From 684c1ed50aebaed07cf89e6f1f7ee189a1b79b9b Mon Sep 17 00:00:00 2001
From: mdietz <mdietz@openstack>
Date: Tue, 5 Oct 2010 20:43:23 +0000
Subject: Huge sweeping changes

---
 nova/tests/api/rackspace/test_servers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/tests/api/rackspace/test_servers.py b/nova/tests/api/rackspace/test_servers.py
index 5a21356eb..92377538b 100644
--- a/nova/tests/api/rackspace/test_servers.py
+++ b/nova/tests/api/rackspace/test_servers.py
@@ -72,7 +72,7 @@ class ServersTest(unittest.TestCase):
         req = webob.Request.blank('/v1.0/servers/1')
         res = req.get_response(nova.api.API())
         res_dict = json.loads(res.body)
-        self.assertEqual(res_dict['server']['id'], '1')
+        self.assertEqual(res_dict['server']['id'], 1)
         self.assertEqual(res_dict['server']['name'], 'server1')
 
     def test_get_server_list(self):
@@ -93,7 +93,7 @@ class ServersTest(unittest.TestCase):
 
         def instance_create(context, inst):
             class Foo(object):
-                internal_id = 1
+                internal_id = '1'
             return Foo()
 
         def fake_method(*args, **kwargs):
-- 
cgit 


From 5f40379b407301c0907a72cde988197f3d18ea56 Mon Sep 17 00:00:00 2001
From: mdietz <mdietz@openstack>
Date: Tue, 5 Oct 2010 21:00:05 +0000
Subject: Merge prop suggestions

---
 nova/tests/api/rackspace/fakes.py        | 16 ----------------
 nova/tests/api/rackspace/test_servers.py |  4 +---
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/nova/tests/api/rackspace/fakes.py b/nova/tests/api/rackspace/fakes.py
index 2c4447920..f623524ed 100644
--- a/nova/tests/api/rackspace/fakes.py
+++ b/nova/tests/api/rackspace/fakes.py
@@ -60,22 +60,6 @@ def stub_out_image_service(stubs):
 
     stubs.Set(nova.image.service.LocalImageService, 'show', fake_image_show)
 
-
-def stub_out_id_translator(stubs):
-    class FakeTranslator(object):
-        def __init__(self, id_type, service_name):
-            pass
-        
-        def to_rs_id(self, id):
-            return id
-
-        def from_rs_id(self, id):
-            return id
-
-    stubs.Set(nova.api.rackspace._id_translator,
-        'RackspaceAPIIdTranslator', FakeTranslator)
-
-
 def stub_out_auth(stubs):
     def fake_auth_init(self, app):
         self.application = app
diff --git a/nova/tests/api/rackspace/test_servers.py b/nova/tests/api/rackspace/test_servers.py
index 92377538b..7fed0cc26 100644
--- a/nova/tests/api/rackspace/test_servers.py
+++ b/nova/tests/api/rackspace/test_servers.py
@@ -57,7 +57,6 @@ class ServersTest(unittest.TestCase):
         fakes.stub_out_networking(self.stubs)
         fakes.stub_out_rate_limiting(self.stubs)
         fakes.stub_out_auth(self.stubs)
-        fakes.stub_out_id_translator(self.stubs)
         fakes.stub_out_key_pair_funcs(self.stubs)
         fakes.stub_out_image_service(self.stubs)
         self.stubs.Set(nova.db.api, 'instance_get_all', return_servers)
@@ -93,7 +92,7 @@ class ServersTest(unittest.TestCase):
 
         def instance_create(context, inst):
             class Foo(object):
-                internal_id = '1'
+                internal_id = 1
             return Foo()
 
         def fake_method(*args, **kwargs):
@@ -115,7 +114,6 @@ class ServersTest(unittest.TestCase):
         self.stubs.Set(nova.network.manager.VlanManager, 'allocate_fixed_ip',
             fake_method)
             
-        fakes.stub_out_id_translator(self.stubs)
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality = {}
-- 
cgit