From: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Date: Tue, 22 Nov 2016 13:49:19 +0000 (-0500)
Subject: Merge pull request #15 from juju/run-action
X-Git-Tag: 0.1.0~41
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d613f8d8ae11dc96c240219884f44f2e3f9d004c;hp=-c;p=osm%2FN2VC.git

Merge pull request #15 from juju/run-action

Implement Unit.run_action
---

d613f8d8ae11dc96c240219884f44f2e3f9d004c
diff --combined juju/unit.py
index 0757aa7,37d45d3..d0a70bd
--- a/juju/unit.py
+++ b/juju/unit.py
@@@ -1,4 -1,3 +1,3 @@@
- import asyncio
  import logging
  from datetime import datetime
  
@@@ -57,6 -56,10 +56,10 @@@ class Unit(model.ModelEntity)
          """
          return self.data['workload-status']['message']
  
+     @property
+     def tag(self):
+         return 'unit-%s' % self.name.replace('/', '-')
+ 
      def add_storage(self, name, constraints=None):
          """Add unit storage dynamically.
  
@@@ -128,14 -131,39 +131,39 @@@
          )
          return await self.model.wait_for_action(res.results[0].action.tag)
  
-     def run_action(self, action_name, **params):
-         """Run action on this unit.
+     async def run_action(self, action_name, **params):
+         """Run an action on this unit.
  
          :param str action_name: Name of action to run
          :param \*\*params: Action parameters
- 
-         """
-         pass
+         :returns: An `juju.action.Action` instance.
+ 
+         Note that this only enqueues the action.  You will need to call
+         ``action.wait()`` on the resulting `Action` instance if you wish
+         to block until the action is complete.
+         """
+         action_facade = client.ActionFacade()
+         action_facade.connect(self.connection)
+ 
+         log.debug('Starting action `%s` on %s', action_name, self.name)
+ 
+         res = await action_facade.Enqueue([client.Action(
+             name=action_name,
+             parameters=params,
+             receiver=self.tag,
+         )])
+         action = res.results[0].action
+         error = res.results[0].error
+         if error and error.code == 'not found':
+             raise ValueError('Action `%s` not found on %s' % (action_name,
+                                                               self.name))
+         elif error:
+             raise Exception('Unknown action error: %s' % error.serialize())
+         action_id = action.tag[len('action-'):]
+         log.debug('Action started as %s', action_id)
+         # we can't use wait_for_new here because we don't
+         # consistently (ever?) get an "add" delta for the action
+         return await self.model._wait('action', action_id, None)
  
      def scp(
              self, source_path, user=None, destination_path=None, proxy=False,
@@@ -178,26 -206,3 +206,26 @@@
  
          """
          pass
 +
 +    async def is_leader_from_status(self):
 +        """
 +        Check to see if this unit is the leader. Returns True if so, and
 +        False if it is not, or if leadership does not make sense
 +        (e.g., there is no leader in this application.)
 +
 +        This method is a kluge that calls FullStatus in the
 +        ClientFacade to get its information. Once
 +        https://bugs.launchpad.net/juju/+bug/1643691 is resolved, we
 +        should add a simple .is_leader property, and deprecate this
 +        method.
 +
 +        """
 +        app = self.name.split("/")[0]
 +
 +        c = client.ClientFacade()
 +        c.connect(self.model.connection)
 +
 +        status = await c.FullStatus(None)
 +
 +        return status.applications[app]['units'][self.name].get(
 +            'leader', False)