Fix client issue

Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I4b2fc706fec47ce595b13b65eced0d40128d85d6

diff --git a/docker-compose.yml b/docker-compose.yml
index c7ca8b7..efb52cf 100644 (file)
--- 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 (file)
--- 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)\r
 \r
     def _list(self, **filters):\r
-        return self.driver.getK8sList(filters)\r
+        return self.driver.getK8sList(**filters)\r
 \r
 \r
 class StxPserverClient(BaseClient):\r
@@ -73,7 +73,7 @@ class StxPserverClient(BaseClient):
         return self.driver.getPserver(id)\r
 \r
     def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
-        return self.driver.getPserverList(filters)\r
+        return self.driver.getPserverList(**filters)\r
 \r
 \r
 class StxCpuClient(BaseClient):\r
@@ -86,7 +86,7 @@ class StxCpuClient(BaseClient):
         return self.driver.getCpu(id)\r
 \r
     def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
-        return self.driver.getCpuList(filters)\r
+        return self.driver.getCpuList(**filters)\r
 \r
 # internal driver which implement client call to Stx Standalone instance\r
 \r
@@ -146,15 +146,16 @@ class StxSaClientImp(object):
 \r
     def getCpuList(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
         hostid = filters.get("hostid", None)\r
+        assert (hostid is not None), "missing hostid to query icpu list"\r
         cpulist = self.stxclient.icpu.list(hostid)\r
         return [ocloudModel.StxGenericModel(\r
-            ResourceTypeEnum.OCLOUD,\r
+            ResourceTypeEnum.PSERVER_CPU,\r
             self._cpuconverter(cpures)) for cpures in cpulist if cpures]\r
 \r
     def getCpu(self, id) -> ocloudModel.StxGenericModel:\r
         cpuinfo = self.stxclient.icpu.get(id)\r
         return ocloudModel.StxGenericModel(\r
-            ResourceTypeEnum.OCLOUD, self._cpuconverter(cpuinfo))\r
+            ResourceTypeEnum.PSERVER_CPU, self._cpuconverter(cpuinfo))\r
 \r
     def _getIsystems(self):\r
         return self.stxclient.isystem.list()\r

diff --git a/o2ims/entrypoints/o2ims-redis-entry.sh b/o2ims/entrypoints/o2ims-redis-entry.sh
new file mode 100644 (file)
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 (file)
--- a/o2ims/service/client/base_client.py
+++ b/o2ims/service/client/base_client.py
@@ -23,7 +23,7 @@ class BaseClient(abc.ABC):
         pass\r
 \r
     def list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
-        return self._list(filters)\r
+        return self._list(**filters)\r
 \r
     def get(self, id) -> ocloudModel.StxGenericModel:\r
         return self._get(id)\r

diff --git a/o2ims/service/watcher/base.py b/o2ims/service/watcher/base.py
index 45967de..12b259e 100644 (file)
--- a/o2ims/service/watcher/base.py
+++ b/o2ims/service/watcher/base.py
@@ -81,5 +81,5 @@ class WatcherTree(object):
             return\r
 \r
         for res in resources:\r
-            for node in self.children:\r
-                node.probe(res, childdepth)\r
+            for targetname in self.children.keys():\r
+                self.children[targetname].probe(res, childdepth)\r