Integrate nfdeployment api with event handler

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

diff --git a/o2ims/views/ocloud_dto.py b/o2ims/views/ocloud_dto.py
index 586de3f..1a489e1 100644 (file)
--- a/o2ims/views/ocloud_dto.py
+++ b/o2ims/views/ocloud_dto.py
@@ -12,15 +12,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from flask_restx import Namespace, fields
+from flask_restx import fields
 
+from o2ims.views import api_ims_inventory_v1
 
-class OcloudDTO:
 
-    api = Namespace("Ocloud", description='Ocloud related operations.')
+class OcloudDTO:
 
-    ocloud = api.model(
-        "OcloudList",
+    ocloud = api_ims_inventory_v1.model(
+        "OcloudDto",
         {
             'oCloudId': fields.String(required=True),
             'globalCloudId': fields.String,
@@ -33,11 +33,8 @@ class OcloudDTO:
 
 class ResourceTypeDTO:
 
-    api = Namespace(
-        "ResourceType", description='Resource type related operations.')
-
-    resource_type_get = api.model(
-        "ResourceTypeGet",
+    resource_type_get = api_ims_inventory_v1.model(
+        "ResourceTypeGetDto",
         {
             'resourceTypeId': fields.String(required=True,
                                             description='Resource type ID'),
@@ -51,11 +48,8 @@ class ResourceTypeDTO:
 
 class ResourcePoolDTO:
 
-    api = Namespace(
-        "ResourcePool", description='Resource pool related operations.')
-
-    resource_pool_get = api.model(
-        "ResourcePoolGet",
+    resource_pool_get = api_ims_inventory_v1.model(
+        "ResourcePoolGetDto",
         {
             'resourcePoolId': fields.String(required=True,
                                             description='Resource pool ID'),
@@ -69,10 +63,8 @@ class ResourcePoolDTO:
 
 class ResourceDTO:
 
-    api = Namespace("Resource", description='Resource related operations.')
-
-    resource_list = api.model(
-        "ResourceList",
+    resource_list = api_ims_inventory_v1.model(
+        "ResourceListDto",
         {
             'resourceId': fields.String(required=True,
                                         description='Resource ID'),
@@ -83,8 +75,8 @@ class ResourceDTO:
         }
     )
 
-    resource_get = api.model(
-        "ResourceGet",
+    resource_get = api_ims_inventory_v1.model(
+        "ResourceGetDto",
         {
             'resourceId': fields.String(required=True,
                                         description='Resource ID'),
@@ -98,11 +90,8 @@ class ResourceDTO:
 
 class DeploymentManagerDTO:
 
-    api = Namespace("DeploymentManager",
-                    description='Deployment manager related operations.')
-
-    deployment_manager_get = api.model(
-        "DeploymentManagerGet",
+    deployment_manager_get = api_ims_inventory_v1.model(
+        "DeploymentManagerGetDto",
         {
             'deploymentManagerId': fields.String(
                 required=True,
@@ -119,11 +108,8 @@ class DeploymentManagerDTO:
 
 class SubscriptionDTO:
 
-    api = Namespace(
-        "Subscription", description='Subscription related operations.')
-
-    subscription_get = api.model(
-        "SubscriptionGet",
+    subscription_get = api_ims_inventory_v1.model(
+        "SubscriptionGetDto",
         {
             'subscriptionId': fields.String(required=True,
                                             description='Subscription ID'),
@@ -133,8 +119,8 @@ class SubscriptionDTO:
         }
     )
 
-    subscription = api.model(
-        "SubscriptionCreate",
+    subscription = api_ims_inventory_v1.model(
+        "SubscriptionCreateDto",
         {
             'callback': fields.String(
                 required=True, description='Subscription callback address'),
@@ -143,8 +129,8 @@ class SubscriptionDTO:
         }
     )
 
-    subscription_post_resp = api.model(
-        "SubscriptionCreatedResp",
+    subscription_post_resp = api_ims_inventory_v1.model(
+        "SubscriptionCreatedRespDto",
         {
             'subscriptionId': fields.String(required=True,
                                             description='Subscription ID'),