Fix client issue

[pti/o2.git] / o2ims / adapter / clients / ocloud_sa_client.py

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