diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-07 11:02:43 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-13 20:10:21 +0200 |
| commit | 2a0702ea914a574ffa7c6d6f83a5c606e24ebd0a (patch) | |
| tree | a6f07cda495c2c1631b3366d0d95adee5cf30ef7 /functest/opnfv_tests/vnf | |
| parent | 0619955a7998868c437a462c9ece3eb1ea7a5277 (diff) | |
Update to Python3
Functest containers leverage on Python3 instead of python2.
https://mail.python.org/pipermail/python-dev/2018-March/152348.html
It also updates robotframework librairies to latest release and Vmtp
to master ([1] is needed)
It patches cloudify rest client to support python3.
Vmtp is currently disabled because it currently supports python2 only.
[1] https://github.com/openstack/vmtp/commit/a5d062881d91bf4f547d92c6e289bea30feb5d6e#diff-b4ef698db8ca845e5845c4618278f29a
Change-Id: I39964a212ec2d4dbf53c9ea7c63f02e0b6a05b48
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
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 |