new node in wifilab, bios updated to A09

diff --git a/system/TestNode.py b/system/TestNode.py
index 935994e..c77950d 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -67,8 +67,8 @@ class TestNode:
             for interface in self.node_spec['extra_interfaces']:
                 server.AddNodeNetwork(userauth,self.name(),
                                                     interface['network_fields'])
-                if interface.has_key('attributes'):
-                    for (attribute,value) in interface['attributes'].iteritems():
+                if interface.has_key('settings'):
+                    for (attribute,value) in interface['settings'].iteritems():
                         # locate node network
                         nn = server.GetNodeNetworks(userauth,{'ip':interface['network_fields']['ip']})[0]
                         nnid=nn['nodenetwork_id']
@@ -77,7 +77,7 @@ class TestNode:
                             nnst = server.GetNodeNetworkSettingTypes(userauth,{'name':attribute})[0]
                         except:
                             nnst = server.AddNodeNetworkSettingType(rootauth,{'category':'test',
-                                                                          'name':attribute})
+                                                                              'name':attribute})
                         # attach value
                         server.AddNodeNetworkSetting(userauth,nnid,attribute,value)
 

diff --git a/system/config_wifilab.py b/system/config_wifilab.py
index 7e9da6b..08d812b 100644 (file)
--- a/system/config_wifilab.py
+++ b/system/config_wifilab.py
@@ -9,55 +9,53 @@ 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 = {'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 = {'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',},
                                        },
                                      ],
               }
-             ]
+    node17 = {'node_fields': {'hostname': 'wlab17.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',},
+                                       'settings' : { 'essid' : 'guest-inria-sophia',
+                                                      'ifname' : 'wlan0',},
+                                       },
+                                     ],
+              }
+
+    return [ node02 , node05 , node17 ]
 
 def all_nodenames ():
     return [ node['node_fields']['hostname'] for node in nodes()]