From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 12 Jun 2012 09:22:39 +0000 (+0200)
Subject: checking system slice will try netflow and drl
X-Git-Tag: tests-5.1-7~19
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8f8165fa1ecd6cb0f06072c060a5ef7d18f41ec0;p=tests.git

checking system slice will try netflow and drl
---

diff --git a/system/TestNode.py b/system/TestNode.py
index 238778c..9a980f5 100644
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -298,7 +298,7 @@ class TestNode:
         test_ssh=self.create_test_ssh()
         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()
diff --git a/system/TestPlc.py b/system/TestPlc.py
index ccb90a5..dd094e2 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -97,7 +97,7 @@ class TestPlc:
         'ssh_node_debug@1', 'plcsh_stress_test@1', SEP,
         'ssh_node_boot@1', 'ssh_slice', 'check_initscripts', SEP,
         'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA,
-        'check_tcp', 'check_sys_slice', SEP,
+        'check_tcp', 'check_system_slice', SEP,
         'empty_slices', 'ssh_slice_off', 'fill_slices', SEP,
         'force_gather_logs', SEP,
         ]
@@ -113,6 +113,7 @@ class TestPlc:
 	'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA,
         'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,
         'plc_db_dump' , 'plc_db_restore', SEP,
+        'check_netflow','check_drl', SEP,
         'standby_1_through_20',SEP,
         ]
 
@@ -1159,20 +1160,24 @@ class TestPlc:
         return overall
 
     # painfully enough, we need to allow for some time as netflow might show up last
-    def check_sys_slice (self): 
+    def check_system_slice (self): 
         "all nodes: check that a system slice is alive"
-# would probably make more sense to check for netflow, 
-# but that one is currently not working in the lxc distro        
-#        return self.check_systemslice ('netflow')
-        return self.check_systemslice ('drl')
+        # netflow currently not working in the lxc distro
+        # drl not built at all in the wtx distro
+        # if we find either of them we're happy
+        return self.check_netflow() or self.check_drl_ ('drl')
     
+    # expose these
+    def check_netflow (self): return self._check_system_slice ('netflow')
+    def check_drl (self): return self._check_system_slice ('drl')
+
     # we have the slices up already here, so it should not take too long
-    def check_systemslice (self, slicename, timeout_minutes=5, period=15):
+    def _check_system_slice (self, slicename, timeout_minutes=5, period=15):
         timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes)
         test_nodes=self.all_nodes()
         while test_nodes:
             for test_node in test_nodes:
-                if test_node.check_systemslice (slicename,dry_run=self.options.dry_run):
+                if test_node._check_system_slice (slicename,dry_run=self.options.dry_run):
                     utils.header ("ok")
                     test_nodes.remove(test_node)
                 else: