openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "Ensure metering is the default service_type"

Browse Source
This commit is contained in:
Jenkins
2015-11-27 00:45:20 +00:00
committed by Gerrit Code Review
parent e65d174ceb 43fa4c3abe
commit 479b1cc76f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometerclient/client.py
View File

@@ -456,7 +456,7 @@ def _construct_http_client(**kwargs):
return SessionClient( return SessionClient(
session=kwargs.pop('session'), session=kwargs.pop('session'),
service_type=kwargs.pop('service_type', 'metering'), service_type=kwargs.pop('service_type', 'metering') or 'metering',
interface=kwargs.pop('interface', kwargs.pop('endpoint_type', interface=kwargs.pop('interface', kwargs.pop('endpoint_type',
'publicURL')), 'publicURL')),
region_name=kwargs.pop('region_name', None), region_name=kwargs.pop('region_name', None),
@@ -510,7 +510,7 @@ class SessionClient(adapter.LegacyJsonAdapter):
def request(self, url, method, **kwargs): def request(self, url, method, **kwargs):
kwargs.setdefault('headers', kwargs.get('headers', {})) kwargs.setdefault('headers', kwargs.get('headers', {}))
# NOTE(sileht): The standard call raises errors from # NOTE(sileht): The standard call raises errors from
# keystoneauth, where we need to raise the gnocchiclient errors. # keystoneauth, where we need to raise the ceilometerclient errors.
raise_exc = kwargs.pop('raise_exc', True) raise_exc = kwargs.pop('raise_exc', True)
with record_time(self.times, self.timings, method, url): with record_time(self.times, self.timings, method, url):
resp, body = super(SessionClient, self).request(url, resp, body = super(SessionClient, self).request(url,