Remove addition of account to service url.

8 files changed, 45 insertions, 45 deletions

diff --git a/nova/tests/api/openstack/test_accounts.py b/nova/tests/api/openstack/test_accounts.py
index b2e89824a..746f02f57 100644
--- a/nova/tests/api/openstack/test_accounts.py
+++ b/nova/tests/api/openstack/test_accounts.py
@@ -70,7 +70,7 @@ class AccountsTest(test.TestCase):
         super(AccountsTest, self).tearDown()
 
     def test_get_account(self):
-        req = webob.Request.blank('/v1.0/test1')
+        req = webob.Request.blank('/v1.0/accounts/test1')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
@@ -80,7 +80,7 @@ class AccountsTest(test.TestCase):
         self.assertEqual(res.status_int, 200)
 
     def test_account_delete(self):
-        req = webob.Request.blank('/v1.0/test1')
+        req = webob.Request.blank('/v1.0/accounts/test1')
         req.method = 'DELETE'
         res = req.get_response(fakes.wsgi_app())
         self.assertTrue('test1' not in fakes.FakeAuthManager.projects)
@@ -89,7 +89,7 @@ class AccountsTest(test.TestCase):
     def test_account_create(self):
         body = dict(account=dict(description='test account',
                               manager='guy1'))
-        req = webob.Request.blank('/v1.0/newacct')
+        req = webob.Request.blank('/v1.0/accounts/newacct')
         req.method = 'PUT'
         req.body = json.dumps(body)
 
@@ -108,7 +108,7 @@ class AccountsTest(test.TestCase):
     def test_account_update(self):
         body = dict(account=dict(description='test account',
                               manager='guy2'))
-        req = webob.Request.blank('/v1.0/test1')
+        req = webob.Request.blank('/v1.0/accounts/test1')
         req.method = 'PUT'
         req.body = json.dumps(body)
 
diff --git a/nova/tests/api/openstack/test_adminapi.py b/nova/tests/api/openstack/test_adminapi.py
index 7cb9e8450..4568cb9f5 100644
--- a/nova/tests/api/openstack/test_adminapi.py
+++ b/nova/tests/api/openstack/test_adminapi.py
@@ -50,7 +50,7 @@ class AdminAPITest(test.TestCase):
     def test_admin_enabled(self):
         FLAGS.allow_admin_api = True
         # We should still be able to access public operations.
-        req = webob.Request.blank('/v1.0/testacct/flavors')
+        req = webob.Request.blank('/v1.0/flavors')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
         # TODO: Confirm admin operations are available.
@@ -58,7 +58,7 @@ class AdminAPITest(test.TestCase):
     def test_admin_disabled(self):
         FLAGS.allow_admin_api = False
         # We should still be able to access public operations.
-        req = webob.Request.blank('/v1.0/testacct/flavors')
+        req = webob.Request.blank('/v1.0/flavors')
         res = req.get_response(fakes.wsgi_app())
         # TODO: Confirm admin operations are unavailable.
         self.assertEqual(res.status_int, 200)
diff --git a/nova/tests/api/openstack/test_auth.py b/nova/tests/api/openstack/test_auth.py
index 8268a6fb9..49f90879d 100644
--- a/nova/tests/api/openstack/test_auth.py
+++ b/nova/tests/api/openstack/test_auth.py
@@ -78,7 +78,7 @@ class Test(test.TestCase):
         self.assertEqual(result.status, '204 No Content')
         self.assertEqual(len(result.headers['X-Auth-Token']), 40)
         self.assertEqual(result.headers['X-Server-Management-Url'],
-            "http://foo/v1.0/test/")
+            "http://foo/v1.0/")
         self.assertEqual(result.headers['X-CDN-Management-Url'],
             "")
         self.assertEqual(result.headers['X-Storage-Url'], "")
diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/test_flavors.py
index ba0785b0e..8280a505f 100644
--- a/nova/tests/api/openstack/test_flavors.py
+++ b/nova/tests/api/openstack/test_flavors.py
@@ -42,11 +42,11 @@ class FlavorsTest(test.TestCase):
         super(FlavorsTest, self).tearDown()
 
     def test_get_flavor_list(self):
