From 89df9c1e9dbf05b841da7963966d3d0b01217f7f Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Wed, 22 Dec 2010 17:53:42 -0800
Subject: [PATCH] added tests to ensure the easy api works as a backend for
 Compute API

---
 nova/tests/cloud_unittest.py   |  2 ++
 nova/tests/compute_unittest.py |  9 ++++++---
 nova/tests/easy_unittest.py    | 19 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 1398a986..4439c131 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -22,6 +22,7 @@ import logging
 from M2Crypto import BIO
 from M2Crypto import RSA
 import os
+import shutil
 import tempfile
 import time
 
@@ -293,6 +294,7 @@ class CloudTestCase(test.TestCase):
         self.assertEqual('Foo Img', img.metadata['description'])
         self._fake_set_image_description(self.context, 'ami-testing', '')
         self.assertEqual('', img.metadata['description'])
+        shutil.rmtree(pathdir)
 
     def test_update_of_instance_display_fields(self):
         inst = db.instance_create(self.context, {})
diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py
index 348bb335..0bebd1c5 100644
--- a/nova/tests/compute_unittest.py
+++ b/nova/tests/compute_unittest.py
@@ -75,7 +75,7 @@ class ComputeTestCase(test.TestCase):
             ref = self.compute_api.create_instances(self.context,
                 FLAGS.default_instance_type, None, **instance)
             try:
-                self.assertNotEqual(ref[0].display_name, None)
+                self.assertNotEqual(ref[0]['display_name'], None)
             finally:
                 db.instance_destroy(self.context, ref[0]['id'])
 
@@ -87,9 +87,12 @@ class ComputeTestCase(test.TestCase):
                   'project_id': self.project.id}
         group = db.security_group_create(self.context, values)
         ref = self.compute_api.create_instances(self.context,
-            FLAGS.default_instance_type, None, security_group=['default'])
+            instance_type=FLAGS.default_instance_type,
+            image_id=None,
+            security_group=['default'])
         try:
-            self.assertEqual(len(ref[0]['security_groups']), 1)
+            self.assertEqual(len(db.security_group_get_by_instance(
+                self.context, ref[0]['id'])), 1)
         finally:
             db.security_group_destroy(self.context, group['id'])
             db.instance_destroy(self.context, ref[0]['id'])
diff --git a/nova/tests/easy_unittest.py b/nova/tests/easy_unittest.py
index ed223831..81990d84 100644
--- a/nova/tests/easy_unittest.py
+++ b/nova/tests/easy_unittest.py
@@ -28,7 +28,8 @@ from nova import exception
 from nova import test
 from nova import utils
 from nova.api import easy
-
+from nova.compute import api as compute_api
+from nova.tests import cloud_unittest
 
 class FakeService(object):
     def echo(self, context, data):
@@ -83,3 +84,19 @@ class EasyTestCase(test.TestCase):
         proxy = easy.Proxy(self.router)
         rv = proxy.fake.echo(self.context, data='baz')
         self.assertEqual(rv['data'], 'baz')
+
+
+class EasyCloudTestCase(cloud_unittest.CloudTestCase):
+    def setUp(self):
+        super(EasyCloudTestCase, self).setUp()
+        compute_handle = compute_api.ComputeAPI(self.cloud.network_manager,
+                                                self.cloud.image_service)
+        easy.register_service('compute', compute_handle)
+        self.router = easy.JsonParamsMiddleware(easy.SundayMorning())
+        proxy = easy.Proxy(self.router)
+        self.cloud.compute_api = proxy.compute
+
+    def tearDown(self):
+        super(EasyCloudTestCase, self).tearDown()
+        easy.EASY_ROUTES = {}
+