diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-27 17:07:21 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-27 17:07:21 -0500 |
| commit | b699b9abd235eb611bc1d59b923f1ed83f96cfff (patch) | |
| tree | bc354fa40903cdcccd436d680c2352a82b35dd3c | |
| parent | 0a2c2e0975c3037372b47b09a7f547eb197ef7d7 (diff) | |
| download | nova-b699b9abd235eb611bc1d59b923f1ed83f96cfff.tar.gz nova-b699b9abd235eb611bc1d59b923f1ed83f96cfff.tar.xz nova-b699b9abd235eb611bc1d59b923f1ed83f96cfff.zip | |
removed unneded mac parameter to lease and release fixed ip functions
| -rwxr-xr-x | bin/nova-dhcpbridge | 8 | ||||
| -rw-r--r-- | nova/network/manager.py | 10 | ||||
| -rw-r--r-- | nova/tests/network/base.py | 4 |
3 files changed, 8 insertions, 14 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 5926b97de..6d9d85896 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -59,14 +59,12 @@ def add_lease(mac, ip_address, _hostname, _interface): LOG.debug(_("leasing ip")) network_manager = utils.import_object(FLAGS.network_manager) network_manager.lease_fixed_ip(context.get_admin_context(), - mac, ip_address) else: rpc.cast(context.get_admin_context(), "%s.%s" % (FLAGS.network_topic, FLAGS.host), {"method": "lease_fixed_ip", - "args": {"mac": mac, - "address": ip_address}}) + "args": {"address": ip_address}}) def old_lease(mac, ip_address, hostname, interface): @@ -81,14 +79,12 @@ def del_lease(mac, ip_address, _hostname, _interface): LOG.debug(_("releasing ip")) network_manager = utils.import_object(FLAGS.network_manager) network_manager.release_fixed_ip(context.get_admin_context(), - mac, ip_address) else: rpc.cast(context.get_admin_context(), "%s.%s" % (FLAGS.network_topic, FLAGS.host), {"method": "release_fixed_ip", - "args": {"mac": mac, - "address": ip_address}}) + "args": {"address": ip_address}}) def init_leases(interface): diff --git a/nova/network/manager.py b/nova/network/manager.py index b60e70990..44d5d406f 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -503,10 +503,9 @@ class NetworkManager(manager.SchedulerDependentManager): {'allocated': False, 'virtual_interface_id': None}) - def lease_fixed_ip(self, context, mac, address): + def lease_fixed_ip(self, context, address): """Called by dhcp-bridge when ip is leased.""" - LOG.debug(_('Leased IP |%(address)s| to mac |%(mac)s|'), locals(), - context=context) + LOG.debug(_('Leased IP |%(address)s|'), locals(), context=context) fixed_ip = self.db.fixed_ip_get_by_address(context, address) instance = fixed_ip['instance'] if not instance: @@ -521,10 +520,9 @@ class NetworkManager(manager.SchedulerDependentManager): LOG.warn(_('IP |%s| leased that isn\'t allocated'), address, context=context) - def release_fixed_ip(self, context, mac, address): + def release_fixed_ip(self, context, address): """Called by dhcp-bridge when ip is released.""" - LOG.debug(_('Released IP |%(address)s| from mac |%(mac)s|'), locals(), - context=context) + LOG.debug(_('Released IP |%(address)s|'), locals(), context=context) fixed_ip = self.db.fixed_ip_get_by_address(context, address) instance = fixed_ip['instance'] if not instance: diff --git a/nova/tests/network/base.py b/nova/tests/network/base.py index eceb384f2..9c42909d8 100644 --- a/nova/tests/network/base.py +++ b/nova/tests/network/base.py @@ -135,10 +135,10 @@ class TestFuncs(object): db.fixed_ip_update(self.context, address, {'virtual_interface_id': vif['id']}) - self.network.lease_fixed_ip(self.context, vif['address'], address) + self.network.lease_fixed_ip(self.context, address) ip = db.fixed_ip_get_by_address(self.context, address) self.assertTrue(ip['leased']) - self.network.release_fixed_ip(self.context, vif['address'], address) + self.network.release_fixed_ip(self.context, address) ip = db.fixed_ip_get_by_address(self.context, address) self.assertFalse(ip['leased']) |