Virtual Router fixes cleanup

Author: Ronald van Zantvoort

systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py

@@ -501,10 +501,6 @@ def fw_vpcrouter(self):
         self.fw.append(["filter", "", "-P FORWARD DROP"])
 
     def post_config_change(self, method):
-        logging.warn('PCONF: {}'.format(method))
-        logging.warn('ME: {}'.format(self))
-        logging.warn('GT: {}'.format(self.get_type()))
-
         route = CsRoute()
         if method == "add":
             route.add_table(self.dev)

systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py

@@ -81,24 +81,12 @@ def use_extdns(self):
     def get_dns(self):
         conf = self.cmdline().idata()
         dns = []
-<<<<<<< e09480728f4ed77d0bd0bdc6a6c0966d90f7ee26
-        if not self.cl.get_use_ext_dns():
-            if not self.is_vpc() and self.cl.is_redundant():
-                dns.append(self.cl.get_guest_gw())
-            else:
-                dns.append(self.address().get_guest_ip())
-        names = ["dns1", "dns2"]
-        for name in names:
-            if name in self.cmdline().idata():
-                dns.append(self.cmdline().idata()[name])
-=======
         if not self.use_extdns():
             dns.append(self.address().get_guest_ip())
 
         for name in ('dns1', 'dns2'):
             if name in conf:
                 dns.append(conf[name])
->>>>>>> Virtual Router fixes:
         return dns
 
     def get_format(self):

systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py

@@ -59,7 +59,6 @@ def process(self):
 
     def configure_server(self):
         # self.conf.addeq("dhcp-hostsfile=%s" % DHCP_HOSTS)
-        logging.warning('DEVINFO: {}'.format(self.devinfo))
         idx = 0
         for i in self.devinfo:
             if not i['dnsmasq']:

systemvm/patches/debian/config/opt/cloud/bin/merge.py

@@ -134,8 +134,8 @@ def process(self):
             self.db.load()
             dbag = self.process_ipaliases(self.db.getDataBag())
         elif self.qFile.type == 'dhcpconfig':
-            logging.warn('RECEIVED: {}'.format(self.db.getDataBag()))
-            dbag = self.process_dhcpconfig(self.db.getDataBag())
+            logging.error("I don't think I need %s anymore", self.qFile.type)
+            return
         else:
             logging.error("Error I do not know what to do with file of type %s", self.qFile.type)
             return
@@ -239,7 +239,6 @@ def processVmData(self, dbag):
         return dbag
 
     def process_ipaliases(self, dbag):
-        logging.warn('DOUCHEBAGS: {}'.format(dbag))
         nic_dev = None
         # Should be a way to deal with this better
         for intf, data in dbag.items():
@@ -264,10 +263,6 @@ def process_ipaliases(self, dbag):
             dbag = cs_ip.merge(dbag, ip)
         return dbag
 
-    def process_dhcpconfig(self, dbag):
-        logging.error('STUBBED!!!')
-        return dbag
-
 class QueueFile:
 
     fileName = ''