# 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
super().__init__()\r
self.driver = driver if driver else StxSaClientImp()\r
\r
- # def list(self) -> List[ocloudModel.StxGenericModel]:\r
- # return self._list()\r
-\r
- # def get(self, id) -> ocloudModel.StxGenericModel:\r
- # return self._get(id)\r
-\r
def _get(self, id) -> ocloudModel.StxGenericModel:\r
return self.driver.getInstanceInfo()\r
\r
- def _list(self):\r
+ def _list(self, **filters):\r
return [self.driver.getInstanceInfo()]\r
\r
\r
def _get(self, id) -> ocloudModel.StxGenericModel:\r
return self.driver.getInstanceInfo()\r
\r
- def _list(self):\r
+ def _list(self, **filters):\r
return [self.driver.getInstanceInfo()]\r
\r
\r
def _get(self, name) -> ocloudModel.StxGenericModel:\r
return self.driver.getK8sDetail(name)\r
\r
- def _list(self):\r
- return self.driver.getK8sList()\r
+ def _list(self, **filters):\r
+ return self.driver.getK8sList(**filters)\r
\r
\r
class StxPserverClient(BaseClient):\r
def _get(self, id) -> ocloudModel.StxGenericModel:\r
return self.driver.getPserver(id)\r
\r
- def _list(self) -> List[ocloudModel.StxGenericModel]:\r
- return self.driver.getPserverList()\r
+ def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
+ return self.driver.getPserverList(**filters)\r
\r
\r
class StxCpuClient(BaseClient):\r
- def __init__(self, pserver_id):\r
+ def __init__(self):\r
super().__init__()\r
- self._pserver_id = pserver_id\r
+ # self._pserver_id = pserver_id\r
self.driver = StxSaClientImp()\r
\r
def _get(self, id) -> ocloudModel.StxGenericModel:\r
return self.driver.getCpu(id)\r
\r
- def _list(self) -> List[ocloudModel.StxGenericModel]:\r
- return self.driver.getCpuList(self._pserver_id)\r
+ def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
+ return self.driver.getCpuList(**filters)\r
\r
-# internal driver which implement client call to Stx Standalone instance\r
\r
+class StxMemClient(BaseClient):\r
+ def __init__(self):\r
+ super().__init__()\r
+ # self._pserver_id = pserver_id\r
+ self.driver = StxSaClientImp()\r
+\r
+ def _get(self, id) -> ocloudModel.StxGenericModel:\r
+ return self.driver.getMem(id)\r
+\r
+ def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
+ return self.driver.getMemList(**filters)\r
+\r
+\r
+class StxPortClient(BaseClient):\r
+ def __init__(self):\r
+ super().__init__()\r
+ # self._pserver_id = pserver_id\r
+ self.driver = StxSaClientImp()\r
+\r
+ def _get(self, id) -> ocloudModel.StxGenericModel:\r
+ return self.driver.getPort(id)\r
+\r
+ def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
+ return self.driver.getPortList(**filters)\r
+\r
+\r
+class StxIfClient(BaseClient):\r
+ def __init__(self):\r
+ super().__init__()\r
+ # self._pserver_id = pserver_id\r
+ self.driver = StxSaClientImp()\r
+\r
+ def _get(self, id) -> ocloudModel.StxGenericModel:\r
+ return self.driver.getIf(id)\r
\r
+ def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
+ return self.driver.getIfList(**filters)\r
+\r
+\r
+# internal driver which implement client call to Stx Standalone instance\r
class StxSaClientImp(object):\r
def __init__(self, stx_client=None):\r
super().__init__()\r
self.stxclient = stx_client if stx_client else self.getStxClient()\r
\r
- def getStxClient():\r
+ def getStxClient(self):\r
os_client_args = config.get_stx_access_info()\r
config_client = get_client(**os_client_args)\r
return config_client\r
def getInstanceInfo(self) -> ocloudModel.StxGenericModel:\r
systems = self.stxclient.isystem.list()\r
logger.debug("systems:" + str(systems[0].to_dict()))\r
- return ocloudModel.StxGenericModel(systems[0]) if systems else None\r
+ return ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.OCLOUD, systems[0]) if systems else None\r
\r
- def getPserverList(self) -> List[ocloudModel.StxGenericModel]:\r
+ def getPserverList(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
+ # resourcepoolid = filters.get("resourcepoolid", None)\r
hosts = self.stxclient.ihost.list()\r
logger.debug("host 1:" + str(hosts[0].to_dict()))\r
- return [ocloudModel.StxGenericModel(self._hostconverter(host))\r
- for host in hosts if host]\r
+ return [ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.PSERVER, self._hostconverter(host))\r
+ for host in hosts if host]\r
\r
def getPserver(self, id) -> ocloudModel.StxGenericModel:\r
host = self.stxclient.ihost.get(id)\r
logger.debug("host:" + str(host.to_dict()))\r
- return ocloudModel.StxGenericModel(self._hostconverter(host))\r
+ return ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.PSERVER, self._hostconverter(host))\r
\r
- def getK8sList(self) -> List[ocloudModel.StxGenericModel]:\r
+ def getK8sList(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
k8sclusters = self.stxclient.kube_cluster.list()\r
- logger.debug("k8sresources:" + str(k8sclusters[0].to_dict()))\r
-\r
- return [ocloudModel.StxGenericModel(self._k8sconverter(k8sres))\r
- for k8sres in k8sclusters if k8sres]\r
+ logger.debug("k8sresources[0]:" + str(k8sclusters[0].to_dict()))\r
+ return [ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.DMS,\r
+ self._k8sconverter(k8sres), self._k8shasher(k8sres))\r
+ for k8sres in k8sclusters if k8sres]\r
\r
def getK8sDetail(self, name) -> ocloudModel.StxGenericModel:\r
- k8scluster = self.stxclient.kube_cluster.get(name)\r
+ if not name:\r
+ k8sclusters = self.stxclient.kube_cluster.list()\r
+ # logger.debug("k8sresources[0]:" + str(k8sclusters[0].to_dict()))\r
+ k8scluster = k8sclusters.pop()\r
+ else:\r
+ k8scluster = self.stxclient.kube_cluster.get(name)\r
+\r
+ if not k8scluster:\r
+ return None\r
logger.debug("k8sresource:" + str(k8scluster.to_dict()))\r
- return ocloudModel.StxGenericModel(self._k8sconverter(k8scluster))\r
+ return ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.DMS,\r
+ self._k8sconverter(k8scluster), self._k8shasher(k8scluster))\r
\r
- def getCpuList(self, hostid) -> List[ocloudModel.StxGenericModel]:\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(self._cpuconverter(cpures))\r
- for cpures in cpulist if cpures]\r
+ return [ocloudModel.StxGenericModel(\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(self._cpuconverter(cpuinfo))\r
+ return ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.PSERVER_CPU, self._cpuconverter(cpuinfo))\r
+\r
+ def getMemList(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
+ hostid = filters.get("hostid", None)\r
+ assert (hostid is not None), "missing hostid to query imem list"\r
+ memlist = self.stxclient.imemory.list(hostid)\r
+ return [ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.PSERVER_RAM,\r
+ self._memconverter(memories)) for memories in memlist if memories]\r
+\r
+ def getMem(self, id) -> ocloudModel.StxGenericModel:\r
+ meminfo = self.stxclient.imemory.get(id)\r
+ return ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.PSERVER_RAM, self._memconverter(meminfo))\r
+\r
+ def getPortList(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
+ hostid = filters.get("hostid", None)\r
+ assert (hostid is not None), "missing hostid to query port list"\r
+ portlist = self.stxclient.port.list(hostid)\r
+ return [ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.PSERVER_PORT,\r
+ port) for port in portlist if port]\r
+\r
+ def getPort(self, id) -> ocloudModel.StxGenericModel:\r
+ portinfo = self.stxclient.port.get(id)\r
+ return ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.PSERVER_PORT, portinfo)\r
+\r
+ def getIfList(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
+ hostid = filters.get("hostid", None)\r
+ assert (hostid is not None), "missing hostid to query iinterface list"\r
+ iflist = self.stxclient.iinterface.list(hostid)\r
+ return [ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.PSERVER_IF,\r
+ self._ifconverter(ifs)) for ifs in iflist if ifs]\r
+\r
+ def getIf(self, id) -> ocloudModel.StxGenericModel:\r
+ ifinfo = self.stxclient.iinterface.get(id)\r
+ return ocloudModel.StxGenericModel(\r
+ ResourceTypeEnum.PSERVER_IF, self._ifconverter(ifinfo))\r
\r
def _getIsystems(self):\r
return self.stxclient.isystem.list()\r
'more than one system exists in the account.')\r
return isystems[0]\r
\r
- @staticmethod\r
+ @ staticmethod\r
def _hostconverter(host):\r
setattr(host, "name", host.hostname)\r
return host\r
\r
- @staticmethod\r
+ @ staticmethod\r
def _cpuconverter(cpu):\r
- setattr(cpu, "name", "core-"+str(cpu.core))\r
+ setattr(cpu, "name", "cpu-"+str(cpu.cpu))\r
return cpu\r
\r
- @staticmethod\r
- def _k8sconverter(host):\r
- setattr(host, "name", host.cluster_name)\r
- setattr(host, "uuid",\r
- uuid.uuid3(uuid.NAMESPACE_URL, host.cluster_name))\r
- setattr(host, 'updated_at', None)\r
- setattr(host, 'created_at', None)\r
+ @ staticmethod\r
+ def _memconverter(mem):\r
+ setattr(mem, "name", "mem-node-"+str(mem.numa_node))\r
+ return mem\r
+\r
+ @ staticmethod\r
+ def _ifconverter(ifs):\r
+ setattr(ifs, "name", ifs.ifname)\r
+ setattr(ifs, 'updated_at', None)\r
+ setattr(ifs, 'created_at', None)\r
+ return ifs\r
+\r
+ @ staticmethod\r
+ def _k8sconverter(cluster):\r
+ setattr(cluster, "name", cluster.cluster_name)\r
+ setattr(cluster, "uuid",\r
+ uuid.uuid3(uuid.NAMESPACE_URL, cluster.cluster_name))\r
+ setattr(cluster, 'updated_at', None)\r
+ setattr(cluster, 'created_at', None)\r
+ setattr(cluster, 'events', [])\r
logger.debug("k8s cluster name/uuid:" +\r
- host.name + "/" + str(host.uuid))\r
- return host\r
+ cluster.name + "/" + str(cluster.uuid))\r
+ return cluster\r
+\r
+ @ staticmethod\r
+ def _k8shasher(cluster):\r
+ return str(hash((cluster.cluster_name,\r
+ cluster.cluster_api_endpoint, cluster.admin_user)))\r
Code Review / pti / o2.git / blobdiff