Enable Vmtp if py3 17/67917/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Sun, 19 May 2019 17:21:10 +0000 (19:21 +0200)
committerCédric Ollivier <ollivier.cedric@gmail.com>
Thu, 23 May 2019 18:30:01 +0000 (20:30 +0200)
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)

functest/opnfv_tests/openstack/vmtp/vmtp.py

index 3462ec0..4397e2b 100644 (file)
@@ -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)