From: Bin Yang <bin.yang@windriver.com>
Date: Thu, 10 Nov 2022 13:03:46 +0000 (+0000)
Subject: Merge "Fix INF-342 refactor deploymentManager profile data"
X-Git-Tag: 2.0.0-rc2~31
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=fcab0224016c6e609d227ca6737e87076465d70a;hp=491b61a82db9a7c286b4f25bd38e45669dbb6041;p=pti%2Fo2.git

Merge "Fix INF-342 refactor deploymentManager profile data"
---

diff --git a/o2ims/views/ocloud_dto.py b/o2ims/views/ocloud_dto.py
index 478a513..2bc836d 100644
--- a/o2ims/views/ocloud_dto.py
+++ b/o2ims/views/ocloud_dto.py
@@ -177,6 +177,11 @@ class DeploymentManagerDTO:
         'helmcli_kubeconfig': fields.String(attribute='helmcli_kubeconfig'),
     })
 
+    extensions = api_ims_inventory_v1.model("DeploymentManagerExtensions", {
+        'profileName': fields.String,
+        'profileData': fields.Nested(profile, False, True),
+    })
+
     deployment_manager_get = api_ims_inventory_v1.model(
         "DeploymentManagerGetDto",
         {
@@ -192,12 +197,10 @@ class DeploymentManagerDTO:
             # 'supportedLocations': fields.String,
             # 'capabilities': fields.String,
             # 'capacity': fields.String,
-            'profileName': fields.String,
-            'profileData': fields.Nested(profile, False, True),
-            'extensions': fields.String
+            'extensions': fields.Nested(extensions, True, True)
         },
         mask='{deploymentManagerId,name,description,oCloudId,serviceUri,' +\
-        'profileName,profileData}'
+        'extensions/profileName,extensions/profileData}'
     )
 
 
diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py
index 95ce671..2f115e2 100644
--- a/o2ims/views/ocloud_view.py
+++ b/o2ims/views/ocloud_view.py
@@ -142,16 +142,18 @@ def deployment_manager_one(deploymentManagerId: str,
             return None
 
     profile_data = result.pop("profile", None)
-    result['profileName'] = profile
     profiles = config.get_dms_support_profiles()
     if profile not in profiles:
         return ""
 
+    extensions = {
+        'profileName': profile
+    }
     if ocloud.DeploymentManagerProfileDefault == profile \
             or ocloud.DeploymentManagerProfileSOL018 == profile:
         result['serviceUri'] = \
             profile_data['cluster_api_endpoint']
-        result['profileData'] = profile_data
+        extensions['profileData'] = profile_data
     elif ocloud.DeploymentManagerProfileSOL018HelmCLI == profile:
         result['serviceUri'] = \
             profile_data['cluster_api_endpoint']
@@ -162,10 +164,11 @@ def deployment_manager_one(deploymentManagerId: str,
             config.get_helmcli_access()
         helmcli_profile["helmcli_kubeconfig"] = _gen_kube_config(
             deploymentManagerId, profile_data)
-        result['profileData'] = helmcli_profile
+        extensions['profileData'] = helmcli_profile
     else:
         return ""
 
+    result['extensions'] = extensions
     return result
 
 
diff --git a/tests/unit/test_ocloud.py b/tests/unit/test_ocloud.py
index abc394e..5b51221 100644
--- a/tests/unit/test_ocloud.py
+++ b/tests/unit/test_ocloud.py
@@ -324,7 +324,7 @@ def test_view_deployment_manager_one(mock_uow):
         deployment_manager_id1, uow, profile=profileName)
     assert str(deployment_manager_res.get(
         'serviceUri')) == cluster_endpoint
-    assert str(deployment_manager_res.get(
+    assert str(deployment_manager_res.get("extensions").get(
         "profileName")) == profileName
 
     # profile wrong name