RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 00:22:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/orch: ServiceDescription: change json representation

Browse Source 
In order to match the new paradigm

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
This commit is contained in:
Sebastian Wagner 2020-03-19 12:57:08 +01:00
parent b4c88196ff
commit 24e375a536
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pybind/mgr/orchestrator/_interface.py
View File

@ -1366,40 +1366,44 @@ class ServiceDescription(object):
self.last_refresh = last_refresh # type: Optional[datetime.datetime]
self.created = created # type: Optional[datetime.datetime]
self.spec = spec
self.spec: ServiceSpec = spec
def service_type(self):
if self.service_name:
return self.service_name.split('.')[0]
return None
return self.spec.service_type
def __repr__(self):
return "<ServiceDescription>({name})".format(name=self.service_name)
return f"<ServiceDescription of {self.spec.one_line_str()}>"
def to_json(self):
out = {
out = self.spec.to_json()
status = {
'container_image_id': self.container_image_id,
'container_image_name': self.container_image_name,
'service_name': self.service_name,
'rados_config_location': self.rados_config_location,
'service_url': self.service_url,
'size': self.size,
'running': self.running,
'spec': self.spec.to_json() if self.spec is not None else None
'last_refresh': self.last_refresh,
'created': self.created
}
for k in ['last_refresh', 'created']:
if getattr(self, k):
out[k] = getattr(self, k).strftime(DATEFMT)
return {k: v for (k, v) in out.items() if v is not None}
status[k] = getattr(self, k).strftime(DATEFMT)
status = {k: v for (k, v) in status.items() if v is not None}
out['status'] = status
return out
@classmethod
@handle_type_error
def from_json(cls, data):
c = data.copy()
def from_json(cls, data: dict):
status = data.pop('status', {})
spec = ServiceSpec.from_json(data)
c = status.copy()
for k in ['last_refresh', 'created']:
if k in c:
c[k] = datetime.datetime.strptime(c[k], DATEFMT)
return cls(**c)
return cls(spec=spec, **c)
class InventoryFilter(object):