projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accept None for parameter ca_cert at vnf.py: N2VC.__init__
[osm/N2VC.git]
/
modules
/
libjuju
/
juju
/
machine.py
diff --git
a/modules/libjuju/juju/machine.py
b/modules/libjuju/juju/machine.py
index
a46135c
..
39bfa11
100644
(file)
--- a/
modules/libjuju/juju/machine.py
+++ b/
modules/libjuju/juju/machine.py
@@
-21,7
+21,7
@@
class Machine(model.ModelEntity):
if not model.info:
await utils.run_with_interrupt(model.get_info(),
model._watch_stopping,
if not model.info:
await utils.run_with_interrupt(model.get_info(),
model._watch_stopping,
- model.loop)
+
loop=
model.loop)
if model._watch_stopping.is_set():
return
if model.info.agent_version < client.Number.from_json('2.2.3'):
if model._watch_stopping.is_set():
return
if model.info.agent_version < client.Number.from_json('2.2.3'):
@@
-50,7
+50,7
@@
class Machine(model.ModelEntity):
full_status = await utils.run_with_interrupt(model.get_status(),
model._watch_stopping,
full_status = await utils.run_with_interrupt(model.get_status(),
model._watch_stopping,
- model.loop)
+
loop=
model.loop)
if model._watch_stopping.is_set():
return
if model._watch_stopping.is_set():
return
@@
-146,7
+146,8
@@
class Machine(model.ModelEntity):
:param str destination: Remote destination of transferred files
:param str user: Remote username
:param bool proxy: Proxy through the Juju API server
:param str destination: Remote destination of transferred files
:param str user: Remote username
:param bool proxy: Proxy through the Juju API server
- :param str scp_opts: Additional options to the `scp` command
+ :param scp_opts: Additional options to the `scp` command
+ :type scp_opts: str or list
"""
if proxy:
raise NotImplementedError('proxy option is not implemented')
"""
if proxy:
raise NotImplementedError('proxy option is not implemented')
@@
-163,7
+164,8
@@
class Machine(model.ModelEntity):
:param str destination: Local destination of transferred files
:param str user: Remote username
:param bool proxy: Proxy through the Juju API server
:param str destination: Local destination of transferred files
:param str user: Remote username
:param bool proxy: Proxy through the Juju API server
- :param str scp_opts: Additional options to the `scp` command
+ :param scp_opts: Additional options to the `scp` command
+ :type scp_opts: str or list
"""
if proxy:
raise NotImplementedError('proxy option is not implemented')
"""
if proxy:
raise NotImplementedError('proxy option is not implemented')
@@
-181,10
+183,10
@@
class Machine(model.ModelEntity):
'-i', os.path.expanduser('~/.local/share/juju/ssh/juju_id_rsa'),
'-o', 'StrictHostKeyChecking=no',
'-q',
'-i', os.path.expanduser('~/.local/share/juju/ssh/juju_id_rsa'),
'-o', 'StrictHostKeyChecking=no',
'-q',
- '-B',
- source, destination
+ '-B'
]
]
- cmd += scp_opts.split()
+ cmd.extend(scp_opts.split() if isinstance(scp_opts, str) else scp_opts)
+ cmd.extend([source, destination])
loop = self.model.loop
process = await asyncio.create_subprocess_exec(*cmd, loop=loop)
await process.wait()
loop = self.model.loop
process = await asyncio.create_subprocess_exec(*cmd, loop=loop)
await process.wait()