openstack
/
nova
Code Issues Proposed changes

Merge "Allow 'network' in RequestContext service_catalog" into stable/queens

This commit is contained in:
Zuul 2018-03-07 22:11:43 +00:00 committed by Gerrit Code Review
parent 7c6e7fd916 c50ffc9dc1
commit 9d8de62a07
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/context.py
View File

@ -119,7 +119,7 @@ class RequestContext(context.RequestContext):
# Only include required parts of service_catalog # Only include required parts of service_catalog
self.service_catalog = [s for s in service_catalog self.service_catalog = [s for s in service_catalog
if s.get('type') in ('image', 'block-storage', 'volumev3', if s.get('type') in ('image', 'block-storage', 'volumev3',
'key-manager', 'placement')] 'key-manager', 'placement', 'network')]
else: else:
# if list is empty or none # if list is empty or none
self.service_catalog = [] self.service_catalog = []

2
nova/tests/unit/test_context.py
View File

@ -103,6 +103,7 @@ class ContextTestCase(test.NoDBTestCase):
{u'type': u's3', u'name': u's3'}, {u'type': u's3', u'name': u's3'},
{u'type': u'image', u'name': u'glance'}, {u'type': u'image', u'name': u'glance'},
{u'type': u'volumev3', u'name': u'cinderv3'}, {u'type': u'volumev3', u'name': u'cinderv3'},
{u'type': u'network', u'name': u'neutron'},
{u'type': u'ec2', u'name': u'ec2'}, {u'type': u'ec2', u'name': u'ec2'},
{u'type': u'object-store', u'name': u'swift'}, {u'type': u'object-store', u'name': u'swift'},
{u'type': u'identity', u'name': u'keystone'}, {u'type': u'identity', u'name': u'keystone'},
@ -112,6 +113,7 @@ class ContextTestCase(test.NoDBTestCase):
volume_catalog = [{u'type': u'image', u'name': u'glance'}, volume_catalog = [{u'type': u'image', u'name': u'glance'},
{u'type': u'volumev3', u'name': u'cinderv3'}, {u'type': u'volumev3', u'name': u'cinderv3'},
{u'type': u'network', u'name': u'neutron'},
{u'type': u'block-storage', u'name': u'cinder'}] {u'type': u'block-storage', u'name': u'cinder'}]
ctxt = context.RequestContext('111', '222', ctxt = context.RequestContext('111', '222',
service_catalog=service_catalog) service_catalog=service_catalog)