X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_view.py;h=bc1109774834fd74f7a1ef2d9211f77e9757e063;hb=c6a78454000fc8ad2699207063c1c7a87652bbd7;hp=51ee9c103dce2cb60b45946155035dd22a5d3d1e;hpb=9eb298bafb2aa192bf08332c75b8f20a1ca09b09;p=pti%2Fo2.git diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py index 51ee9c1..bc11097 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.pagination_view import Pagination from o2common.views.view import gen_filter, check_filter +from o2common.views.pagination_view import Pagination +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 @@ -233,6 +236,15 @@ def subscription_create(subscriptionDto: SubscriptionDTO.subscription_create, sub_uuid, subscriptionDto['callback'], 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() first = uow.subscriptions.get(sub_uuid) @@ -242,6 +254,10 @@ def subscription_create(subscriptionDto: SubscriptionDTO.subscription_create, 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