Fix INF-346 and INF-347 subscription filter
[pti/o2.git] / o2ims / views / ocloud_view.py
index 953adc9..215c917 100644 (file)
@@ -22,7 +22,7 @@ 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
+from o2common.views.view import gen_filter, check_filter
 from o2ims.domain import ocloud
 from o2ims.views.ocloud_dto import SubscriptionDTO
 from o2ims.domain.subscription_obj import Subscription
@@ -220,12 +220,15 @@ def subscription_one(subscriptionId: str,
 
 def subscription_create(subscriptionDto: SubscriptionDTO.subscription_create,
                         uow: unit_of_work.AbstractUnitOfWork):
+    filter = subscriptionDto.get('filter', '')
+    consumer_subs_id = subscriptionDto.get('consumerSubscriptionId', '')
+
+    check_filter(ocloud.Resource, filter)
 
     sub_uuid = str(uuid.uuid4())
     subscription = Subscription(
         sub_uuid, subscriptionDto['callback'],
-        subscriptionDto['consumerSubscriptionId'],
-        subscriptionDto['filter'])
+        consumer_subs_id, filter)
     with uow:
         uow.subscriptions.add(subscription)
         uow.commit()