From: Brian Haley <brian.haley@hp.com>
Date: Mon, 14 Sep 2015 20:12:18 +0000 (-0400)
Subject: Fix TypeError caused by delete_agent_gateway_port()
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=573c14659a953164ba556c694062e9242dcca807;p=openstack-build%2Fneutron-build.git

Fix TypeError caused by delete_agent_gateway_port()

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
---

diff --git a/neutron/api/rpc/handlers/l3_rpc.py b/neutron/api/rpc/handlers/l3_rpc.py
index 47157e5b9..9727e00f4 100644
--- a/neutron/api/rpc/handlers/l3_rpc.py
+++ b/neutron/api/rpc/handlers/l3_rpc.py
@@ -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)