diff --git a/ceilometer/tests/unit/dispatcher/test_gnocchi.py b/ceilometer/tests/unit/dispatcher/test_gnocchi.py index d9d0e4eb..535f1e32 100644 --- a/ceilometer/tests/unit/dispatcher/test_gnocchi.py +++ b/ceilometer/tests/unit/dispatcher/test_gnocchi.py @@ -69,7 +69,7 @@ class DispatcherTest(base.BaseTestCase): 'resource_id': self.resource_id, 'resource_metadata': { 'host': 'foo', - 'image_ref_url': 'imageref!', + 'image_ref': 'imageref!', 'instance_flavor_id': 1234, 'display_name': 'myinstance', }}, @@ -84,7 +84,7 @@ class DispatcherTest(base.BaseTestCase): 'resource_id': self.resource_id, 'resource_metadata': { 'host': 'foo', - 'image_ref_url': 'imageref!', + 'image_ref': 'imageref!', 'instance_flavor_id': 1234, 'display_name': 'myinstance', } @@ -196,7 +196,7 @@ class DispatcherWorkflowTest(base.BaseTestCase, 'timestamp': '2012-05-08 20:23:48.028195', 'resource_metadata': { 'host': 'foo', - 'image_ref_url': 'imageref!', + 'image_ref': 'imageref!', 'instance_flavor_id': 1234, 'display_name': 'myinstance', } diff --git a/etc/ceilometer/gnocchi_resources.yaml b/etc/ceilometer/gnocchi_resources.yaml index 4f7e0226..b285dd3d 100644 --- a/etc/ceilometer/gnocchi_resources.yaml +++ b/etc/ceilometer/gnocchi_resources.yaml @@ -59,7 +59,7 @@ resources: - 'disk.usage' attributes: host: resource_metadata.host - image_ref: resource_metadata.image_ref_url + image_ref: resource_metadata.image_ref display_name: resource_metadata.display_name flavor_id: resource_metadata.(instance_flavor_id|(flavor.id)) server_group: resource_metadata.user_metadata.server_group