diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py index 4e4a8b7..968410c 100644 --- a/nova/api/openstack/wsgi.py +++ b/nova/api/openstack/wsgi.py @@ -23,7 +23,6 @@ import webob from nova import exception from nova import log as logging -from nova import test from nova import utils from nova import wsgi @@ -562,11 +561,8 @@ class Resource(wsgi.Application): return Fault(webob.exc.HTTPBadRequest(explanation=msg)) project_id = args.pop("project_id", None) - if test.TESTING: - if 'nova.context' in request.environ and project_id: - request.environ['nova.context'].project_id = project_id - elif ('nova.context' in request.environ and project_id - and project_id != request.environ['nova.context'].project_id): + if ('nova.context' in request.environ and project_id + and project_id != request.environ['nova.context'].project_id): msg = _("Malformed request url") return Fault(webob.exc.HTTPBadRequest(explanation=msg)) diff --git a/nova/test.py b/nova/test.py index 961594c..1fc47f5 100644 --- a/nova/test.py +++ b/nova/test.py @@ -49,7 +49,6 @@ flags.DEFINE_bool('fake_tests', True, 'should we use everything for testing') LOG = log.getLogger('nova.tests') -TESTING = False class skip_test(object): @@ -129,8 +128,6 @@ class TestCase(unittest.TestCase): self.injected = [] self._services = [] self._original_flags = FLAGS.FlagValuesDict() - global TESTING - TESTING = True def tearDown(self): """Runs after each test method to tear down test environment.""" diff --git a/nova/tests/api/openstack/v2/contrib/test_cloudpipe.py b/nova/tests/api/openstack/v2/contrib/test_cloudpipe.py index 8dfac47..9786984 100644 --- a/nova/tests/api/openstack/v2/contrib/test_cloudpipe.py +++ b/nova/tests/api/openstack/v2/contrib/test_cloudpipe.py @@ -113,8 +113,8 @@ class CloudpipeTest(test.TestCase): self.flags(allow_admin_api=True) self.app = fakes.wsgi_app() inner_app = v2.APIRouter() - adm_ctxt = context.get_admin_context() - self.app = auth.InjectContext(adm_ctxt, inner_app) + self.context = context.RequestContext('fake', 'fake', is_admin=True) + self.app = auth.InjectContext(self.context, inner_app) route = inner_app.map.match('/1234/os-cloudpipe') self.controller = route['controller'].controller fakes.stub_out_networking(self.stubs) @@ -133,13 +133,12 @@ class CloudpipeTest(test.TestCase): # causes failures in AuthManagerLdapTestCase. So use a fake object. self.controller.auth_manager = FakeAuthManager() self.stubs.Set(utils, 'vpn_ping', utils_vpn_ping) - self.context = context.get_admin_context() global EMPTY_INSTANCE_LIST EMPTY_INSTANCE_LIST = True def test_cloudpipe_list_none_running(self): """Should still get an entry per-project, just less descriptive.""" - req = webob.Request.blank('/123/os-cloudpipe') + req = webob.Request.blank('/fake/os-cloudpipe') res = req.get_response(self.app) self.assertEqual(res.status_int, 200) res_dict = json.loads(res.body) @@ -150,7 +149,7 @@ class CloudpipeTest(test.TestCase): def test_cloudpipe_list(self): global EMPTY_INSTANCE_LIST EMPTY_INSTANCE_LIST = False - req = webob.Request.blank('/123/os-cloudpipe') + req = webob.Request.blank('/fake/os-cloudpipe') res = req.get_response(self.app) self.assertEqual(res.status_int, 200) res_dict = json.loads(res.body) @@ -162,7 +161,7 @@ class CloudpipeTest(test.TestCase): def test_cloudpipe_create(self): body = {'cloudpipe': {'project_id': 1}} - req = webob.Request.blank('/123/os-cloudpipe') + req = webob.Request.blank('/fake/os-cloudpipe') req.method = 'POST' req.body = json.dumps(body) req.headers['Content-Type'] = 'application/json' @@ -178,7 +177,7 @@ class CloudpipeTest(test.TestCase): self.stubs.SmartSet(self.controller.cloudpipe, 'launch_vpn_instance', better_not_call_this) body = {'cloudpipe': {'project_id': 1}} - req = webob.Request.blank('/123/os-cloudpipe') + req = webob.Request.blank('/fake/os-cloudpipe') req.method = 'POST' req.body = json.dumps(body) req.headers['Content-Type'] = 'application/json' diff --git a/nova/tests/api/openstack/v2/contrib/test_console_output.py b/nova/tests/api/openstack/v2/contrib/test_console_output.py index 0fae967..ad22ff4 100644 --- a/nova/tests/api/openstack/v2/contrib/test_console_output.py +++ b/nova/tests/api/openstack/v2/contrib/test_console_output.py @@ -54,7 +54,7 @@ class ConsoleOutputExtensionTest(test.TestCase): def test_get_text_console_instance_action(self): body = {'os-getConsoleOutput': {}} - req = webob.Request.blank('/v1.1/123/servers/1/action') + req = webob.Request.blank('/v2/fake/servers/1/action') req.method = "POST" req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -66,7 +66,7 @@ class ConsoleOutputExtensionTest(test.TestCase): def test_get_console_output_with_tail(self): body = {'os-getConsoleOutput': {'length': 3}} - req = webob.Request.blank('/v2/123/servers/1/action') + req = webob.Request.blank('/v2/fake/servers/1/action') req.method = "POST" req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -78,7 +78,7 @@ class ConsoleOutputExtensionTest(test.TestCase): def test_get_text_console_no_instance(self): self.stubs.Set(compute.API, 'get', fake_get_not_found) body = {'os-getConsoleOutput': {}} - req = webob.Request.blank('/v1.1/123/servers/1/action') + req = webob.Request.blank('/v2/fake/servers/1/action') req.method = "POST" req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -88,7 +88,7 @@ class ConsoleOutputExtensionTest(test.TestCase): def test_get_text_console_bad_body(self): body = {} - req = webob.Request.blank('/v1.1/123/servers/1/action') + req = webob.Request.blank('/v2/fake/servers/1/action') req.method = "POST" req.body = json.dumps(body) req.headers["content-type"] = "application/json" diff --git a/nova/tests/api/openstack/v2/contrib/test_createserverext.py b/nova/tests/api/openstack/v2/contrib/test_createserverext.py index f46f09a..2393780 100644 --- a/nova/tests/api/openstack/v2/contrib/test_createserverext.py +++ b/nova/tests/api/openstack/v2/contrib/test_createserverext.py @@ -175,7 +175,7 @@ class CreateserverextTest(test.TestCase): return {'server': server} def _get_create_request_json(self, body_dict): - req = webob.Request.blank('/v2/123/os-create-server-ext') + req = webob.Request.blank('/v2/fake/os-create-server-ext') req.headers['Content-Type'] = 'application/json' req.method = 'POST' req.body = json.dumps(body_dict) @@ -220,7 +220,7 @@ class CreateserverextTest(test.TestCase): return ''.join(body_parts) def _get_create_request_xml(self, body_dict): - req = webob.Request.blank('/v2/123/os-create-server-ext') + req = webob.Request.blank('/v2/fake/os-create-server-ext') req.content_type = 'application/xml' req.accept = 'application/xml' req.method = 'POST' @@ -406,7 +406,7 @@ class CreateserverextTest(test.TestCase): def test_get_server_by_id_verify_security_groups_json(self): self.stubs.Set(nova.db, 'instance_get', return_server_by_id) self._setup_mock_network_api() - req = webob.Request.blank('/v2/123/os-create-server-ext/1') + req = webob.Request.blank('/v2/fake/os-create-server-ext/1') req.headers['Content-Type'] = 'application/json' response = req.get_response(fakes.wsgi_app()) self.assertEquals(response.status_int, 200) @@ -418,7 +418,7 @@ class CreateserverextTest(test.TestCase): def test_get_server_by_id_verify_security_groups_xml(self): self.stubs.Set(nova.db, 'instance_get', return_server_by_id) self._setup_mock_network_api() - req = webob.Request.blank('/v2/123/os-create-server-ext/1') + req = webob.Request.blank('/v2/fake/os-create-server-ext/1') req.headers['Accept'] = 'application/xml' response = req.get_response(fakes.wsgi_app()) self.assertEquals(response.status_int, 200) diff --git a/nova/tests/api/openstack/v2/contrib/test_extendedstatus.py b/nova/tests/api/openstack/v2/contrib/test_extendedstatus.py index 6656565..dc7f0ce 100644 --- a/nova/tests/api/openstack/v2/contrib/test_extendedstatus.py +++ b/nova/tests/api/openstack/v2/contrib/test_extendedstatus.py @@ -39,7 +39,7 @@ class ExtendedStatusTest(test.TestCase): def setUp(self): super(ExtendedStatusTest, self).setUp() self.uuid = '70f6db34-de8d-4fbd-aafb-4065bdfa6114' - self.url = '/v2/openstack/servers/%s' % self.uuid + self.url = '/v2/fake/servers/%s' % self.uuid fakes.stub_out_nw_api(self.stubs) self.flags(allow_admin_api=True) self.stubs.Set(compute.api.API, 'routing_get', fake_compute_get) diff --git a/nova/tests/api/openstack/v2/contrib/test_flavors_extra_specs.py b/nova/tests/api/openstack/v2/contrib/test_flavors_extra_specs.py index 645f6be..6faa1ca 100644 --- a/nova/tests/api/openstack/v2/contrib/test_flavors_extra_specs.py +++ b/nova/tests/api/openstack/v2/contrib/test_flavors_extra_specs.py @@ -61,7 +61,7 @@ class FlavorsExtraSpecsTest(test.TestCase): self.stubs.Set(nova.db, 'instance_type_extra_specs_get', return_flavor_extra_specs) - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs') + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs') res_dict = self.controller.index(req, 1) self.assertEqual('value1', res_dict['extra_specs']['key1']) @@ -70,7 +70,7 @@ class FlavorsExtraSpecsTest(test.TestCase): self.stubs.Set(nova.db, 'instance_type_extra_specs_get', return_empty_flavor_extra_specs) - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs') + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs') res_dict = self.controller.index(req, 1) self.assertEqual(0, len(res_dict['extra_specs'])) @@ -79,7 +79,7 @@ class FlavorsExtraSpecsTest(test.TestCase): self.stubs.Set(nova.db, 'instance_type_extra_specs_get', return_flavor_extra_specs) - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs' + + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' + '/key5') res_dict = self.controller.show(req, 1, 'key5') @@ -89,7 +89,7 @@ class FlavorsExtraSpecsTest(test.TestCase): self.stubs.Set(nova.db, 'instance_type_extra_specs_get', return_empty_flavor_extra_specs) - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs' + + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' + '/key6') self.assertRaises(webob.exc.HTTPNotFound, self.controller.show, req, 1, 'key6') @@ -98,7 +98,7 @@ class FlavorsExtraSpecsTest(test.TestCase): self.stubs.Set(nova.db, 'instance_type_extra_specs_delete', delete_flavor_extra_specs) - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs' + + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' + '/key5') self.controller.delete(req, 1, 'key5') @@ -108,7 +108,7 @@ class FlavorsExtraSpecsTest(test.TestCase): return_create_flavor_extra_specs) body = {"extra_specs": {"key1": "value1"}} - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs') + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs') res_dict = self.controller.create(req, 1, body) self.assertEqual('value1', res_dict['extra_specs']['key1']) @@ -118,7 +118,7 @@ class FlavorsExtraSpecsTest(test.TestCase): 'instance_type_extra_specs_update_or_create', return_create_flavor_extra_specs) - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs') + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, 1, '') @@ -128,7 +128,7 @@ class FlavorsExtraSpecsTest(test.TestCase): return_create_flavor_extra_specs) body = {"key1": "value1"} - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs' + + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' + '/key1') res_dict = self.controller.update(req, 1, 'key1', body) @@ -139,7 +139,7 @@ class FlavorsExtraSpecsTest(test.TestCase): 'instance_type_extra_specs_update_or_create', return_create_flavor_extra_specs) - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs' + + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' + '/key1') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update, req, 1, 'key1', '') @@ -150,7 +150,7 @@ class FlavorsExtraSpecsTest(test.TestCase): return_create_flavor_extra_specs) body = {"key1": "value1", "key2": "value2"} - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs' + + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs' + '/key1') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update, req, 1, 'key1', body) @@ -161,7 +161,7 @@ class FlavorsExtraSpecsTest(test.TestCase): return_create_flavor_extra_specs) body = {"key1": "value1"} - req = fakes.HTTPRequest.blank('/v2/123/flavors/1/os-extra_specs/bad') + req = fakes.HTTPRequest.blank('/v2/fake/flavors/1/os-extra_specs/bad') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update, req, 1, 'bad', body) diff --git a/nova/tests/api/openstack/v2/contrib/test_floating_ips.py b/nova/tests/api/openstack/v2/contrib/test_floating_ips.py index 0c2c652..4b0a410 100644 --- a/nova/tests/api/openstack/v2/contrib/test_floating_ips.py +++ b/nova/tests/api/openstack/v2/contrib/test_floating_ips.py @@ -156,7 +156,7 @@ class FloatingIpTest(test.TestCase): self.assertTrue('floating_ip' in view) def test_floating_ips_list(self): - req = fakes.HTTPRequest.blank('/v2/123/os-floating-ips') + req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips') res_dict = self.controller.index(req) response = {'floating_ips': [{'instance_id': FAKE_UUID, @@ -170,7 +170,7 @@ class FloatingIpTest(test.TestCase): self.assertEqual(res_dict, response) def test_floating_ip_show(self): - req = fakes.HTTPRequest.blank('/v2/123/os-floating-ips/1') + req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips/1') res_dict = self.controller.show(req, 1) self.assertEqual(res_dict['floating_ip']['id'], 1) @@ -184,7 +184,7 @@ class FloatingIpTest(test.TestCase): 'instance': {'uuid': FAKE_UUID}}} self.stubs.Set(network.api.API, "get_floating_ip", get_floating_ip) - req = fakes.HTTPRequest.blank('/v2/123/os-floating-ips/1') + req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips/1') res_dict = self.controller.show(req, 1) self.assertEqual(res_dict['floating_ip']['id'], 1) @@ -198,7 +198,7 @@ class FloatingIpTest(test.TestCase): self.stubs.Set(rpc, "call", fake_call) - req = fakes.HTTPRequest.blank('/v2/123/os-floating-ips') + req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req) @@ -214,7 +214,7 @@ class FloatingIpTest(test.TestCase): self.stubs.Set(network.api.API, "get_floating_ip_by_address", fake2) - req = fakes.HTTPRequest.blank('/v2/123/os-floating-ips') + req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips') res_dict = self.controller.create(req) ip = res_dict['floating_ip'] @@ -227,7 +227,7 @@ class FloatingIpTest(test.TestCase): self.assertEqual(ip, expected) def test_floating_ip_release(self): - req = fakes.HTTPRequest.blank('/v2/123/os-floating-ips/1') + req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips/1') self.controller.delete(req, 1) # test floating ip add/remove -> associate/disassociate @@ -235,13 +235,13 @@ class FloatingIpTest(test.TestCase): def test_floating_ip_associate(self): body = dict(addFloatingIp=dict(address=self.address)) - req = fakes.HTTPRequest.blank('/v2/123/servers/test_inst/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action') self.manager._add_floating_ip(body, req, 'test_inst') def test_floating_ip_disassociate(self): body = dict(removeFloatingIp=dict(address='10.10.10.10')) - req = fakes.HTTPRequest.blank('/v2/123/servers/test_inst/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action') self.manager._remove_floating_ip(body, req, 'test_inst') # these are a few bad param tests @@ -249,7 +249,7 @@ class FloatingIpTest(test.TestCase): def test_bad_address_param_in_remove_floating_ip(self): body = dict(removeFloatingIp=dict(badparam='11.0.0.1')) - req = fakes.HTTPRequest.blank('/v2/123/servers/test_inst/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._add_floating_ip, body, req, 'test_inst') @@ -257,7 +257,7 @@ class FloatingIpTest(test.TestCase): def test_missing_dict_param_in_remove_floating_ip(self): body = dict(removeFloatingIp='11.0.0.1') - req = fakes.HTTPRequest.blank('/v2/123/servers/test_inst/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._remove_floating_ip, body, req, 'test_inst') @@ -265,7 +265,7 @@ class FloatingIpTest(test.TestCase): def test_missing_dict_param_in_add_floating_ip(self): body = dict(addFloatingIp='11.0.0.1') - req = fakes.HTTPRequest.blank('/v2/123/servers/test_inst/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/test_inst/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._add_floating_ip, body, req, 'test_inst') diff --git a/nova/tests/api/openstack/v2/contrib/test_keypairs.py b/nova/tests/api/openstack/v2/contrib/test_keypairs.py index 3a27b1d..9da907c 100644 --- a/nova/tests/api/openstack/v2/contrib/test_keypairs.py +++ b/nova/tests/api/openstack/v2/contrib/test_keypairs.py @@ -61,7 +61,7 @@ class KeypairsTest(test.TestCase): self.context = context.get_admin_context() def test_keypair_list(self): - req = webob.Request.blank('/v2/123/os-keypairs') + req = webob.Request.blank('/v2/fake/os-keypairs') res = req.get_response(fakes.wsgi_app()) self.assertEqual(res.status_int, 200) res_dict = json.loads(res.body) @@ -70,7 +70,7 @@ class KeypairsTest(test.TestCase): def test_keypair_create(self): body = {'keypair': {'name': 'create_test'}} - req = webob.Request.blank('/v2/123/os-keypairs') + req = webob.Request.blank('/v2/fake/os-keypairs') req.method = 'POST' req.body = json.dumps(body) req.headers['Content-Type'] = 'application/json' @@ -96,7 +96,7 @@ class KeypairsTest(test.TestCase): }, } - req = webob.Request.blank('/v2/123/os-keypairs') + req = webob.Request.blank('/v2/fake/os-keypairs') req.method = 'POST' req.body = json.dumps(body) req.headers['Content-Type'] = 'application/json' @@ -108,7 +108,7 @@ class KeypairsTest(test.TestCase): self.assertFalse('private_key' in res_dict['keypair']) def test_keypair_delete(self): - req = webob.Request.blank('/v2/123/os-keypairs/FAKE') + req = webob.Request.blank('/v2/fake/os-keypairs/FAKE') req.method = 'DELETE' req.headers['Content-Type'] = 'application/json' res = req.get_response(fakes.wsgi_app()) diff --git a/nova/tests/api/openstack/v2/contrib/test_multinic_xs.py b/nova/tests/api/openstack/v2/contrib/test_multinic_xs.py index 3ac5a6b..0d9b6e3 100644 --- a/nova/tests/api/openstack/v2/contrib/test_multinic_xs.py +++ b/nova/tests/api/openstack/v2/contrib/test_multinic_xs.py @@ -61,7 +61,7 @@ class FixedIpTest(test.TestCase): last_add_fixed_ip = (None, None) body = dict(addFixedIp=dict(networkId='test_net')) - req = webob.Request.blank('/v2/123/servers/%s/action' % UUID) + req = webob.Request.blank('/v2/fake/servers/%s/action' % UUID) req.method = 'POST' req.body = json.dumps(body) req.headers['content-type'] = 'application/json' @@ -75,7 +75,7 @@ class FixedIpTest(test.TestCase): last_add_fixed_ip = (None, None) body = dict(addFixedIp=dict()) - req = webob.Request.blank('/v2/123/servers/%s/action' % UUID) + req = webob.Request.blank('/v2/fake/servers/%s/action' % UUID) req.method = 'POST' req.body = json.dumps(body) req.headers['content-type'] = 'application/json' @@ -89,7 +89,7 @@ class FixedIpTest(test.TestCase): last_remove_fixed_ip = (None, None) body = dict(removeFixedIp=dict(address='10.10.10.1')) - req = webob.Request.blank('/v2/123/servers/%s/action' % UUID) + req = webob.Request.blank('/v2/fake/servers/%s/action' % UUID) req.method = 'POST' req.body = json.dumps(body) req.headers['content-type'] = 'application/json' @@ -103,7 +103,7 @@ class FixedIpTest(test.TestCase): last_remove_fixed_ip = (None, None) body = dict(removeFixedIp=dict()) - req = webob.Request.blank('/v2/123/servers/%s/action' % UUID) + req = webob.Request.blank('/v2/fake/servers/%s/action' % UUID) req.method = 'POST' req.body = json.dumps(body) req.headers['content-type'] = 'application/json' diff --git a/nova/tests/api/openstack/v2/contrib/test_quotas.py b/nova/tests/api/openstack/v2/contrib/test_quotas.py index 104f44a..dc86490 100644 --- a/nova/tests/api/openstack/v2/contrib/test_quotas.py +++ b/nova/tests/api/openstack/v2/contrib/test_quotas.py @@ -98,14 +98,14 @@ class QuotaSetsTest(test.TestCase): self.assertEqual(res_dict, expected) def test_quotas_show_as_admin(self): - req = fakes.HTTPRequest.blank('/v2/1234/os-quota-sets/1234', + req = fakes.HTTPRequest.blank('/v2/fake4/os-quota-sets/1234', use_admin_context=True) res_dict = self.controller.show(req, 1234) self.assertEqual(res_dict, quota_set('1234')) def test_quotas_show_as_unauthorized_user(self): - req = fakes.HTTPRequest.blank('/v2/1234/os-quota-sets/1234') + req = fakes.HTTPRequest.blank('/v2/fake4/os-quota-sets/1234') self.assertRaises(webob.exc.HTTPForbidden, self.controller.show, req, 1234) @@ -116,7 +116,7 @@ class QuotaSetsTest(test.TestCase): 'metadata_items': 128, 'injected_files': 5, 'injected_file_content_bytes': 10240}} - req = fakes.HTTPRequest.blank('/v2/1234/os-quota-sets/update_me', + req = fakes.HTTPRequest.blank('/v2/fake4/os-quota-sets/update_me', use_admin_context=True) res_dict = self.controller.update(req, 'update_me', body) @@ -129,7 +129,7 @@ class QuotaSetsTest(test.TestCase): 'metadata_items': 128, 'injected_files': 5, 'injected_file_content_bytes': 10240}} - req = fakes.HTTPRequest.blank('/v2/1234/os-quota-sets/update_me') + req = fakes.HTTPRequest.blank('/v2/fake4/os-quota-sets/update_me') self.assertRaises(webob.exc.HTTPForbidden, self.controller.update, req, 'update_me', body) diff --git a/nova/tests/api/openstack/v2/contrib/test_rescue.py b/nova/tests/api/openstack/v2/contrib/test_rescue.py index ade5939..9a37061 100644 --- a/nova/tests/api/openstack/v2/contrib/test_rescue.py +++ b/nova/tests/api/openstack/v2/contrib/test_rescue.py @@ -46,7 +46,7 @@ class RescueTest(test.TestCase): def test_rescue_with_preset_password(self): body = {"rescue": {"adminPass": "AABBCC112233"}} - req = webob.Request.blank('/v2/123/servers/test_inst/action') + req = webob.Request.blank('/v2/fake/servers/test_inst/action') req.method = "POST" req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -58,7 +58,7 @@ class RescueTest(test.TestCase): def test_rescue_generates_password(self): body = dict(rescue=None) - req = webob.Request.blank('/v2/123/servers/test_inst/action') + req = webob.Request.blank('/v2/fake/servers/test_inst/action') req.method = "POST" req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -70,7 +70,7 @@ class RescueTest(test.TestCase): def test_unrescue(self): body = dict(unrescue=None) - req = webob.Request.blank('/v2/123/servers/test_inst/action') + req = webob.Request.blank('/v2/fake/servers/test_inst/action') req.method = "POST" req.body = json.dumps(body) req.headers["content-type"] = "application/json" diff --git a/nova/tests/api/openstack/v2/contrib/test_security_groups.py b/nova/tests/api/openstack/v2/contrib/test_security_groups.py index b4ef608..f8d984a 100644 --- a/nova/tests/api/openstack/v2/contrib/test_security_groups.py +++ b/nova/tests/api/openstack/v2/contrib/test_security_groups.py @@ -124,7 +124,7 @@ class TestSecurityGroups(test.TestCase): def test_create_security_group(self): sg = security_group_template() - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') res_dict = self.controller.create(req, {'security_group': sg}) self.assertEqual(res_dict['security_group']['name'], 'test') self.assertEqual(res_dict['security_group']['description'], @@ -134,7 +134,7 @@ class TestSecurityGroups(test.TestCase): sg = security_group_template() del sg['name'] - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPUnprocessableEntity, self.controller.create, req, sg) @@ -142,35 +142,35 @@ class TestSecurityGroups(test.TestCase): sg = security_group_template() del sg['description'] - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) def test_create_security_group_with_blank_name(self): sg = security_group_template(name='') - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) def test_create_security_group_with_whitespace_name(self): sg = security_group_template(name=' ') - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) def test_create_security_group_with_blank_description(self): sg = security_group_template(description='') - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) def test_create_security_group_with_whitespace_description(self): sg = security_group_template(description=' ') - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) @@ -178,50 +178,50 @@ class TestSecurityGroups(test.TestCase): sg = security_group_template() # FIXME: Stub out _get instead of creating twice - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.controller.create(req, {'security_group': sg}) - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) def test_create_security_group_with_no_body(self): - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPUnprocessableEntity, self.controller.create, req, None) def test_create_security_group_with_no_security_group(self): body = {'no-securityGroup': None} - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPUnprocessableEntity, self.controller.create, req, body) def test_create_security_group_above_255_characters_name(self): sg = security_group_template(name='1234567890' * 26) - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) def test_create_security_group_above_255_characters_description(self): sg = security_group_template(description='1234567890' * 26) - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) def test_create_security_group_non_string_name(self): sg = security_group_template(name=12) - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) def test_create_security_group_non_string_description(self): sg = security_group_template(description=12) - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group': sg}) @@ -241,7 +241,7 @@ class TestSecurityGroups(test.TestCase): self.stubs.Set(nova.db, 'security_group_get_by_project', return_security_groups) - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups') res_dict = self.controller.index(req) self.assertEquals(res_dict, expected) @@ -256,19 +256,19 @@ class TestSecurityGroups(test.TestCase): self.stubs.Set(nova.db, 'security_group_get', return_security_group) - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups/2') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups/2') res_dict = self.controller.show(req, '2') expected = {'security_group': sg} self.assertEquals(res_dict, expected) def test_get_security_group_by_invalid_id(self): - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups/invalid') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups/invalid') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.delete, req, 'invalid') def test_get_security_group_by_non_existing_id(self): - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups/111111111') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups/111111111') self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete, req, '111111111') @@ -289,32 +289,32 @@ class TestSecurityGroups(test.TestCase): self.stubs.Set(nova.db, 'security_group_get', return_security_group) - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups/1') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups/1') self.controller.delete(req, '1') self.assertTrue(self.called) def test_delete_security_group_by_invalid_id(self): - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups/invalid') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups/invalid') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.delete, req, 'invalid') def test_delete_security_group_by_non_existing_id(self): - req = fakes.HTTPRequest.blank('/v2/123/os-security-groups/11111111') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-groups/11111111') self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete, req, '11111111') def test_associate_by_non_existing_security_group_name(self): body = dict(addSecurityGroup=dict(name='non-existing')) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPNotFound, self.manager._addSecurityGroup, body, req, '1') def test_associate_by_invalid_server_id(self): body = dict(addSecurityGroup=dict(name='test')) - req = fakes.HTTPRequest.blank('/v2/123/servers/invalid/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/invalid/action') self.assertRaises(webob.exc.HTTPNotFound, self.manager._addSecurityGroup, body, req, 'invalid') @@ -322,7 +322,7 @@ class TestSecurityGroups(test.TestCase): self.stubs.Set(nova.db, 'instance_get', return_server) body = dict(addSecurityGroup=None) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._addSecurityGroup, body, req, '1') @@ -330,7 +330,7 @@ class TestSecurityGroups(test.TestCase): self.stubs.Set(nova.db, 'instance_get', return_server) body = dict(addSecurityGroup=dict()) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._addSecurityGroup, body, req, '1') @@ -338,7 +338,7 @@ class TestSecurityGroups(test.TestCase): self.stubs.Set(nova.db, 'instance_get', return_server) body = dict(addSecurityGroup=dict(name=" ")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._addSecurityGroup, body, req, '1') @@ -348,7 +348,7 @@ class TestSecurityGroups(test.TestCase): return_server_nonexistent) body = dict(addSecurityGroup=dict(name="test")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPNotFound, self.manager._addSecurityGroup, body, req, '1') @@ -360,7 +360,7 @@ class TestSecurityGroups(test.TestCase): return_security_group_without_instances) body = dict(addSecurityGroup=dict(name="test")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._addSecurityGroup, body, req, '1') @@ -372,7 +372,7 @@ class TestSecurityGroups(test.TestCase): return_security_group_by_name) body = dict(addSecurityGroup=dict(name="test")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._addSecurityGroup, body, req, '1') @@ -390,13 +390,13 @@ class TestSecurityGroups(test.TestCase): body = dict(addSecurityGroup=dict(name="test")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.manager._addSecurityGroup(body, req, '1') def test_disassociate_by_non_existing_security_group_name(self): body = dict(removeSecurityGroup=dict(name='non-existing')) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPNotFound, self.manager._removeSecurityGroup, body, req, '1') @@ -405,7 +405,7 @@ class TestSecurityGroups(test.TestCase): return_security_group_by_name) body = dict(removeSecurityGroup=dict(name='test')) - req = fakes.HTTPRequest.blank('/v2/123/servers/invalid/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/invalid/action') self.assertRaises(webob.exc.HTTPNotFound, self.manager._removeSecurityGroup, body, req, 'invalid') @@ -414,7 +414,7 @@ class TestSecurityGroups(test.TestCase): self.stubs.Set(nova.db, 'instance_get', return_server) body = dict(removeSecurityGroup=None) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._removeSecurityGroup, body, req, '1') @@ -422,7 +422,7 @@ class TestSecurityGroups(test.TestCase): self.stubs.Set(nova.db, 'instance_get', return_server) body = dict(removeSecurityGroup=dict()) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._removeSecurityGroup, body, req, '1') @@ -430,7 +430,7 @@ class TestSecurityGroups(test.TestCase): self.stubs.Set(nova.db, 'instance_get', return_server) body = dict(removeSecurityGroup=dict(name=" ")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._removeSecurityGroup, body, req, '1') @@ -440,7 +440,7 @@ class TestSecurityGroups(test.TestCase): return_security_group_by_name) body = dict(removeSecurityGroup=dict(name="test")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPNotFound, self.manager._removeSecurityGroup, body, req, '1') @@ -452,7 +452,7 @@ class TestSecurityGroups(test.TestCase): return_security_group_by_name) body = dict(removeSecurityGroup=dict(name="test")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._removeSecurityGroup, body, req, '1') @@ -464,7 +464,7 @@ class TestSecurityGroups(test.TestCase): return_security_group_without_instances) body = dict(removeSecurityGroup=dict(name="test")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.assertRaises(webob.exc.HTTPBadRequest, self.manager._removeSecurityGroup, body, req, '1') @@ -482,7 +482,7 @@ class TestSecurityGroups(test.TestCase): body = dict(removeSecurityGroup=dict(name="test")) - req = fakes.HTTPRequest.blank('/v2/123/servers/1/action') + req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action') self.manager._removeSecurityGroup(body, req, '1') @@ -517,7 +517,7 @@ class TestSecurityGroupRules(test.TestCase): def test_create_by_cidr(self): rule = security_group_rule_template(cidr='10.2.3.124/24') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') res_dict = self.controller.create(req, {'security_group_rule': rule}) security_group_rule = res_dict['security_group_rule'] @@ -529,7 +529,7 @@ class TestSecurityGroupRules(test.TestCase): def test_create_by_group_id(self): rule = security_group_rule_template(group_id='1') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') res_dict = self.controller.create(req, {'security_group_rule': rule}) security_group_rule = res_dict['security_group_rule'] @@ -550,7 +550,7 @@ class TestSecurityGroupRules(test.TestCase): to_port=22, parent_group_id=2, cidr="10.2.3.124/2433") - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -562,7 +562,7 @@ class TestSecurityGroupRules(test.TestCase): parent_group_id=2, cidr="10.2.3.124/24") - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -573,7 +573,7 @@ class TestSecurityGroupRules(test.TestCase): to_port=256, parent_group_id=2, cidr="10.2.3.124/24") - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -582,25 +582,25 @@ class TestSecurityGroupRules(test.TestCase): self.parent_security_group['rules'] = [security_group_rule_db(rule)] - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) def test_create_with_no_body(self): - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPUnprocessableEntity, self.controller.create, req, None) def test_create_with_no_security_group_rule_in_body(self): rules = {'test': 'test'} - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPUnprocessableEntity, self.controller.create, req, rules) def test_create_with_invalid_parent_group_id(self): rule = security_group_rule_template(parent_group_id='invalid') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -608,7 +608,7 @@ class TestSecurityGroupRules(test.TestCase): rule = security_group_rule_template(group_id='invalid', parent_group_id='1111111111111') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPNotFound, self.controller.create, req, {'security_group_rule': rule}) @@ -616,7 +616,7 @@ class TestSecurityGroupRules(test.TestCase): rule = security_group_rule_template(ip_protocol='invalid-protocol', cidr='10.2.2.0/24') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -624,7 +624,7 @@ class TestSecurityGroupRules(test.TestCase): rule = security_group_rule_template(cidr='10.2.2.0/24') del rule['ip_protocol'] - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -632,7 +632,7 @@ class TestSecurityGroupRules(test.TestCase): rule = security_group_rule_template(from_port='666666', cidr='10.2.2.0/24') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -640,7 +640,7 @@ class TestSecurityGroupRules(test.TestCase): rule = security_group_rule_template(to_port='666666', cidr='10.2.2.0/24') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -648,7 +648,7 @@ class TestSecurityGroupRules(test.TestCase): rule = security_group_rule_template(from_port='invalid', cidr='10.2.2.0/24') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -656,7 +656,7 @@ class TestSecurityGroupRules(test.TestCase): rule = security_group_rule_template(to_port='invalid', cidr='10.2.2.0/24') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -664,7 +664,7 @@ class TestSecurityGroupRules(test.TestCase): rule = security_group_rule_template(cidr='10.2.2.0/24') del rule['from_port'] - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -672,21 +672,21 @@ class TestSecurityGroupRules(test.TestCase): rule = security_group_rule_template(cidr='10.2.2.0/24') del rule['to_port'] - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) def test_create_with_invalid_cidr(self): rule = security_group_rule_template(cidr='10.2.2222.0/24') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) def test_create_with_no_cidr_group(self): rule = security_group_rule_template() - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') res_dict = self.controller.create(req, {'security_group_rule': rule}) security_group_rule = res_dict['security_group_rule'] @@ -699,28 +699,28 @@ class TestSecurityGroupRules(test.TestCase): def test_create_with_invalid_group_id(self): rule = security_group_rule_template(group_id='invalid') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) def test_create_with_empty_group_id(self): rule = security_group_rule_template(group_id='') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) def test_create_with_nonexist_group_id(self): rule = security_group_rule_template(group_id='222222') - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) def test_create_rule_with_same_group_parent_id(self): rule = security_group_rule_template(group_id=2) - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, req, {'security_group_rule': rule}) @@ -738,17 +738,17 @@ class TestSecurityGroupRules(test.TestCase): self.stubs.Set(nova.db, 'security_group_rule_destroy', security_group_rule_destroy) - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules/10') + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules/10') self.controller.delete(req, '10') def test_delete_invalid_rule_id(self): - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules' + + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules' + '/invalid') self.assertRaises(webob.exc.HTTPBadRequest, self.controller.delete, req, 'invalid') def test_delete_non_existing_rule_id(self): - req = fakes.HTTPRequest.blank('/v2/123/os-security-group-rules' + + req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules' + '/22222222222222') self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete, req, '22222222222222') diff --git a/nova/tests/api/openstack/v2/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/v2/contrib/test_simple_tenant_usage.py index 5d36518..54d7221 100644 --- a/nova/tests/api/openstack/v2/contrib/test_simple_tenant_usage.py +++ b/nova/tests/api/openstack/v2/contrib/test_simple_tenant_usage.py @@ -90,7 +90,7 @@ class SimpleTenantUsageTest(test.TestCase): def test_verify_index(self): req = webob.Request.blank( - '/v2/123/os-simple-tenant-usage?start=%s&end=%s' % + '/v2/faketenant_0/os-simple-tenant-usage?start=%s&end=%s' % (START.isoformat(), STOP.isoformat())) req.method = "GET" req.headers["content-type"] = "application/json" @@ -116,7 +116,7 @@ class SimpleTenantUsageTest(test.TestCase): def test_verify_detailed_index(self): req = webob.Request.blank( - '/v2/123/os-simple-tenant-usage?' + '/v2/faketenant_0/os-simple-tenant-usage?' 'detailed=1&start=%s&end=%s' % (START.isoformat(), STOP.isoformat())) req.method = "GET" @@ -134,13 +134,14 @@ class SimpleTenantUsageTest(test.TestCase): def test_verify_index_fails_for_nonadmin(self): req = webob.Request.blank( - '/v2/123/os-simple-tenant-usage?' + '/v2/faketenant_0/os-simple-tenant-usage?' 'detailed=1&start=%s&end=%s' % (START.isoformat(), STOP.isoformat())) req.method = "GET" req.headers["content-type"] = "application/json" - res = req.get_response(fakes.wsgi_app()) + res = req.get_response(fakes.wsgi_app( + fake_auth_context=self.user_context)) self.assertEqual(res.status_int, 403) def test_verify_show(self): diff --git a/nova/tests/api/openstack/v2/contrib/test_snapshots.py b/nova/tests/api/openstack/v2/contrib/test_snapshots.py index a04c9b7..6d65bcd 100644 --- a/nova/tests/api/openstack/v2/contrib/test_snapshots.py +++ b/nova/tests/api/openstack/v2/contrib/test_snapshots.py @@ -121,7 +121,7 @@ class SnapshotApiTest(test.TestCase): "display_name": "Snapshot Test Name", "display_description": "Snapshot Test Desc"} body = dict(snapshot=snapshot) - req = webob.Request.blank('/v1.1/777/os-snapshots') + req = webob.Request.blank('/v2/fake/os-snapshots') req.method = 'POST' req.body = json.dumps(body) req.headers['content-type'] = 'application/json' @@ -152,7 +152,7 @@ class SnapshotApiTest(test.TestCase): "display_name": "Snapshot Test Name", "display_description": "Snapshot Test Desc"} body = dict(snapshot=snapshot) - req = webob.Request.blank('/v1.1/777/os-snapshots') + req = webob.Request.blank('/v2/fake/os-snapshots') req.method = 'POST' req.body = json.dumps(body) req.headers['content-type'] = 'application/json' @@ -179,7 +179,7 @@ class SnapshotApiTest(test.TestCase): _last_param = {} snapshot_id = 123 - req = webob.Request.blank('/v1.1/777/os-snapshots/%d' % snapshot_id) + req = webob.Request.blank('/v2/fake/os-snapshots/%d' % snapshot_id) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) @@ -191,7 +191,7 @@ class SnapshotApiTest(test.TestCase): _last_param = {} snapshot_id = 234 - req = webob.Request.blank('/v1.1/777/os-snapshots/%d' % snapshot_id) + req = webob.Request.blank('/v2/fake/os-snapshots/%d' % snapshot_id) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) @@ -203,7 +203,7 @@ class SnapshotApiTest(test.TestCase): _last_param = {} snapshot_id = 123 - req = webob.Request.blank('/v1.1/777/os-snapshots/%d' % snapshot_id) + req = webob.Request.blank('/v2/fake/os-snapshots/%d' % snapshot_id) req.method = 'GET' resp = req.get_response(fakes.wsgi_app()) @@ -220,14 +220,14 @@ class SnapshotApiTest(test.TestCase): _last_param = {} snapshot_id = 234 - req = webob.Request.blank('/v1.1/777/os-snapshots/%d' % snapshot_id) + req = webob.Request.blank('/v2/fake/os-snapshots/%d' % snapshot_id) req.method = 'GET' resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 404) self.assertEqual(str(_last_param['snapshot_id']), str(snapshot_id)) def test_snapshot_detail(self): - req = webob.Request.blank('/v1.1/777/os-snapshots/detail') + req = webob.Request.blank('/v2/fake/os-snapshots/detail') req.method = 'GET' resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 200) diff --git a/nova/tests/api/openstack/v2/contrib/test_virtual_interfaces.py b/nova/tests/api/openstack/v2/contrib/test_virtual_interfaces.py index 47f085b..fe98d04 100644 --- a/nova/tests/api/openstack/v2/contrib/test_virtual_interfaces.py +++ b/nova/tests/api/openstack/v2/contrib/test_virtual_interfaces.py @@ -44,7 +44,7 @@ class ServerVirtualInterfaceTest(test.TestCase): super(ServerVirtualInterfaceTest, self).tearDown() def test_get_virtual_interfaces_list(self): - url = '/v2/123/servers/abcd/os-virtual-interfaces' + url = '/v2/fake/servers/abcd/os-virtual-interfaces' req = webob.Request.blank(url) res = req.get_response(fakes.wsgi_app()) self.assertEqual(res.status_int, 200) diff --git a/nova/tests/api/openstack/v2/contrib/test_volume_types.py b/nova/tests/api/openstack/v2/contrib/test_volume_types.py index 4343a6d..89287b1 100644 --- a/nova/tests/api/openstack/v2/contrib/test_volume_types.py +++ b/nova/tests/api/openstack/v2/contrib/test_volume_types.py @@ -86,7 +86,7 @@ class VolumeTypesApiTest(test.TestCase): self.stubs.Set(volume_types, 'get_all_types', return_volume_types_get_all_types) - req = fakes.HTTPRequest.blank('/v2/123/os-volume-types') + req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types') res_dict = self.controller.index(req) self.assertEqual(3, len(res_dict)) @@ -98,7 +98,7 @@ class VolumeTypesApiTest(test.TestCase): self.stubs.Set(volume_types, 'get_all_types', return_empty_volume_types_get_all_types) - req = fakes.HTTPRequest.blank('/v2/123/os-volume-types') + req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types') res_dict = self.controller.index(req) self.assertEqual(0, len(res_dict)) @@ -107,7 +107,7 @@ class VolumeTypesApiTest(test.TestCase): self.stubs.Set(volume_types, 'get_volume_type', return_volume_types_get_volume_type) - req = fakes.HTTPRequest.blank('/v2/123/os-volume-types/1') + req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types/1') res_dict = self.controller.show(req, 1) self.assertEqual(1, len(res_dict)) @@ -117,7 +117,7 @@ class VolumeTypesApiTest(test.TestCase): self.stubs.Set(volume_types, 'get_volume_type', return_volume_types_get_volume_type) - req = fakes.HTTPRequest.blank('/v2/123/os-volume-types/777') + req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types/777') self.assertRaises(webob.exc.HTTPNotFound, self.controller.show, req, '777') @@ -127,7 +127,7 @@ class VolumeTypesApiTest(test.TestCase): self.stubs.Set(volume_types, 'destroy', return_volume_types_destroy) - req = fakes.HTTPRequest.blank('/v2/123/os-volume-types/1') + req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types/1') self.controller.delete(req, 1) def test_volume_types_delete_not_found(self): @@ -136,7 +136,7 @@ class VolumeTypesApiTest(test.TestCase): self.stubs.Set(volume_types, 'destroy', return_volume_types_destroy) - req = fakes.HTTPRequest.blank('/v2/123/os-volume-types/777') + req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types/777') self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete, req, '777') @@ -148,7 +148,7 @@ class VolumeTypesApiTest(test.TestCase): body = {"volume_type": {"name": "vol_type_1", "extra_specs": {"key1": "value1"}}} - req = fakes.HTTPRequest.blank('/v2/123/os-volume-types') + req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types') res_dict = self.controller.create(req, body) self.assertEqual(1, len(res_dict)) @@ -160,7 +160,7 @@ class VolumeTypesApiTest(test.TestCase): self.stubs.Set(volume_types, 'get_volume_type_by_name', return_volume_types_get_by_name) - req = fakes.HTTPRequest.blank('/v2/123/os-volume-types') + req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types') self.assertRaises(webob.exc.HTTPUnprocessableEntity, self.controller.create, req, '') diff --git a/nova/tests/api/openstack/v2/contrib/test_volume_types_extra_specs.py b/nova/tests/api/openstack/v2/contrib/test_volume_types_extra_specs.py index 41b5011..caa6368 100644 --- a/nova/tests/api/openstack/v2/contrib/test_volume_types_extra_specs.py +++ b/nova/tests/api/openstack/v2/contrib/test_volume_types_extra_specs.py @@ -58,7 +58,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): def setUp(self): super(VolumeTypesExtraSpecsTest, self).setUp() fakes.stub_out_key_pair_funcs(self.stubs) - self.api_path = '/v2/123/os-volume-types/1/extra_specs' + self.api_path = '/v2/fake/os-volume-types/1/extra_specs' self.controller = volumetypes.VolumeTypeExtraSpecsController() def test_index(self): diff --git a/nova/tests/api/openstack/v2/contrib/test_vsa.py b/nova/tests/api/openstack/v2/contrib/test_vsa.py index d48803b..c7c26bd 100644 --- a/nova/tests/api/openstack/v2/contrib/test_vsa.py +++ b/nova/tests/api/openstack/v2/contrib/test_vsa.py @@ -119,7 +119,7 @@ class VSAApiTest(test.TestCase): vsa = {"displayName": "VSA Test Name", "displayDescription": "VSA Test Desc"} body = dict(vsa=vsa) - req = webob.Request.blank('/v2/777/zadr-vsa') + req = webob.Request.blank('/v2/fake/zadr-vsa') req.method = 'POST' req.body = json.dumps(body) req.headers['content-type'] = 'application/json' @@ -138,7 +138,7 @@ class VSAApiTest(test.TestCase): vsa['displayDescription']) def test_vsa_create_no_body(self): - req = webob.Request.blank('/v2/777/zadr-vsa') + req = webob.Request.blank('/v2/fake/zadr-vsa') req.method = 'POST' req.body = json.dumps({}) req.headers['content-type'] = 'application/json' @@ -151,7 +151,7 @@ class VSAApiTest(test.TestCase): last_param = {} vsa_id = 123 - req = webob.Request.blank('/v2/777/zadr-vsa/%d' % vsa_id) + req = webob.Request.blank('/v2/fake/zadr-vsa/%d' % vsa_id) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) @@ -163,7 +163,7 @@ class VSAApiTest(test.TestCase): last_param = {} vsa_id = 234 - req = webob.Request.blank('/v2/777/zadr-vsa/%d' % vsa_id) + req = webob.Request.blank('/v2/fake/zadr-vsa/%d' % vsa_id) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) @@ -175,7 +175,7 @@ class VSAApiTest(test.TestCase): last_param = {} vsa_id = 123 - req = webob.Request.blank('/v2/777/zadr-vsa/%d' % vsa_id) + req = webob.Request.blank('/v2/fake/zadr-vsa/%d' % vsa_id) req.method = 'GET' resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 200) @@ -190,14 +190,14 @@ class VSAApiTest(test.TestCase): last_param = {} vsa_id = 234 - req = webob.Request.blank('/v2/777/zadr-vsa/%d' % vsa_id) + req = webob.Request.blank('/v2/fake/zadr-vsa/%d' % vsa_id) req.method = 'GET' resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 404) self.assertEqual(str(last_param['vsa_id']), str(vsa_id)) def test_vsa_index(self): - req = webob.Request.blank('/v2/777/zadr-vsa') + req = webob.Request.blank('/v2/fake/zadr-vsa') req.method = 'GET' resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 200) @@ -212,7 +212,7 @@ class VSAApiTest(test.TestCase): self.assertEqual(resp_vsa['id'], 123) def test_vsa_detail(self): - req = webob.Request.blank('/v2/777/zadr-vsa/detail') + req = webob.Request.blank('/v2/fake/zadr-vsa/detail') req.method = 'GET' resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 200) @@ -330,7 +330,7 @@ class VSAVolumeApiTest(test.TestCase): "displayName": "VSA Volume Test Name", "displayDescription": "VSA Volume Test Desc"} body = {self.test_obj: vol} - req = webob.Request.blank('/v2/777/zadr-vsa/123/%s' % self.test_objs) + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s' % self.test_objs) req.method = 'POST' req.body = json.dumps(body) req.headers['content-type'] = 'application/json' @@ -351,7 +351,7 @@ class VSAVolumeApiTest(test.TestCase): self.assertEqual(resp.status_int, 400) def test_vsa_volume_create_no_body(self): - req = webob.Request.blank('/v2/777/zadr-vsa/123/%s' % self.test_objs) + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s' % self.test_objs) req.method = 'POST' req.body = json.dumps({}) req.headers['content-type'] = 'application/json' @@ -363,25 +363,25 @@ class VSAVolumeApiTest(test.TestCase): self.assertEqual(resp.status_int, 400) def test_vsa_volume_index(self): - req = webob.Request.blank('/v2/777/zadr-vsa/123/%s' % self.test_objs) + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s' % self.test_objs) resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 200) def test_vsa_volume_detail(self): - req = webob.Request.blank('/v2/777/zadr-vsa/123/%s/detail' % \ + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/detail' % \ self.test_objs) resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 200) def test_vsa_volume_show(self): obj_num = 234 if self.test_objs == "volumes" else 345 - req = webob.Request.blank('/v2/777/zadr-vsa/123/%s/%s' % \ + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/%s' % \ (self.test_objs, obj_num)) resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 200) def test_vsa_volume_show_no_vsa_assignment(self): - req = webob.Request.blank('/v2/777/zadr-vsa/4/%s/333' % \ + req = webob.Request.blank('/v2/fake/zadr-vsa/4/%s/333' % \ (self.test_objs)) resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 400) @@ -389,7 +389,7 @@ class VSAVolumeApiTest(test.TestCase): def test_vsa_volume_show_no_volume(self): self.stubs.Set(volume.api.API, "get", stub_volume_get_notfound) - req = webob.Request.blank('/v2/777/zadr-vsa/123/%s/333' % \ + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/333' % \ (self.test_objs)) resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 404) @@ -399,7 +399,7 @@ class VSAVolumeApiTest(test.TestCase): update = {"status": "available", "displayName": "Test Display name"} body = {self.test_obj: update} - req = webob.Request.blank('/v2/777/zadr-vsa/123/%s/%s' % \ + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/%s' % \ (self.test_objs, obj_num)) req.method = 'PUT' req.body = json.dumps(body) @@ -413,7 +413,7 @@ class VSAVolumeApiTest(test.TestCase): def test_vsa_volume_delete(self): obj_num = 234 if self.test_objs == "volumes" else 345 - req = webob.Request.blank('/v2/777/zadr-vsa/123/%s/%s' % \ + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/%s' % \ (self.test_objs, obj_num)) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) @@ -423,7 +423,7 @@ class VSAVolumeApiTest(test.TestCase): self.assertEqual(resp.status_int, 400) def test_vsa_volume_delete_no_vsa_assignment(self): - req = webob.Request.blank('/v2/777/zadr-vsa/4/%s/333' % \ + req = webob.Request.blank('/v2/fake/zadr-vsa/4/%s/333' % \ (self.test_objs)) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) @@ -432,7 +432,7 @@ class VSAVolumeApiTest(test.TestCase): def test_vsa_volume_delete_no_volume(self): self.stubs.Set(volume.api.API, "get", stub_volume_get_notfound) - req = webob.Request.blank('/v2/777/zadr-vsa/123/%s/333' % \ + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/333' % \ (self.test_objs)) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) diff --git a/nova/tests/api/openstack/v2/test_extensions.py b/nova/tests/api/openstack/v2/test_extensions.py index 51af89d..8a63130 100644 --- a/nova/tests/api/openstack/v2/test_extensions.py +++ b/nova/tests/api/openstack/v2/test_extensions.py @@ -133,7 +133,7 @@ class ExtensionControllerTest(ExtensionTestCase): app = v2.APIRouter() ext_midware = extensions.ExtensionMiddleware(app) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/123/extensions") + request = webob.Request.blank("/fake/extensions") response = request.get_response(ser_midware) self.assertEqual(200, response.status_int) @@ -160,7 +160,7 @@ class ExtensionControllerTest(ExtensionTestCase): app = v2.APIRouter() ext_midware = extensions.ExtensionMiddleware(app) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/123/extensions/FOXNSOX") + request = webob.Request.blank("/fake/extensions/FOXNSOX") response = request.get_response(ser_midware) self.assertEqual(200, response.status_int) @@ -176,7 +176,7 @@ class ExtensionControllerTest(ExtensionTestCase): def test_get_non_existing_extension_json(self): app = v2.APIRouter() ext_midware = extensions.ExtensionMiddleware(app) - request = webob.Request.blank("/123/extensions/4") + request = webob.Request.blank("/fake/extensions/4") response = request.get_response(ext_midware) self.assertEqual(404, response.status_int) @@ -184,7 +184,7 @@ class ExtensionControllerTest(ExtensionTestCase): app = v2.APIRouter() ext_midware = extensions.ExtensionMiddleware(app) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/123/extensions") + request = webob.Request.blank("/fake/extensions") request.accept = "application/xml" response = request.get_response(ser_midware) self.assertEqual(200, response.status_int) @@ -212,7 +212,7 @@ class ExtensionControllerTest(ExtensionTestCase): app = v2.APIRouter() ext_midware = extensions.ExtensionMiddleware(app) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/123/extensions/FOXNSOX") + request = webob.Request.blank("/fake/extensions/FOXNSOX") request.accept = "application/xml" response = request.get_response(ser_midware) self.assertEqual(200, response.status_int) @@ -250,7 +250,7 @@ class ResourceExtensionTest(ExtensionTestCase): app = v2.APIRouter(manager) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/123/tweedles") + request = webob.Request.blank("/fake/tweedles") response = request.get_response(ser_midware) self.assertEqual(200, response.status_int) self.assertEqual(response_body, response.body) @@ -262,7 +262,7 @@ class ResourceExtensionTest(ExtensionTestCase): app = v2.APIRouter(manager) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/123/tweedles") + request = webob.Request.blank("/fake/tweedles") response = request.get_response(ser_midware) self.assertEqual(200, response.status_int) self.assertEqual(response_body, response.body) @@ -274,7 +274,7 @@ class ResourceExtensionTest(ExtensionTestCase): app = v2.APIRouter(manager) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/123/tweedles") + request = webob.Request.blank("/fake/tweedles") request.method = "POST" response = request.get_response(ser_midware) self.assertEqual(400, response.status_int) @@ -295,7 +295,7 @@ class ResourceExtensionTest(ExtensionTestCase): app = v2.APIRouter(manager) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/123/tweedles/1") + request = webob.Request.blank("/fake/tweedles/1") response = request.get_response(ser_midware) self.assertEqual(404, response.status_int) self.assertEqual('application/json', response.content_type) @@ -335,7 +335,7 @@ class ExtensionManagerTest(ExtensionTestCase): app = v2.APIRouter() ext_midware = extensions.ExtensionMiddleware(app) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/123/foxnsocks") + request = webob.Request.blank("/fake/foxnsocks") response = request.get_response(ser_midware) self.assertEqual(200, response.status_int) self.assertEqual(response_body, response.body) @@ -384,7 +384,7 @@ class ActionExtensionTest(ExtensionTestCase): def test_extended_action(self): body = dict(add_tweedle=dict(name="test")) - url = "/123/servers/abcd/action" + url = "/fake/servers/abcd/action" response = self._send_server_action_request(url, body) self.assertEqual(200, response.status_int) self.assertEqual("Tweedle Beetle Added.", response.body) @@ -396,7 +396,7 @@ class ActionExtensionTest(ExtensionTestCase): def test_invalid_action(self): body = dict(blah=dict(name="test")) # Doesn't exist - url = "/123/servers/abcd/action" + url = "/fake/servers/abcd/action" response = self._send_server_action_request(url, body) self.assertEqual(400, response.status_int) self.assertEqual('application/json', response.content_type) @@ -411,13 +411,13 @@ class ActionExtensionTest(ExtensionTestCase): def test_non_exist_action(self): body = dict(blah=dict(name="test")) - url = "/123/fdsa/1/action" + url = "/fake/fdsa/1/action" response = self._send_server_action_request(url, body) self.assertEqual(404, response.status_int) def test_failed_action(self): body = dict(fail=dict(name="test")) - url = "/123/servers/abcd/action" + url = "/fake/servers/abcd/action" response = self._send_server_action_request(url, body) self.assertEqual(400, response.status_int) self.assertEqual('application/json', response.content_type) @@ -441,14 +441,14 @@ class RequestExtensionTest(ExtensionTestCase): return res req_ext = extensions.RequestExtension('GET', - '/v2/123/flavors/:(id)', + '/v2/fake/flavors/:(id)', _req_handler) manager = StubExtensionManager(None, None, req_ext) app = fakes.wsgi_app(serialization=base_wsgi.Middleware) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/v2/123/flavors/1?chewing=bluegoo") + request = webob.Request.blank("/v2/fake/flavors/1?chewing=bluegoo") request.environ['api.version'] = '2' response = request.get_response(ser_midware) self.assertEqual(200, response.status_int) @@ -460,7 +460,7 @@ class RequestExtensionTest(ExtensionTestCase): app = fakes.wsgi_app(serialization=base_wsgi.Middleware) ext_midware = extensions.ExtensionMiddleware(app) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) - request = webob.Request.blank("/v2/123/flavors/1?chewing=newblue") + request = webob.Request.blank("/v2/fake/flavors/1?chewing=newblue") request.environ['api.version'] = '2' response = request.get_response(ser_midware) self.assertEqual(200, response.status_int) diff --git a/nova/tests/api/openstack/v2/test_image_metadata.py b/nova/tests/api/openstack/v2/test_image_metadata.py index d625080..e3e774b 100644 --- a/nova/tests/api/openstack/v2/test_image_metadata.py +++ b/nova/tests/api/openstack/v2/test_image_metadata.py @@ -35,7 +35,7 @@ class ImageMetaDataTest(test.TestCase): self.controller = image_metadata.Controller() def test_index(self): - req = fakes.HTTPRequest.blank('/v2/123/images/123/metadata') + req = fakes.HTTPRequest.blank('/v2/fake/images/123/metadata') res_dict = self.controller.index(req, '123') expected = {'metadata': {'key1': 'value1'}} self.assertEqual(res_dict, expected) diff --git a/nova/tests/api/openstack/v2/test_servers.py b/nova/tests/api/openstack/v2/test_servers.py index 03627c8..536df06 100644 --- a/nova/tests/api/openstack/v2/test_servers.py +++ b/nova/tests/api/openstack/v2/test_servers.py @@ -1043,7 +1043,7 @@ class ServersControllerTest(test.TestCase): return_server_with_attributes(name='server_test', access_ipv4='0.0.0.0', access_ipv6='beef::0123')) - req = fakes.HTTPRequest.blank('/v2/123/servers/%s' % FAKE_UUID) + req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID) req.method = 'PUT' req.content_type = 'application/json' body = {'server': { @@ -1075,7 +1075,7 @@ class ServersControllerTest(test.TestCase): def test_update_server_access_ipv4(self): self.stubs.Set(nova.db, 'instance_get', return_server_with_attributes(access_ipv4='0.0.0.0')) - req = fakes.HTTPRequest.blank('/v2/123/servers/%s' % FAKE_UUID) + req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID) req.method = 'PUT' req.content_type = 'application/json' body = {'server': {'accessIPv4': '0.0.0.0'}} @@ -1088,7 +1088,7 @@ class ServersControllerTest(test.TestCase): def test_update_server_access_ipv6(self): self.stubs.Set(nova.db, 'instance_get', return_server_with_attributes(access_ipv6='beef::0123')) - req = fakes.HTTPRequest.blank('/v2/123/servers/%s' % FAKE_UUID) + req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID) req.method = 'PUT' req.content_type = 'application/json' body = {'server': {'accessIPv6': 'beef::0123'}} @@ -1382,7 +1382,7 @@ class ServersControllerCreateTest(test.TestCase): } } - req = fakes.HTTPRequest.blank('/v2/123/servers') + req = fakes.HTTPRequest.blank('/v2/fake/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -1410,7 +1410,7 @@ class ServersControllerCreateTest(test.TestCase): } } - req = fakes.HTTPRequest.blank('/v2/123/servers') + req = fakes.HTTPRequest.blank('/v2/fake/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -1438,7 +1438,7 @@ class ServersControllerCreateTest(test.TestCase): } } - req = fakes.HTTPRequest.blank('/v2/123/servers') + req = fakes.HTTPRequest.blank('/v2/fake/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -1464,7 +1464,7 @@ class ServersControllerCreateTest(test.TestCase): } } - req = fakes.HTTPRequest.blank('/v2/123/servers', + req = fakes.HTTPRequest.blank('/v2/fake/servers', use_admin_context=True) req.method = 'POST' req.body = json.dumps(body) @@ -1523,7 +1523,7 @@ class ServersControllerCreateTest(test.TestCase): }, } - req = fakes.HTTPRequest.blank('/v2/123/servers') + req = fakes.HTTPRequest.blank('/v2/fake/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -1611,13 +1611,13 @@ class ServersControllerCreateTest(test.TestCase): self.controller.create, req, body) def test_create_instance_invalid_flavor_id_int(self): - image_href = 'http://localhost/v2/123/images/2' + image_href = 'http://localhost/v2/fake/images/2' flavor_ref = -1 body = dict(server=dict( name='server_test', imageRef=image_href, flavorRef=flavor_ref, metadata={'hello': 'world', 'open': 'stack'}, personality={})) - req = fakes.HTTPRequest.blank('/v2/123/servers') + req = fakes.HTTPRequest.blank('/v2/fake/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -1643,7 +1643,7 @@ class ServersControllerCreateTest(test.TestCase): def test_create_instance_with_config_drive(self): self.config_drive = True image_href = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6' - flavor_ref = 'http://localhost/v2/123/flavors/3' + flavor_ref = 'http://localhost/v2/fake/flavors/3' body = { 'server': { 'name': 'config_drive_test', @@ -1658,7 +1658,7 @@ class ServersControllerCreateTest(test.TestCase): }, } - req = fakes.HTTPRequest.blank('/v2/123/servers') + req = fakes.HTTPRequest.blank('/v2/fake/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -1670,7 +1670,7 @@ class ServersControllerCreateTest(test.TestCase): def test_create_instance_with_config_drive_as_id(self): self.config_drive = 2 image_href = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6' - flavor_ref = 'http://localhost/v2/123/flavors/3' + flavor_ref = 'http://localhost/v2/fake/flavors/3' body = { 'server': { 'name': 'config_drive_test', @@ -1685,7 +1685,7 @@ class ServersControllerCreateTest(test.TestCase): }, } - req = fakes.HTTPRequest.blank('/v2/123/servers') + req = fakes.HTTPRequest.blank('/v2/fake/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -1697,7 +1697,7 @@ class ServersControllerCreateTest(test.TestCase): def test_create_instance_with_bad_config_drive(self): self.config_drive = "asdf" image_href = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6' - flavor_ref = 'http://localhost/v2/123/flavors/3' + flavor_ref = 'http://localhost/v2/fake/flavors/3' body = { 'server': { 'name': 'config_drive_test', @@ -1712,7 +1712,7 @@ class ServersControllerCreateTest(test.TestCase): }, } - req = fakes.HTTPRequest.blank('/v2/123/servers') + req = fakes.HTTPRequest.blank('/v2/fake/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" @@ -1722,7 +1722,7 @@ class ServersControllerCreateTest(test.TestCase): def test_create_instance_without_config_drive(self): image_href = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6' - flavor_ref = 'http://localhost/v2/123/flavors/3' + flavor_ref = 'http://localhost/v2/fake/flavors/3' body = { 'server': { 'name': 'config_drive_test', @@ -1737,7 +1737,7 @@ class ServersControllerCreateTest(test.TestCase): }, } - req = fakes.HTTPRequest.blank('/v2/123/servers') + req = fakes.HTTPRequest.blank('/v2/fake/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" diff --git a/nova/tests/api/openstack/v2/test_urlmap.py b/nova/tests/api/openstack/v2/test_urlmap.py index d1aa8ae..82a870a 100644 --- a/nova/tests/api/openstack/v2/test_urlmap.py +++ b/nova/tests/api/openstack/v2/test_urlmap.py @@ -92,7 +92,7 @@ class UrlmapTest(test.TestCase): def test_path_content_type(self): """Test URL path specifying JSON returns JSON content.""" - url = '/v2/foobar/images/cedef40a-ed67-4d10-800e-17455edce175.json' + url = '/v2/fake/images/cedef40a-ed67-4d10-800e-17455edce175.json' req = webob.Request.blank(url) req.accept = "application/xml" res = req.get_response(fakes.wsgi_app()) @@ -104,7 +104,7 @@ class UrlmapTest(test.TestCase): def test_accept_content_type(self): """Test Accept header specifying JSON returns JSON content.""" - url = '/v2/foobar/images/cedef40a-ed67-4d10-800e-17455edce175' + url = '/v2/fake/images/cedef40a-ed67-4d10-800e-17455edce175' req = webob.Request.blank(url) req.accept = "application/xml;q=0.8, application/json" res = req.get_response(fakes.wsgi_app())