Add auditor for resource pool, pserver and cpu/memory/port/interface for pserver...

[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 e8f1685..31c9069 100644 (file)
--- a/o2ims/adapter/clients/ocloud_sa_client.py
+++ b/o2ims/adapter/clients/ocloud_sa_client.py
@@ -89,9 +89,47 @@ class StxCpuClient(BaseClient):
     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
@@ -114,7 +152,7 @@ class StxSaClientImp(object):
         logger.debug("host 1:" + str(hosts[0].to_dict()))\r
         return [ocloudModel.StxGenericModel(\r
             ResourceTypeEnum.PSERVER, self._hostconverter(host))\r
-                for host in hosts if host]\r
+            for host in hosts if host]\r
 \r
     def getPserver(self, id) -> ocloudModel.StxGenericModel:\r
         host = self.stxclient.ihost.get(id)\r
@@ -158,6 +196,45 @@ class StxSaClientImp(object):
         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
 \r
@@ -171,28 +248,41 @@ class StxSaClientImp(object):
                                 '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
+    @ 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
                      cluster.name + "/" + str(cluster.uuid))\r
         return cluster\r
 \r
-    @staticmethod\r
+    @ staticmethod\r
     def _k8shasher(cluster):\r
         return str(hash((cluster.cluster_name,\r
                          cluster.cluster_api_endpoint, cluster.admin_user)))\r