x/python-ganttclient
Code Issues Proposed changes

bug #828429: remove references to interface in nova-dhcpbridge

Browse Source
This commit is contained in:
Dan Wendlandt
2011-08-17 22:00:38 -07:00
parent 192dd49f5e
commit 9538e313b4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/nova-dhcpbridge
View File

@@ -52,7 +52,7 @@ flags.DECLARE('update_dhcp_on_disassociate', 'nova.network.manager')
LOG = logging.getLogger('nova.dhcpbridge') LOG = logging.getLogger('nova.dhcpbridge')
def add_lease(mac, ip_address, _interface): def add_lease(mac, ip_address):
"""Set the IP that was assigned by the DHCP server.""" """Set the IP that was assigned by the DHCP server."""
if FLAGS.fake_rabbit: if FLAGS.fake_rabbit:
LOG.debug(_("leasing ip")) LOG.debug(_("leasing ip"))
@@ -66,13 +66,13 @@ def add_lease(mac, ip_address, _interface):
"args": {"address": ip_address}}) "args": {"address": ip_address}})
def old_lease(mac, ip_address, interface): def old_lease(mac, ip_address):
"""Update just as add lease.""" """Update just as add lease."""
LOG.debug(_("Adopted old lease or got a change of mac")) LOG.debug(_("Adopted old lease or got a change of mac"))
add_lease(mac, ip_address, interface) add_lease(mac, ip_address)
def del_lease(mac, ip_address, _interface): def del_lease(mac, ip_address):
"""Called when a lease expires.""" """Called when a lease expires."""
if FLAGS.fake_rabbit: if FLAGS.fake_rabbit:
LOG.debug(_("releasing ip")) LOG.debug(_("releasing ip"))
@@ -116,9 +116,9 @@ def main():
mac = argv[2] mac = argv[2]
ip = argv[3] ip = argv[3]
msg = _("Called %(action)s for mac %(mac)s with ip %(ip)s" msg = _("Called %(action)s for mac %(mac)s with ip %(ip)s"
" on interface %(interface)s") % locals() " for network %(network_id)s") % locals()
LOG.debug(msg) LOG.debug(msg)
globals()[action + '_lease'](mac, ip, interface) globals()[action + '_lease'](mac, ip)
else: else:
print init_leases(network_id) print init_leases(network_id)