checking system slice will try netflow and drl

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index 548edbd..9a980f5 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -2,7 +2,6 @@
 # Copyright (C) 2010 INRIA 
 #
 import sys, os, os.path, time, base64
-import xmlrpclib
 
 import utils
 from TestUser import TestUser
@@ -268,7 +267,7 @@ class TestNode:
 ###        # assuming we've run testplc.fetch_keys()
 ###        key = "keys/%(vservername)s.rsa"%locals()
         # fetch_keys doesn't grab the root key anymore
-        key = "keys/key1.rsa"
+        key = "keys/key_admin.rsa"
         return TestSsh(self.name(), buildname=self.buildname(), key=key)
 
     def check_hooks (self):
@@ -297,22 +296,24 @@ class TestNode:
 
     def has_libvirt (self):
         test_ssh=self.create_test_ssh()
-        return test_ssh.run ("rpm -q libvirt-client")==0
+        return test_ssh.run ("rpm -q --quiet libvirt-client")==0
 
-    def check_systemslice (self, slicename,dry_run=False):
+    def _check_system_slice (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():
+            utils.header("Checking system slice %s using virsh"%slicename)
             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))
+            utils.header("Found slicefamily '%s'for slice %s"%(slicefamily,slicename))
             if retcod != 0: 
                 return False
+            utils.header("Checking system slice %s using vserver-stat"%slicename)
             return test_ssh.run("vserver-stat | grep %s"%vservername,dry_run=dry_run)==0