Enhance kube-hunter result postprocessing

[functest-kubernetes.git] / functest_kubernetes / k8stest.py

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index 09dc50e..a759dce 100644 (file)
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -23,7 +23,7 @@ import time
 from xtesting.core import testcase
 
 
-class K8sTesting(testcase.TestCase):
+class E2ETesting(testcase.TestCase):
     """Kubernetes test runner"""
     # pylint: disable=too-many-instance-attributes
 
@@ -32,21 +32,27 @@ class K8sTesting(testcase.TestCase):
     config = '/root/.kube/config'
 
     def __init__(self, **kwargs):
-        super(K8sTesting, self).__init__(**kwargs)
+        super(E2ETesting, self).__init__(**kwargs)
         self.cmd = []
-        self.res_dir = "/home/opnfv/functest/results/{}".format(
-            self.case_name)
+        self.dir_results = "/home/opnfv/functest/results"
+        self.res_dir = os.path.join(self.dir_results, self.case_name)
         self.result = 0
         self.start_time = 0
         self.stop_time = 0
         self.output_log_name = 'functest-kubernetes.log'
         self.output_debug_log_name = 'functest-kubernetes.debug.log'
 
-    def run_kubetest(self):  # pylint: disable=too-many-branches
+    def run_kubetest(self, **kwargs):  # pylint: disable=too-many-branches
         """Run the test suites"""
-        cmd_line = self.cmd
+        cmd_line = ['e2e.test', '-ginkgo.noColor', '-kubeconfig', self.config,
+                    '-provider', 'local', '-report-dir', self.res_dir]
+        for arg in kwargs:
+            cmd_line.extend(['-ginkgo.{}'.format(arg), kwargs.get(arg)])
+        if "NON_BLOCKING_TAINTS" in os.environ:
+            cmd_line.extend(
+                ['-non-blocking-taints', os.environ["NON_BLOCKING_TAINTS"]])
+        cmd_line.extend(['-disable-log-dump', 'true'])
         self.__logger.info("Starting k8s test: '%s'.", cmd_line)
-
         process = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT)
         boutput = process.stdout.read()
@@ -54,7 +60,8 @@ class K8sTesting(testcase.TestCase):
             foutput.write(boutput)
         grp = re.search(
             r'^(FAIL|SUCCESS)!.* ([0-9]+) Passed \| ([0-9]+) Failed \|'
-            r' ([0-9]+) Pending \| ([0-9]+) Skipped', boutput.decode("utf-8"),
+            r' ([0-9]+) Pending \| ([0-9]+) Skipped',
+            boutput.decode("utf-8", errors="ignore"),
             re.MULTILINE | re.DOTALL)
         assert grp
         self.details['passed'] = int(grp.group(2))
@@ -68,7 +75,8 @@ class K8sTesting(testcase.TestCase):
         self.__logger.debug("result: %s", self.result)
         if grp.group(1) == 'FAIL':
             grp2 = re.search(
-                r'^(Summarizing [0-9]+ Failure.*)Ran', boutput.decode("utf-8"),
+                r'^(Summarizing [0-9]+ Failure.*)Ran',
+                boutput.decode("utf-8", errors="ignore"),
                 re.MULTILINE | re.DOTALL)
             if grp2:
                 self.__logger.error(grp2.group(1))
@@ -80,35 +88,10 @@ class K8sTesting(testcase.TestCase):
             return self.EX_RUN_ERROR
         self.start_time = time.time()
         try:
-            self.run_kubetest()
+            self.run_kubetest(**kwargs)
             res = self.EX_OK
         except Exception:  # pylint: disable=broad-except
             self.__logger.exception("Error with running kubetest:")
             res = self.EX_RUN_ERROR
         self.stop_time = time.time()
         return res
-
-
-class K8sSmokeTest(K8sTesting):
-    """Kubernetes smoke test suite"""
-    def __init__(self, **kwargs):
-        if "case_name" not in kwargs:
-            kwargs.get("case_name", 'k8s_smoke')
-        super(K8sSmokeTest, self).__init__(**kwargs)
-        self.cmd = ['e2e.test', '-ginkgo.focus', 'Guestbook.application',
-                    '-ginkgo.noColor', '-kubeconfig', self.config,
-                    '-provider', 'local', '-report-dir', self.res_dir,
-                    '-disable-log-dump', 'true']
-
-
-class K8sConformanceTest(K8sTesting):
-    """Kubernetes conformance test suite"""
-    def __init__(self, **kwargs):
-        if "case_name" not in kwargs:
-            kwargs.get("case_name", 'k8s_conformance')
-        super(K8sConformanceTest, self).__init__(**kwargs)
-        self.cmd = [
-            'e2e.test', '-ginkgo.focus', r'\[Conformance\]', '-ginkgo.noColor',
-            '-ginkgo.skip', r'Alpha|\[(Disruptive|Feature:[^\]]+|Flaky)\]',
-            '-kubeconfig', self.config, '-provider', 'local',
-            '-report-dir', self.res_dir, '-disable-log-dump', 'true']