projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get everything working on juju-2.0beta11
[osm/N2VC.git]
/
juju
/
unit.py
diff --git
a/juju/unit.py
b/juju/unit.py
index
900ade9
..
b540ada
100644
(file)
--- a/
juju/unit.py
+++ b/
juju/unit.py
@@
-1,4
+1,15
@@
-class Unit(object):
+import logging
+
+from . import model
+from .client import client
+
+log = logging.getLogger(__name__)
+
+
+class Unit(model.ModelEntity):
+ def _get_tag(self):
+ return 'unit-{}'.format(self.data['name'].replace('/', '-'))
+
def add_storage(self, name, constraints=None):
"""Add unit storage dynamically.
def add_storage(self, name, constraints=None):
"""Add unit storage dynamically.
@@
-39,14
+50,27
@@
class Unit(object):
"""
pass
"""
pass
- def run(self, command, timeout=None):
+
async
def run(self, command, timeout=None):
"""Run command on this unit.
:param str command: The command to run
:param int timeout: Time to wait before command is considered failed
"""
"""Run command on this unit.
:param str command: The command to run
:param int timeout: Time to wait before command is considered failed
"""
- pass
+ action = client.ActionFacade()
+ conn = await self.model.connection.clone()
+ action.connect(conn)
+
+ log.debug(
+ 'Running `%s` on %s', command, self.name)
+
+ return await action.Run(
+ [],
+ command,
+ [],
+ timeout,
+ [self.name],
+ )
def run_action(self, action_name, **params):
"""Run action on this unit.
def run_action(self, action_name, **params):
"""Run action on this unit.