openstack/aodh
Code Issues Proposed changes

Merge "Extracting make_resource_metadata method"

Browse Source
This commit is contained in:
Jenkins 2014-08-06 14:04:38 +00:00 committed by Gerrit Code Review
commit 145fe6a17f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ceilometer/hardware/pollsters/util.py
View File

@ -30,13 +30,19 @@ def get_metadata_from_host(host_url):
return {'resource_url': urlparse.urlunsplit(host_url)}
def make_sample_from_host(host_url, name, type, unit, volume,
project_id=None, user_id=None, res_metadata=None):
def make_resource_metadata(res_metadata=None, host_url=None):
resource_metadata = dict()
if res_metadata is not None:
metadata = copy.copy(res_metadata)
resource_metadata = dict(zip(metadata._fields, metadata))
resource_metadata.update(get_metadata_from_host(host_url))
return resource_metadata
def make_sample_from_host(host_url, name, type, unit, volume,
project_id=None, user_id=None, res_metadata=None):
resource_metadata = make_resource_metadata(res_metadata, host_url)
return sample.Sample(
name='hardware.' + name,