X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Fclients%2Focloud_sa_client.py;h=e8f1685fbc930be5cd7db9d4d81364241a4589b7;hb=84867b76a65efc4e9add52c86eae7e451c4a038d;hp=8ae49680eb9f986e4e06cadacd5358ba12d1a978;hpb=e60b74de2ecaccc5f2fef8e75a44649d0e90d362;p=pti%2Fo2.git

diff --git a/o2ims/adapter/clients/ocloud_sa_client.py b/o2ims/adapter/clients/ocloud_sa_client.py
index 8ae4968..e8f1685 100644
--- a/o2ims/adapter/clients/ocloud_sa_client.py
+++ b/o2ims/adapter/clients/ocloud_sa_client.py
@@ -15,17 +15,18 @@
 # client talking to Stx standalone
 
 import uuid
-from o2ims.service.client.base_client import BaseClient
+from o2common.service.client.base_client import BaseClient
 from typing import List
 # Optional,  Set
 from o2ims.domain import stx_object as ocloudModel
-from o2ims import config
+from o2common.config import config
 from o2ims.domain.resource_type import ResourceTypeEnum
 
 # from dcmanagerclient.api import client
 from cgtsclient.client import get_client
-import logging
-logger = logging.getLogger(__name__)
+
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
 
 
 class StxSaOcloudClient(BaseClient):
@@ -61,7 +62,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 +74,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 +87,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 +147,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()