X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fdomain%2Ffilter.py;h=adc7df30f964d5995a0642eb7775761294654398;hb=58994b7d851b47456eed1820d36cc06803777e3b;hp=de89cea2acfd80da69cab96af869f49fa5aaf0cd;hpb=9c9fde8a0fd391b71753e51ae8b8bdd4531d79aa;p=pti%2Fo2.git

diff --git a/o2common/domain/filter.py b/o2common/domain/filter.py
index de89cea..adc7df3 100644
--- a/o2common/domain/filter.py
+++ b/o2common/domain/filter.py
@@ -15,28 +15,30 @@
 from sqlalchemy.sql.elements import ColumnElement
 from sqlalchemy import or_
 
+from o2ims.domain.alarm_obj import AlarmEventRecord
+from o2ims.domain.ocloud import Ocloud
+
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
 
 def gen_orm_filter(obj: ColumnElement, filter_str: str):
+    logger.debug(filter_str)
     if not filter_str:
         return []
-    # filter_without_space = filter_str.replace(" ", "")
-    filter_without_space = filter_str.strip(' ()')
+    filter_without_space = filter_str.strip()
     items = filter_without_space.split(';')
 
     filter_list = list()
     for i in items:
-        # if '(' in i:
-        #     i = i.replace("(", "")
-        # if ')' in i:
-        #     i = i.replace(")", "")
-        filter_expr = i.split(',')
+        item = i.strip(' ()')
+        filter_expr = item.split(',')
         if len(filter_expr) < 3:
             continue
         filter_op = filter_expr[0].strip()
         filter_key = filter_expr[1].strip()
+        if filter_key == 'objectType':
+            continue
         filter_vals = filter_expr[2:]
         filter_list.extend(toFilterArgs(
             filter_op, obj, filter_key, filter_vals))
@@ -62,6 +64,7 @@ def toFilterArgs(operation: str, obj: ColumnElement, key: str, values: list):
     #                        format(operation))
     # else:
     #     raise KeyError('Filter operation {} not support'.format(operation))
+    key = transfer_filter_attr_name_in_special(obj, key)
 
     ll = list()
     if operation == 'eq':
@@ -101,3 +104,19 @@ def toFilterArgs(operation: str, obj: ColumnElement, key: str, values: list):
             val_list.append(getattr(obj, key).contains(val))
         ll.append(~or_(*val_list))
     return ll
+
+
+def transfer_filter_attr_name_in_special(obj: ColumnElement, filter_key: str):
+    if obj == AlarmEventRecord:
+        if filter_key == 'resourceTypeID':
+            filter_key = 'resourceTypeId'
+        elif filter_key == 'resourceID':
+            filter_key = 'resourceId'
+        elif filter_key == 'alarmDefinitionID':
+            filter_key = 'alarmDefinitionId'
+        elif filter_key == 'probableCauseID':
+            filter_key = 'probableCauseId'
+    elif obj == Ocloud:
+        if filter_key == 'globalcloudId':
+            filter_key = 'globalCloudId'
+    return filter_key