Refactor watchers

[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 e8c48a3..8ae4968 100644 (file)
--- a/o2ims/adapter/clients/ocloud_sa_client.py
+++ b/o2ims/adapter/clients/ocloud_sa_client.py
@@ -33,16 +33,10 @@ class StxSaOcloudClient(BaseClient):
         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
@@ -54,7 +48,7 @@ class StxSaResourcePoolClient(BaseClient):
     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
@@ -66,8 +60,8 @@ class StxSaDmsClient(BaseClient):
     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
@@ -78,21 +72,21 @@ class StxPserverClient(BaseClient):
     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
@@ -113,7 +107,8 @@ class StxSaClientImp(object):
         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(\r
@@ -126,7 +121,7 @@ class StxSaClientImp(object):
         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[0]:" + str(k8sclusters[0].to_dict()))\r
         return [ocloudModel.StxGenericModel(\r
@@ -149,7 +144,8 @@ class StxSaClientImp(object):
             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
         cpulist = self.stxclient.icpu.list(hostid)\r
         return [ocloudModel.StxGenericModel(\r
             ResourceTypeEnum.OCLOUD,\r