-        req = webob.Request.blank('/v1.0/testacct/flavors')
+        req = webob.Request.blank('/v1.0/flavors')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
 
     def test_get_flavor_by_id(self):
-        req = webob.Request.blank('/v1.0/testacct/flavors/1')
+        req = webob.Request.blank('/v1.0/flavors/1')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 200)
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index 819ca001e..dbe507f7d 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -216,7 +216,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
         super(ImageControllerWithGlanceServiceTest, self).tearDown()
 
     def test_get_image_index(self):
-        req = webob.Request.blank('/v1.0/testacct/images')
+        req = webob.Request.blank('/v1.0/images')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
@@ -228,7 +228,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase):
                               "image %s not in fixture index!" % str(image))
 
     def test_get_image_details(self):
-        req = webob.Request.blank('/v1.0/testacct/images/detail')
+        req = webob.Request.blank('/v1.0/images/detail')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index d592e06b0..705a2f800 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -150,7 +150,7 @@ class ServersTest(test.TestCase):
         super(ServersTest, self).tearDown()
 
     def test_get_server_by_id(self):
-        req = webob.Request.blank('/v1.0/testacct/servers/1')
+        req = webob.Request.blank('/v1.0/servers/1')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
         self.assertEqual(res_dict['server']['id'], '1')
@@ -161,7 +161,7 @@ class ServersTest(test.TestCase):
         public = ["1.2.3.4"]
         new_return_server = return_server_with_addresses(private, public)
         self.stubs.Set(nova.db.api, 'instance_get', new_return_server)
-        req = webob.Request.blank('/v1.0/testacct/servers/1')
+        req = webob.Request.blank('/v1.0/servers/1')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
         self.assertEqual(res_dict['server']['id'], '1')
@@ -173,7 +173,7 @@ class ServersTest(test.TestCase):
         self.assertEqual(addresses["private"][0], private)
 
     def test_get_server_list(self):
-        req = webob.Request.blank('/v1.0/testacct/servers')
+        req = webob.Request.blank('/v1.0/servers')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
@@ -224,7 +224,7 @@ class ServersTest(test.TestCase):
             name='server_test', imageId=2, flavorId=2,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = webob.Request.blank('/v1.0/testacct/servers')
+        req = webob.Request.blank('/v1.0/servers')
         req.method = 'POST'
         req.body = json.dumps(body)
 
@@ -233,7 +233,7 @@ class ServersTest(test.TestCase):
         self.assertEqual(res.status_int, 200)
 
     def test_update_no_body(self):
-        req = webob.Request.blank('/v1.0/testacct/servers/1')
+        req = webob.Request.blank('/v1.0/servers/1')
         req.method = 'PUT'
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 422)
@@ -251,7 +251,7 @@ class ServersTest(test.TestCase):
         self.stubs.Set(nova.db.api, 'instance_update',
             server_update)
 
-        req = webob.Request.blank('/v1.0/testacct/servers/1')
+        req = webob.Request.blank('/v1.0/servers/1')
         req.method = 'PUT'
         req.body = self.body
         req.get_response(fakes.wsgi_app())
@@ -267,30 +267,30 @@ class ServersTest(test.TestCase):
         self.stubs.Set(nova.db.api, 'instance_update',
             server_update)
 
-        req = webob.Request.blank('/v1.0/testacct/servers/1')
+        req = webob.Request.blank('/v1.0/servers/1')
         req.method = 'PUT'
         req.body = self.body
         req.get_response(fakes.wsgi_app())
 
     def test_create_backup_schedules(self):
-        req = webob.Request.blank('/v1.0/testacct/servers/1/backup_schedules')
+        req = webob.Request.blank('/v1.0/servers/1/backup_schedules')
         req.method = 'POST'
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status, '404 Not Found')
 
     def test_delete_backup_schedules(self):
-        req = webob.Request.blank('/v1.0/testacct/servers/1/backup_schedules')
+        req = webob.Request.blank('/v1.0/servers/1/backup_schedules')
         req.method = 'DELETE'
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status, '404 Not Found')
 
     def test_get_server_backup_schedules(self):
