X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Funit.py;h=9a7540459cfc320eac17eaa0de1c4e358223ccfe;hb=de5d31a2f09275264d3139720f5a287cef8b438b;hp=dc5fa63caefbada8329493d8849c558a3f017f50;hpb=0a3b685af80dc92e039241b17e712b15994f5769;p=osm%2FN2VC.git diff --git a/juju/unit.py b/juju/unit.py index dc5fa63..9a75404 100644 --- a/juju/unit.py +++ b/juju/unit.py @@ -14,42 +14,42 @@ class Unit(model.ModelEntity): """Returns the current agent status string. """ - return self.data['agent-status']['current'] + return self.safe_data['agent-status']['current'] @property def agent_status_since(self): """Get the time when the `agent_status` was last updated. """ - return parse_date(self.data['agent-status']['since']) + return parse_date(self.safe_data['agent-status']['since']) @property def agent_status_message(self): """Get the agent status message. """ - return self.data['agent-status']['message'] + return self.safe_data['agent-status']['message'] @property def workload_status(self): """Returns the current workload status string. """ - return self.data['workload-status']['current'] + return self.safe_data['workload-status']['current'] @property def workload_status_since(self): """Get the time when the `workload_status` was last updated. """ - return parse_date(self.data['workload-status']['since']) + return parse_date(self.safe_data['workload-status']['since']) @property def workload_status_message(self): """Get the workload status message. """ - return self.data['workload-status']['message'] + return self.safe_data['workload-status']['message'] @property def tag(self): @@ -106,9 +106,7 @@ class Unit(model.ModelEntity): :param str command: The command to run :param int timeout: Time to wait before command is considered failed - - Returns a tuple containing the stdout, stderr, and return code - from the command. + :returns: A :class:`juju.action.Action` instance. """ action = client.ActionFacade() @@ -131,11 +129,12 @@ class Unit(model.ModelEntity): :param str action_name: Name of action to run :param \*\*params: Action parameters - :returns: An `juju.action.Action` instance. + :returns: A :class:`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) @@ -237,8 +236,8 @@ class Unit(model.ModelEntity): if not status.applications[app]['units'].get(self.name): return False - return status.applications[app]['units'][self.name].get('leader', False) - + return status.applications[app]['units'][self.name].get('leader', + False) async def get_metrics(self): metrics = await self.model.get_metrics(self.tag)