MT#56753 bin/check.py: xavp names can have ':' and '-'

Change-Id: I0a03f4807bae8eca7ed9b1772c07bfc352fcf86e

bin/check.py

@@ -39,7 +39,7 @@ class XAvp:
     """Class to simulate the xavp"""
 
     def __init__(self, name, data):
-        result = re.match(r"\$xavp\((\w+)\)", name)
+        result = re.match(r"\$xavp\(([\w\:-]+)\)", name)
         try:
             self._name = result.group(1)
         except Exception:
@@ -76,7 +76,7 @@ class XAvp:
     def parse(cls, str):
         pattern_nindx = r"(\[(?P<%s>\d+)\])?" % "nindx"
         pattern_kindx = r"(\[(?P<%s>\d+|\*+)\])?" % "kindx"
-        pattern = r"\$xavp\((?P<name>\w+)%s(=>(?P<key>\w+)%s)?\)" % (
+        pattern = r"\$xavp\((?P<name>[\w\:-]+)%s(=>(?P<key>[\w\:-]+)%s)?\)" % (
             pattern_nindx,
             pattern_kindx,
         )

tests/test_check.py

@@ -35,7 +35,6 @@ not_ok = re.compile("^not ok.*", re.MULTILINE)
 
 
 class TestSection(unittest.TestCase):
-
     def setUp(self):
         self.sec = Section(0)
 
@@ -55,7 +54,9 @@ class TestXAvp(unittest.TestCase):
     def setUp(self):
         self.name = "test"
         self.data = [
-            {"koko": [1]}, {"koko": [1, 2]}, {"lolo": [3], "lola": [7]}
+            {"koko": [1]},
+            {"koko": [1, 2]},
+            {"lolo": [3], "lola": [7]},
         ]
         self.xavp = XAvp("$xavp(%s)" % self.name, self.data)
 
@@ -99,6 +100,31 @@ class TestXAvp(unittest.TestCase):
         self.assertCountEqual(self.xavp.get("$xavp(test[1]=>koko[*])"), [1, 2])
 
 
+class TestXAvpName(unittest.TestCase):
+    def setUp(self):
+        self.name = "test:long"
+        self.data = [
+            {"koko:long": [1]},
+            {"koko:long": [1, 2]},
+            {"lolo": [3], "lola-1": [7]},
+        ]
+        self.xavp = XAvp("$xavp(%s)" % self.name, self.data)
+
+    def test_init(self):
+        self.assertEqual(self.name, self.xavp._name)
+        self.assertCountEqual(self.data, self.xavp._data)
+
+    def test_get_value(self):
+        self.assertEqual(self.xavp.get("$xavp(test:long=>koko:long)"), 1)
+        self.assertEqual(self.xavp.get("$xavp(test:long[1]=>koko:long[1])"), 2)
+        self.assertEqual(self.xavp.get("$xavp(test:long[2]=>lola-1[0])"), 7)
+
+    def test_get_value_all(self):
+        self.assertCountEqual(
+            self.xavp.get("$xavp(test:long[1]=>koko:long[*])"), [1, 2]
+        )
+
+
 class TestCheckFlowVars(unittest.TestCase):
     def setUp(self):
         self.ctest = Test()