git://git.onelab.eu
/
tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8d9664
)
lxc vm's rootfs are now in /vservers
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Tue, 16 Apr 2013 13:28:14 +0000
(15:28 +0200)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Tue, 16 Apr 2013 13:28:14 +0000
(15:28 +0200)
system/TestPlc.py
patch
|
blob
|
history
diff --git
a/system/TestPlc.py
b/system/TestPlc.py
index
1f1eb37
..
34e9959
100644
(file)
--- a/
system/TestPlc.py
+++ b/
system/TestPlc.py
@@
-203,13
+203,13
@@
class TestPlc:
def vm_root_in_host(self):
if self.options.plcs_use_lxc:
def vm_root_in_host(self):
if self.options.plcs_use_lxc:
- return "/v
ar/lib/lxc
/%s/rootfs/"%(self.vservername)
+ return "/v
servers
/%s/rootfs/"%(self.vservername)
else:
return "/vservers/%s"%(self.vservername)
def vm_timestamp_path (self):
if self.options.plcs_use_lxc:
else:
return "/vservers/%s"%(self.vservername)
def vm_timestamp_path (self):
if self.options.plcs_use_lxc:
- return "/v
ar/lib/lxc
/%s/%s.timestamp"%(self.vservername,self.vservername)
+ return "/v
servers
/%s/%s.timestamp"%(self.vservername,self.vservername)
else:
return "/vservers/%s.timestamp"%(self.vservername)
else:
return "/vservers/%s.timestamp"%(self.vservername)
@@
-548,7
+548,7
@@
class TestPlc:
if self.options.plcs_use_lxc:
self.run_in_host("virsh -c lxc:// destroy %s"%self.vservername)
self.run_in_host("virsh -c lxc:// undefine %s"%self.vservername)
if self.options.plcs_use_lxc:
self.run_in_host("virsh -c lxc:// destroy %s"%self.vservername)
self.run_in_host("virsh -c lxc:// undefine %s"%self.vservername)
- self.run_in_host("rm -fr /v
ar/lib/lxc
/%s"%self.vservername)
+ self.run_in_host("rm -fr /v
servers
/%s"%self.vservername)
return True
else:
self.run_in_host("vserver --silent %s delete"%self.vservername)
return True
else:
self.run_in_host("vserver --silent %s delete"%self.vservername)