X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestMain.py;h=a325223bd1c1be28b352ad5f8e985278bd86355e;hb=c15f3e993044f4e943a0876fb8dc972b3f7b06b4;hp=c72aa99db3f11aaad06b16f970f5dd111d0c0fbc;hpb=f3c23ed307e48fa09c3fbf30c1ad03f2a397ff00;p=tests.git diff --git a/system/TestMain.py b/system/TestMain.py index c72aa99..a325223 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -171,7 +171,9 @@ steps refer to a method in TestPlc or to a step_* module help="Specify the set of hostnames for the boxes that host the nodes") parser.add_option("-N","--nodes",action="append", dest="ips_vnode", default=[], help="Specify the set of hostname/IP's to use for vnodes") - parser.add_option ('-X', "--lxc",action='store_true',dest='plcs_use_lxc', + parser.add_option ('-X', "--lxc",action='store_true',dest='plcs_use_lxc',default=True, + help='use lxc-enabled plc boxes instead of vs-enabled ones') + parser.add_option ('-S', "--vs",action='store_false',dest='plcs_use_lxc', help='use lxc-enabled plc boxes instead of vs-enabled ones') parser.add_option("-s","--size",action="store",type="int",dest="size",default=1, help="sets test size in # of plcs - default is 1") @@ -189,8 +191,9 @@ steps refer to a method in TestPlc or to a step_* module help="prompts before each step") parser.add_option("-n","--dry-run", action="store_true", dest="dry_run", default=False, help="Show environment and exits") - parser.add_option("-r","--restart-nm", action="store_true", dest="forcenm", default=False, - help="Force the NM to restart in ssh_slices step") +# dropped when added Completer.py +# parser.add_option("-r","--restart-nm", action="store_true", dest="forcenm", default=False, +# help="Force the NM to restart in ssh_slices step") parser.add_option("-t","--trace", action="store", dest="trace_file", default=None, help="Trace file location") (self.options, self.args) = parser.parse_args()