from flask_restx import fields
-from o2ims.views.api_ns import api_ims_inventory_v1
+from o2ims.views.api_ns import api_ims_inventory as api_ims_inventory_v1
+from o2common.views.flask_restx_fields import Json2Dict
class OcloudDTO:
"OcloudDto",
{
'oCloudId': fields.String(required=True),
- 'globalCloudId': fields.String,
+ 'globalcloudId': fields.String(attribute='globalCloudId'),
'name': fields.String,
'description': fields.String,
- 'infrastructureManagementServiceEndpoint': fields.String,
- }
+ 'serviceUri': fields.String(attribute='serviceUri'),
+ # 'infrastructureManagementServiceEndpoint': fields.String(
+ # attribute='serviceUri'),
+ # 'infrastructureMangementServiceEndPoint': fields.String(
+ # attribute='serviceUri'),
+ # 'resourceTypes': fields.String,
+ # 'resourcePools': fields.String,
+ # 'deploymentManagers': fields.String,
+ # 'smoRegistrationService': fields.String
+ 'extensions': fields.String
+ },
+ mask='{oCloudId,globalcloudId,name,description,serviceUri}'
)
class ResourceTypeDTO:
+ alarm_dictionary = api_ims_inventory_v1.model(
+ "AlarmDictionaryDto",
+ {
+ 'id': fields.String,
+ 'alarmDictionaryVersion': fields.String,
+ 'alarmDictionarySchemVersion': fields.String,
+ 'entityType': fields.String,
+ 'vendor': fields.String,
+ 'managementInterfaceId': fields.String,
+ 'pkNotificationField': fields.String,
+ 'alarmDefinition': fields.String,
+ }
+ )
resource_type_get = api_ims_inventory_v1.model(
"ResourceTypeGetDto",
'resourceTypeId': fields.String(required=True,
description='Resource type ID'),
'name': fields.String,
+ 'description': fields.String,
'vendor': fields.String,
+ 'model': fields.String,
'version': fields.String,
- 'description': fields.String,
- }
+ 'alarmDictionary': fields.Nested(alarm_dictionary, False, True),
+ # 'resourceKind': fields.String,
+ # 'resourceClass': fields.String,
+ 'extensions': fields.String
+ },
+ mask='{resourceTypeId,name,description,model,vendor,version}'
)
{
'resourcePoolId': fields.String(required=True,
description='Resource pool ID'),
- 'name': fields.String,
'globalLocationId': fields.String,
- 'location': fields.String,
+ 'name': fields.String,
'description': fields.String,
- }
+ 'oCloudId': fields.String,
+ 'location': fields.String,
+ # 'resources': fields.String,
+ 'extensions': fields.String
+ },
+ mask='{resourcePoolId,oCloudId,globalLocationId,name,description}'
)
description='Resource ID'),
'resourceTypeId': fields.String,
'resourcePoolId': fields.String,
- 'name': fields.String,
+ 'globalAssetId': fields.String,
+ # 'name': fields.String,
'parentId': fields.String,
'description': fields.String,
- }
- )
-
- list_result = api_ims_inventory_v1.model(
- "ResourceListPagenationDto",
- {
- 'count': fields.Integer(),
- 'page_num': fields.Integer(),
- 'results': fields.List(fields.Nested(resource_list))
- }
+ # 'elements': fields.String,
+ # 'extensions': fields.String
+ 'extensions': Json2Dict(attribute='extensions')
+ # 'extensions': fields.Raw(attribute='extensions')
+ },
+ mask='{resourceId,resourcePoolId,resourceTypeId,description,parentId}'
)
- # def get_paginated_list(results, url, start, limit):
- # start = int(start)
- # limit = int(limit)
- # count = len(results)
- # if count < start or limit < 0:
- # api_ims_inventory_v1.abort(404)
- # # make response
- # obj = {}
- # obj['start'] = start
- # obj['limit'] = limit
- # obj['count'] = count
- # # make URLs
- # # make previous url
- # if start == 1:
- # obj['previous'] = ''
- # else:
- # start_copy = max(1, start - limit)
- # limit_copy = start - 1
- # obj['previous'] = url + \
- # '?start=%d&limit=%d' % (start_copy, limit_copy)
- # # make next url
- # if start + limit > count:
- # obj['next'] = ''
- # else:
- # start_copy = start + limit
- # obj['next'] = url + '?start=%d&limit=%d' % (start_copy, limit)
- # # finally extract result according to bounds
- # # obj['results'] = results[(start - 1):(start - 1 + limit)]
- # obj['result'] = fields.List(fields.Nested(ResourceDTO.resource_list))
- # return obj
-
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,
+ 'globalAssetId': fields.String,
+ # 'name': fields.String,
'parentId': fields.String,
'description': fields.String,
- 'elements': fields.String,
+ # 'elements': fields.String,
+ # 'extensions': fields.String
+ 'extensions': Json2Dict(attribute='extensions')
+ # 'extensions': fields.Raw(attribute='extensions')
}
if iteration_number:
- resource_json_mapping['children'] = fields.List(
+ resource_json_mapping['elements'] = fields.List(
fields.Nested(ResourceDTO.recursive_resource_mapping(
- iteration_number-1)))
+ iteration_number-1)), attribute='children')
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()))
- # }
- # )
+ 'ResourceGetDto' + str(iteration_number), resource_json_mapping,
+ mask='{resourceId,resourcePoolId,resourceTypeId,description,' +
+ 'parentId}')
class DeploymentManagerDTO:
description='Deployment manager ID'),
'name': fields.String,
'description': fields.String,
- 'deploymentManagementServiceEndpoint': fields.String,
- 'supportedLocations': fields.String,
- 'capabilities': fields.String,
- 'capacity': fields.String,
+ 'oCloudId': fields.String,
+ 'serviceUri': fields.String(attribute='serviceUri'),
+ # 'deploymentManagementServiceEndpoint': fields.String(
+ # attribute='serviceUri'),
+ # 'supportedLocations': fields.String,
+ # 'capabilities': fields.String,
+ # 'capacity': fields.String,
'profileSupportList': fields.List(
fields.String,
description='Profile support list, use default for the return \
endpoint'),
- }
+ 'extensions': fields.String
+ },
+ mask='{deploymentManagerId,name,description,oCloudId,serviceUri,' + \
+ 'profileSupportList}'
)
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')
+ attribute='cluster_api_endpoint'),
+ 'cluster_ca_cert': fields.String(attribute='cluster_ca_cert'),
+ 'admin_user': fields.String(attribute='admin_user'),
+ 'admin_client_cert': fields.String(attribute='admin_client_cert'),
+ 'admin_client_key': fields.String(attribute='admin_client_key'),
+ # 'kube_config_file': fields.String(attribute='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'),
+ attribute='helmcli_host_with_port'),
+ 'helmcli_username': fields.String(attribute='helmcli_username'),
+ 'helmcli_password': fields.String(attribute='helmcli_password'),
+ 'helmcli_kubeconfig': fields.String(attribute='helmcli_kubeconfig'),
+ })
+
+ extensions = api_ims_inventory_v1.model("DeploymentManagerExtensions", {
+ 'profileName': fields.String,
+ 'profileData': fields.Nested(profile, False, True),
})
deployment_manager_get = api_ims_inventory_v1.model(
description='Deployment manager ID'),
'name': fields.String,
'description': fields.String,
- 'deploymentManagementServiceEndpoint': fields.String,
- 'supportedLocations': fields.String,
- 'capabilities': fields.String,
- 'capacity': fields.String,
- 'profileName': fields.String,
- 'profileData': fields.Nested(profile, False, True),
- }
+ 'oCloudId': fields.String,
+ 'serviceUri': fields.String(attribute='serviceUri'),
+ # 'deploymentManagementServiceEndpoint': fields.String(
+ # attribute='serviceUri'),
+ # 'supportedLocations': fields.String,
+ # 'capabilities': fields.String,
+ # 'capacity': fields.String,
+ 'extensions': fields.Nested(extensions, True, True)
+ },
+ mask='{deploymentManagerId,name,description,oCloudId,serviceUri,' +\
+ 'extensions/profileName,extensions/profileData}'
)
'callback': fields.String,
'consumerSubscriptionId': fields.String,
'filter': fields.String,
- }
+ },
+ mask='{subscriptionId,callback}'
)
- subscription = api_ims_inventory_v1.model(
+ subscription_create = api_ims_inventory_v1.model(
"SubscriptionCreateDto",
{
'callback': fields.String(
'filter': fields.String,
}
)
-
- subscription_post_resp = api_ims_inventory_v1.model(
- "SubscriptionCreatedRespDto",
- {
- 'subscriptionId': fields.String(required=True,
- description='Subscription ID'),
- }
- )
Code Review / pti / o2.git / blobdiff