X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_dto.py;h=df8385a3fc58bc8793aeccd4d93a15dc03a50283;hb=refs%2Fchanges%2F88%2F9388%2F1;hp=6bf994a337f2e6ca7d9164ba5a703898ae9e6fbb;hpb=02b85e27680e1139bc8e1930af5449a26527b4de;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_dto.py b/o2ims/views/ocloud_dto.py
index 6bf994a..df8385a 100644
--- a/o2ims/views/ocloud_dto.py
+++ b/o2ims/views/ocloud_dto.py
@@ -14,7 +14,7 @@
 
 from flask_restx import fields
 
-from o2ims.views import api_ims_inventory_v1
+from o2ims.views.api_ns import api_ims_inventory_v1
 
 
 class OcloudDTO:
@@ -62,7 +62,6 @@ class ResourcePoolDTO:
 
 
 class ResourceDTO:
-
     resource_list = api_ims_inventory_v1.model(
         "ResourceListDto",
         {
@@ -94,43 +93,77 @@ class ResourceDTO:
         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,
+    # 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_list = api_ims_inventory_v1.model(
+        "DeploymentManagerListDto",
+        {
+            'deploymentManagerId': fields.String(
+                required=True,
+                description='Deployment manager ID'),
             'name': fields.String,
-            'parentId': fields.String,
             'description': fields.String,
+            'deploymentManagementServiceEndpoint': fields.String,
+            'supportedLocations': fields.String,
+            'capabilities': fields.String,
+            'capacity': fields.String,
+            'profileSupportList': fields.List(
+                fields.String,
+                description='Profile support list, use default for the return \
+                     endpoint'),
         }
-        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:
+    profile = api_ims_inventory_v1.model("DeploymentManagerGetDtoProfile", {
+        'cluster_api_endpoint': fields.String(
+            attributes='cluster_api_endpoint'),
+        'cluster_ca_cert': fields.String(attributes='cluster_ca_cert'),
+        'admin_user': fields.String(attributes='admin_user'),
+        'admin_client_cert': fields.String(attributes='admin_client_cert'),
+        'admin_client_key': fields.String(attributes='admin_client_key'),
+        # 'kube_config_file': fields.String(attributes='kube_config_file')
+        'helmcli_host_with_port': fields.String(
+            attributes='helmcli_host_with_port'),
+        'helmcli_username': fields.String(attributes='helmcli_username'),
+        'helmcli_password': fields.String(attributes='helmcli_password'),
+        'helmcli_kubeconfig': fields.String(attributes='helmcli_kubeconfig'),
+    })
 
     deployment_manager_get = api_ims_inventory_v1.model(
         "DeploymentManagerGetDto",
@@ -144,6 +177,8 @@ class DeploymentManagerDTO:
             'supportedLocations': fields.String,
             'capabilities': fields.String,
             'capacity': fields.String,
+            'profileName': fields.String,
+            'profileData': fields.Nested(profile, False, True),
         }
     )
 
@@ -178,32 +213,3 @@ class SubscriptionDTO:
                                             description='Subscription ID'),
         }
     )
-
-
-class RegistrationDTO:
-
-    registration_get = api_ims_inventory_v1.model(
-        "RegistrationGetDto",
-        {
-            'registrationId': fields.String(required=True,
-                                            description='Registration ID'),
-            'callback': fields.String,
-            'notified': fields.Boolean,
-        }
-    )
-
-    registration = api_ims_inventory_v1.model(
-        "RegistrationCreateDto",
-        {
-            'callback': fields.String(
-                required=True, description='Registration SMO callback address')
-        }
-    )
-
-    registration_post_resp = api_ims_inventory_v1.model(
-        "RegistrationCreatedRespDto",
-        {
-            'registrationId': fields.String(required=True,
-                                            description='registration ID'),
-        }
-    )