X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_wifilab.py;h=85f26bccd8bd826104db2ce95c95011a8ec1450c;hb=5e8bc072712ee774b4dca54b0cc62ad1e0fcdb67;hp=46af4df3001ab7056a314c3a60aecdf4071d08f1;hpb=c935cb1d1792b84a569505f4a2d6530476e56043;p=tests.git

diff --git a/system/config_wifilab.py b/system/config_wifilab.py
index 46af4df..85f26bc 100644
--- a/system/config_wifilab.py
+++ b/system/config_wifilab.py
@@ -30,7 +30,7 @@
 # I'm pretty sure that yum.conf.php still needs hacking, at least for centos5
 ########## unclear stuff
 
-onelab="one-lab.org"
+onelab="onelab.eu"
 
 # these are real nodes, they dont get started by the framework
 def nodes():
@@ -38,8 +38,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 +52,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 +66,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 +80,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 +140,7 @@ def sites ():
                                'login_base':'wifi',
                                'abbreviated_name':'wifi',
                                'max_slices':100,
-                               'url':'http://testbox1.one-lab.org',
+                               'url':'http://test.onelab.eu',
                                },
               'address_fields' : {'line1':'route des lucioles',
                                   'city':'sophia',
@@ -153,7 +153,7 @@ def sites ():
             }]
 
 ##########
-public_key="""ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4jNj8yT9ieEc6nSJz/ESu4fui9WrJ2y/MCfqIZ5WcdVKhBFUYyIenmUaeTduMcSqvoYRQ4QnFR1BFdLG8XR9D6FWZ5zTKUgpkew22EVNeqai4IXeWYKyt1Qf3ehaz9E3o1PG/bmQNIM6aQay6TD1Y4lqXI+eTVXVQev4K2fixySjFQpp9RB4UHbeA8c28yoa/cgAYHqCqlvm9uvpGMjgm/Qa4M+ZeO7NdjowfaF/wF4BQIzVFN9YRhvQ/d8WDz84B5Pr0J7pWpaX7EyC4bvdskxl6kmdNIwIRcIe4OcuIiX5Z9oO+7h/chsEVJWF4vqNIYlL9Zvyhnr0hLLhhuk2bw== root@test.one-lab.org
+public_key="""ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4jNj8yT9ieEc6nSJz/ESu4fui9WrJ2y/MCfqIZ5WcdVKhBFUYyIenmUaeTduMcSqvoYRQ4QnFR1BFdLG8XR9D6FWZ5zTKUgpkew22EVNeqai4IXeWYKyt1Qf3ehaz9E3o1PG/bmQNIM6aQay6TD1Y4lqXI+eTVXVQev4K2fixySjFQpp9RB4UHbeA8c28yoa/cgAYHqCqlvm9uvpGMjgm/Qa4M+ZeO7NdjowfaF/wF4BQIzVFN9YRhvQ/d8WDz84B5Pr0J7pWpaX7EyC4bvdskxl6kmdNIwIRcIe4OcuIiX5Z9oO+7h/chsEVJWF4vqNIYlL9Zvyhnr0hLLhhuk2bw== root@test.onelab.eu
 """
 private_key="""-----BEGIN RSA PRIVATE KEY-----
 MIIEogIBAAKCAQEA4jNj8yT9ieEc6nSJz/ESu4fui9WrJ2y/MCfqIZ5WcdVKhBFU