From: Ole Troan <ot@cisco.com>
Date: Mon, 29 Mar 2021 19:12:53 +0000 (+0200)
Subject: stats: python: handle when pattern is not list in ls
X-Git-Tag: v21.10-rc0~312
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F31817%2F3;p=vpp.git

stats: python: handle when pattern is not list in ls

The reimplementation of python stats module mishandled the case
where pattern to ls was not a list.

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I9ba189423a76f2fd4298c4c4b19a0875f705d719
---

diff --git a/src/vpp-api/python/vpp_papi/vpp_stats.py b/src/vpp-api/python/vpp_papi/vpp_stats.py
index 30bf930469a..18f13e9c4c0 100755
--- a/src/vpp-api/python/vpp_papi/vpp_stats.py
+++ b/src/vpp-api/python/vpp_papi/vpp_stats.py
@@ -247,6 +247,8 @@ class VPPStats():
         # pylint: disable=invalid-name
         if not self.connected:
             self.connect()
+        if not isinstance(patterns, list):
+            patterns = [patterns]
         regex = [re.compile(i) for i in patterns]
         return [k for k, v in self.directory.items()
                 if any(re.match(pattern, k) for pattern in regex)]
@@ -499,6 +501,13 @@ class TestStats(unittest.TestCase):
         data = self.stat.dump(directory)
         print(data)
 
+    def test_sys_nodes(self):
+        '''Test /sys/nodes'''
+        counters = self.stat.ls('^/sys/node')
+        print('COUNTERS:', counters)
+        print('/sys/node', self.stat.dump(counters))
+        print('/net/route/to', self.stat['/net/route/to'])
+
 if __name__ == '__main__':
     import cProfile
     from pstats import Stats