summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDan Wendlandt <dan@nicira.com>2011-08-17 22:00:38 -0700
committerDan Wendlandt <dan@nicira.com>2011-08-17 22:00:38 -0700
commit635306fd009ea9e50259d01e10762f6b5ab45049 (patch)
treec388e133150b524ea6eeb5cfd1dd8f6266b67f16 /bin
parentaca07a42fabb7f506cf132b995b4ad0139987b02 (diff)
downloadnova-635306fd009ea9e50259d01e10762f6b5ab45049.tar.gz
bug #828429: remove references to interface in nova-dhcpbridge
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-dhcpbridge12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index a47ea7a761..c2fd8994dc 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -52,7 +52,7 @@ flags.DECLARE('update_dhcp_on_disassociate', 'nova.network.manager')
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."""
if FLAGS.fake_rabbit:
LOG.debug(_("leasing ip"))
@@ -66,13 +66,13 @@ def add_lease(mac, ip_address, _interface):
"args": {"address": ip_address}})
-def old_lease(mac, ip_address, interface):
+def old_lease(mac, ip_address):
"""Update just as add lease."""
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."""
if FLAGS.fake_rabbit:
LOG.debug(_("releasing ip"))
@@ -116,9 +116,9 @@ def main():
mac = argv[2]
ip = argv[3]
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)
- globals()[action + '_lease'](mac, ip, interface)
+ globals()[action + '_lease'](mac, ip)
else:
print init_leases(network_id)