Consume new mapping fields from service-type-authority
The service type authority is publishing three new pre-computed mappings. Add getters to expose them and use them where appropriate. Also, add a method that will return all of the service data for a project with more than one service to complement the one that only returns the primary data. Depends-On: Ib761cf9de875e7b80404797d4aa8d294ca56347a Change-Id: I78d2dfa03a5a0c392a85a7a77612098b4b01f70e
This commit is contained in:
parent
3e8e86bdb5
commit
8e1b7471b6
File diff suppressed because it is too large
Load Diff
|
@ -64,17 +64,6 @@ class ServiceTypes(object):
|
||||||
if only_remote:
|
if only_remote:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
by_project = {}
|
|
||||||
for s in self._service_types_data['services']:
|
|
||||||
# Skip secondary projects
|
|
||||||
if s.get('secondary', False):
|
|
||||||
continue
|
|
||||||
for key in ['project', 'api_reference_project']:
|
|
||||||
name = s.get(key)
|
|
||||||
if name:
|
|
||||||
by_project[self._canonical_project_name(name)] = s
|
|
||||||
self._service_types_data['by_project'] = by_project
|
|
||||||
|
|
||||||
def _canonical_project_name(self, name):
|
def _canonical_project_name(self, name):
|
||||||
"Convert repo name to project name."
|
"Convert repo name to project name."
|
||||||
if name is None:
|
if name is None:
|
||||||
|
@ -107,6 +96,24 @@ class ServiceTypes(object):
|
||||||
"Full service-type data listing."
|
"Full service-type data listing."
|
||||||
return copy.deepcopy(self._service_types_data['services'])
|
return copy.deepcopy(self._service_types_data['services'])
|
||||||
|
|
||||||
|
@property
|
||||||
|
def all_types_by_service_type(self):
|
||||||
|
"Mapping of official service type to official type and aliases."
|
||||||
|
return copy.deepcopy(
|
||||||
|
self._service_types_data['all_types_by_service_type'])
|
||||||
|
|
||||||
|
@property
|
||||||
|
def primary_service_by_project(self):
|
||||||
|
"Mapping of project name to the primary associated service."
|
||||||
|
return copy.deepcopy(
|
||||||
|
self._service_types_data['primary_service_by_project'])
|
||||||
|
|
||||||
|
@property
|
||||||
|
def service_types_by_project(self):
|
||||||
|
"Mapping of project name to a list of all associated service-types."
|
||||||
|
return copy.deepcopy(
|
||||||
|
self._service_types_data['service_types_by_project'])
|
||||||
|
|
||||||
def get_official_service_data(self, service_type):
|
def get_official_service_data(self, service_type):
|
||||||
"""Get the service data for an official service_type.
|
"""Get the service data for an official service_type.
|
||||||
|
|
||||||
|
@ -216,10 +223,8 @@ class ServiceTypes(object):
|
||||||
"""
|
"""
|
||||||
if not self.is_known(service_type):
|
if not self.is_known(service_type):
|
||||||
return [service_type]
|
return [service_type]
|
||||||
service_type = self.get_service_type(service_type)
|
return self.all_types_by_service_type[
|
||||||
ret = [service_type]
|
self.get_service_type(service_type)]
|
||||||
ret.extend(self.get_aliases(service_type))
|
|
||||||
return ret
|
|
||||||
|
|
||||||
def get_project_name(self, service_type):
|
def get_project_name(self, service_type):
|
||||||
"""Return the OpenStack project name for a given service_type.
|
"""Return the OpenStack project name for a given service_type.
|
||||||
|
@ -229,7 +234,7 @@ class ServiceTypes(object):
|
||||||
"""
|
"""
|
||||||
service = self.get_service_data(service_type)
|
service = self.get_service_data(service_type)
|
||||||
if service:
|
if service:
|
||||||
return self._canonical_project_name(service['project'])
|
return service['project']
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def get_service_data_for_project(self, project_name):
|
def get_service_data_for_project(self, project_name):
|
||||||
|
@ -238,7 +243,23 @@ class ServiceTypes(object):
|
||||||
:param name: A repository or project name in the form
|
:param name: A repository or project name in the form
|
||||||
``'openstack/{project}'`` or just ``'{project}'``.
|
``'openstack/{project}'`` or just ``'{project}'``.
|
||||||
:type name: str
|
:type name: str
|
||||||
|
:raises ValueError: If project_name is None
|
||||||
:returns: dict or None if not found
|
:returns: dict or None if not found
|
||||||
"""
|
"""
|
||||||
key = self._canonical_project_name(project_name)
|
project_name = self._canonical_project_name(project_name)
|
||||||
return self._service_types_data['by_project'].get(key)
|
return self.primary_service_by_project.get(project_name)
|
||||||
|
|
||||||
|
def get_all_service_data_for_project(self, project_name):
|
||||||
|
"""Return the information for every service associated with a project.
|
||||||
|
|
||||||
|
:param name: A repository or project name in the form
|
||||||
|
``'openstack/{project}'`` or just ``'{project}'``.
|
||||||
|
:type name: str
|
||||||
|
:raises ValueError: If project_name is None
|
||||||
|
:returns: list of dicts
|
||||||
|
"""
|
||||||
|
data = []
|
||||||
|
for service_type in self.service_types_by_project.get(
|
||||||
|
project_name, []):
|
||||||
|
data.append(self.get_service_data(service_type))
|
||||||
|
return data
|
||||||
|
|
|
@ -50,21 +50,21 @@ class ServiceDataMixin(object):
|
||||||
service_type='compute', official='compute', aliases=[],
|
service_type='compute', official='compute', aliases=[],
|
||||||
all_types=['compute'],
|
all_types=['compute'],
|
||||||
api_reference='compute', api_reference_project=None,
|
api_reference='compute', api_reference_project=None,
|
||||||
is_secondary=False,
|
is_secondary=False, all_services=['compute', 'placement'],
|
||||||
is_known=True, is_alias=False, is_official=True, project='nova')),
|
is_known=True, is_alias=False, is_official=True, project='nova')),
|
||||||
('volumev2', dict(
|
('volumev2', dict(
|
||||||
service_type='volumev2', official='block-storage', aliases=[],
|
service_type='volumev2', official='block-storage', aliases=[],
|
||||||
all_types=['block-storage', 'volumev3', 'volumev2', 'volume'],
|
all_types=['block-storage', 'volumev3', 'volumev2', 'volume'],
|
||||||
api_reference='block-storage', api_reference_project=None,
|
api_reference='block-storage', api_reference_project=None,
|
||||||
is_known=True, is_alias=True, is_official=False,
|
is_known=True, is_alias=True, is_official=False,
|
||||||
is_secondary=False,
|
is_secondary=False, all_services=['block-storage'],
|
||||||
project='cinder')),
|
project='cinder')),
|
||||||
('volumev3', dict(
|
('volumev3', dict(
|
||||||
service_type='volumev3', official='block-storage', aliases=[],
|
service_type='volumev3', official='block-storage', aliases=[],
|
||||||
all_types=['block-storage', 'volumev3', 'volumev2', 'volume'],
|
all_types=['block-storage', 'volumev3', 'volumev2', 'volume'],
|
||||||
api_reference='block-storage', api_reference_project=None,
|
api_reference='block-storage', api_reference_project=None,
|
||||||
is_known=True, is_alias=True, is_official=False,
|
is_known=True, is_alias=True, is_official=False,
|
||||||
is_secondary=False,
|
is_secondary=False, all_services=['block-storage'],
|
||||||
project='cinder')),
|
project='cinder')),
|
||||||
('block-storage', dict(
|
('block-storage', dict(
|
||||||
service_type='block-storage', official='block-storage',
|
service_type='block-storage', official='block-storage',
|
||||||
|
@ -72,24 +72,24 @@ class ServiceDataMixin(object):
|
||||||
api_reference='block-storage', api_reference_project=None,
|
api_reference='block-storage', api_reference_project=None,
|
||||||
aliases=['volumev3', 'volumev2', 'volume'],
|
aliases=['volumev3', 'volumev2', 'volume'],
|
||||||
is_known=True, is_alias=False, is_official=True,
|
is_known=True, is_alias=False, is_official=True,
|
||||||
is_secondary=False,
|
is_secondary=False, all_services=['block-storage'],
|
||||||
project='cinder')),
|
project='cinder')),
|
||||||
('network', dict(
|
('network', dict(
|
||||||
service_type='network', official='network', aliases=[],
|
service_type='network', official='network', aliases=[],
|
||||||
all_types=['network'],
|
all_types=['network'],
|
||||||
api_reference='networking', api_reference_project='neutron-lib',
|
api_reference='networking', api_reference_project='neutron-lib',
|
||||||
is_known=True, is_alias=False, is_official=True,
|
is_known=True, is_alias=False, is_official=True,
|
||||||
is_secondary=False,
|
is_secondary=False, all_services=['network'],
|
||||||
project='neutron')),
|
project='neutron')),
|
||||||
('placement', dict(
|
('placement', dict(
|
||||||
service_type='placement', official='placement', aliases=[],
|
service_type='placement', official='placement', aliases=[],
|
||||||
all_types=['placement'],
|
all_types=['placement'], all_services=['compute', 'placement'],
|
||||||
api_reference='placement', api_reference_project=None,
|
api_reference='placement', api_reference_project=None,
|
||||||
is_known=True, is_alias=False, is_official=True, is_secondary=True,
|
is_known=True, is_alias=False, is_official=True, is_secondary=True,
|
||||||
project='nova')),
|
project='nova')),
|
||||||
('missing', dict(
|
('missing', dict(
|
||||||
service_type='missing', official=None,
|
service_type='missing', official=None,
|
||||||
aliases=[],
|
aliases=[], all_services=[],
|
||||||
all_types=['missing'],
|
all_types=['missing'],
|
||||||
api_reference=None, api_reference_project=None,
|
api_reference=None, api_reference_project=None,
|
||||||
is_known=False, is_alias=False, is_official=False,
|
is_known=False, is_alias=False, is_official=False,
|
||||||
|
@ -177,9 +177,7 @@ class ServiceDataMixin(object):
|
||||||
|
|
||||||
def test_get_service_data_for_project(self):
|
def test_get_service_data_for_project(self):
|
||||||
if self.is_secondary:
|
if self.is_secondary:
|
||||||
self.assertNotIn(
|
self.skipTest("Secondary services have no project mapping")
|
||||||
self.service_type,
|
|
||||||
self.service_types._service_types_data['by_project'].values())
|
|
||||||
return
|
return
|
||||||
elif not self.project:
|
elif not self.project:
|
||||||
self.skipTest("Empty project is invalid but tested elsewhere.")
|
self.skipTest("Empty project is invalid but tested elsewhere.")
|
||||||
|
@ -207,3 +205,15 @@ class ServiceDataMixin(object):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
self.all_types,
|
self.all_types,
|
||||||
self.service_types.get_all_types(self.service_type))
|
self.service_types.get_all_types(self.service_type))
|
||||||
|
|
||||||
|
def test_all_get_service_data_for_project(self):
|
||||||
|
if not self.project:
|
||||||
|
self.skipTest("Empty project is invalid but tested elsewhere.")
|
||||||
|
return
|
||||||
|
|
||||||
|
all_data = self.service_types.get_all_service_data_for_project(
|
||||||
|
self.project)
|
||||||
|
for (index, data) in enumerate(all_data):
|
||||||
|
self.assertEqual(
|
||||||
|
data,
|
||||||
|
self.service_types.get_service_data(self.all_services[index]))
|
||||||
|
|
Loading…
Reference in New Issue