From: Philip Joseph <philip.joseph@riftio.com>
Date: Fri, 9 Sep 2016 19:36:44 +0000 (-0400)
Subject: Bug 34 : Fix Juju 2.x connectivity error
X-Git-Tag: v1.0.0~35
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=71d69942de5da5974b7ff7da12fe59d090033fb6;p=osm%2FSO.git

Bug 34 : Fix Juju 2.x connectivity error

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
---

diff --git a/common/python/rift/mano/utils/juju_api.py b/common/python/rift/mano/utils/juju_api.py
index 3f3b0864..6eb3568b 100644
--- a/common/python/rift/mano/utils/juju_api.py
+++ b/common/python/rift/mano/utils/juju_api.py
@@ -256,9 +256,10 @@ class JujuApi(object):
             models = env.models.list()
             for m in models['user-models']:
                 if m['model']['name'] == 'default':
-                    mep =  '{}/model/{}/api'.format(endpoint, m['model']['uuid'])
+                    mep =  '{}/model/{}/api'.format(self.endpoint,
+                                                    m['model']['uuid'])
                     model = Env2(mep, env_uuid=m['model']['uuid'])
-                    l = model.login(args.password, user=args.user)
+                    l = model.login(self.password, user=self.user)
                     break
 
             if model is None: