Fix INF-342 refactor deploymentManager profile data

[pti/o2.git] / o2ims / views / ocloud_view.py

diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py
index 441c938..51ee9c1 100644 (file)
--- a/o2ims/views/ocloud_view.py
+++ b/o2ims/views/ocloud_view.py
@@ -22,7 +22,7 @@ import shutil
 from o2common.service import unit_of_work
 from o2common.config import config
 from o2common.views.pagination_view import Pagination
-from o2common.views.view import gen_filter
+from o2common.views.view import gen_filter, check_filter
 from o2ims.domain import ocloud
 from o2ims.views.ocloud_dto import SubscriptionDTO
 from o2ims.domain.subscription_obj import Subscription
@@ -140,16 +140,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']
@@ -160,10 +162,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
 
 
@@ -218,18 +221,22 @@ def subscription_one(subscriptionId: str,
         return first.serialize() if first is not None else None
 
 
-def subscription_create(subscriptionDto: SubscriptionDTO.subscription,
+def subscription_create(subscriptionDto: SubscriptionDTO.subscription_create,
                         uow: unit_of_work.AbstractUnitOfWork):
+    filter = subscriptionDto.get('filter', '')
+    consumer_subs_id = subscriptionDto.get('consumerSubscriptionId', '')
+
+    check_filter(ocloud.Resource, filter)
 
     sub_uuid = str(uuid.uuid4())
     subscription = Subscription(
         sub_uuid, subscriptionDto['callback'],
-        subscriptionDto['consumerSubscriptionId'],
-        subscriptionDto['filter'])
+        consumer_subs_id, filter)
     with uow:
         uow.subscriptions.add(subscription)
         uow.commit()
-    return {"subscriptionId": sub_uuid}
+        first = uow.subscriptions.get(sub_uuid)
+        return first.serialize()
 
 
 def subscription_delete(subscriptionId: str,