From: Zhang Rong(Jon) <rong.zhang@windriver.com>
Date: Fri, 11 Nov 2022 10:48:59 +0000 (+0800)
Subject: Fix regex expression bug
X-Git-Tag: 2.0.0-rc2~28
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=3208312ac59ad0ae1d39632aebb71caf03add9bc;p=pti%2Fo2.git

Fix regex expression bug

Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: I8fec3c2b5843791b6ae61990966e9868b91b4019
---

diff --git a/o2common/views/view.py b/o2common/views/view.py
index 2a01005..2b05027 100644
--- a/o2common/views/view.py
+++ b/o2common/views/view.py
@@ -44,8 +44,8 @@ def gen_filter(obj: ColumnElement, filter_str: str):
 def check_filter(obj: ColumnElement, filter_str: str):
     if not filter_str:
         return
-    pattern = r'^(\((eq|neq|gt|lt|gte|lte){1},\w+,[\w -]+\)\;?|' +\
-        r'\((in|nin|cont|ncont){1},\w*(,[\w -]*)*\)\;?)+'
+    pattern = r'^(\((eq|neq|gt|lt|gte|lte){1},\w+,[\w -\.]+\)\;?|' +\
+        r'\((in|nin|cont|ncont){1},\w*(,[\w -\.]*)*\)\;?)+'
     result = re.match(pattern, filter_str)
     logger.warning('filter: {} match result is {}'.format(filter_str, result))
     if not result: