# client talking to Stx standalone\r
\r
import uuid\r
-from o2ims.service.client.base_client import BaseClient\r
+from o2common.service.client.base_client import BaseClient\r
from typing import List\r
# Optional, Set\r
from o2ims.domain import stx_object as ocloudModel\r
-from o2ims import config\r
+from o2common.config import config\r
from o2ims.domain.resource_type import ResourceTypeEnum\r
\r
# from dcmanagerclient.api import client\r
from cgtsclient.client import get_client\r
-import logging\r
-logger = logging.getLogger(__name__)\r
+\r
+from o2common.helper import o2logging\r
+logger = o2logging.get_logger(__name__)\r
\r
\r
class StxSaOcloudClient(BaseClient):\r
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
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
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
\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