X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_wifilab.py;h=46af4df3001ab7056a314c3a60aecdf4071d08f1;hb=64da80c58907fa23e814f0742bf095d23e3277b4;hp=ba948669eaef1c76bb4d742c7b3ed0015086b3a5;hpb=2f5a9f05d3d581c1c5ebe75f1d4e55ef2c5d44d1;p=tests.git

diff --git a/system/config_wifilab.py b/system/config_wifilab.py
index ba94866..46af4df 100644
--- a/system/config_wifilab.py
+++ b/system/config_wifilab.py
@@ -5,9 +5,34 @@
 #     (**) TestMain options field
 # (*) and that returns the new set of plc_specs
 
+# archs & vrefs :
+# current focus is to
+########## myplc
+# (*) run a 32bits myplc
+########## multi-arch
+# (*) run wlab02 as a plain 32bits node
+# (*) try and run 64bits in wlab17 (i.e. bootcd & bootstrapfs)
+#     which should be achieved by simply adding this node in the 'x86_64' nodegroup
+# (*) investigate what it takes to have the slivers on wlab17 run 32bits as well
+########## multi-vref
+# (*) define slice 'plain' without secific tuning, that should result in f8-based slivers
+# (*) define slice 'centos' with its vref set to centos5
+########## manual stuff
+# all this would require to
+# (*) install bootcd            f8-x86_64
+# (*) install bootstrapfs       f8-x86_64
+# (*) install noderepo          f8-x86_64 
+# (*) install noderepo          centos5-i386
+# (*) install noderepo          centos5-x86_64
+# (*) install vserver           centos5-i386
+# (*) and add that to yumgroups.xml
+########## unclear stuff
+# I'm pretty sure that yum.conf.php still needs hacking, at least for centos5
+########## unclear stuff
+
 onelab="one-lab.org"
 
-# use a model that contains "vmware" to get the node actually started
+# these are real nodes, they dont get started by the framework
 def nodes():
     node02 = {'name':'wlab02',
               'node_fields': {'hostname': 'wlab02.inria.fr', 'model':'Dell Latitude 830'},
@@ -23,6 +48,20 @@ def nodes():
                                        },
                                      ],
               }
+    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',},
+                                       },
+                                     ],
+              }
     node05 = {'name':'wlab05',
               'node_fields': {'hostname': 'wlab05.inria.fr', 'model':'Dell Latitude 830'},
               'owner' : 'pi',
@@ -51,22 +90,10 @@ def nodes():
                                        },
                                      ],
               }
-    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 ]
+
+    # wlab05 not avail. for now
+    return [ node02 , node17 ]
 
 def all_nodenames ():
     return [ node['name'] for node in nodes()]
@@ -166,28 +193,41 @@ def keys ():
 
 def initscripts(): 
     return [ { 'initscript_fields' : { 'enabled' : True,
-                                       'name':'script1',
-                                       'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 1; date) > /tmp/initscript1.log \n ',
+                                       'name':'script_plain',
+                                       'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 1; date) > /tmp/initscript_plain.log \n ',
                                        }},
              { 'initscript_fields' : { 'enabled' : True,
-                                       'name':'script2',
-                                       'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 2; date) > /tmp/initscript2.log \n ',
+                                       'name':'script_centos',
+                                       'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 2; date) > /tmp/initscript_centos.log \n ',
                                        }},
              ]
 
 def slices ():
-    return [ { 'slice_fields': {'name':'wifi_slice1',
+    plain= { 'slice_fields': {'name':'wifi_plain',
+                                'instantiation':'plc-instantiated',
+                                'url':'http://foo@foo.com',
+                                'description':'plain slice',
+                                'max_nodes':10,
+                                },
+               'usernames' : [ 'pi','tech','techuser' ],
+               'nodenames' : all_nodenames(),
+               'initscriptname' : 'script_plain',
+               'sitename' : 'wifi',
+               'owner' : 'pi',
+               }
+    centos= { 'slice_fields': {'name':'wifi_centos',
                                 'instantiation':'plc-instantiated',
                                 'url':'http://foo@foo.com',
-                                'description':'test slice',
-                                'max_nodes':2
+                                'description':'centos slice',
+                                'max_nodes':10,
                                 },
                'usernames' : [ 'pi','tech','techuser' ],
                'nodenames' : all_nodenames(),
-               'initscriptname' : 'script1',
+               'initscriptname' : 'script_centos',
                'sitename' : 'wifi',
                'owner' : 'pi',
-               },
+              'vref' : 'centos5',
+               }
              ]
 
 def plc () :
@@ -210,6 +250,7 @@ def plc () :
         'PLC_BOOT_HOST' : 'wlab24.inria.fr',
         'PLC_NET_DNS1' : '138.96.0.10',
         'PLC_NET_DNS2' : '138.96.0.11',
+        'PLC_DNS_ENABLED' : 'false',
         'sites' : sites(),
         'keys' : keys(),
         'initscripts': initscripts(),