Rename cases to modules and minor bug fix

[integration/test.git] / test / tools / CSIT_Test / base / modules / switch_manager.py

diff --git a/test/tools/CSIT_Test/base/cases/switch_manager.py b/test/tools/CSIT_Test/base/modules/switch_manager.py
similarity index 98%
rename from test/tools/CSIT_Test/base/cases/switch_manager.py
rename to test/tools/CSIT_Test/base/modules/switch_manager.py
index 0f18736a72cad471a2526c4f55ead61163c9a637..d4492f5ae38cedfc36697cc1bd4afe17b711b031 100644 (file)
--- a/test/tools/CSIT_Test/base/cases/switch_manager.py
+++ b/test/tools/CSIT_Test/base/modules/switch_manager.py
@@ -79,8 +79,8 @@ class SwitchManager(TestModule):
         """
         result = []
         r = self.get_nodes()
-        if r:
-            t = [e['node'] for e in r['nodeProperties']]
+        t = super(self.__class__, self).extract_properties(r, 'nodeProperties', 'node')
+        if t:
             result.append({u'type': u'OF', u'id': u'00:00:00:00:00:00:00:01'} in t)
             result.append({u'type': u'OF', u'id': u'00:00:00:00:00:00:00:02'} in t)
             result.append({u'type': u'OF', u'id': u'00:00:00:00:00:00:00:03'} in t)