-        req = webob.Request.blank('/v1.0/testacct/servers/1/backup_schedules')
+        req = webob.Request.blank('/v1.0/servers/1/backup_schedules')
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status, '404 Not Found')
 
     def test_get_all_server_details(self):
-        req = webob.Request.blank('/v1.0/testacct/servers/detail')
+        req = webob.Request.blank('/v1.0/servers/detail')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
@@ -321,7 +321,7 @@ class ServersTest(test.TestCase):
         self.stubs.Set(nova.db.api, 'instance_get_all_by_user',
             return_servers_with_host)
 
-        req = webob.Request.blank('/v1.0/testacct/servers/detail')
+        req = webob.Request.blank('/v1.0/servers/detail')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
@@ -341,7 +341,7 @@ class ServersTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality={}))
-        req = webob.Request.blank('/v1.0/testacct/servers/1/pause')
+        req = webob.Request.blank('/v1.0/servers/1/pause')
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
@@ -353,7 +353,7 @@ class ServersTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality={}))
-        req = webob.Request.blank('/v1.0/testacct/servers/1/unpause')
+        req = webob.Request.blank('/v1.0/servers/1/unpause')
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
@@ -365,7 +365,7 @@ class ServersTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality={}))
-        req = webob.Request.blank('/v1.0/testacct/servers/1/suspend')
+        req = webob.Request.blank('/v1.0/servers/1/suspend')
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
@@ -377,7 +377,7 @@ class ServersTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality={}))
-        req = webob.Request.blank('/v1.0/testacct/servers/1/resume')
+        req = webob.Request.blank('/v1.0/servers/1/resume')
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
@@ -389,7 +389,7 @@ class ServersTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality={}))
-        req = webob.Request.blank('/v1.0/testacct/servers/1/reset_network')
+        req = webob.Request.blank('/v1.0/servers/1/reset_network')
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
@@ -402,7 +402,7 @@ class ServersTest(test.TestCase):
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality={}))
         req = webob.Request.blank(
-              '/v1.0/testacct/servers/1/inject_network_info')
+              '/v1.0/servers/1/inject_network_info')
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
@@ -410,13 +410,13 @@ class ServersTest(test.TestCase):
         self.assertEqual(res.status_int, 202)
 
     def test_server_diagnostics(self):
-        req = webob.Request.blank("/v1.0/testacct/servers/1/diagnostics")
+        req = webob.Request.blank("/v1.0/servers/1/diagnostics")
         req.method = "GET"
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 404)
 
     def test_server_actions(self):
-        req = webob.Request.blank("/v1.0/testacct/servers/1/actions")
+        req = webob.Request.blank("/v1.0/servers/1/actions")
         req.method = "GET"
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status_int, 404)
@@ -425,7 +425,7 @@ class ServersTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality={}))
-        req = webob.Request.blank('/v1.0/testacct/servers/1/action')
+        req = webob.Request.blank('/v1.0/servers/1/action')
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
@@ -435,7 +435,7 @@ class ServersTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality={}))
-        req = webob.Request.blank('/v1.0/testacct/servers/1/action')
+        req = webob.Request.blank('/v1.0/servers/1/action')
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
@@ -445,14 +445,14 @@ class ServersTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
             personality={}))
-        req = webob.Request.blank('/v1.0/testacct/servers/1/action')
+        req = webob.Request.blank('/v1.0/servers/1/action')
         req.method = 'POST'
         req.content_type = 'application/json'
         req.body = json.dumps(body)
         res = req.get_response(fakes.wsgi_app())
 
     def test_delete_server_instance(self):
-        req = webob.Request.blank('/v1.0/testacct/servers/1')
+        req = webob.Request.blank('/v1.0/servers/1')
         req.method = 'DELETE'
 
         self.server_delete_called = False
