X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_view.py;h=d062adad4cfee41ac30be468d87b3657beed9e53;hb=0c60b5232b47e292f54728e78bd0161901cdd974;hp=441c938c5b31d2c65a1679b81f24bc779bda48c8;hpb=d9000f0859a254f2c3c32f30ed71a143e731e2ff;p=pti%2Fo2.git diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py index 441c938..d062ada 100644 --- a/o2ims/views/ocloud_view.py +++ b/o2ims/views/ocloud_view.py @@ -21,8 +21,11 @@ import shutil from o2common.service import unit_of_work from o2common.config import config +from o2common.views.view import gen_filter, check_filter from o2common.views.pagination_view import Pagination -from o2common.views.view import gen_filter +from o2common.views.route_exception import BadRequestException, \ + NotFoundException + from o2ims.domain import ocloud from o2ims.views.ocloud_dto import SubscriptionDTO from o2ims.domain.subscription_obj import Subscription @@ -74,11 +77,16 @@ def resource_pool_one(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork): with uow: first = uow.resource_pools.get(resourcePoolId) - return first.serialize() if first is not None else None + return first.serialize() if first else None def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork, **kwargs): + with uow: + first = uow.resource_pools.get(resourcePoolId) + if first is None: + raise NotFoundException("ResourcePool {} doesn't exist".format( + resourcePoolId)) pagination = Pagination(**kwargs) # filter key should be the same with database name query_kwargs = pagination.get_pagination() @@ -95,8 +103,6 @@ def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork, query_kwargs['resourceTypeId'] = restype_id args = gen_filter( ocloud.Resource, kwargs['filter']) if 'filter' in kwargs else [] - args.append(ocloud.Resource.resourcePoolId == resourcePoolId) - # args.append(ocloud.Resource.parentId == None) if 'parentId' in kwargs: query_kwargs['parentId'] = kwargs['parentId'] @@ -110,10 +116,19 @@ def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork, return pagination.get_result(ret) -def resource_one(resourceId: str, uow: unit_of_work.AbstractUnitOfWork): +def resource_one(resourceId: str, + uow: unit_of_work.AbstractUnitOfWork, resourcePoolId: str): with uow: - first = uow.resources.get(resourceId) - return first.serialize() if first is not None else None + resoucePool = uow.resource_pools.get(resourcePoolId) + if resoucePool is None: + raise NotFoundException("ResourcePool {} doesn't exist".format( + resourcePoolId)) + + first = uow.resources.get(resourceId) + if first is None: + raise NotFoundException("Resource {} doesn't exist".format( + resourceId)) + return first.serialize() def deployment_managers(uow: unit_of_work.AbstractUnitOfWork, **kwargs): @@ -140,16 +155,18 @@ def deployment_manager_one(deploymentManagerId: str, return None profile_data = result.pop("profile", None) - result['profileName'] = profile profiles = config.get_dms_support_profiles() if profile not in profiles: return "" + extensions = { + 'profileName': profile + } if ocloud.DeploymentManagerProfileDefault == profile \ or ocloud.DeploymentManagerProfileSOL018 == profile: result['serviceUri'] = \ profile_data['cluster_api_endpoint'] - result['profileData'] = profile_data + extensions['profileData'] = profile_data elif ocloud.DeploymentManagerProfileSOL018HelmCLI == profile: result['serviceUri'] = \ profile_data['cluster_api_endpoint'] @@ -160,10 +177,11 @@ def deployment_manager_one(deploymentManagerId: str, config.get_helmcli_access() helmcli_profile["helmcli_kubeconfig"] = _gen_kube_config( deploymentManagerId, profile_data) - result['profileData'] = helmcli_profile + extensions['profileData'] = helmcli_profile else: return "" + result['extensions'] = extensions return result @@ -218,23 +236,96 @@ def subscription_one(subscriptionId: str, return first.serialize() if first is not None else None -def subscription_create(subscriptionDto: SubscriptionDTO.subscription, +def subscription_create(subscriptionDto: SubscriptionDTO.subscription_create, uow: unit_of_work.AbstractUnitOfWork): + filter = subscriptionDto.get('filter', '') + consumer_subs_id = subscriptionDto.get('consumerSubscriptionId', '') + + _check_subscription_filter(filter) sub_uuid = str(uuid.uuid4()) subscription = Subscription( sub_uuid, subscriptionDto['callback'], - subscriptionDto['consumerSubscriptionId'], - subscriptionDto['filter']) + consumer_subs_id, filter) with uow: + args = list() + args.append(getattr(Subscription, 'callback') + == subscriptionDto['callback']) + args.append(getattr(Subscription, 'filter') == filter) + args.append(getattr(Subscription, + 'consumerSubscriptionId') == consumer_subs_id) + count, _ = uow.subscriptions.list_with_count(*args) + if count > 0: + raise BadRequestException("The value of parameters is duplicated") uow.subscriptions.add(subscription) uow.commit() - return {"subscriptionId": sub_uuid} + first = uow.subscriptions.get(sub_uuid) + return first.serialize() + + +def _check_subscription_filter(filter: str): + if not filter: + return + + def _sub_filter_checking(sub_filter: str): + exprs = sub_filter.split(';') + objectType = False + objectTypeValue = '' + for expr in exprs: + expr_strip = expr.strip(' ()') + items = expr_strip.split(',') + if len(items) < 3: + raise BadRequestException("invalid filter {}".format(expr)) + item_key = items[1].strip() + if item_key != 'objectType': + continue + item_op = items[0].strip() + if item_op != 'eq': + raise BadRequestException( + "Filter objectType only support 'eq' operation") + objectType = True + objectTypeValue = items[2].strip() + if not objectType: + # if there has no objectType specific, by default is ResourceInfo + check_filter(ocloud.Resource, sub_filter) + # return 'ResourceInfo' + return + if objectTypeValue == 'ResourceTypeInfo': + check_filter(ocloud.ResourceType, sub_filter) + elif objectTypeValue == 'ResourcePoolInfo': + check_filter(ocloud.ResourcePool, sub_filter) + elif objectTypeValue == 'DeploymentManagerInfo': + check_filter(ocloud.DeploymentManager, sub_filter) + elif objectTypeValue == 'CloudInfo': + check_filter(ocloud.Ocloud, sub_filter) + elif objectTypeValue == 'ResourceInfo': + check_filter(ocloud.Resource, sub_filter) + else: + raise BadRequestException( + "Filter ObjectType {} not support.".format(items[2])) + # return objectTypeValue + filter_strip = filter.strip(' []') + filter_list = filter_strip.split('|') + # check_duplication = dict() + for sub_filter in filter_list: + _sub_filter_checking(sub_filter) + # obj_type = _sub_filter_checking(sub_filter) + # if obj_type not in check_duplication: + # check_duplication[obj_type] = 0 + # check_duplication[obj_type] += 1 + # if check_duplication[obj_type] > 1: + # raise BadRequestException( + # "Filter objectType {} only support one in each." + # .format(obj_type)) def subscription_delete(subscriptionId: str, uow: unit_of_work.AbstractUnitOfWork): with uow: + first = uow.subscriptions.get(subscriptionId) + if not first: + raise NotFoundException( + "Subscription {} not found.".format(subscriptionId)) uow.subscriptions.delete(subscriptionId) uow.commit() return True