From 4356ab20a36141268783151def5151f5f87b51ca Mon Sep 17 00:00:00 2001
From: "Yunhong, Jiang" <yunhong.jiang@intel.com>
Date: Mon, 17 Dec 2012 15:58:45 +0800
Subject: [PATCH] Fix image_id in instance resource metadata

Originally the image property in instance resource metadata is correct
since instance information is fetched from db access.

After switching to nova client api, these information is lost
since the returned data format from nova client is different with db
access result.

Image ref and image url is fixed with this patch while kernel_id and
ramdisk_id should be fixed in nova side.

For bug 1090310

Change-Id: I51816b4bd31c09a59e1ef857f8981a45f33f68dc
Signed-off-by: Yunhong, Jiang <yunhong.jiang@intel.com>
---
 ceilometer/compute/instance.py |  7 ++++---
 tests/compute/test_instance.py | 30 ++++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ceilometer/compute/instance.py b/ceilometer/compute/instance.py
index 8c2c7f832..9eb946470 100644
--- a/ceilometer/compute/instance.py
+++ b/ceilometer/compute/instance.py
@@ -25,9 +25,6 @@ INSTANCE_PROPERTIES = [
     'architecture',
     # Location properties
     'availability_zone',
-    # Image properties
-    'image_ref',
-    'image_ref_url',
     'kernel_id',
     'os_type',
     'ramdisk_id',
@@ -48,6 +45,10 @@ def get_metadata_from_object(instance):
         'name': getattr(instance, 'OS-EXT-SRV-ATTR:instance_name', u''),
         'instance_type': (instance.flavor['id'] if instance.flavor else None),
         'host': instance.hostId,
+        # Image properties
+        'image_ref': (instance.image['id'] if instance.image else None),
+        'image_ref_url': (instance.image['links'][0]['href']
+                            if instance.image else None),
         }
 
     for name in INSTANCE_PROPERTIES:
diff --git a/tests/compute/test_instance.py b/tests/compute/test_instance.py
index b7949bb33..e0e598985 100644
--- a/tests/compute/test_instance.py
+++ b/tests/compute/test_instance.py
@@ -44,14 +44,16 @@ class FauxInstance(object):
 
 class TestLocationMetadata(unittest.TestCase):
 
-    # Mimics an instance returned from nova api call
-    INSTANCE_PROPERTIES = {'name': 'display name',
+    def setUp(self):
+        self.manager = manager.AgentManager()
+        super(TestLocationMetadata, self).setUp()
+
+        # Mimics an instance returned from nova api call
+        self.INSTANCE_PROPERTIES = {'name': 'display name',
                            'OS-EXT-SRV-ATTR:instance_name': 'instance-000001',
                            'reservation_id': 'reservation id',
                            'architecture': 'x86_64',
                            'availability_zone': 'zone1',
-                           'image_ref': 'image ref',
-                           'image_ref_url': 'image ref url',
                            'kernel_id': 'kernel id',
                            'os_type': 'linux',
                            'ramdisk_id': 'ramdisk id',
@@ -60,13 +62,14 @@ class TestLocationMetadata(unittest.TestCase):
                            'memory_mb': 2048,
                            'root_gb': 3,
                            'vcpus': 1,
+                           'image': {'id': 1,
+                                     'links': [{"rel": "bookmark",
+                                                'href': 2}],
+                                    },
                            'flavor': {'id': 1},
-                           'hostId': '1234-5678'
+                           'hostId': '1234-5678',
                            }
 
-    def setUp(self):
-        self.manager = manager.AgentManager()
-        super(TestLocationMetadata, self).setUp()
         self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
         self.instance.host = 'made-up-hostname'
         m = mock.MagicMock()
@@ -87,5 +90,16 @@ class TestLocationMetadata(unittest.TestCase):
                 assert actual == iprops['name']
             elif name == 'instance_type':
                 assert actual == iprops['flavor']['id']
+            elif name == 'image_ref':
+                assert actual == iprops['image']['id']
+            elif name == 'image_ref_url':
+                assert actual == iprops['image']['links'][0]['href']
             else:
                 assert actual == iprops[name]
+
+    def test_metadata_empty_image(self):
+        self.INSTANCE_PROPERTIES['image'] = ''
+        self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
+        md = instance.get_metadata_from_object(self.instance)
+        assert md['image_ref'] == None
+        assert md['image_ref_url'] == None