X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Funit.py;h=fc597bf15ed57e48729176b497366487381f7e16;hb=c50c361a8b9a3bbf1a33f5659e492b481f065cd2;hp=2ec1769560e538bce345d07fb42b7d9951f7a7a4;hpb=748ead6b20ea06c274b85af671ddce8cde3d1868;p=osm%2FN2VC.git diff --git a/juju/unit.py b/juju/unit.py index 2ec1769..fc597bf 100644 --- a/juju/unit.py +++ b/juju/unit.py @@ -1,5 +1,6 @@ import logging -from datetime import datetime + +from dateutil.parser import parse as parse_date from . import model from .client import client @@ -13,48 +14,60 @@ 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. """ - since = self.data['agent-status']['since'] - # Juju gives us nanoseconds, but Python only supports microseconds - since = since[:26] - return datetime.strptime(since, "%Y-%m-%dT%H:%M:%S.%f") + 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. """ - since = self.data['workload-status']['since'] - # Juju gives us nanoseconds, but Python only supports microseconds - since = since[:26] - return datetime.strptime(since, "%Y-%m-%dT%H:%M:%S.%f") + 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 machine(self): + """Get the machine object for this unit. + + """ + machine_id = self.safe_data['machine-id'] + if machine_id: + return self.model.machines.get(machine_id, None) + else: + return None + + @property + def public_address(self): + """ Get the public address. + + """ + return self.safe_data['public-address'] or None @property def tag(self): @@ -68,20 +81,19 @@ class Unit(model.ModelEntity): form 'POOL,COUNT,SIZE' """ - pass + raise NotImplementedError() def collect_metrics(self): """Collect metrics on this unit. """ - pass + raise NotImplementedError() async def destroy(self): """Destroy this unit. """ - app_facade = client.ApplicationFacade() - app_facade.connect(self.connection) + app_facade = client.ApplicationFacade.from_connection(self.connection) log.debug( 'Destroying %s', self.name) @@ -96,7 +108,7 @@ class Unit(model.ModelEntity): unit """ - pass + raise NotImplementedError() def resolved(self, retry=False): """Mark unit errors resolved. @@ -104,20 +116,17 @@ class Unit(model.ModelEntity): :param bool retry: Re-execute failed hooks """ - pass + raise NotImplementedError() 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 - - Returns a tuple containing the stdout, stderr, and return code - from the command. + :returns: A :class:`juju.action.Action` instance. """ - action = client.ActionFacade() - action.connect(self.connection) + action = client.ActionFacade.from_connection(self.connection) log.debug( 'Running `%s` on %s', command, self.name) @@ -136,14 +145,14 @@ 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) + action_facade = client.ActionFacade.from_connection(self.connection) log.debug('Starting action `%s` on %s', action_name, self.name) @@ -165,26 +174,37 @@ class Unit(model.ModelEntity): # action is complete, rather than just being in the model return await self.model._wait_for_new('action', action_id) - def scp( - self, source_path, user=None, destination_path=None, proxy=False, - scp_opts=None): + async def scp_to(self, source, destination, user='ubuntu', proxy=False, + scp_opts=''): """Transfer files to this unit. - :param str source_path: Path of file(s) to transfer + :param str source: Local path of file(s) to transfer + :param str destination: Remote destination of transferred files :param str user: Remote username - :param str destination_path: Destination of transferred files on - remote machine :param bool proxy: Proxy through the Juju API server :param str scp_opts: Additional options to the `scp` command + """ + await self.machine.scp_to(source, destination, user=user, proxy=proxy, + scp_opts=scp_opts) + + async def scp_from(self, source, destination, user='ubuntu', proxy=False, + scp_opts=''): + """Transfer files from this unit. + :param str source: Remote path of file(s) to transfer + :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 """ - pass + await self.machine.scp_from(source, destination, user=user, + proxy=proxy, scp_opts=scp_opts) def set_meter_status(self): """Set the meter status on this unit. """ - pass + raise NotImplementedError() def ssh( self, command, user=None, proxy=False, ssh_opts=None): @@ -196,7 +216,7 @@ class Unit(model.ModelEntity): :param str ssh_opts: Additional options to the `ssh` command """ - pass + raise NotImplementedError() def status_history(self, num=20, utc=False): """Get status history for this unit. @@ -205,7 +225,7 @@ class Unit(model.ModelEntity): :param bool utc: Display time as UTC in RFC3339 format """ - pass + raise NotImplementedError() async def is_leader_from_status(self): """ @@ -222,19 +242,33 @@ class Unit(model.ModelEntity): """ app = self.name.split("/")[0] - c = client.ClientFacade() - c.connect(self.model.connection) + c = client.ClientFacade.from_connection(self.connection) status = await c.FullStatus(None) - try: - return status.applications[app]['units'][self.name].get( - 'leader', False) - except KeyError: - # FullStatus may be more up-to-date than the model - # referenced by this class. If this unit has been - # destroyed between the time the class was created and the - # time that we call this method, we'll get a KeyError. In - # that case, we simply return False, as a destroyed unit - # is not a leader. + # FullStatus may be more up to date than our model, and the + # unit may have gone away, or we may be doing something silly, + # like trying to fetch leadership for a subordinate, which + # will not be filed where we expect in the model. In those + # cases, we may simply return False, as a nonexistent or + # subordinate unit is not a leader. + if not status.applications.get(app): + return False + + if not status.applications[app].get('units'): + return False + + if not status.applications[app]['units'].get(self.name): return False + + return status.applications[app]['units'][self.name].get('leader', + False) + + async def get_metrics(self): + """Get metrics for the unit. + + :return: Dictionary of metrics for this unit. + + """ + metrics = await self.model.get_metrics(self.tag) + return metrics[self.name]