From: Salvatore Orlando <salv.orlando@gmail.com>
Date: Tue, 27 Nov 2012 00:53:30 +0000 (-0800)
Subject: Fix syntax error in nvplib
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7f900006fe4a67c0f650ffacdc7178606145dfc1;p=openstack-build%2Fneutron-build.git

Fix syntax error in nvplib

Bug 1083379

Change-Id: I906be569b72506df5729e547407a204739c36305
---

diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py b/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py
index 96aaf60df..6417c1736 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py
@@ -192,8 +192,8 @@ def create_lswitch(cluster, lswitch_obj):
     return d
 
 
-def update_network(cluster, switch, **params):
-    uri = "/ws.v1/lswitch/" + switch
+def update_network(cluster, lswitch_id, **params):
+    uri = "/ws.v1/lswitch/" + lswitch_id
     lswitch_obj = {}
     if params["network"]["name"]:
         lswitch_obj["display_name"] = params["network"]["name"]
@@ -202,7 +202,7 @@ def update_network(cluster, switch, **params):
                                      cluster=cluster)
     except NvpApiClient.ResourceNotFound as e:
         LOG.error("Network not found, Error: %s" % str(e))
-        raise exception.NetworkNotFound(net_id=network)
+        raise exception.NetworkNotFound(net_id=lswitch_id)
     except NvpApiClient.NvpApiException as e:
         raise exception.QuantumException()