From cbe50abd06ae2160acd8b48e39d8c6b96325f3c1 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Mon, 15 Nov 2021 14:45:35 +0800 Subject: [PATCH] Fix client issue Signed-off-by: Bin Yang Change-Id: I4b2fc706fec47ce595b13b65eced0d40128d85d6 --- docker-compose.yml | 4 ++-- o2ims/adapter/clients/ocloud_sa_client.py | 11 ++++++----- o2ims/entrypoints/o2ims-redis-entry.sh | 8 ++++++++ o2ims/service/client/base_client.py | 2 +- o2ims/service/watcher/base.py | 4 ++-- 5 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 o2ims/entrypoints/o2ims-redis-entry.sh diff --git a/docker-compose.yml b/docker-compose.yml index c7ca8b7..efb52cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,8 +24,8 @@ services: - ./o2common:/o2common - ./tests:/tests entrypoint: - - python - - /o2ims/entrypoints/redis_eventconsumer.py + - /bin/sh + - /o2ims/entrypoints/o2ims-redis-entry.sh api: image: o2imsdms-image diff --git a/o2ims/adapter/clients/ocloud_sa_client.py b/o2ims/adapter/clients/ocloud_sa_client.py index 8ae4968..e9a5c5c 100644 --- a/o2ims/adapter/clients/ocloud_sa_client.py +++ b/o2ims/adapter/clients/ocloud_sa_client.py @@ -61,7 +61,7 @@ class StxSaDmsClient(BaseClient): return self.driver.getK8sDetail(name) def _list(self, **filters): - return self.driver.getK8sList(filters) + return self.driver.getK8sList(**filters) class StxPserverClient(BaseClient): @@ -73,7 +73,7 @@ class StxPserverClient(BaseClient): return self.driver.getPserver(id) def _list(self, **filters) -> List[ocloudModel.StxGenericModel]: - return self.driver.getPserverList(filters) + return self.driver.getPserverList(**filters) class StxCpuClient(BaseClient): @@ -86,7 +86,7 @@ class StxCpuClient(BaseClient): return self.driver.getCpu(id) def _list(self, **filters) -> List[ocloudModel.StxGenericModel]: - return self.driver.getCpuList(filters) + return self.driver.getCpuList(**filters) # internal driver which implement client call to Stx Standalone instance @@ -146,15 +146,16 @@ class StxSaClientImp(object): def getCpuList(self, **filters) -> List[ocloudModel.StxGenericModel]: hostid = filters.get("hostid", None) + assert (hostid is not None), "missing hostid to query icpu list" cpulist = self.stxclient.icpu.list(hostid) return [ocloudModel.StxGenericModel( - ResourceTypeEnum.OCLOUD, + ResourceTypeEnum.PSERVER_CPU, self._cpuconverter(cpures)) for cpures in cpulist if cpures] def getCpu(self, id) -> ocloudModel.StxGenericModel: cpuinfo = self.stxclient.icpu.get(id) return ocloudModel.StxGenericModel( - ResourceTypeEnum.OCLOUD, self._cpuconverter(cpuinfo)) + ResourceTypeEnum.PSERVER_CPU, self._cpuconverter(cpuinfo)) def _getIsystems(self): return self.stxclient.isystem.list() diff --git a/o2ims/entrypoints/o2ims-redis-entry.sh b/o2ims/entrypoints/o2ims-redis-entry.sh new file mode 100644 index 0000000..41369ae --- /dev/null +++ b/o2ims/entrypoints/o2ims-redis-entry.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# pip install -e /src +# python /o2ims/entrypoints/resource_watcher.py + +cp -r /o2ims/* /src/o2ims +pip install -e /src +python /o2ims/entrypoints/redis_eventconsumer.py diff --git a/o2ims/service/client/base_client.py b/o2ims/service/client/base_client.py index 48047af..0c35fee 100644 --- a/o2ims/service/client/base_client.py +++ b/o2ims/service/client/base_client.py @@ -23,7 +23,7 @@ class BaseClient(abc.ABC): pass def list(self, **filters) -> List[ocloudModel.StxGenericModel]: - return self._list(filters) + return self._list(**filters) def get(self, id) -> ocloudModel.StxGenericModel: return self._get(id) diff --git a/o2ims/service/watcher/base.py b/o2ims/service/watcher/base.py index 45967de..12b259e 100644 --- a/o2ims/service/watcher/base.py +++ b/o2ims/service/watcher/base.py @@ -81,5 +81,5 @@ class WatcherTree(object): return for res in resources: - for node in self.children: - node.probe(res, childdepth) + for targetname in self.children.keys(): + self.children[targetname].probe(res, childdepth) -- 2.16.6