]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Fix TypeError caused by delete_agent_gateway_port()
authorBrian Haley <brian.haley@hp.com>
Mon, 14 Sep 2015 20:12:18 +0000 (16:12 -0400)
committerBrian Haley <brian.haley@hpe.com>
Mon, 14 Sep 2015 21:09:19 +0000 (17:09 -0400)
A recent change used a keyword argument when it didn't need to,
correct it to fix the multinode DVR job.

End of typical traceback:

File "/opt/stack/new/neutron/neutron/api/rpc/handlers/l3_rpc.py",
in delete_agent_gateway_port(admin_ctx, network_id, host_id=host)

TypeError: delete_floatingip_agent_gateway_port() got multiple
values for keyword argument 'host_id'

Introduced in commit 639f1893dde0d393a97b29ca5309dba716831a7

Related-bug: #1495147

Change-Id: Id2522bc843bc7b089b7783d3f765900a50a0033f

neutron/api/rpc/handlers/l3_rpc.py

index 47157e5b961c916acc5c97ea5bcd75e7dcd10bce..9727e00f47604c5851f188a9c89f4c6ac2b35e8a 100644 (file)
@@ -289,4 +289,4 @@ class L3RpcCallback(object):
         host = kwargs.get('host')
         admin_ctx = neutron_context.get_admin_context()
         self.l3plugin.delete_floatingip_agent_gateway_port(
-            admin_ctx, network_id, host_id=host)
+            admin_ctx, host, network_id)