From: Adam Israel Date: Wed, 22 May 2019 20:30:25 +0000 (-0400) Subject: Align machine_spec with pydoc X-Git-Tag: v6.0.0~8 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F7492%2F1;p=osm%2FN2VC.git Align machine_spec with pydoc Align the name of the machine_spec keys as defined in the pydoc Change-Id: I3e9c3609ea81b53b77cefcda63bbb4a8b0c6510c Signed-off-by: Adam Israel --- diff --git a/n2vc/vnf.py b/n2vc/vnf.py index a68e657..04ad301 100644 --- a/n2vc/vnf.py +++ b/n2vc/vnf.py @@ -456,8 +456,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(