openstack
/
nova
Code Issues Proposed changes

Merge "Fix wrapping of neutron forbidden error" into stable/ocata

This commit is contained in:
Zuul 2018-04-18 00:54:51 +00:00 committed by Gerrit Code Review
parent 31f214af4e 5c43e76ce0
commit 2fffe19634
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/network/neutronv2/api.py
View File

@ -127,7 +127,7 @@ class ClientWrapper(clientv20.Client):
"admin credential located in nova.conf"))
raise exception.NeutronAdminCredentialConfigurationInvalid()
except neutron_client_exc.Forbidden as e:
raise exception.Forbidden(e)
raise exception.Forbidden(six.text_type(e))
return ret
return wrapper

3
nova/tests/unit/network/test_neutronv2.py
View File

@ -181,9 +181,10 @@ class TestNeutronClient(test.NoDBTestCase):
auth_token='token',
is_admin=False)
client = neutronapi.get_client(my_context)
self.assertRaises(
exc = self.assertRaises(
exception.Forbidden,
client.create_port)
self.assertIsInstance(exc.format_message(), six.text_type)
def test_withtoken_context_is_admin(self):
self.flags(url='http://anyhost/', group='neutron')