Fix subscription get response

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

diff --git a/o2ims/views/ocloud_dto.py b/o2ims/views/ocloud_dto.py
index 1573101..0201451 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
 
-class OcloudDTO:
 
-    api = Namespace("Ocloud", description='Ocloud related operations.')
+class OcloudDTO:
 
-    ocloud_list = api.model(
-        "List Ocloud object",
+    ocloud = api.model(
+        "OcloudList",
         {
             '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(
-        "Get ResourceType object",
+        "ResourceTypeGet",
         {
             '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(
-        "Get ResourcePool object",
+        "ResourcePoolGet",
         {
             '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(
-        "List Resource object",
+        "ResourceList",
         {
             'resourceId': fields.String(required=True,
                                         description='Resource ID'),
@@ -84,7 +76,7 @@ class ResourceDTO:
     )
 
     resource_get = api.model(
-        "Get Resource object",
+        "ResourceGet",
         {
             '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(
-        "Get DeploymentManager object",
+        "DeploymentManagerGet",
         {
             'deploymentManagerId': fields.String(
                 required=True,
@@ -119,11 +108,8 @@ class DeploymentManagerDTO:
 
 class SubscriptionDTO:
 
-    api = Namespace(
-        "Subscription", description='Subscription related operations.')
-
     subscription_get = api.model(
-        "Get Subscription object",
+        "SubscriptionGet",
         {
             'subscriptionId': fields.String(required=True,
                                             description='Subscription ID'),
@@ -132,3 +118,21 @@ class SubscriptionDTO:
             'filter': fields.String,
         }
     )
+
+    subscription = api.model(
+        "SubscriptionCreate",
+        {
+            'callback': fields.String(
+                required=True, description='Subscription callback address'),
+            'consumerSubscriptionId': fields.String,
+            'filter': fields.String,
+        }
+    )
+
+    subscription_post_resp = api.model(
+        "SubscriptionCreatedResp",
+        {
+            'subscriptionId': fields.String(required=True,
+                                            description='Subscription ID'),
+        }
+    )