Show which modules are available in module group details

Also process modules as sets to avoid duplicates.

Change-Id: I5f09af93b60e3610145f9c4221d47bf2e2ef3a38
This commit is contained in:
Ilya Shakhat
2015-10-19 16:24:14 +03:00
parent 5549ead1e4
commit fa0b8ec9d4
9 changed files with 49 additions and 38 deletions

View File

@@ -104,6 +104,7 @@ class TestAPIModules(test_api.TestAPI):
{'id': 'nova',
'modules': [
{'module_name': 'nova',
'visible': True,
'repo_uri': 'git://git.openstack.org/openstack/nova.git'}
],
'name': 'Nova', 'tag': 'module'}, module)
@@ -112,9 +113,10 @@ class TestAPIModules(test_api.TestAPI):
module = test_api.load_json(response)['module']
self.assertEqual(
{'id': 'nova-group',
'modules': [
{'module_name': 'nova-cli'},
{'module_name': 'nova',
'repo_uri': 'git://git.openstack.org/openstack/nova.git'}
'modules': [{
'module_name': 'nova',
'visible': True,
'repo_uri': 'git://git.openstack.org/openstack/nova.git'},
{'module_name': 'nova-cli', 'visible': False},
],
'name': 'Nova-group', 'tag': 'group'}, module)

View File

@@ -69,55 +69,55 @@ class TestGovernance(testtools.TestCase):
'sahara-group': {
'id': 'sahara-group',
'module_group_name': 'Sahara Official',
'modules': ['python-saharaclient', 'sahara',
'modules': {'python-saharaclient', 'sahara',
'sahara-dashboard', 'sahara-extra',
'sahara-image-elements', 'sahara-specs'],
'sahara-image-elements', 'sahara-specs'},
'tag': 'program'
},
'tc-approved-release': {
'id': 'tc-approved-release',
'module_group_name': 'tc-approved-release',
'modules': [],
'modules': set(),
'releases': {
'liberty': ['sahara', 'sahara-extra',
'sahara-image-elements'],
'liberty': {'sahara', 'sahara-extra',
'sahara-image-elements'},
},
'tag': 'project_type'
},
'type:library': {
'id': 'type:library',
'module_group_name': 'type:library',
'modules': [],
'modules': set(),
'releases': {
'liberty': ['python-saharaclient', 'sahara-dashboard'],
'liberty': {'python-saharaclient', 'sahara-dashboard'},
},
'tag': 'project_type'
},
'type:service': {
'id': 'type:service',
'module_group_name': 'type:service',
'modules': [],
'modules': set(),
'releases': {
'liberty': ['sahara', 'sahara-extra',
'sahara-image-elements'],
'liberty': {'sahara', 'sahara-extra',
'sahara-image-elements'},
},
'tag': 'project_type'
},
'openstack-official': {
'id': 'openstack-official',
'module_group_name': 'openstack-official',
'modules': [],
'modules': set(),
'releases': {
'liberty': ['python-saharaclient', 'sahara',
'liberty': {'python-saharaclient', 'sahara',
'sahara-dashboard', 'sahara-extra',
'sahara-image-elements', 'sahara-specs'],
'sahara-image-elements', 'sahara-specs'},
},
'tag': 'project_type'
},
'openstack-others': {
'id': 'openstack-others',
'module_group_name': 'openstack-others',
'modules': [],
'modules': set(),
'releases': {},
'tag': 'project_type'
}