renamed steps and configs to use _ rather than -

diff --git a/system/TestMain.py b/system/TestMain.py
index 882ff61..bd77cb6 100755 (executable)
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -10,13 +10,12 @@ from TestPlc import TestPlc
 from TestSite import TestSite
 from TestNode import TestNode
 
-
 default_config = [ 'onelab' ]
 
 default_steps = ['uninstall','install','configure', 'start', 'store_keys', 'initscripts', 
                  'sites', 'nodes', 'slices',  
-                 'bootcd', 'start_nodes', 'check-nodes', 'check-slices' ]
-other_steps = [ 'fresh-install', 'stop', 'install_vserver_create', 'install_vserver_native',
+                 'bootcd', 'start_nodes', 'check_nodes', 'check_slices' ]
+other_steps = [ 'fresh_install', 'stop', 'install_vserver_create', 'install_vserver_native',
                 'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys',
                 'stop_nodes' ,  'db_dump' , 'db_restore',
                 ]
@@ -44,7 +43,7 @@ class TestMain:
         usage = """usage: %prog [options] steps
 myplc-url defaults to the last value used, as stored in MYPLC-URL
 build-url defaults to the last value used, as stored in BUILD-URL
-steps refer to a method in TestPlc or to a step-* module"""
+steps refer to a method in TestPlc or to a step_* module"""
         usage += "\n  Defaut steps are %r"%default_steps
         usage += "\n  Other useful steps are %r"%other_steps
         usage += "\n  Default config(s) are %r"%default_config
@@ -118,7 +117,7 @@ steps refer to a method in TestPlc or to a step-* module"""
 
         all_plc_specs = []
         for config in self.options.config:
-            modulename='config-'+config
+            modulename='config_'+config
             try:
                 m = __import__(modulename)
                 all_plc_specs = m.config(all_plc_specs,self.options)
@@ -140,9 +139,9 @@ steps refer to a method in TestPlc or to a step-* module"""
             # try and locate a method in TestPlc
             if testplc_method_dict.has_key(step):
                 all_step_infos += [ (step, testplc_method_dict[step] )]
-            # otherwise search for the 'run' method in the step-<x> module
+            # otherwise search for the 'run' method in the step_<x> module
             else:
-                modulename='step-'+step
+                modulename='step_'+step
                 try:
                     # locate all methods named run* in the module
                     module_dict = __import__(modulename).__dict__

diff --git a/system/config-onelab.py b/system/config_onelab.py
similarity index 100%
rename from system/config-onelab.py
rename to system/config_onelab.py

diff --git a/system/config-onelab-vserver.py b/system/config_onelab_vserver.py
similarity index 100%
rename from system/config-onelab-vserver.py
rename to system/config_onelab_vserver.py

diff --git a/system/runtest b/system/runtest
new file mode 120000 (symlink)
index 0000000..23360cc
--- /dev/null
+++ b/system/runtest
@@ -0,0 +1 @@
+TestMain.py
\ No newline at end of file

diff --git a/system/step-check-nodes.py b/system/step_check_nodes.py
similarity index 100%
rename from system/step-check-nodes.py
rename to system/step_check_nodes.py

diff --git a/system/step-check-slices.py b/system/step_check_slices.py
similarity index 100%
rename from system/step-check-slices.py
rename to system/step_check_slices.py

diff --git a/system/step-fresh-install.py b/system/step_fresh_install.py
similarity index 100%
rename from system/step-fresh-install.py
rename to system/step_fresh_install.py