X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Fclients%2Focloud_sa_client.py;h=31c9069c8fdacc740de62bd67ed860fc9797a3d2;hb=5ad82f634e2f10aaeccf1d2420fafc63e2d0056e;hp=e8c48a3d656acef57a2f0aa8e31c3cbcc3d516d7;hpb=8be81dfad35b08c4de77168e885bb18253069771;p=pti%2Fo2.git diff --git a/o2ims/adapter/clients/ocloud_sa_client.py b/o2ims/adapter/clients/ocloud_sa_client.py index e8c48a3..31c9069 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): @@ -33,16 +34,10 @@ class StxSaOcloudClient(BaseClient): super().__init__() self.driver = driver if driver else StxSaClientImp() - # def list(self) -> List[ocloudModel.StxGenericModel]: - # return self._list() - - # def get(self, id) -> ocloudModel.StxGenericModel: - # return self._get(id) - def _get(self, id) -> ocloudModel.StxGenericModel: return self.driver.getInstanceInfo() - def _list(self): + def _list(self, **filters): return [self.driver.getInstanceInfo()] @@ -54,7 +49,7 @@ class StxSaResourcePoolClient(BaseClient): def _get(self, id) -> ocloudModel.StxGenericModel: return self.driver.getInstanceInfo() - def _list(self): + def _list(self, **filters): return [self.driver.getInstanceInfo()] @@ -66,8 +61,8 @@ class StxSaDmsClient(BaseClient): def _get(self, name) -> ocloudModel.StxGenericModel: return self.driver.getK8sDetail(name) - def _list(self): - return self.driver.getK8sList() + def _list(self, **filters): + return self.driver.getK8sList(**filters) class StxPserverClient(BaseClient): @@ -78,25 +73,63 @@ class StxPserverClient(BaseClient): def _get(self, id) -> ocloudModel.StxGenericModel: return self.driver.getPserver(id) - def _list(self) -> List[ocloudModel.StxGenericModel]: - return self.driver.getPserverList() + def _list(self, **filters) -> List[ocloudModel.StxGenericModel]: + return self.driver.getPserverList(**filters) class StxCpuClient(BaseClient): - def __init__(self, pserver_id): + def __init__(self): super().__init__() - self._pserver_id = pserver_id + # self._pserver_id = pserver_id self.driver = StxSaClientImp() def _get(self, id) -> ocloudModel.StxGenericModel: return self.driver.getCpu(id) - def _list(self) -> List[ocloudModel.StxGenericModel]: - return self.driver.getCpuList(self._pserver_id) + def _list(self, **filters) -> List[ocloudModel.StxGenericModel]: + return self.driver.getCpuList(**filters) -# internal driver which implement client call to Stx Standalone instance +class StxMemClient(BaseClient): + def __init__(self): + super().__init__() + # self._pserver_id = pserver_id + self.driver = StxSaClientImp() + + def _get(self, id) -> ocloudModel.StxGenericModel: + return self.driver.getMem(id) + + def _list(self, **filters) -> List[ocloudModel.StxGenericModel]: + return self.driver.getMemList(**filters) + +class StxPortClient(BaseClient): + def __init__(self): + super().__init__() + # self._pserver_id = pserver_id + self.driver = StxSaClientImp() + + def _get(self, id) -> ocloudModel.StxGenericModel: + return self.driver.getPort(id) + + def _list(self, **filters) -> List[ocloudModel.StxGenericModel]: + return self.driver.getPortList(**filters) + + +class StxIfClient(BaseClient): + def __init__(self): + super().__init__() + # self._pserver_id = pserver_id + self.driver = StxSaClientImp() + + def _get(self, id) -> ocloudModel.StxGenericModel: + return self.driver.getIf(id) + + def _list(self, **filters) -> List[ocloudModel.StxGenericModel]: + return self.driver.getIfList(**filters) + + +# internal driver which implement client call to Stx Standalone instance class StxSaClientImp(object): def __init__(self, stx_client=None): super().__init__() @@ -113,12 +146,13 @@ class StxSaClientImp(object): return ocloudModel.StxGenericModel( ResourceTypeEnum.OCLOUD, systems[0]) if systems else None - def getPserverList(self) -> List[ocloudModel.StxGenericModel]: + def getPserverList(self, **filters) -> List[ocloudModel.StxGenericModel]: + # resourcepoolid = filters.get("resourcepoolid", None) hosts = self.stxclient.ihost.list() logger.debug("host 1:" + str(hosts[0].to_dict())) return [ocloudModel.StxGenericModel( ResourceTypeEnum.PSERVER, self._hostconverter(host)) - for host in hosts if host] + for host in hosts if host] def getPserver(self, id) -> ocloudModel.StxGenericModel: host = self.stxclient.ihost.get(id) @@ -126,7 +160,7 @@ class StxSaClientImp(object): return ocloudModel.StxGenericModel( ResourceTypeEnum.PSERVER, self._hostconverter(host)) - def getK8sList(self) -> List[ocloudModel.StxGenericModel]: + def getK8sList(self, **filters) -> List[ocloudModel.StxGenericModel]: k8sclusters = self.stxclient.kube_cluster.list() logger.debug("k8sresources[0]:" + str(k8sclusters[0].to_dict())) return [ocloudModel.StxGenericModel( @@ -149,16 +183,57 @@ class StxSaClientImp(object): ResourceTypeEnum.DMS, self._k8sconverter(k8scluster), self._k8shasher(k8scluster)) - def getCpuList(self, hostid) -> List[ocloudModel.StxGenericModel]: + 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 getMemList(self, **filters) -> List[ocloudModel.StxGenericModel]: + hostid = filters.get("hostid", None) + assert (hostid is not None), "missing hostid to query imem list" + memlist = self.stxclient.imemory.list(hostid) + return [ocloudModel.StxGenericModel( + ResourceTypeEnum.PSERVER_RAM, + self._memconverter(memories)) for memories in memlist if memories] + + def getMem(self, id) -> ocloudModel.StxGenericModel: + meminfo = self.stxclient.imemory.get(id) + return ocloudModel.StxGenericModel( + ResourceTypeEnum.PSERVER_RAM, self._memconverter(meminfo)) + + def getPortList(self, **filters) -> List[ocloudModel.StxGenericModel]: + hostid = filters.get("hostid", None) + assert (hostid is not None), "missing hostid to query port list" + portlist = self.stxclient.port.list(hostid) + return [ocloudModel.StxGenericModel( + ResourceTypeEnum.PSERVER_PORT, + port) for port in portlist if port] + + def getPort(self, id) -> ocloudModel.StxGenericModel: + portinfo = self.stxclient.port.get(id) + return ocloudModel.StxGenericModel( + ResourceTypeEnum.PSERVER_PORT, portinfo) + + def getIfList(self, **filters) -> List[ocloudModel.StxGenericModel]: + hostid = filters.get("hostid", None) + assert (hostid is not None), "missing hostid to query iinterface list" + iflist = self.stxclient.iinterface.list(hostid) + return [ocloudModel.StxGenericModel( + ResourceTypeEnum.PSERVER_IF, + self._ifconverter(ifs)) for ifs in iflist if ifs] + + def getIf(self, id) -> ocloudModel.StxGenericModel: + ifinfo = self.stxclient.iinterface.get(id) + return ocloudModel.StxGenericModel( + ResourceTypeEnum.PSERVER_IF, self._ifconverter(ifinfo)) def _getIsystems(self): return self.stxclient.isystem.list() @@ -173,28 +248,41 @@ class StxSaClientImp(object): 'more than one system exists in the account.') return isystems[0] - @staticmethod + @ staticmethod def _hostconverter(host): setattr(host, "name", host.hostname) return host - @staticmethod + @ staticmethod def _cpuconverter(cpu): - setattr(cpu, "name", "core-"+str(cpu.core)) + setattr(cpu, "name", "cpu-"+str(cpu.cpu)) return cpu - @staticmethod + @ staticmethod + def _memconverter(mem): + setattr(mem, "name", "mem-node-"+str(mem.numa_node)) + return mem + + @ staticmethod + def _ifconverter(ifs): + setattr(ifs, "name", ifs.ifname) + setattr(ifs, 'updated_at', None) + setattr(ifs, 'created_at', None) + return ifs + + @ staticmethod def _k8sconverter(cluster): setattr(cluster, "name", cluster.cluster_name) setattr(cluster, "uuid", uuid.uuid3(uuid.NAMESPACE_URL, cluster.cluster_name)) setattr(cluster, 'updated_at', None) setattr(cluster, 'created_at', None) + setattr(cluster, 'events', []) logger.debug("k8s cluster name/uuid:" + cluster.name + "/" + str(cluster.uuid)) return cluster - @staticmethod + @ staticmethod def _k8shasher(cluster): return str(hash((cluster.cluster_name, cluster.cluster_api_endpoint, cluster.admin_user)))