diff --git a/nova/tests/api/openstack/test_users.py b/nova/tests/api/openstack/test_users.py
index bd32254cd..14c7897f0 100644
--- a/nova/tests/api/openstack/test_users.py
+++ b/nova/tests/api/openstack/test_users.py
@@ -72,7 +72,7 @@ class UsersTest(test.TestCase):
         super(UsersTest, self).tearDown()
 
     def test_get_user_list(self):
-        req = webob.Request.blank('/v1.0/testacct/users')
+        req = webob.Request.blank('/v1.0/users')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
@@ -80,7 +80,7 @@ class UsersTest(test.TestCase):
         self.assertEqual(len(res_dict['users']), 2)
 
     def test_get_user_by_id(self):
-        req = webob.Request.blank('/v1.0/testacct/users/guy2')
+        req = webob.Request.blank('/v1.0/users/guy2')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
@@ -91,7 +91,7 @@ class UsersTest(test.TestCase):
         self.assertEqual(res.status_int, 200)
 
     def test_user_delete(self):
-        req = webob.Request.blank('/v1.0/testacct/users/guy1')
+        req = webob.Request.blank('/v1.0/users/guy1')
         req.method = 'DELETE'
         res = req.get_response(fakes.wsgi_app())
         self.assertTrue('guy1' not in [u.id for u in
@@ -103,7 +103,7 @@ class UsersTest(test.TestCase):
                               access='acc3',
                               secret='invasionIsInNormandy',
                               admin=True))
-        req = webob.Request.blank('/v1.0/testacct/users')
+        req = webob.Request.blank('/v1.0/users')
         req.method = 'POST'
         req.body = json.dumps(body)
 
@@ -124,7 +124,7 @@ class UsersTest(test.TestCase):
         body = dict(user=dict(name='guy2',
                               access='acc2',
                               secret='invasionIsInNormandy'))
-        req = webob.Request.blank('/v1.0/testacct/users/guy2')
+        req = webob.Request.blank('/v1.0/users/guy2')
         req.method = 'PUT'
         req.body = json.dumps(body)
 
diff --git a/nova/tests/api/openstack/test_zones.py b/nova/tests/api/openstack/test_zones.py
index 51f13af48..6d869dc15 100644
--- a/nova/tests/api/openstack/test_zones.py
+++ b/nova/tests/api/openstack/test_zones.py
@@ -85,7 +85,7 @@ class ZonesTest(test.TestCase):
         super(ZonesTest, self).tearDown()
 
     def test_get_zone_list(self):
-        req = webob.Request.blank('/v1.0/testacct/zones')
+        req = webob.Request.blank('/v1.0/zones')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
@@ -93,7 +93,7 @@ class ZonesTest(test.TestCase):
         self.assertEqual(len(res_dict['zones']), 2)
 
     def test_get_zone_by_id(self):
-        req = webob.Request.blank('/v1.0/testacct/zones/1')
+        req = webob.Request.blank('/v1.0/zones/1')
         res = req.get_response(fakes.wsgi_app())
         res_dict = json.loads(res.body)
 
@@ -103,7 +103,7 @@ class ZonesTest(test.TestCase):
         self.assertEqual(res.status_int, 200)
 
     def test_zone_delete(self):
-        req = webob.Request.blank('/v1.0/testacct/zones/1')
+        req = webob.Request.blank('/v1.0/zones/1')
         res = req.get_response(fakes.wsgi_app())
 
         self.assertEqual(res.status_int, 200)
@@ -111,7 +111,7 @@ class ZonesTest(test.TestCase):
     def test_zone_create(self):
         body = dict(zone=dict(api_url='http://blah.zoo', username='fred',
                         password='fubar'))
-        req = webob.Request.blank('/v1.0/testacct/zones')
+        req = webob.Request.blank('/v1.0/zones')
         req.method = 'POST'
         req.body = json.dumps(body)
 
@@ -125,7 +125,7 @@ class ZonesTest(test.TestCase):
 
     def test_zone_update(self):
         body = dict(zone=dict(username='zeb', password='sneaky'))
-        req = webob.Request.blank('/v1.0/testacct/zones/1')
+        req = webob.Request.blank('/v1.0/zones/1')
         req.method = 'PUT'
         req.body = json.dumps(body)