X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Fclients%2Focloud_sa_client.py;h=5d1a5f91caf7baa7b28893d041e03940a99f1e78;hb=f10107e78b324fc607fe06486764588f38fc220d;hp=b8607efdbe9b21cb45dd520ea091976f3bc1e78a;hpb=81e3575a77366f30c2049f98c48a3087db0ea992;p=pti%2Fo2.git

diff --git a/o2ims/adapter/clients/ocloud_sa_client.py b/o2ims/adapter/clients/ocloud_sa_client.py
index b8607ef..5d1a5f9 100644
--- a/o2ims/adapter/clients/ocloud_sa_client.py
+++ b/o2ims/adapter/clients/ocloud_sa_client.py
@@ -14,17 +14,22 @@
 
 # client talking to Stx standalone
 
-from service.client.base_client import BaseClient
+from o2ims.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 dcmanagerclient.api import client
+from cgtsclient.client import get_client
+import logging
+logger = logging.getLogger(__name__)
+
 
 class StxSaOcloudClient(BaseClient):
-    def __init__(self):
+    def __init__(self, driver=None):
         super().__init__()
-        self.driver = StxSaClientImp()
+        self.driver = driver if driver else StxSaClientImp()
 
     # def list(self) -> List[ocloudModel.StxGenericModel]:
     #     return self._list()
@@ -33,7 +38,7 @@ class StxSaOcloudClient(BaseClient):
     #     return self._get(id)
 
     def _get(self, id) -> ocloudModel.StxGenericModel:
-        raise self.driver.getInstanceInfo()
+        return self.driver.getInstanceInfo()
 
     def _list(self):
         return [self.driver.getInstanceInfo()]
@@ -62,33 +67,54 @@ class StxSaDmsClient(BaseClient):
     def _list(self):
         return self.driver.getK8sList()
 
-# internal driver which implement client call to Stx Standalone instance
 
-# from keystoneauth1.identity import v3
-# from keystoneauth1 import session
-# # from keystoneclient.v3 import ksclient
-# from starlingxclient.v3 import stxclient
+class StxPserverClient(BaseClient):
+    def __init__(self):
+        super().__init__()
+        self.driver = StxSaClientImp()
+
+    def _get(self, id) -> ocloudModel.StxGenericModel:
+        return self.driver.getPserver(id)
+
+    def _list(self) -> List[ocloudModel.StxGenericModel]:
+        return self.driver.getPserverList()
+
+# internal driver which implement client call to Stx Standalone instance
 
 
 class StxSaClientImp(object):
-    def __init__(self, access_info=None) -> None:
+    def __init__(self, stx_client=None):
         super().__init__()
-        self.access_info = access_info
-        if self.access_info is None:
-            self.access_info = config.get_stx_access_info()
-        # self.auth = auth = v3.Password(
-        #     auth_url="http://example.com:5000/v3", username="admin",
-        #     password="password", project_name="admin",
-        #     user_domain_id="default", project_domain_id="default")
-        # self.session = sess = session.Session(auth=auth)
-        # # self.keystone = ksclient.Client(session=sess)
-        # self.stx = stxclient.Client(session=sess)
+        self.stxclient = stx_client if stx_client else self.getStxClient()
+
+    def getStxClient():
+        os_client_args = config.get_stx_access_info()
+        config_client = get_client(**os_client_args)
+        return config_client
 
     def getInstanceInfo(self) -> ocloudModel.StxGenericModel:
-        raise NotImplementedError
+        systems = self.stxclient.isystem.list()
+        logger.debug("systems:" + str(systems[0].to_dict()))
+        return ocloudModel.StxGenericModel(systems[0]) if systems else None
+
+    def getPserverList(self) -> List[ocloudModel.StxGenericModel]:
+        hosts = self.stxclient.ihost.list()
+        logger.debug("host 1:" + str(hosts[0].to_dict()))
+        return [ocloudModel.StxGenericModel(self._hostconverter(host))
+                for host in hosts if host]
+
+    def getPserver(self, id) -> ocloudModel.StxGenericModel:
+        host = self.stxclient.ihost.get(id)
+        logger.debug("host:" + str(host.to_dict()))
+        return ocloudModel.StxGenericModel(self._hostconverter(host))
 
     def getK8sList(self) -> List[ocloudModel.StxGenericModel]:
         raise NotImplementedError
 
     def getK8sDetail(self, id) -> ocloudModel.StxGenericModel:
         raise NotImplementedError
+
+    @staticmethod
+    def _hostconverter(host):
+        setattr(host, "name", host.hostname)
+        return host