X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest_kubernetes%2Fnetperf%2Fnetperf.py;h=b3642085d76112c11200bf8f75b2f98f728c71d4;hb=10d72a2e5c8a78cde617d2c10fa0ea46d90f6924;hp=2bd1e1bebb2c88befefab1098a2f58c5eb933306;hpb=8b86dd02328e331cc01b21bf1072e515bbd6db68;p=functest-kubernetes.git

diff --git a/functest_kubernetes/netperf/netperf.py b/functest_kubernetes/netperf/netperf.py
index 2bd1e1be..b3642085 100644
--- a/functest_kubernetes/netperf/netperf.py
+++ b/functest_kubernetes/netperf/netperf.py
@@ -14,6 +14,7 @@ Benchmarking Kubernetes Networking Performance
 import glob
 import logging
 import os
+from pathlib import Path
 import shutil
 import subprocess
 import time
@@ -43,23 +44,26 @@ class Netperf(testcase.TestCase):
         try:
             if not os.path.exists(self.res_dir):
                 os.makedirs(self.res_dir)
+            os.chdir(self.res_dir)
             cmd = ['launch', '-iterations', '1', '-kubeConfig',
-                   '/root/.kube/config']
-            output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+                   f'{Path.home()}/.kube/config', '-v', '3']
+            output = subprocess.check_output(
+                cmd, stderr=subprocess.STDOUT, timeout=3600)
             self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
             lfiles = glob.glob(os.path.join(
                 'results_netperf-latest', 'netperf-latest*.csv'))
             results = max(lfiles, key=os.path.getmtime)
-            shutil.move(results, os.path.join(self.res_dir, 'netperf.csv'))
-            cmd = ['plotperf', '-c',
-                   os.path.join(self.res_dir, 'netperf.csv'),
+            cmd = ['plotperf', '-c', results,
                    '-o', self.res_dir, '-s', 'netperf']
-            output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+            output = subprocess.check_output(
+                cmd, stderr=subprocess.STDOUT, timeout=60)
             self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
             self.result = 100
             status = testcase.TestCase.EX_OK
-        except Exception:  # pylint: disable=broad-except
-            self.__logger.exception("Can not run Netperf")
+        except subprocess.SubprocessError as exc:
+            self.__logger.exception(
+                "Cannot run Netperf:\n%s", ' '.join(exc.cmd),
+                exc.output.decode("utf-8"))
             self.result = 0
             status = testcase.TestCase.EX_RUN_ERROR
         self.stop_time = time.time()