X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_route.py;h=570292db7a81640260491247aebae62d3ffa8e0b;hb=4e221e2f91b6a960e31befcf3aa24a1b4e065afc;hp=2490d4a05180824a5b1d3727bf254e9f93583606;hpb=94e6f93c3434e5f9a9529246d97d2666a2479299;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_route.py b/o2ims/views/ocloud_route.py
index 2490d4a..570292d 100644
--- a/o2ims/views/ocloud_route.py
+++ b/o2ims/views/ocloud_route.py
@@ -17,6 +17,7 @@ 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_exception import NotFoundException
 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,\
@@ -81,8 +82,7 @@ class OcloudsListRouter(Resource):
         res = ocloud_view.oclouds(bus.uow)
         if len(res) > 0:
             return res[0]
-        api_ims_inventory_v1.abort(
-            404, "oCloud doesn't exist")
+        raise NotFoundException("oCloud doesn't exist")
 
 
 # ----------  ResourceTypes ---------- #
@@ -167,8 +167,8 @@ class ResourceTypeGetRouter(Resource):
         result = ocloud_view.resource_type_one(resourceTypeID, bus.uow)
         if result is not None:
             return result
-        api_ims_inventory_v1.abort(
-            404, "Resource type {} doesn't exist".format(resourceTypeID))
+        raise NotFoundException("Resource type {} doesn't exist".format(
+            resourceTypeID))
 
 
 # ----------  ResourcePools ---------- #
@@ -253,8 +253,8 @@ class ResourcePoolGetRouter(Resource):
         result = ocloud_view.resource_pool_one(resourcePoolID, bus.uow)
         if result is not None:
             return result
-        api_ims_inventory_v1.abort(
-            404, "Resource pool {} doesn't exist".format(resourcePoolID))
+        raise NotFoundException("Resource pool {} doesn't exist".format(
+            resourcePoolID))
 
 
 # ----------  Resources ---------- #
@@ -352,8 +352,8 @@ class ResourceGetRouter(Resource):
         result = ocloud_view.resource_one(resourceID, bus.uow)
         if result is not None:
             return result
-        api_ims_inventory_v1.abort(
-            404, "Resource {} doesn't exist".format(resourceID))
+        raise NotFoundException("Resource {} doesn't exist".format(
+            resourceID))
 
 
 # ----------  DeploymentManagers ---------- #
@@ -448,9 +448,8 @@ class DeploymentManagerGetRouter(Resource):
             deploymentManagerID, bus.uow, profile)
         if result is not None:
             return result
-        api_ims_inventory_v1.abort(
-            404,
-            "Deployment manager {} doesn't exist".format(deploymentManagerID))
+        raise NotFoundException("Deployment manager {} doesn't exist".format(
+            deploymentManagerID))
 
 
 # ----------  Subscriptions ---------- #
@@ -549,11 +548,11 @@ class SubscriptionGetDelRouter(Resource):
             subscriptionID, bus.uow)
         if result is not None:
             return result
-        api_ims_inventory_v1.abort(404, "Subscription {} doesn't exist".format(
+        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