From: Dan Prince <dprince@redhat.com>
Date: Mon, 25 Mar 2013 17:43:14 +0000 (-0400)
Subject: Fix kwargs for FloatingIPPortAlreadyAssociated.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6f752c0125ab1c6a5422c7ddb9c0061eda6fae17;p=openstack-build%2Fneutron-build.git

Fix kwargs for FloatingIPPortAlreadyAssociated.

Updates the NVP plugin to use the correct kwargs when raising
l3.FloatingIPPortAlreadyAssociated.

Fixes LP Bug #1159922.

Change-Id: If89feea5e40976ccb4286f96f5348c54f84950ce
---

diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
index ea8017e23..b9e522a04 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
@@ -1940,7 +1940,11 @@ class NvpPluginV2(db_base_plugin_v2.QuantumDbPluginV2,
             try:
                 port_qry.filter_by(fixed_port_id=fip['port_id']).one()
                 raise l3.FloatingIPPortAlreadyAssociated(
-                    port_id=fip['port_id'])
+                    port_id=fip['port_id'],
+                    fip_id=floatingip_db['id'],
+                    floating_ip_address=floatingip_db['floating_ip_address'],
+                    fixed_ip=floatingip_db['fixed_ip_address'],
+                    net_id=floatingip_db['floating_network_id'])
             except sa_exc.NoResultFound:
                 pass
             port_id, internal_ip, router_id = self.get_assoc_data(