Fix INF-328 and INF-373 the resource change and update issue

[pti/o2.git] / o2ims / service / command / notify_handler.py

diff --git a/o2ims/service/command/notify_handler.py b/o2ims/service/command/notify_handler.py
index 06dc824..01c91c5 100644 (file)
--- a/o2ims/service/command/notify_handler.py
+++ b/o2ims/service/command/notify_handler.py
@@ -89,6 +89,8 @@ def _notify_resourcetype(uow, data):
                             sub_data['subscriptionId'],
                             sub_data['filter']))
                     continue
+                if len(args) == 0:
+                    continue
                 args.append(ocloud.ResourceType.resourceTypeId == data.id)
                 ret = uow.resource_types.list_with_count(*args)
                 if ret[0] > 0:
@@ -136,6 +138,8 @@ def _notify_resourcepool(uow, data):
                             sub_data['subscriptionId'],
                             sub_data['filter']))
                     continue
+                if len(args) == 0:
+                    continue
                 args.append(ocloud.ResourcePool.resourcePoolId == data.id)
                 ret = uow.resource_pools.list_with_count(*args)
                 if ret[0] > 0:
@@ -185,6 +189,8 @@ def _notify_dms(uow, data):
                             sub_data['subscriptionId'],
                             sub_data['filter']))
                     continue
+                if len(args) == 0:
+                    continue
                 args.append(
                     ocloud.DeploymentManager.deploymentManagerId == data.id)
                 ret = uow.deployment_managers.list_with_count(*args)
@@ -200,14 +206,6 @@ def _notify_dms(uow, data):
             callback_smo(sub, data, dms_dict)
 
 
-class FilterNotEffect(Exception):
-    pass
-
-
-class FilterEffect(Exception):
-    pass
-
-
 def _notify_resource(uow, data):
     with uow:
         resource = uow.resources.get(data.id)
@@ -243,6 +241,8 @@ def _notify_resource(uow, data):
                             sub_data['subscriptionId'],
                             sub_data['filter']))
                     continue
+                if len(args) == 0:
+                    continue
                 args.append(ocloud.Resource.resourceId == data.id)
                 ret = uow.resources.list_with_count(res_pool_id, *args)
                 if ret[0] > 0: