X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_route.py;h=7616b25e78ddc4e9802bcd5861ba8d3904b3d478;hb=d9000f0859a254f2c3c32f30ed71a143e731e2ff;hp=19613f0177ca415faa21ec21f532d4dfdf4743e1;hpb=dbfb30d19fdbd134b5df8500db2d249cb126901f;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_route.py b/o2ims/views/ocloud_route.py
index 19613f0..7616b25 100644
--- a/o2ims/views/ocloud_route.py
+++ b/o2ims/views/ocloud_route.py
@@ -17,7 +17,8 @@ from flask_restx import Resource, reqparse
 
 from o2common.service.messagebus import MessageBus
 from o2common.views.pagination_route import link_header, PAGE_PARAM
-from o2common.views.route import ProblemDetails
+from o2common.views.route_exception import NotFoundException
+from o2ims.domain import ocloud
 from o2ims.views import ocloud_view
 from o2ims.views.api_ns import api_ims_inventory as api_ims_inventory_v1
 from o2ims.views.ocloud_dto import OcloudDTO, ResourceTypeDTO,\
@@ -82,9 +83,7 @@ class OcloudsListRouter(Resource):
         res = ocloud_view.oclouds(bus.uow)
         if len(res) > 0:
             return res[0]
-        ProblemDetails(
-            api_ims_inventory_v1,
-            404, "oCloud doesn't exist").abort()
+        raise NotFoundException("oCloud doesn't exist")
 
 
 # ----------  ResourceTypes ---------- #
@@ -169,10 +168,8 @@ class ResourceTypeGetRouter(Resource):
         result = ocloud_view.resource_type_one(resourceTypeID, bus.uow)
         if result is not None:
             return result
-        ProblemDetails(
-            api_ims_inventory_v1,
-            404, "Resource type {} doesn't exist".format(
-                resourceTypeID)).abort()
+        raise NotFoundException("Resource type {} doesn't exist".format(
+            resourceTypeID))
 
 
 # ----------  ResourcePools ---------- #
@@ -257,10 +254,8 @@ class ResourcePoolGetRouter(Resource):
         result = ocloud_view.resource_pool_one(resourcePoolID, bus.uow)
         if result is not None:
             return result
-        ProblemDetails(
-            api_ims_inventory_v1,
-            404, "Resource pool {} doesn't exist".format(
-                resourcePoolID)).abort()
+        raise NotFoundException("Resource pool {} doesn't exist".format(
+            resourcePoolID))
 
 
 # ----------  Resources ---------- #
@@ -358,10 +353,8 @@ class ResourceGetRouter(Resource):
         result = ocloud_view.resource_one(resourceID, bus.uow)
         if result is not None:
             return result
-        ProblemDetails(
-            api_ims_inventory_v1,
-            404, "Resource {} doesn't exist".format(
-                resourceID)).abort()
+        raise NotFoundException("Resource {} doesn't exist".format(
+            resourceID))
 
 
 # ----------  DeploymentManagers ---------- #
@@ -416,8 +409,9 @@ class DeploymentManagersListRouter(Resource):
 @api_ims_inventory_v1.route("/v1/deploymentManagers/<deploymentManagerID>")
 @api_ims_inventory_v1.param('deploymentManagerID',
                             'ID of the deployment manager')
-@api_ims_inventory_v1.param('profile', 'DMS profile: value supports "sol018"',
-                            _in='query')
+@api_ims_inventory_v1.param(
+    'profile', 'DMS profile: value supports "native_k8sapi"',
+    _in='query')
 @api_ims_inventory_v1.response(404, 'Deployment manager not found')
 @api_ims_inventory_v1.param(
     'all_fields',
@@ -451,16 +445,18 @@ class DeploymentManagerGetRouter(Resource):
         args = parser.parse_args()
         profile = (
             args.profile if args.profile is not None and args.profile != ''
-            else 'default')
+            else ocloud.DeploymentManagerProfileDefault)
         result = ocloud_view.deployment_manager_one(
             deploymentManagerID, bus.uow, profile)
-        if result is not None:
+        if result is not None and result != "":
             return result
+        elif result == "":
+            raise NotFoundException(
+                "Profile {} doesn't support".format(
+                    args.profile))
 
-        ProblemDetails(
-            api_ims_inventory_v1,
-            404, "Deployment manager {} doesn't exist".format(
-                deploymentManagerID)).abort()
+        raise NotFoundException("Deployment manager {} doesn't exist".format(
+            deploymentManagerID))
 
 
 # ----------  Subscriptions ---------- #
@@ -559,13 +555,11 @@ class SubscriptionGetDelRouter(Resource):
             subscriptionID, bus.uow)
         if result is not None:
             return result
-        ProblemDetails(
-            api_ims_inventory_v1,
-            404, "Subscription {} doesn't exist".format(
-                subscriptionID)).abort()
+        raise NotFoundException("Subscription {} doesn't exist".format(
+            subscriptionID))
 
     @api_ims_inventory_v1.doc('Delete subscription by ID')
-    @api_ims_inventory_v1.response(204, 'Subscription deleted')
+    @api_ims_inventory_v1.response(200, 'Subscription deleted')
     def delete(self, subscriptionID):
         result = ocloud_view.subscription_delete(subscriptionID, bus.uow)
-        return result, 204
+        return result, 200