From: Salvatore Orlando <salv.orlando@gmail.com>
Date: Wed, 26 Feb 2014 22:38:24 +0000 (-0800)
Subject: NSX: Pass NSX uuid when plugging l2 gw attachment
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=caa4ccd5d75626b390bb071e10367935f2878880;p=openstack-build%2Fneutron-build.git

NSX: Pass NSX uuid when plugging l2 gw attachment

The code passed the neutron network identifier.
This is no longer valid as identifiers on the backend are not
anymore the same as neutron identifiers.

Also, this would have hardly worked with networks on extended
logical switches.

Closes-Bug: 1285399
Change-Id: I6fe4d22d5b8d8b7dc3eb1cb3f47ad52ac1a2b565
---

diff --git a/neutron/plugins/nicira/NeutronPlugin.py b/neutron/plugins/nicira/NeutronPlugin.py
index db5c7bc4b..fade1bb21 100644
--- a/neutron/plugins/nicira/NeutronPlugin.py
+++ b/neutron/plugins/nicira/NeutronPlugin.py
@@ -717,7 +717,7 @@ class NvpPluginV2(addr_pair_db.AllowedAddressPairsMixin,
                 selected_lswitch['uuid'], lport['uuid'])
             l2gwlib.plug_l2_gw_service(
                 self.cluster,
-                port_data['network_id'],
+                selected_lswitch['uuid'],
                 lport['uuid'],
                 port_data['device_id'],
                 int(port_data.get('gw:segmentation_id') or 0))