From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 28 Mar 2012 08:04:43 +0000 (+0200)
Subject: manage displays both vs and lxc boxes
X-Git-Tag: tests-5.1-1~25
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e153623fa5f36047818bd23a3b99bb1497f6887c;p=tests.git

manage displays both vs and lxc boxes
---

diff --git a/system/Substrate.py b/system/Substrate.py
index b2748a8..fde07e3 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -556,7 +556,7 @@ class PlcLxcBox (PlcBox):
     # to describe the currently running VM's
     # as well as to call  self.get_uname() once
     def sense (self, options):
-        print "px (todo:PlcLxcBox.sense)",
+        print "xp (todo:PlcLxcBox.sense)",
         self.get_uname()
 
 
@@ -1178,8 +1178,6 @@ class Substrate:
                            help='add build boxes')
         parser.add_option ('-p',"--plc",action='store_true',dest='plcs',default=False,
                            help='add plc boxes')
-        parser.add_option ('-X', "--lxc",action='store_true',dest='plcs_use_lxc',
-                           help='use lxc-enabled plc boxes instead of vs-enabled ones')
         parser.add_option ('-q',"--qemu",action='store_true',dest='qemus',default=False,
                            help='add qemu boxes') 
         parser.add_option ('-a',"--all",action='store_true',dest='all',default=False,
@@ -1190,8 +1188,7 @@ class Substrate:
                            help='dry run mode')
         (self.options,args)=parser.parse_args()
 
-        if self.options.plcs_use_lxc:
-            self.rescope (plcs_on_vs=False, plcs_on_lxc=True)
+        self.rescope (plcs_on_vs=True, plcs_on_lxc=True)
 
         boxes=args
         if self.options.testbox: boxes += [self.test_box]