X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_view.py;h=c685898f8ac91a0ef06004924ebe45bd7eb99c42;hb=91debe5e19a2a7782a8bd721950b475d4ac4a65a;hp=95ce6719ab59b55d9fe54a15947f7f07bac0d0bf;hpb=491b61a82db9a7c286b4f25bd38e45669dbb6041;p=pti%2Fo2.git diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py index 95ce671..c685898 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 @@ -238,7 +241,7 @@ def subscription_create(subscriptionDto: SubscriptionDTO.subscription_create, args.append(getattr(Subscription, 'filter') == filter) args.append(getattr(Subscription, 'consumerSubscriptionId') == consumer_subs_id) - count, _ = uow.alarm_subscriptions.list_with_count(*args) + count, _ = uow.subscriptions.list_with_count(*args) if count > 0: raise BadRequestException("The value of parameters is duplicated") uow.subscriptions.add(subscription)