summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-09-17 15:26:31 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-09-17 15:26:31 -0700
commit78f7cd742126a9f758ae3a6c133af99df12e838b (patch)
tree313245c0d7eac45cb54fadf1a44c2149cc322a2b
parentf69ccc655fb132f344fe633279d1a73e2e30245a (diff)
get the interface using the network and instance
-rw-r--r--nova/network/manager.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 1283899c1..1f7dc784e 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -633,8 +633,9 @@ class NetworkManager(manager.SchedulerDependentManager):
if FLAGS.force_dhcp_release:
dev = self.driver.get_dev(fixed_ip_ref['network'])
address = fixed_ip_ref['address']
- mac_address = fixed_ip_ref['virtual_interface']['address']
- self.driver.release_dhcp(dev, address, mac_address)
+ 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."""