From: Adam Israel <adam.israel@canonical.com>
Date: Mon, 27 May 2019 13:28:13 +0000 (+0200)
Subject: Merge "Complete Feature 6297"
X-Git-Tag: v6.0.0~7
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=8bf1041b5ce6398f9997aeb3564dfbe7e732bf0c;hp=c92163f142d07c6bb213354398d9befd70efaacd;p=osm%2FN2VC.git

Merge "Complete Feature 6297"
---

diff --git a/n2vc/vnf.py b/n2vc/vnf.py
index 0d9530e..11ce3c8 100644
--- a/n2vc/vnf.py
+++ b/n2vc/vnf.py
@@ -457,8 +457,8 @@ class N2VC:
             if all(k in machine_spec for k in ['host', 'user']):
                 # Enlist an existing machine as a Juju unit
                 machine = await model.add_machine(spec='ssh:{}@{}:{}'.format(
-                    machine_spec['user'],
-                    machine_spec['host'],
+                    machine_spec['username'],
+                    machine_spec['hostname'],
                     self.GetPrivateKeyPath(),
                 ))
                 to = machine.id
diff --git a/tests/base.py b/tests/base.py
index 912eab9..663e89a 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -740,8 +740,8 @@ class TestN2VC(object):
             )
 
             machine_spec = {
-                'host': hostname,
-                'user': 'ubuntu',
+                'hostname': hostname,
+                'username': 'ubuntu',
             }
 
         await self.n2vc.DeployCharms(