Fixing test_create_instance

2 files changed, 8 insertions, 7 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 8172e8600..30119d467 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -520,10 +520,7 @@ class API(base.Base):
 
         if uuid_like:
             uuid = instance_id
-            try:
-                instance = self.db.instance_get_by_uuid(context, uuid)
-            except Exception as e:
-                raise Exception(e)
+            instance = self.db.instance_get_by_uuid(context, uuid)
         else:
             instance = self.db.instance_get(context, instance_id)
 
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 1dc2d6118..f47708de6 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -49,6 +49,9 @@ FLAGS = flags.FLAGS
 FLAGS.verbose = True
 
 
+FAKE_UUID = 'abcd-abcd-abcd-abcd'
+
+
 def return_server_by_id(context, id):
     return stub_instance(id)
 
@@ -240,11 +243,11 @@ class ServersTest(test.TestCase):
         self.assertEqual(res_dict['server']['name'], 'server1')
 
     def test_get_server_by_uuid(self):
-        req = webob.Request.blank('/v1.0/servers/abcd-abcd-abcd-abcd')
+        req = webob.Request.blank('/v1.0/servers/%s' % FAKE_UUID)
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
         self.assertEqual(res_dict['server']['id'], 1)
-        self.assertEqual(res_dict['server']['uuid'], 'abcd-abcd-abcd-abcd')
+        self.assertEqual(res_dict['server']['uuid'], FAKE_UUID)
         self.assertEqual(res_dict['server']['name'], 'server1')
 
     def test_get_server_by_id_v1_1(self):
@@ -558,7 +561,8 @@ class ServersTest(test.TestCase):
     def _setup_for_create_instance(self):
         """Shared implementation for tests below that create instance"""
         def instance_create(context, inst):
-            return {'id': '1', 'display_name': 'server_test'}
+            return {'id': 1, 'display_name': 'server_test',
+                    'uuid': FAKE_UUID}
 
         def server_update(context, id, params):
             return instance_create(context, id)