openstack/ceilometer
Code Issues Proposed changes

Merge "fix image_ref attr in gnocchi resource"

Browse Source
This commit is contained in:
Jenkins 2015-10-17 11:39:31 +00:00 committed by Gerrit Code Review
commit 2e7691c53d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/tests/unit/dispatcher/test_gnocchi.py
View File

@ -69,7 +69,7 @@ class DispatcherTest(base.BaseTestCase):
'resource_id': self.resource_id, 'resource_id': self.resource_id,
'resource_metadata': { 'resource_metadata': {
'host': 'foo', 'host': 'foo',
'image_ref_url': 'imageref!', 'image_ref': 'imageref!',
'instance_flavor_id': 1234, 'instance_flavor_id': 1234,
'display_name': 'myinstance', 'display_name': 'myinstance',
}}, }},
@ -84,7 +84,7 @@ class DispatcherTest(base.BaseTestCase):
'resource_id': self.resource_id, 'resource_id': self.resource_id,
'resource_metadata': { 'resource_metadata': {
'host': 'foo', 'host': 'foo',
'image_ref_url': 'imageref!', 'image_ref': 'imageref!',
'instance_flavor_id': 1234, 'instance_flavor_id': 1234,
'display_name': 'myinstance', 'display_name': 'myinstance',
} }
@ -196,7 +196,7 @@ class DispatcherWorkflowTest(base.BaseTestCase,
'timestamp': '2012-05-08 20:23:48.028195', 'timestamp': '2012-05-08 20:23:48.028195',
'resource_metadata': { 'resource_metadata': {
'host': 'foo', 'host': 'foo',
'image_ref_url': 'imageref!', 'image_ref': 'imageref!',
'instance_flavor_id': 1234, 'instance_flavor_id': 1234,
'display_name': 'myinstance', 'display_name': 'myinstance',
} }

2
etc/ceilometer/gnocchi_resources.yaml
View File

@ -59,7 +59,7 @@ resources:
- 'disk.usage' - 'disk.usage'
attributes: attributes:
host: resource_metadata.host host: resource_metadata.host
image_ref: resource_metadata.image_ref_url image_ref: resource_metadata.image_ref
display_name: resource_metadata.display_name display_name: resource_metadata.display_name
flavor_id: resource_metadata.(instance_flavor_id|(flavor.id)) flavor_id: resource_metadata.(instance_flavor_id|(flavor.id))
server_group: resource_metadata.user_metadata.server_group server_group: resource_metadata.user_metadata.server_group