From 158ed6b568e08d3de9463b82a301f3f7cf08ca3c Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Tue, 26 Jun 2012 16:36:58 -0400
Subject: [PATCH] fix typo in instance properties list

Change-Id: Ib09f4ab8db06d024ff863b54702a36f6ef77698b
---
 ceilometer/compute/instance.py |  2 +-
 tests/compute/test_instance.py | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ceilometer/compute/instance.py b/ceilometer/compute/instance.py
index ad8862dfd..9dd4728ae 100644
--- a/ceilometer/compute/instance.py
+++ b/ceilometer/compute/instance.py
@@ -23,7 +23,7 @@ INSTANCE_PROPERTIES = [
     'display_name',
     'reservation_id',
     # Type properties
-    'architecture'
+    'architecture',
     # Location properties
     'availability_zone',
     # Image properties
diff --git a/tests/compute/test_instance.py b/tests/compute/test_instance.py
index a9a11f2ca..758bd51c6 100644
--- a/tests/compute/test_instance.py
+++ b/tests/compute/test_instance.py
@@ -29,13 +29,29 @@ from ceilometer.agent import manager
 
 class TestLocationMetadata(test.TestCase):
 
+    INSTANCE_PROPERTIES = {'display_name': 'display name',
+                           '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',
+                           'disk_gb': 10,
+                           'ephemeral_gb': 7,
+                           'memory_mb': 2048,
+                           'root_gb': 3,
+                           'vcpus': 1,
+                           }
+
     def setUp(self):
         self.context = context.RequestContext('admin', 'admin', is_admin=True)
         self.manager = manager.AgentManager()
         super(TestLocationMetadata, self).setUp()
-        self.instance = db.instance_create(self.context, {})
+        self.instance = db.instance_create(self.context, self.INSTANCE_PROPERTIES)
 
     def test_metadata(self):
         md = instance.get_metadata_from_dbobject(self.instance)
-        for name in instance.INSTANCE_PROPERTIES:
-            assert name in md
+        for name in self.INSTANCE_PROPERTIES.keys():
+            assert md[name] == self.INSTANCE_PROPERTIES[name]