openstack
/
ceilometer
Code Issues Proposed changes

Do not check keystone domains length in TenantDiscovery 

For keystone v2 and v3, it always return one domain at least

Change-Id: I1586bb07fe135eadc968fec1c675de48b88cf13c
This commit is contained in:
jing.liuqing 2017-12-21 22:12:19 +08:00
parent 0df0df7dff
commit cb4ba79f98
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ceilometer/polling/discovery/tenant.py
View File

@ -30,15 +30,12 @@ class TenantDiscovery(plugin.DiscoveryBase):
def discover(self, manager, param=None):
domains = manager.keystone.domains.list()
LOG.debug('Found %s keystone domains', len(domains))
if domains:
tenants = []
for domain in domains:
domain_tenants = manager.keystone.projects.list(domain)
LOG.debug("Found %s tenants in domain %s", len(domain_tenants),
domain.name)
tenants = tenants + domain_tenants
else:
tenants = manager.keystone.projects.list()
LOG.debug("No domains - found %s tenants in default domain",
len(tenants))
tenants = []
for domain in domains:
domain_tenants = manager.keystone.projects.list(domain)
LOG.debug("Found %s tenants in domain %s", len(domain_tenants),
domain.name)
tenants = tenants + domain_tenants
return tenants or []

8
ceilometer/tests/unit/polling/test_discovery.py
View File

@ -141,18 +141,12 @@ class TestProjectDiscovery(base.BaseTestCase):
self.manager = mock.MagicMock()
self.manager.keystone.projects.list.side_effect = self.side_effect
def test_project_discovery_with_domains(self):
def test_project_discovery(self):
self.manager.keystone.domains.list.return_value = self.domains
result = self.discovery.discover(self.manager)
self.assertEqual(len(result), 3)
self.assertEqual(self.manager.keystone.projects.list.call_count, 2)
def test_project_discovery_no_domain(self):
self.manager.keystone.domains.list.return_value = []
result = self.discovery.discover(self.manager)
self.assertEqual(len(result), 2)
self.assertEqual(self.manager.keystone.projects.list.call_count, 1)
class TestHardwareDiscovery(base.BaseTestCase):
class MockInstance(object):