X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_dto.py;h=c6896e0bd8bb35041f32fb68737ed7180a4d981e;hb=6c304dfab28ffd1bbe69b9ada3d11e8fbbde014b;hp=e480e090d77b0f76ce682737c83a3aca0d9fe271;hpb=c3ab2dcb442a0e66b7a621c59c6c7a679c26cee9;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_dto.py b/o2ims/views/ocloud_dto.py
index e480e09..c6896e0 100644
--- a/o2ims/views/ocloud_dto.py
+++ b/o2ims/views/ocloud_dto.py
@@ -14,12 +14,12 @@
 
 from flask_restx import fields
 
-from o2ims.views import api
+from o2ims.views.api_ns import api_ims_inventory_v1
 
 
 class OcloudDTO:
 
-    ocloud = api.model(
+    ocloud = api_ims_inventory_v1.model(
         "OcloudDto",
         {
             'oCloudId': fields.String(required=True),
@@ -33,7 +33,7 @@ class OcloudDTO:
 
 class ResourceTypeDTO:
 
-    resource_type_get = api.model(
+    resource_type_get = api_ims_inventory_v1.model(
         "ResourceTypeGetDto",
         {
             'resourceTypeId': fields.String(required=True,
@@ -48,7 +48,7 @@ class ResourceTypeDTO:
 
 class ResourcePoolDTO:
 
-    resource_pool_get = api.model(
+    resource_pool_get = api_ims_inventory_v1.model(
         "ResourcePoolGetDto",
         {
             'resourcePoolId': fields.String(required=True,
@@ -63,34 +63,76 @@ class ResourcePoolDTO:
 
 class ResourceDTO:
 
-    resource_list = api.model(
+    resource_list = api_ims_inventory_v1.model(
         "ResourceListDto",
         {
             'resourceId': fields.String(required=True,
                                         description='Resource ID'),
             'resourceTypeId': fields.String,
             'resourcePoolId': fields.String,
+            'name': fields.String,
             'parentId': fields.String,
             'description': fields.String,
         }
     )
 
-    resource_get = api.model(
-        "ResourceGetDto",
-        {
+    def recursive_resource_mapping(iteration_number=2):
+        resource_json_mapping = {
             'resourceId': fields.String(required=True,
                                         description='Resource ID'),
             'resourceTypeId': fields.String,
             'resourcePoolId': fields.String,
+            'name': fields.String,
             'parentId': fields.String,
             'description': fields.String,
+            'elements': fields.String,
         }
-    )
+        if iteration_number:
+            resource_json_mapping['children'] = fields.List(
+                fields.Nested(ResourceDTO.recursive_resource_mapping(
+                    iteration_number-1)))
+        return api_ims_inventory_v1.model(
+            'ResourceGetDto' + str(iteration_number), resource_json_mapping)
+
+    def _recursive_resource_mapping(self, iteration_number=2):
+        resource_json_mapping = {
+            'resourceId': fields.String(required=True,
+                                        description='Resource ID'),
+            'resourceTypeId': fields.String,
+            'resourcePoolId': fields.String,
+            'name': fields.String,
+            'parentId': fields.String,
+            'description': fields.String,
+        }
+        if iteration_number:
+            resource_json_mapping['children'] = fields.List(
+                fields.Nested(self._recursive_resource_mapping(
+                    iteration_number-1)))
+            # print(type(resource_json_mapping['children']))
+            if resource_json_mapping['children'] is None:
+                del resource_json_mapping['children']
+        return resource_json_mapping
+
+    def get_resource_get(self):
+        return api_ims_inventory_v1.model(
+            'ResourceGetDto',
+            {
+                'resourceId': fields.String(required=True,
+                                            description='Resource ID'),
+                'resourceTypeId': fields.String,
+                'resourcePoolId': fields.String,
+                'name': fields.String,
+                'parentId': fields.String,
+                'description': fields.String,
+                'children': fields.List(fields.Nested(
+                    self._recursive_resource_mapping()))
+            }
+        )
 
 
 class DeploymentManagerDTO:
 
-    deployment_manager_get = api.model(
+    deployment_manager_get = api_ims_inventory_v1.model(
         "DeploymentManagerGetDto",
         {
             'deploymentManagerId': fields.String(
@@ -108,7 +150,7 @@ class DeploymentManagerDTO:
 
 class SubscriptionDTO:
 
-    subscription_get = api.model(
+    subscription_get = api_ims_inventory_v1.model(
         "SubscriptionGetDto",
         {
             'subscriptionId': fields.String(required=True,
@@ -119,7 +161,7 @@ class SubscriptionDTO:
         }
     )
 
-    subscription = api.model(
+    subscription = api_ims_inventory_v1.model(
         "SubscriptionCreateDto",
         {
             'callback': fields.String(
@@ -129,7 +171,7 @@ class SubscriptionDTO:
         }
     )
 
-    subscription_post_resp = api.model(
+    subscription_post_resp = api_ims_inventory_v1.model(
         "SubscriptionCreatedRespDto",
         {
             'subscriptionId': fields.String(required=True,