openstack
/
neutron-vpnaas
Code Issues Proposed changes

Merge "Add cisco_csr_rest_client.py module for py34 support"

This commit is contained in:
Jenkins 2015-09-06 02:08:54 +00:00 committed by Gerrit Code Review
parent 55ec0e0d1f 51a6bec639
commit c788f33d51
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_vpnaas/services/vpn/device_drivers/cisco_csr_rest_client.py
View File

@ -90,7 +90,7 @@ class CsrRestClient(object):
if method == 'POST' and self.status == requests.codes.CREATED:
return response.headers.get('location', '')
if self.status >= requests.codes.BAD_REQUEST and response.content:
if 'error-code' in response.content:
if b'error-code' in response.content:
content = jsonutils.loads(response.content)
LOG.debug("Error response content %s", content)
return content

1
tox.ini
View File

@ -94,6 +94,7 @@ commands = python -m testtools.run \
neutron_vpnaas.tests.unit.extensions.test_vpnaas \
neutron_vpnaas.tests.unit.services.vpn.device_drivers.test_ipsec \
neutron_vpnaas.tests.unit.services.vpn.device_drivers.test_cisco_ipsec \
neutron_vpnaas.tests.unit.services.vpn.device_drivers.test_cisco_csr_rest_client \
neutron_vpnaas.tests.unit.services.vpn.test_vpn_service \
neutron_vpnaas.tests.unit.services.vpn.test_vyatta_vpn_service \
neutron_vpnaas.tests.unit.services.vpn.service_drivers.test_vyatta_ipsec \