check system slice using 'drl' for now

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index 7f5c469..4d684dc 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -6,7 +6,7 @@ import xmlrpclib
 
 import utils
 from TestUser import TestUser
-from TestBox import TestBox
+from TestBoxQemu import TestBoxQemu
 from TestSsh import TestSsh
 
 class TestNode:
@@ -51,12 +51,12 @@ class TestNode:
                 utils.header("WARNING : qemu nodes need a host box")
                 return 'localhost'
 
-    # this returns a TestBox instance - cached in .test_box_value
+    # this returns a TestBoxQemu instance - cached in .test_box_value
     def test_box (self):
         try:
             return self.test_box_value
         except:
-            self.test_box_value = TestBox (self.host_box(),self.buildname())
+            self.test_box_value = TestBoxQemu (self.host_box(),self.buildname())
             return self.test_box_value
 
     def create_node (self):
@@ -198,8 +198,13 @@ class TestNode:
             utils.header("TestNode.qemu_start : %s model %s taken as real node"%(self.name(),model))
         return True
 
+    def timestamp_qemu (self):
+        test_box = self.test_box()
+        test_box.run_in_buildname("mkdir -p %s"%self.nodedir())
+        now=int(time.time())
+        return test_box.run_in_buildname("echo %d > %s/timestamp"%(now,self.nodedir()))==0
+
     def start_qemu (self):
-        options = self.test_plc.options
         test_box = self.test_box()
         utils.header("Starting qemu node %s on %s"%(self.name(),test_box.hostname()))
 
@@ -266,3 +271,24 @@ class TestNode:
             utils.header ("SUCCESS: node hook %s OK"%script_name)
             return True
 
+    def has_libvirt (self):
+        test_ssh=self.create_test_ssh()
+        return test_ssh.run ("rpm -q libvirt-client")==0
+
+    def check_systemslice (self, slicename,dry_run=False):
+        sitename=self.test_plc.plc_spec['PLC_SLICE_PREFIX']
+        vservername="%s_%s"%(sitename,slicename)
+        test_ssh=self.create_test_ssh()
+        if self.has_libvirt():
+            return test_ssh.run("virsh --connect lxc:// list | grep -q ' %s '"%vservername,
+                                dry_run=dry_run)==0
+        else:
+            (retcod,output)=utils.output_of(test_ssh.actual_command("cat /vservers/%s/etc/slicefamily 2> /dev/null")%vservername)
+            # get last line only as ssh pollutes the output
+            slicefamily=output.split("\n")[-1]
+            utils.header("system slice %s has slicefamily %s"%(slicename, slicefamily))
+            if retcod != 0: 
+                return False
+            return test_ssh.run("vserver-stat | grep %s"%vservername,dry_run=dry_run)==0
+        
+