be smarter if nodegroups is set as a string instead of an array

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 42ccafc..08dd6c2 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -4,6 +4,8 @@ import sys
 import xmlrpclib
 import datetime
 import traceback
+from types import StringTypes
+
 import utils
 from TestSite import TestSite
 from TestNode import TestNode
@@ -249,7 +251,10 @@ class TestPlc:
             for node_spec in site_spec['nodes']:
                 test_node=TestNode (self,test_site,node_spec)
                 if node_spec.has_key('nodegroups'):
-                    for nodegroupname in node_spec['nodegroups']:
+                    nodegroupnames=node_spec['nodegroups']
+                    if isinstance(nodegroupnames,StringTypes):
+                        nodegroupnames = [ nodegroupnames ]
+                    for nodegroupname in nodegroupnames:
                         if not groups_dict.has_key(nodegroupname):
                             groups_dict[nodegroupname]=[]
                         groups_dict[nodegroupname].append(test_node.name())

diff --git a/system/config_wifilab.py b/system/config_wifilab.py
index def6f56..f118a6f 100644 (file)
--- a/system/config_wifilab.py
+++ b/system/config_wifilab.py
@@ -12,7 +12,7 @@ def nodes():
     return [ {'node_fields': {'hostname': 'wlab02.inria.fr',
                               'model':'Dell Latitude 830'},
               'owner' : 'pi',
-              'nodegroups' : 'wireless',
+              'nodegroups' : 'wifi',
               'network_fields': { 'method':'dhcp',
                                   'type' : 'ipv4',
                                   'ip':'138.96.250.162',