projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove incorrect docstring
[osm/N2VC.git]
/
juju
/
unit.py
diff --git
a/juju/unit.py
b/juju/unit.py
index
cad4bb7
..
9a75404
100644
(file)
--- a/
juju/unit.py
+++ b/
juju/unit.py
@@
-1,5
+1,6
@@
import logging
import logging
-from datetime import datetime
+
+from dateutil.parser import parse as parse_date
from . import model
from .client import client
from . import model
from .client import client
@@
-13,48
+14,42
@@
class Unit(model.ModelEntity):
"""Returns the current agent status string.
"""
"""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.
"""
@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.
"""
@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.
"""
@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.
"""
@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.
"""
@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):
@property
def tag(self):
@@
-111,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
: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 = client.ActionFacade()
@@
-136,11
+129,12
@@
class Unit(model.ModelEntity):
:param str action_name: Name of action to run
:param \*\*params: Action parameters
:param str action_name: Name of action to run
:param \*\*params: Action parameters
- :returns: A
n
`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.
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()
action_facade.connect(self.connection)
@@
-242,8
+236,8
@@
class Unit(model.ModelEntity):
if not status.applications[app]['units'].get(self.name):
return False
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)
async def get_metrics(self):
metrics = await self.model.get_metrics(self.tag)