smarter way to write configs, provide structure and map to avail. resources (testboxe...

[tests.git] / system / config_wifilab.py

diff --git a/system/config_wifilab.py b/system/config_wifilab.py
index 7e9da6b..ba94866 100644 (file)
--- a/system/config_wifilab.py
+++ b/system/config_wifilab.py
@@ -9,58 +9,67 @@ onelab="one-lab.org"
 
 # use a model that contains "vmware" to get the node actually started
 def nodes():
-    return [ {'node_fields': {'hostname': 'wlab02.inria.fr',
-                              'model':'Dell Latitude 830'},
+    node02 = {'name':'wlab02',
+              'node_fields': {'hostname': 'wlab02.inria.fr', 'model':'Dell Latitude 830'},
               'owner' : 'pi',
               'nodegroups' : 'wifi',
-              'network_fields': { 'method':'dhcp',
-                                  'type' : 'ipv4',
-                                  'ip':'138.96.250.162',
-                                  },
-              'extra_interfaces' : [ { 'network_fields' : 
-                                       { 'method' : 'static',
-                                         'type' : 'ipv4',
-                                         'mac' : '00:1B:77:70:F4:C6',
-                                         'ip' : '138.96.250.212',
-                                         'network' : '138.96.0.0',
-                                         'dns1': '138.96.0.10',
-                                         'dns2': '138.96.0.11',
-                                         'broadcast' : '138.96.255.255',
-                                         'netmask' : '255.255.0.0',
-                                         'gateway' : '138.96.248.250',
-                                         },
-                                       'attributes' : 
-                                       { 'essid' : 'guest-inria-sophia',
-                                         'ifname' : 'wlan0',
-                                         },
+              'network_fields': { 'method':'dhcp', 'type' : 'ipv4', 'ip':'138.96.250.162',},
+              'extra_interfaces' : [ { 'network_fields' : { 'method' : 'dhcp',
+                                                            'type' : 'ipv4',
+                                                            'mac' : '00:1B:77:70:F4:C6',
+                                                            'ip' : '138.96.250.192', },
+                                       'settings' : { 'essid' : 'guest-inria-sophia',
+                                                      'ifname' : 'wlan0', },
                                        },
                                      ],
-              },
-             {'node_fields': {'hostname': 'wlab17.inria.fr',
-                              'model':'Dell Latitude 830'},
+              }
+    node05 = {'name':'wlab05',
+              'node_fields': {'hostname': 'wlab05.inria.fr', 'model':'Dell Latitude 830'},
               'owner' : 'pi',
               'nodegroups' : 'wifi',
-              'network_fields': { 'method':'dhcp',
-                                  'type' : 'ipv4',
-                                  'ip':'138.96.250.177',
-                                  },
-              'extra_interfaces' : [ { 'network_fields' : 
-                                       { 'method' : 'dhcp',
-                                         'type' : 'ipv4',
-                                         'mac' : '00:1c:bf:51:3c:19',
-                                         'ip' : '138.96.250.207',
-                                         },
-                                       'attributes' : 
-                                       { 'essid' : 'guest-inria-sophia',
-                                         'ifname' : 'wlan0',
-                                         },
+              'network_fields': { 'method':'dhcp', 'type' : 'ipv4', 'ip':'138.96.250.165',},
+              'extra_interfaces' : [ { 'network_fields' : { 'method' : 'static',
+                                                            'type' : 'ipv4',
+                                                            'mac' : '00:1B:77:70:FC:84',
+                                                            'ip' : '138.96.250.215',
+                                                            'network' : '138.96.0.0',
+                                                            'dns1': '138.96.0.10',
+                                                            'dns2': '138.96.0.11',
+                                                            'broadcast' : '138.96.255.255',
+                                                            'netmask' : '255.255.0.0',
+                                                            'gateway' : '138.96.248.250',},
+                                       'settings' : { 'essid' : 'guest-inria-sophia',
+                                                      'ifname' : 'wlan0',},
+                                       },
+                                     { 'network_fields' : { 'method' : 'dhcp',
+                                                            'type' : 'ipv4',
+                                                            'mac' : '00:20:A6:4E:FF:E6',
+                                                            'ip' : '138.96.250.50',
+                                                            'hostname' : 'radio40.inria.fr', },
+                                       'settings' : { 'essid' : 'guest-inria-sophia',
+                                                      'ifname' : 'wifi0',},
                                        },
                                      ],
               }
-             ]
+    node17 = {'name':'wlab17',
+              'node_fields': {'hostname': 'wlab17.inria.fr', 'model':'Dell Latitude 830'},
+              'owner' : 'pi',
+              'nodegroups' : ['wifi','x86_64'] ,
+              'network_fields': { 'method':'dhcp', 'type' : 'ipv4', 'ip':'138.96.250.177',},
+              'extra_interfaces' : [ { 'network_fields' : { 'method' : 'dhcp',
+                                                            'type' : 'ipv4',
+                                                            'mac' : '00:1c:bf:51:3c:19',
+                                                            'ip' : '138.96.250.207',},
+                                       'settings' : { 'essid' : 'guest-inria-sophia',
+                                                      'ifname' : 'wlan0',},
+                                       },
+                                     ],
+              }
+
+    return [ node02 , node05 , node17 ]
 
 def all_nodenames ():
-    return [ node['node_fields']['hostname'] for node in nodes()]
+    return [ node['name'] for node in nodes()]
 
 def users (domain=onelab) :
     return [ {'name' : 'pi', 'keynames' : [ 'key1' ],
@@ -104,7 +113,7 @@ def sites ():
                                'login_base':'wifi',
                                'abbreviated_name':'wifi',
                                'max_slices':100,
-                               'url':'http://onelab-test.inria.fr',
+                               'url':'http://testbox1.one-lab.org',
                                },
               'address_fields' : {'line1':'route des lucioles',
                                   'city':'sophia',
@@ -187,7 +196,7 @@ def plc () :
         # as of yet, not sure we can handle foreign hosts, but this is required though
         'hostname' : 'wlab24.inria.fr',
         # set these two items to run within a vserver
-        # 'vservername': '138.96.250.131'
+        # 'vservername': 'somename'
         # 'vserverip': '138.96.250.131'
         'role' : 'root',
         'PLC_ROOT_USER' : 'root@wlab24.inria.fr',