X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_view.py;fp=o2ims%2Fviews%2Focloud_view.py;h=e129b8374c921b37d474a987394f97ae002502be;hb=513d34988f76825846a2379078eb4aedcaed9f27;hp=7213fc41f1387e7c9bbe06b95ec1c458f00d1c53;hpb=1a9dcb5b8f598ee348f23eafecc2d92ef09c8122;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py
index 7213fc4..e129b83 100644
--- a/o2ims/views/ocloud_view.py
+++ b/o2ims/views/ocloud_view.py
@@ -105,64 +105,40 @@ def deployment_managers(uow: unit_of_work.AbstractUnitOfWork):
 
 def deployment_manager_one(deploymentManagerId: str,
                            uow: unit_of_work.AbstractUnitOfWork,
-                           profile: str = 'params'):
+                           profile: str = 'default'):
+    profile = profile.lower()
     with uow:
         first = uow.deployment_managers.get(deploymentManagerId)
         if first is None:
             return first
         result = first.serialize()
+        if result is None:
+            return None
 
-    if "params" == profile:
-        pass
-    elif "file" == profile and result.hasattr("profile"):
-        p = result.pop("profile", None)
-        result["profile"] = _gen_kube_config(deploymentManagerId, p)
-    else:
-        result.pop("profile", None)
+    profile_data = result.pop("profile", None)
+    result['profileName'] = 'default'
+
+    if "sol0018" == profile:
+        result['profileName'] = profile
+        result['deploymentManagementServiceEndpoint'] = \
+            profile_data['cluster_api_endpoint']
+        result['profileData'] = profile_data
+    # elif "file" == profile and result.hasattr("profile"):
+        # p = result.pop("profile", None)
+        # result["profile"] = _gen_kube_config(deploymentManagerId, p)
 
     return result
 
 
 def _gen_kube_config(dmId: str, kubeconfig: dict) -> dict:
 
-    # KUBECONFIG environment variable
-    # reference:
-    # https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/
-    data = {
-        'apiVersion': 'v1',
-        'clusters': [
-            {
-                'cluster': {
-                    'server':
-                    kubeconfig.pop('cluster_api_endpoint', None),
-                    'certificate-authority-data':
-                    kubeconfig.pop('cluster_ca_cert', None),
-                },
-                'name': 'inf-cluster'
-            }],
-        'contexts': [
-            {
-                'context': {
-                    'cluster': 'inf-cluster',
-                    'user': 'kubernetes-admin'
-                },
-                'name': 'kubernetes-admin@inf-cluster'
-            }
-        ],
-        'current-context': 'kubernetes-admin@inf-cluster',
-        'kind': 'Config',
-        'preferences': {},
-        'users': [
-            {
-                'name': kubeconfig.pop('admin_user', None),
-                'user': {
-                    'client-certificate-data':
-                    kubeconfig.pop('admin_client_cert', None),
-                    'client-key-data':
-                    kubeconfig.pop('admin_client_key', None),
-                }
-            }]
-    }
+    data = config.gen_k8s_config_dict(
+        kubeconfig.pop('cluster_api_endpoint', None),
+        kubeconfig.pop('cluster_ca_cert', None),
+        kubeconfig.pop('admin_user', None),
+        kubeconfig.pop('admin_client_cert', None),
+        kubeconfig.pop('admin_client_key', None),
+    )
 
     # Generate a random key for tmp kube config file
     letters = string.ascii_uppercase