openstack/aodh
Code Issues Proposed changes

discovery: allow to discover all endpoints

Browse Source 
This allow the Keystone endpoints discoverer to discover all the URLs if
no service type is specified.

Blueprint: ceilometer-healthcheck-middleware

Change-Id: I6e1e5f6261ca55c5a0a0c70822f80257061d56c2
This commit is contained in:
Julien Danjou 2015-02-03 14:33:30 +01:00
parent f49d43b595
commit 6ae9609857
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ceilometer/agent/discovery/endpoint.py
View File

@ -1,4 +1,4 @@
# Copyright 2014 Red Hat, Inc # Copyright 2014-2015 Red Hat, Inc
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain # not use this file except in compliance with the License. You may obtain
@ -32,15 +32,14 @@ class EndpointDiscovery(plugin.DiscoveryBase):
nova.floating_ips.list() and therefore gets all floating IPs at once. nova.floating_ips.list() and therefore gets all floating IPs at once.
""" """
def discover(self, manager, param=None): @staticmethod
if not param: def discover(manager, param=None):
return []
endpoints = manager.keystone.service_catalog.get_urls( endpoints = manager.keystone.service_catalog.get_urls(
service_type=param, service_type=param,
endpoint_type=cfg.CONF.service_credentials.os_endpoint_type, endpoint_type=cfg.CONF.service_credentials.os_endpoint_type,
region_name=cfg.CONF.service_credentials.os_region_name) region_name=cfg.CONF.service_credentials.os_region_name)
if not endpoints: if not endpoints:
LOG.warning(_LW('No endpoints found for service %s'), param) LOG.warning(_LW('No endpoints found for service %s'),
"<all services>" if param is None else param)
return [] return []
else: return endpoints
return endpoints

13
ceilometer/tests/agent/test_discovery.py
View File

@ -29,12 +29,12 @@ class TestEndpointDiscovery(base.BaseTestCase):
self.discovery = endpoint.EndpointDiscovery() self.discovery = endpoint.EndpointDiscovery()
self.manager = mock.MagicMock() self.manager = mock.MagicMock()
self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF = self.useFixture(fixture_config.Config()).conf
def test_keystone_called(self):
self.CONF.set_override('os_endpoint_type', 'test-endpoint-type', self.CONF.set_override('os_endpoint_type', 'test-endpoint-type',
group='service_credentials') group='service_credentials')
self.CONF.set_override('os_region_name', 'test-region-name', self.CONF.set_override('os_region_name', 'test-region-name',
group='service_credentials') group='service_credentials')
def test_keystone_called(self):
self.discovery.discover(self.manager, param='test-service-type') self.discovery.discover(self.manager, param='test-service-type')
expected = [mock.call(service_type='test-service-type', expected = [mock.call(service_type='test-service-type',
endpoint_type='test-endpoint-type', endpoint_type='test-endpoint-type',
@ -42,3 +42,12 @@ class TestEndpointDiscovery(base.BaseTestCase):
self.assertEqual(expected, self.assertEqual(expected,
self.manager.keystone.service_catalog.get_urls self.manager.keystone.service_catalog.get_urls
.call_args_list) .call_args_list)
def test_keystone_called_no_service_type(self):
self.discovery.discover(self.manager)
expected = [mock.call(service_type=None,
endpoint_type='test-endpoint-type',
region_name='test-region-name')]
self.assertEqual(expected,
self.manager.keystone.service_catalog.get_urls
.call_args_list)