From b699b9abd235eb611bc1d59b923f1ed83f96cfff Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Mon, 27 Jun 2011 17:07:21 -0500 Subject: removed unneded mac parameter to lease and release fixed ip functions --- nova/network/manager.py | 10 ++++------ nova/tests/network/base.py | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'nova') 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']) -- cgit