Update watcher worker

[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 5e9e64c..e8c48a3 100644 (file)
--- a/o2ims/adapter/clients/ocloud_sa_client.py
+++ b/o2ims/adapter/clients/ocloud_sa_client.py
@@ -20,6 +20,7 @@ from typing import List
 # Optional,  Set\r
 from o2ims.domain import stx_object as ocloudModel\r
 from o2ims 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
@@ -101,7 +102,7 @@ class StxSaClientImp(object):
         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
@@ -109,39 +110,55 @@ class StxSaClientImp(object):
     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
         hosts = self.stxclient.ihost.list()\r
         logger.debug("host 1:" + str(hosts[0].to_dict()))\r
-        return [ocloudModel.StxGenericModel(self._hostconverter(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
         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
         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.OCLOUD,\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.OCLOUD, self._cpuconverter(cpuinfo))\r
 \r
     def _getIsystems(self):\r
         return self.stxclient.isystem.list()\r
@@ -167,12 +184,17 @@ class StxSaClientImp(object):
         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
+    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
         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