diff options
Diffstat (limited to 'functest/opnfv_tests/vnf')
| -rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py index cbf531b6b..93961ada9 100644 --- a/functest/opnfv_tests/vnf/epc/juju_epc.py +++ b/functest/opnfv_tests/vnf/epc/juju_epc.py @@ -273,7 +273,8 @@ class JujuEpc(singlevm.VmReady2): for i in range(10): output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) self.__logger.info("%s\n%s", " ".join(cmd), output) - ret = re.search(r'(?=workload:({})\))'.format(status), output) + ret = re.search( + r'(?=workload:({})\))'.format(status), output.decode()) if ret: self.__logger.info("%s workload is %s", name, status) break diff --git a/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py b/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py index c5f554cbd..67f1e0d6d 100644 --- a/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py +++ b/functest/opnfv_tests/vnf/router/vnf_controller/ssh_client.py @@ -110,7 +110,7 @@ class SshClient(object): # pylint: disable=too-many-instance-attributes cmd) break - res_buff += res + res_buff += res.decode() self.logger.debug("Response : '%s'", res_buff) return res_buff |