rename myplc-native into plain myplc and old-fashioned myplc into myplc-chroot

[tests.git] / system / config_default.py

diff --git a/system/config_default.py b/system/config_default.py
index 22a7503..1329670 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -1,25 +1,41 @@
 # the defaults
 import utils
+import TestPlc
+
+# this default is for the OneLab test infrastructure
 
 def config (plc_specs, options):
 
-# tmp : force small test 
-    utils.header("XXX WARNING : forcing small tests in config_default")
-    options.small_test = True
-# tmp : force vserver tests
-    utils.header("XXX WARNING : forcing native tests in config_default")
-    options.native = True
+#    for step in ['main','1testbox','1nodes','1vservers']:
+#        module=__import__(
 
     import config_main
     plcs = config_main.config([],options)
-    import config_1vnodes
-    plcs = config_1vnodes.config(plcs,options)
+    if options.verbose:
+        print '======================================== AFTER main'
+        for plc in plcs: TestPlc.TestPlc.display_mapping_plc(plc)
+        print '========================================'
+
     import config_1testbox
     plcs = config_1testbox.config (plcs,options)
+    if options.verbose:
+        print '======================================== AFTER testbox'
+        for plc in plcs: TestPlc.TestPlc.display_mapping_plc(plc)
+        print '========================================'
+
+    import config_1vnodes
+    plcs = config_1vnodes.config(plcs,options)
+    if options.verbose:
+        print '======================================== AFTER vnodes'
+        for plc in plcs: TestPlc.TestPlc.display_mapping_plc(plc)
+        print '========================================'
 
-    if options.native:
-        import config_1vservers
-        plcs = config_1vservers.config (plcs,options)
+    import config_1vservers
+    plcs = config_1vservers.config (plcs,options)
+    if options.verbose:
+        print '======================================== AFTER vservers'
+        for plc in plcs: TestPlc.TestPlc.display_mapping_plc(plc)
+        print '========================================'
 
     return plcs