X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest_kubernetes%2Fk8stest.py;h=e8e8a1f4d11a97dd7ca46f84ecd17b21fce38cd1;hb=b1acb9c247f09b6c6e29442c4d8e067d6e4a3c10;hp=7d9400edbaef59164440caf506ea2460f4e9585f;hpb=2b768e16be8cd317ff4d3811fb17d14fb14eaaec;p=functest-kubernetes.git

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index 7d9400ed..e8e8a1f4 100644
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -25,16 +25,22 @@ from xtesting.core import testcase
 
 class K8sTesting(testcase.TestCase):
     """Kubernetes test runner"""
+    # pylint: disable=too-many-instance-attributes
 
     __logger = logging.getLogger(__name__)
 
+    config = '/root/.kube/config'
+
     def __init__(self, **kwargs):
         super(K8sTesting, self).__init__(**kwargs)
-        self.config = '/root/.kube/config'
         self.cmd = []
+        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
         """Run the test suites"""
@@ -43,56 +49,35 @@ class K8sTesting(testcase.TestCase):
 
         process = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT)
-        output = process.stdout.read()
-        # Remove color code escape sequences
-        output = re.sub(r'\x1B\[[0-?]*[ -/]*[@-~]', '', str(output))
-
-        remarks = []
-        lines = output.split('\n')
-        i = 0
-        while i < len(lines):
-            if '[k8s.io]' in lines[i]:
-                if i != 0 and 'seconds' in lines[i - 1]:
-                    self.__logger.debug(lines[i - 1])
-                while lines[i] != '-' * len(lines[i]):
-                    if lines[i].startswith('STEP:') or ('INFO:' in lines[i]):
-                        break
-                    self.__logger.debug(lines[i])
-                    i = i + 1
-
-            success = 'SUCCESS!' in lines[i]
-            failure = 'FAIL!' in lines[i]
-            if success or failure:
-                if i != 0 and 'seconds' in lines[i - 1]:
-                    remarks.append(lines[i - 1])
-                remarks = remarks + lines[i].replace('--', '|').split('|')
-                break
-            i = i + 1
-
-        self.__logger.debug('-' * 10)
-        self.__logger.info("Remarks:")
-        for remark in remarks:
-            if 'seconds' in remark:
-                self.__logger.debug(remark)
-            elif 'Passed' in remark:
-                self.__logger.info("Passed: %s", remark.split()[0])
-            elif 'Skipped' in remark:
-                self.__logger.info("Skipped: %s", remark.split()[0])
-            elif 'Failed' in remark:
-                self.__logger.info("Failed: %s", remark.split()[0])
-
-        if success:
-            self.result = 100
-        elif failure:
-            self.result = 0
+        boutput = process.stdout.read()
+        with open(os.path.join(self.res_dir, 'e2e.log'), 'wb') as foutput:
+            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"),
+            re.MULTILINE | re.DOTALL)
+        assert grp
+        self.details['passed'] = int(grp.group(2))
+        self.details['failed'] = int(grp.group(3))
+        self.details['pending'] = int(grp.group(4))
+        self.details['skipped'] = int(grp.group(5))
+        self.__logger.debug("details: %s", self.details)
+        self.result = self.details['passed'] * 100 / (
+            self.details['passed'] + self.details['failed'] +
+            self.details['pending'])
+        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"),
+                re.MULTILINE | re.DOTALL)
+            if grp2:
+                self.__logger.error(grp2.group(1))
 
     def run(self, **kwargs):
-
         if not os.path.isfile(self.config):
             self.__logger.error(
                 "Cannot run k8s testcases. Config file not found")
             return self.EX_RUN_ERROR
-
         self.start_time = time.time()
         try:
             self.run_kubetest()
@@ -100,21 +85,9 @@ class K8sTesting(testcase.TestCase):
         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
 
-    def check_envs(self):  # pylint: disable=no-self-use
-        """Check if required environment variables are set"""
-        try:
-            assert 'DEPLOY_SCENARIO' in os.environ
-            assert 'KUBE_MASTER_IP' in os.environ
-            assert 'KUBERNETES_PROVIDER' in os.environ
-            assert 'KUBE_MASTER_URL' in os.environ
-        except Exception as ex:
-            raise Exception("Cannot run k8s testcases. "
-                            "Please check env var: %s" % str(ex))
-
 
 class K8sSmokeTest(K8sTesting):
     """Kubernetes smoke test suite"""
@@ -122,9 +95,10 @@ class K8sSmokeTest(K8sTesting):
         if "case_name" not in kwargs:
             kwargs.get("case_name", 'k8s_smoke')
         super(K8sSmokeTest, self).__init__(**kwargs)
-        self.check_envs()
-        self.cmd = ['/src/k8s.io/kubernetes/cluster/test-smoke.sh', '--host',
-                    os.getenv('KUBE_MASTER_URL')]
+        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):
@@ -133,7 +107,8 @@ class K8sConformanceTest(K8sTesting):
         if "case_name" not in kwargs:
             kwargs.get("case_name", 'k8s_conformance')
         super(K8sConformanceTest, self).__init__(**kwargs)
-        self.check_envs()
-        self.cmd = ['/src/k8s.io/kubernetes/_output/bin/e2e.test',
-                    '-ginkgo.focus', 'Conformance',
-                    '-kubeconfig', self.config]
+        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']