From: Aaron Rosen <aaronorosen@gmail.com>
Date: Tue, 18 Feb 2014 21:15:02 +0000 (-0800)
Subject: NSX: get_port_status passed wrong id for network
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d532864d832656adaca433792ed50c8ed71db40a;p=openstack-build%2Fneutron-build.git

NSX: get_port_status passed wrong id for network

The call to get_port_status in update_port was passing in the neutron
network_id instead of the nsx_network_id. These used to be the same
but now are different. This patch updates the code so that it now
passes in the correct uuid.

Change-Id: I7b0bd617f68291fa457a49e52d595bb8de1d4835
Closes-bug: #1281789
---

diff --git a/neutron/plugins/nicira/NeutronPlugin.py b/neutron/plugins/nicira/NeutronPlugin.py
index fb248ed2c..974f079a9 100644
--- a/neutron/plugins/nicira/NeutronPlugin.py
+++ b/neutron/plugins/nicira/NeutronPlugin.py
@@ -1311,7 +1311,7 @@ class NvpPluginV2(addr_pair_db.AllowedAddressPairsMixin,
                     # since the port was successfully updated but we were not
                     # able to retrieve the status.
                     ret_port['status'] = switchlib.get_port_status(
-                        self.cluster, ret_port['network_id'],
+                        self.cluster, nsx_switch_id,
                         nsx_port_id)
                 # FIXME(arosen) improve exception handling.
                 except Exception: