openstack
/
ceilometer
Code Issues Proposed changes

Merge "nova_client: stop using global conf"

This commit is contained in:
Jenkins 2016-10-12 23:09:21 +00:00 committed by Gerrit Code Review
parent 7cba577b27 692c3e474e
commit 7a7866c58f
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/compute/discovery.py
View File

@ -42,7 +42,7 @@ cfg.CONF.register_opts(OPTS, group='compute')
class InstanceDiscovery(plugin_base.DiscoveryBase):
def __init__(self):
super(InstanceDiscovery, self).__init__()
self.nova_cli = nova_client.Client()
self.nova_cli = nova_client.Client(cfg.CONF)
self.last_run = None
self.instances = {}
self.expiration_time = cfg.CONF.compute.resource_update_interval

2
ceilometer/hardware/discovery.py
View File

@ -57,7 +57,7 @@ CONF.register_opts(OPTS, group='hardware')
class NodesDiscoveryTripleO(plugin_base.DiscoveryBase):
def __init__(self):
super(NodesDiscoveryTripleO, self).__init__()
self.nova_cli = nova_client.Client()
self.nova_cli = nova_client.Client(cfg.CONF)
self.last_run = None
self.instances = {}

18
ceilometer/nova_client.py
View File

@ -62,12 +62,12 @@ def logged(func):
class Client(object):
"""A client which gets information via python-novaclient."""
def __init__(self):
def __init__(self, conf):
"""Initialize a nova client object."""
conf = cfg.CONF.service_credentials
creds = conf.service_credentials
logger = None
if cfg.CONF.nova_http_log_debug:
if conf.nova_http_log_debug:
logger = log.getLogger("novaclient-debug")
logger.logger.setLevel(log.DEBUG)
ks_session = keystone_client.get_session()
@ -77,17 +77,17 @@ class Client(object):
session=ks_session,
# nova adapter options
region_name=conf.region_name,
interface=conf.interface,
service_type=cfg.CONF.service_types.nova,
region_name=creds.region_name,
interface=creds.interface,
service_type=conf.service_types.nova,
logger=logger)
self.glance_client = glanceclient.Client(
version='2',
session=ks_session,
region_name=conf.region_name,
interface=conf.interface,
service_type=cfg.CONF.service_types.glance)
region_name=creds.region_name,
interface=creds.interface,
service_type=conf.service_types.glance)
def _with_flavor_and_image(self, instances):
flavor_cache = {}

6
ceilometer/tests/unit/test_novaclient.py
View File

@ -26,16 +26,16 @@ class TestNovaClient(base.BaseTestCase):
def setUp(self):
super(TestNovaClient, self).setUp()
self.CONF = self.useFixture(fixture_config.Config()).conf
self._flavors_count = 0
self._images_count = 0
self.nv = nova_client.Client()
self.nv = nova_client.Client(self.CONF)
self.useFixture(mockpatch.PatchObject(
self.nv.nova_client.flavors, 'get',
side_effect=self.fake_flavors_get))
self.useFixture(mockpatch.PatchObject(
self.nv.glance_client.images, 'get',
side_effect=self.fake_images_get))
self.CONF = self.useFixture(fixture_config.Config()).conf
def fake_flavors_get(self, *args, **kwargs):
self._flavors_count += 1
@ -245,5 +245,5 @@ class TestNovaClient(base.BaseTestCase):
def test_with_nova_http_log_debug(self):
self.CONF.set_override("nova_http_log_debug", True)
self.nv = nova_client.Client()
self.nv = nova_client.Client(self.CONF)
self.assertIsNotNone(self.nv.nova_client.client.logger)