X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2dms%2Fapi%2Fdms_lcm_view.py;fp=o2dms%2Fapi%2Fdms_lcm_view.py;h=c9abac90b43e65d619895d5f753364392579d87c;hb=513d34988f76825846a2379078eb4aedcaed9f27;hp=208636aa45c247ce800a9d34f0233e74aea716f9;hpb=1a9dcb5b8f598ee348f23eafecc2d92ef09c8122;p=pti%2Fo2.git

diff --git a/o2dms/api/dms_lcm_view.py b/o2dms/api/dms_lcm_view.py
index 208636a..c9abac9 100644
--- a/o2dms/api/dms_lcm_view.py
+++ b/o2dms/api/dms_lcm_view.py
@@ -35,73 +35,46 @@ def deployment_managers(uow: unit_of_work.AbstractUnitOfWork):
 
 
 def deployment_manager_one(deploymentManagerId: str,
-                           uow: unit_of_work.AbstractUnitOfWork,
-                           profile: str = 'params'):
+                           uow: unit_of_work.AbstractUnitOfWork):
+
     # with uow:
     #     res = uow.session.execute(select(deploymentmanager).where(
     #         deploymentmanager.c.deploymentManagerId == deploymentManagerId))
     #     first = res.first()
-    # return None if first is None else dict(first)
-    # with uow:
-    # first = uow.deployment_managers.get(deploymentManagerId)
-    # return first.serialize() if first is not None else None
+    #     return None if first is None else dict(first)
     with uow:
         first = uow.deployment_managers.get(deploymentManagerId)
-        if first is None:
-            return first
-        result = first.serialize()
+        return first.serialize() if first is not None else None
+
+    # profile = profile.lower()
+    # with uow:
+    #     first = uow.deployment_managers.get(deploymentManagerId)
+    #     if first is None:
+    #         return first
+    #     result = first.serialize()
+
+    # profile_data = result.pop("profile", None)
+    # result['profileName'] = 'default'
 
-    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)
+    # if "sol0018" == profile:
+    #     result['profileName'] = profile
+    #     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
+    # 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