Removed dhcpopts.conf for now as, it is the routing options and they seem to be dealt with dofferently in the new arrangement

Ian Southam · wilderrodrigues · commit 5137d7e13663 · 2015-03-16T11:35:25.000+01:00
Changed the dhcp tests to avoid handing out the broadcast and gateway addresses :)
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/CsDhcp.py b/systemvm/patches/debian/config/opt/cloud/bin/CsDhcp.py
@@ -96,7 +96,7 @@ def delete_leases(self, clist):
 
     def configure_server(self):
         self.updated = self.updated | CsHelper.addifmissing(CLOUD_CONF, "dhcp-hostsfile=/etc/dhcphosts.txt")
-        self.updated = self.updated | CsHelper.addifmissing(DNSMASQ_CONF, "dhcp-optsfile=%s:" % DHCP_OPTS)
+        #self.updated = self.updated | CsHelper.addifmissing(DNSMASQ_CONF, "dhcp-optsfile=%s:" % DHCP_OPTS)
         for i in self.devinfo:
             if not i['dnsmasq']:
                 continue
diff --git a/test/systemvm/test_update_config.py b/test/systemvm/test_update_config.py
@@ -219,7 +219,7 @@ def guest_network(self,config):
 		# This must happen in order for dnsmasq to be listening
         octets = config['router_guest_ip'].split('.')
         configs = []
-        for n in range(10):
+        for n in range(3,13):
             ipb = ".".join(octets[0:3])
             ipa = "%s.%s" % (ipb, n)
             gw = "%s.1" % ipb
