X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_wifilab.py;h=fff7cdf5534c3e820c208febd0df4d1abddc83c6;hb=043b3c4c448ea1b32dca1f9a12e2b812e2036af6;hp=3fe7e0db317d16ebd4e4c48d75e0cef8596b47db;hpb=9578c3c02ac9d0f1f7b6b54754a3bb68fe8c12c2;p=tests.git

diff --git a/system/config_wifilab.py b/system/config_wifilab.py
index 3fe7e0d..fff7cdf 100644
--- a/system/config_wifilab.py
+++ b/system/config_wifilab.py
@@ -1,3 +1,6 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 # a configuration module is expected:
 # (*) to define a config method
 # (*) that takes two arguments
@@ -38,8 +41,8 @@ def nodes():
               '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' : 'dhcp',
+              'interface_fields': { 'method':'dhcp', 'type' : 'ipv4', 'ip':'138.96.250.162',},
+              'extra_interfaces' : [ { 'interface_fields' : { 'method' : 'dhcp',
                                                             'type' : 'ipv4',
                                                             'mac' : '00:1B:77:70:F4:C6',
                                                             'ip' : '138.96.250.192', },
@@ -52,8 +55,8 @@ def nodes():
               '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',
+              'interface_fields': { 'method':'dhcp', 'type' : 'ipv4', 'ip':'138.96.250.177',},
+              'extra_interfaces' : [ { 'interface_fields' : { 'method' : 'dhcp',
                                                             'type' : 'ipv4',
                                                             'mac' : '00:1c:bf:51:3c:19',
                                                             'ip' : '138.96.250.207',},
@@ -66,8 +69,8 @@ def nodes():
               'node_fields': {'hostname': 'wlab05.inria.fr', 'model':'Dell Latitude 830'},
               'owner' : 'pi',
               'nodegroups' : 'wifi',
-              'network_fields': { 'method':'dhcp', 'type' : 'ipv4', 'ip':'138.96.250.165',},
-              'extra_interfaces' : [ { 'network_fields' : { 'method' : 'static',
+              'interface_fields': { 'method':'dhcp', 'type' : 'ipv4', 'ip':'138.96.250.165',},
+              'extra_interfaces' : [ { 'interface_fields' : { 'method' : 'static',
                                                             'type' : 'ipv4',
                                                             'mac' : '00:1B:77:70:FC:84',
                                                             'ip' : '138.96.250.215',
@@ -80,7 +83,7 @@ def nodes():
                                        'settings' : { 'essid' : 'guest-inria-sophia',
                                                       'ifname' : 'wlan0',},
                                        },
-                                     { 'network_fields' : { 'method' : 'dhcp',
+                                     { 'interface_fields' : { 'method' : 'dhcp',
                                                             'type' : 'ipv4',
                                                             'mac' : '00:20:A6:4E:FF:E6',
                                                             'ip' : '138.96.250.50',
@@ -140,7 +143,7 @@ def sites ():
                                'login_base':'wifi',
                                'abbreviated_name':'wifi',
                                'max_slices':100,
-                               'url':'http://testbox1.onelab.eu',
+                               'url':'http://test.onelab.eu',
                                },
               'address_fields' : {'line1':'route des lucioles',
                                   'city':'sophia',
@@ -232,6 +235,7 @@ def slices ():
 
 def plc () :
     return { 
+        'index' : index,
         'name' : 'wifilab',
         # as of yet, not sure we can handle foreign hosts, but this is required though
         'hostname' : 'wlab24.inria.fr',
@@ -243,7 +247,7 @@ def plc () :
         'PLC_ROOT_PASSWORD' : 'test++',
         'PLC_NAME' : 'WifiLab',
         'PLC_MAIL_ENABLED':'true',
-        'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@sophia.inria.fr',
+        'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@inria.fr',
         'PLC_DB_HOST' : 'wlab24.inria.fr',
         'PLC_API_HOST' : 'wlab24.inria.fr',
         'PLC_WWW_HOST' : 'wlab24.inria.fr',
@@ -258,4 +262,7 @@ def plc () :
     }
 
 def config (plc_specs,options):
+    print "config_wifilab is obsolete .."
+    import sys
+    sys.exit(1)
     return plc_specs + [ plc() ]