From: Cory Johns <johnsca@gmail.com>
Date: Tue, 8 Nov 2016 16:53:01 +0000 (-0500)
Subject: Fixed name conflict in auto-generated code
X-Git-Tag: 0.1.0~53^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=6438e5b4b66a45fc680c3d6dce15a044ad9979dd;p=osm%2FN2VC.git

Fixed name conflict in auto-generated code
---

diff --git a/juju/client/facade.py b/juju/client/facade.py
index be5f23b..c4834ee 100644
--- a/juju/client/facade.py
+++ b/juju/client/facade.py
@@ -344,9 +344,9 @@ def makeFunc(cls, name, params, result, async=True):
     assignments = []
     toschema = args.PyToSchemaMapping()
     for arg in args._get_arg_str(False, False):
-        assignments.append("{}params[\'{}\'] = {}".format(INDENT,
-                                                          toschema[arg],
-                                                          arg))
+        assignments.append("{}_params[\'{}\'] = {}".format(INDENT,
+                                                           toschema[arg],
+                                                           arg))
     assignments = "\n".join(assignments)
     res = retspec(result)
     source = """
@@ -358,8 +358,8 @@ def makeFunc(cls, name, params, result, async=True):
     Returns -> {res}
     '''
     # map input types to rpc msg
-    params = dict()
-    msg = dict(type='{cls.name}', request='{name}', version={cls.version}, params=params)
+    _params = dict()
+    msg = dict(type='{cls.name}', request='{name}', version={cls.version}, params=_params)
 {assignments}
     reply = {await}self.rpc(msg)
     return reply