From 30999f152c4fc9e1d37878d3275f6e19638f2674 Mon Sep 17 00:00:00 2001
From: gordon chung <gord@live.ca>
Date: Thu, 15 Oct 2015 14:56:39 -0400
Subject: [PATCH] fix image_ref attr in gnocchi resource

image_ref attr should match to image_ref in metadata, not image_ref_url

Closes-Bug: #1506595
Change-Id: Iddaf2f286657c108af51f761232375a6514e83f1
---
 ceilometer/tests/unit/dispatcher/test_gnocchi.py | 6 +++---
 etc/ceilometer/gnocchi_resources.yaml            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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