Merge lp:~vishvananda/nova/lp852771 into lp:~hudson-openstack/nova/milestone-proposed

[Vish Ishaya]

Adds an optional flag to force dhcp releases on instance termination. This allows ips to be reused without having to wait for the lease to timeout.

=== modified file 'nova/network/linux_net.py'
--- nova/network/linux_net.py	2011-09-07 20:10:05 +0000
+++ nova/network/linux_net.py	2011-09-19 20:13:58 +0000
@@ -540,6 +540,10 @@
     return '\n'.join(hosts)
 
 
+def release_dhcp(dev, address, mac_address):
+    utils.execute('dhcp_release', dev, address, mac_address, run_as_root=True)
+
+
 # NOTE(ja): Sending a HUP only reloads the hostfile, so any
 #           configuration options (like dchp-range, vlan, ...)
 #           aren't reloaded.
@@ -790,6 +794,10 @@
     return interface_driver.unplug(network)
 
 
+def get_dev(network):
+    return interface_driver.get_dev(network)
+
+
 class LinuxNetInterfaceDriver(object):
     """Abstract class that defines generic network host API"""
     """ for for all Linux interface drivers."""
@@ -802,6 +810,11 @@
         """Destory Linux device, return device name"""
         raise NotImplementedError()
 
+    def get_dev(self, network):
+        """Get device name"""
+        raise NotImplementedError()
+
+
 
 # plugs interfaces using Linux Bridge
 class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
@@ -823,6 +836,9 @@
         return network['bridge']
 
     def unplug(self, network):
+        return self.get_dev(network)
+
+    def get_dev(self, network):
         return network['bridge']
 
     @classmethod
@@ -947,6 +963,9 @@
         return dev
 
     def unplug(self, network):
+        return self.get_dev(network)
+
+    def get_dev(self, network):
         dev = "gw-" + str(network['id'])
         return dev
 

=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-09-14 21:57:52 +0000
+++ nova/network/manager.py	2011-09-19 20:13:58 +0000
@@ -110,6 +110,8 @@
                     'Network host to use for ip allocation in flat modes')
 flags.DEFINE_bool('fake_call', False,
                   'If True, skip using the queue and make local calls')
+flags.DEFINE_bool('force_dhcp_release', False,
+                  'If True, send a dhcp release on instance termination')
 
 
 class AddressAlreadyAllocated(exception.Error):
@@ -629,6 +631,11 @@
         instance_id = instance_ref['id']
         self._do_trigger_security_group_members_refresh_for_instance(
                                                                    instance_id)
+        if FLAGS.force_dhcp_release:
+            dev = self.driver.get_dev(fixed_ip_ref['network'])
+            vif = self.db.virtual_interface_get_by_instance_and_network(
+                    context, instance_ref['id'], fixed_ip_ref['network']['id'])
+            self.driver.release_dhcp(dev, address, vif['address'])
 
     def lease_fixed_ip(self, context, address):
         """Called by dhcp-bridge when ip is leased."""