aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-05-19 19:21:10 +0200
committerCédric Ollivier <ollivier.cedric@gmail.com>2019-05-23 20:28:00 +0200
commit0dc9584379c3db46f6cbbbcee0bb9515121d072b (patch)
treeb091046567e78e8964585171dc030b885ffd7dc4
parent44b385a690cb39ee893381629c0640507a327ad6 (diff)
Enable Vmtp if py3
It leverages on last Vmtp review which adds py3 support [1]. [1] https://review.opendev.org/659970 Change-Id: I8319b9e7eb88b9015961188d47657a8c67e0f8da Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit f994b9180b621ae6bb6397acd23de8f1a625c4cd)
-rw-r--r--functest/opnfv_tests/openstack/vmtp/vmtp.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py
index 3462ec063..4397e2b47 100644
--- a/functest/opnfv_tests/openstack/vmtp/vmtp.py
+++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py
@@ -104,7 +104,7 @@ class Vmtp(singlevm.VmReady2):
if not os.path.exists(self.res_dir):
os.makedirs(self.res_dir)
cmd = ['vmtp', '-sc']
- output = subprocess.check_output(cmd)
+ output = subprocess.check_output(cmd).decode()
self.__logger.info("%s\n%s", " ".join(cmd), output)
with open(self.config, "w+") as conf:
vmtp_conf = yaml.load(output)
@@ -146,11 +146,12 @@ class Vmtp(singlevm.VmReady2):
cmd = ['vmtp', '-d', '--json', '{}/vmtp.json'.format(self.res_dir),
'-c', self.config]
output = subprocess.check_output(
- cmd, stderr=subprocess.STDOUT, env=new_env)
+ cmd, stderr=subprocess.STDOUT, env=new_env).decode()
self.__logger.info("%s\n%s", " ".join(cmd), output)
cmd = ['vmtp_genchart', '-c', '{}/vmtp.html'.format(self.res_dir),
'{}/vmtp.json'.format(self.res_dir)]
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+ output = subprocess.check_output(
+ cmd, stderr=subprocess.STDOUT).decode()
self.__logger.info("%s\n%s", " ".join(cmd), output)
with open('{}/vmtp.json'.format(self.res_dir), 'r') as res_file:
self.details = json.load(res_file)