@@ -28,7 +28,7 @@


def _get_create_request_json(body_dict):
req = webob.Request.blank('/v1.1/123/os-security-groups')
req = webob.Request.blank('/v1.1/fake/os-security-groups')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body_dict)
@@ -109,7 +109,7 @@ def _format_create_xml_request_body(self, body_dict):
return ''.join(body_parts)

def _get_create_request_xml(self, body_dict):
req = webob.Request.blank('/v1.1/123/os-security-groups')
req = webob.Request.blank('/v1.1/fake/os-security-groups')
req.headers['Content-Type'] = 'application/xml'
req.content_type = 'application/xml'
req.accept = 'application/xml'
@@ -124,7 +124,7 @@ def _create_security_group_xml(self, security_group):
return response

def _delete_security_group(self, id):
request = webob.Request.blank('/v1.1/123/os-security-groups/%s'
request = webob.Request.blank('/v1.1/fake/os-security-groups/%s'
% id)
request.method = 'DELETE'
response = request.get_response(fakes.wsgi_app())
@@ -263,7 +263,7 @@ def test_get_security_group_list(self):
security_group['description'] = "group-description"
response = _create_security_group_json(security_group)

req = webob.Request.blank('/v1.1/123/os-security-groups')
req = webob.Request.blank('/v1.1/fake/os-security-groups')
req.headers['Content-Type'] = 'application/json'
req.method = 'GET'
response = req.get_response(fakes.wsgi_app())
@@ -272,7 +272,7 @@ def test_get_security_group_list(self):
expected = {'security_groups': [
{'id': 1,
'name':"default",
'tenant_id': "123",
'tenant_id': "fake",
"description":"default",
"rules": []
},
@@ -282,7 +282,7 @@ def test_get_security_group_list(self):
{
'id': 2,
'name': "test",
'tenant_id': "123",
'tenant_id': "fake",
"description": "group-description",
"rules": []
}
@@ -297,7 +297,7 @@ def test_get_security_group_by_id(self):
response = _create_security_group_json(security_group)

res_dict = json.loads(response.body)
req = webob.Request.blank('/v1.1/123/os-security-groups/%s' %
req = webob.Request.blank('/v1.1/fake/os-security-groups/%s' %
res_dict['security_group']['id'])
req.headers['Content-Type'] = 'application/json'
req.method = 'GET'
@@ -308,22 +308,22 @@ def test_get_security_group_by_id(self):
'security_group': {
'id': 2,
'name': "test",
'tenant_id': "123",
'tenant_id': "fake",
'description': "group-description",
'rules': []
}
}
self.assertEquals(res_dict, expected)

def test_get_security_group_by_invalid_id(self):
req = webob.Request.blank('/v1.1/123/os-security-groups/invalid')
req = webob.Request.blank('/v1.1/fake/os-security-groups/invalid')
req.headers['Content-Type'] = 'application/json'
req.method = 'GET'
response = req.get_response(fakes.wsgi_app())
self.assertEquals(response.status_int, 400)

def test_get_security_group_by_non_existing_id(self):
req = webob.Request.blank('/v1.1/123/os-security-groups/111111111')
req = webob.Request.blank('/v1.1/fake/os-security-groups/111111111')
req.headers['Content-Type'] = 'application/json'
req.method = 'GET'
response = req.get_response(fakes.wsgi_app())
@@ -351,7 +351,7 @@ def test_delete_security_group_by_non_existing_id(self):

def test_associate_by_non_existing_security_group_name(self):
body = dict(addSecurityGroup=dict(name='non-existing'))
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -362,15 +362,15 @@ def test_associate_by_invalid_server_id(self):
body = dict(addSecurityGroup=dict(name='test'))
self.stubs.Set(nova.db.api, 'security_group_get_by_name',
return_security_group)
req = webob.Request.blank('/v1.1/123/servers/invalid/action')
req = webob.Request.blank('/v1.1/fake/servers/invalid/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
response = req.get_response(fakes.wsgi_app())
self.assertEquals(response.status_int, 400)

def test_associate_without_body(self):
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
body = dict(addSecurityGroup=None)
self.stubs.Set(nova.db.api, 'instance_get', return_server)
req.headers['Content-Type'] = 'application/json'
@@ -380,7 +380,7 @@ def test_associate_without_body(self):
self.assertEquals(response.status_int, 400)

def test_associate_no_security_group_name(self):
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
body = dict(addSecurityGroup=dict())
self.stubs.Set(nova.db.api, 'instance_get', return_server)
req.headers['Content-Type'] = 'application/json'
@@ -390,7 +390,7 @@ def test_associate_no_security_group_name(self):
self.assertEquals(response.status_int, 400)

def test_associate_security_group_name_with_whitespaces(self):
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
body = dict(addSecurityGroup=dict(name=" "))
self.stubs.Set(nova.db.api, 'instance_get', return_server)
req.headers['Content-Type'] = 'application/json'
@@ -404,7 +404,7 @@ def test_associate_non_existing_instance(self):
body = dict(addSecurityGroup=dict(name="test"))
self.stubs.Set(nova.db.api, 'security_group_get_by_name',
return_security_group)
req = webob.Request.blank('/v1.1/123/servers/10000/action')
req = webob.Request.blank('/v1.1/fake/servers/10000/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -416,7 +416,7 @@ def test_associate_non_running_instance(self):
self.stubs.Set(nova.db.api, 'security_group_get_by_name',
return_security_group_without_instances)
body = dict(addSecurityGroup=dict(name="test"))
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -428,7 +428,7 @@ def test_associate_already_associated_security_group_to_instance(self):
self.stubs.Set(nova.db.api, 'security_group_get_by_name',
return_security_group)
body = dict(addSecurityGroup=dict(name="test"))
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -446,7 +446,7 @@ def test_associate(self):
self.mox.ReplayAll()

body = dict(addSecurityGroup=dict(name="test"))
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -463,7 +463,7 @@ def test_associate_xml(self):
return_security_group_without_instances)
self.mox.ReplayAll()

req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/xml'
req.method = 'POST'
req.body = """<addSecurityGroup>
@@ -474,7 +474,7 @@ def test_associate_xml(self):

def test_disassociate_by_non_existing_security_group_name(self):
body = dict(removeSecurityGroup=dict(name='non-existing'))
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -485,15 +485,15 @@ def test_disassociate_by_invalid_server_id(self):
body = dict(removeSecurityGroup=dict(name='test'))
self.stubs.Set(nova.db.api, 'security_group_get_by_name',
return_security_group)
req = webob.Request.blank('/v1.1/123/servers/invalid/action')
req = webob.Request.blank('/v1.1/fake/servers/invalid/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
response = req.get_response(fakes.wsgi_app())
self.assertEquals(response.status_int, 400)

def test_disassociate_without_body(self):
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
body = dict(removeSecurityGroup=None)
self.stubs.Set(nova.db.api, 'instance_get', return_server)
req.headers['Content-Type'] = 'application/json'
@@ -503,7 +503,7 @@ def test_disassociate_without_body(self):
self.assertEquals(response.status_int, 400)

def test_disassociate_no_security_group_name(self):
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
body = dict(removeSecurityGroup=dict())
self.stubs.Set(nova.db.api, 'instance_get', return_server)
req.headers['Content-Type'] = 'application/json'
@@ -513,7 +513,7 @@ def test_disassociate_no_security_group_name(self):
self.assertEquals(response.status_int, 400)

def test_disassociate_security_group_name_with_whitespaces(self):
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
body = dict(removeSecurityGroup=dict(name=" "))
self.stubs.Set(nova.db.api, 'instance_get', return_server)
req.headers['Content-Type'] = 'application/json'
@@ -527,7 +527,7 @@ def test_disassociate_non_existing_instance(self):
body = dict(removeSecurityGroup=dict(name="test"))
self.stubs.Set(nova.db.api, 'security_group_get_by_name',
return_security_group)
req = webob.Request.blank('/v1.1/123/servers/10000/action')
req = webob.Request.blank('/v1.1/fake/servers/10000/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -539,7 +539,7 @@ def test_disassociate_non_running_instance(self):
self.stubs.Set(nova.db.api, 'security_group_get_by_name',
return_security_group)
body = dict(removeSecurityGroup=dict(name="test"))
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -551,7 +551,7 @@ def test_disassociate_already_associated_security_group_to_instance(self):
self.stubs.Set(nova.db.api, 'security_group_get_by_name',
return_security_group_without_instances)
body = dict(removeSecurityGroup=dict(name="test"))
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -569,7 +569,7 @@ def test_disassociate(self):
self.mox.ReplayAll()

body = dict(removeSecurityGroup=dict(name="test"))
req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/json'
req.method = 'POST'
req.body = json.dumps(body)
@@ -586,7 +586,7 @@ def test_disassociate_xml(self):
return_security_group)
self.mox.ReplayAll()

req = webob.Request.blank('/v1.1/123/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.headers['Content-Type'] = 'application/xml'
req.method = 'POST'
req.body = """<removeSecurityGroup>
@@ -624,15 +624,15 @@ def tearDown(self):
super(TestSecurityGroupRules, self).tearDown()

def _create_security_group_rule_json(self, rules):
request = webob.Request.blank('/v1.1/123/os-security-group-rules')
request = webob.Request.blank('/v1.1/fake/os-security-group-rules')
request.headers['Content-Type'] = 'application/json'
request.method = 'POST'
request.body = json.dumps(rules)
response = request.get_response(fakes.wsgi_app())
return response

def _delete_security_group_rule(self, id):
request = webob.Request.blank('/v1.1/123/os-security-group-rules/%s'
request = webob.Request.blank('/v1.1/fake/os-security-group-rules/%s'
% id)
request.method = 'DELETE'
response = request.get_response(fakes.wsgi_app())
@@ -690,15 +690,15 @@ def test_create_add_existing_rules_json(self):
self.assertEquals(response.status_int, 400)

def test_create_with_no_body_json(self):
request = webob.Request.blank('/v1.1/123/os-security-group-rules')
request = webob.Request.blank('/v1.1/fake/os-security-group-rules')
request.headers['Content-Type'] = 'application/json'
request.method = 'POST'
request.body = json.dumps(None)
response = request.get_response(fakes.wsgi_app())
self.assertEquals(response.status_int, 422)

def test_create_with_no_security_group_rule_in_body_json(self):
request = webob.Request.blank('/v1.1/123/os-security-group-rules')
request = webob.Request.blank('/v1.1/fake/os-security-group-rules')
request.headers['Content-Type'] = 'application/json'
request.method = 'POST'
body_dict = {'test': "test"}
@@ -87,8 +87,8 @@ def setUp(self):

def test_verify_index(self):
req = webob.Request.blank(
'/v1.1/123/os-simple-tenant-usage?start=%s&end=%s' %
(START.isoformat(), STOP.isoformat()))
'/v1.1/faketenant_0/os-simple-tenant-usage?start=%s&end=%s' %
(START.isoformat(), STOP.isoformat()))
req.method = "GET"
req.headers["content-type"] = "application/json"

@@ -113,7 +113,7 @@ def test_verify_index(self):

def test_verify_detailed_index(self):
req = webob.Request.blank(
'/v1.1/123/os-simple-tenant-usage?'
'/v1.1/faketenant_0/os-simple-tenant-usage?'
'detailed=1&start=%s&end=%s' %
(START.isoformat(), STOP.isoformat()))
req.method = "GET"
@@ -131,13 +131,14 @@ def test_verify_detailed_index(self):

def test_verify_index_fails_for_nonadmin(self):
req = webob.Request.blank(
'/v1.1/123/os-simple-tenant-usage?'
'/v1.1/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):
@@ -43,7 +43,7 @@ def tearDown(self):
super(ServerVirtualInterfaceTest, self).tearDown()

def test_get_virtual_interfaces_list(self):
req = webob.Request.blank('/v1.1/123/servers/1/os-virtual-interfaces')
req = webob.Request.blank('/v1.1/fake/servers/1/os-virtual-interfaces')
res = req.get_response(fakes.wsgi_app())
self.assertEqual(res.status_int, 200)
res_dict = json.loads(res.body)
@@ -119,7 +119,7 @@ def test_vsa_create(self):
vsa = {"displayName": "VSA Test Name",
"displayDescription": "VSA Test Desc"}
body = dict(vsa=vsa)
req = webob.Request.blank('/v1.1/777/zadr-vsa')
req = webob.Request.blank('/v1.1/fake/zadr-vsa')
req.method = 'POST'
req.body = json.dumps(body)
req.headers['content-type'] = 'application/json'
@@ -138,7 +138,7 @@ def test_vsa_create(self):
vsa['displayDescription'])

def test_vsa_create_no_body(self):
req = webob.Request.blank('/v1.1/777/zadr-vsa')
req = webob.Request.blank('/v1.1/fake/zadr-vsa')
req.method = 'POST'
req.body = json.dumps({})
req.headers['content-type'] = 'application/json'
@@ -151,7 +151,7 @@ def test_vsa_delete(self):
last_param = {}

vsa_id = 123
req = webob.Request.blank('/v1.1/777/zadr-vsa/%d' % vsa_id)
req = webob.Request.blank('/v1.1/fake/zadr-vsa/%d' % vsa_id)
req.method = 'DELETE'

resp = req.get_response(fakes.wsgi_app())
@@ -163,7 +163,7 @@ def test_vsa_delete_invalid_id(self):
last_param = {}

vsa_id = 234
req = webob.Request.blank('/v1.1/777/zadr-vsa/%d' % vsa_id)
req = webob.Request.blank('/v1.1/fake/zadr-vsa/%d' % vsa_id)
req.method = 'DELETE'

resp = req.get_response(fakes.wsgi_app())
@@ -175,7 +175,7 @@ def test_vsa_show(self):
last_param = {}

vsa_id = 123
req = webob.Request.blank('/v1.1/777/zadr-vsa/%d' % vsa_id)
req = webob.Request.blank('/v1.1/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 @@ def test_vsa_show_invalid_id(self):
last_param = {}

vsa_id = 234
req = webob.Request.blank('/v1.1/777/zadr-vsa/%d' % vsa_id)
req = webob.Request.blank('/v1.1/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('/v1.1/777/zadr-vsa')
req = webob.Request.blank('/v1.1/fake/zadr-vsa')
req.method = 'GET'
resp = req.get_response(fakes.wsgi_app())
self.assertEqual(resp.status_int, 200)
@@ -212,7 +212,7 @@ def test_vsa_index(self):
self.assertEqual(resp_vsa['id'], 123)

def test_vsa_detail(self):
req = webob.Request.blank('/v1.1/777/zadr-vsa/detail')
req = webob.Request.blank('/v1.1/fake/zadr-vsa/detail')
req.method = 'GET'
resp = req.get_response(fakes.wsgi_app())
self.assertEqual(resp.status_int, 200)
@@ -328,7 +328,8 @@ def test_vsa_volume_create(self):
"displayName": "VSA Volume Test Name",
"displayDescription": "VSA Volume Test Desc"}
body = {self.test_obj: vol}
req = webob.Request.blank('/v1.1/777/zadr-vsa/123/%s' % self.test_objs)
req = webob.Request.blank('/v1.1/fake/zadr-vsa/123/%s' %
self.test_objs)
req.method = 'POST'
req.body = json.dumps(body)
req.headers['content-type'] = 'application/json'
@@ -349,7 +350,8 @@ def test_vsa_volume_create(self):
self.assertEqual(resp.status_int, 400)

def test_vsa_volume_create_no_body(self):
req = webob.Request.blank('/v1.1/777/zadr-vsa/123/%s' % self.test_objs)
req = webob.Request.blank('/v1.1/fake/zadr-vsa/123/%s' %
self.test_objs)
req.method = 'POST'
req.body = json.dumps({})
req.headers['content-type'] = 'application/json'
@@ -361,33 +363,34 @@ def test_vsa_volume_create_no_body(self):
self.assertEqual(resp.status_int, 400)

def test_vsa_volume_index(self):
req = webob.Request.blank('/v1.1/777/zadr-vsa/123/%s' % self.test_objs)
req = webob.Request.blank('/v1.1/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('/v1.1/777/zadr-vsa/123/%s/detail' % \
req = webob.Request.blank('/v1.1/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('/v1.1/777/zadr-vsa/123/%s/%s' % \
req = webob.Request.blank('/v1.1/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('/v1.1/777/zadr-vsa/4/%s/333' % \
req = webob.Request.blank('/v1.1/fake/zadr-vsa/4/%s/333' % \
(self.test_objs))
resp = req.get_response(fakes.wsgi_app())
self.assertEqual(resp.status_int, 400)

def test_vsa_volume_show_no_volume(self):
self.stubs.Set(volume.api.API, "get", stub_volume_get_notfound)

req = webob.Request.blank('/v1.1/777/zadr-vsa/123/%s/333' % \
req = webob.Request.blank('/v1.1/fake/zadr-vsa/123/%s/333' % \
(self.test_objs))
resp = req.get_response(fakes.wsgi_app())
self.assertEqual(resp.status_int, 404)
@@ -397,7 +400,7 @@ def test_vsa_volume_update(self):
update = {"status": "available",
"displayName": "Test Display name"}
body = {self.test_obj: update}
req = webob.Request.blank('/v1.1/777/zadr-vsa/123/%s/%s' % \
req = webob.Request.blank('/v1.1/fake/zadr-vsa/123/%s/%s' % \
(self.test_objs, obj_num))
req.method = 'PUT'
req.body = json.dumps(body)
@@ -411,7 +414,7 @@ def test_vsa_volume_update(self):

def test_vsa_volume_delete(self):
obj_num = 234 if self.test_objs == "volumes" else 345
req = webob.Request.blank('/v1.1/777/zadr-vsa/123/%s/%s' % \
req = webob.Request.blank('/v1.1/fake/zadr-vsa/123/%s/%s' % \
(self.test_objs, obj_num))
req.method = 'DELETE'
resp = req.get_response(fakes.wsgi_app())
@@ -421,7 +424,7 @@ def test_vsa_volume_delete(self):
self.assertEqual(resp.status_int, 400)

def test_vsa_volume_delete_no_vsa_assignment(self):
req = webob.Request.blank('/v1.1/777/zadr-vsa/4/%s/333' % \
req = webob.Request.blank('/v1.1/fake/zadr-vsa/4/%s/333' % \
(self.test_objs))
req.method = 'DELETE'
resp = req.get_response(fakes.wsgi_app())
@@ -430,7 +433,7 @@ def test_vsa_volume_delete_no_vsa_assignment(self):
def test_vsa_volume_delete_no_volume(self):
self.stubs.Set(volume.api.API, "get", stub_volume_get_notfound)

req = webob.Request.blank('/v1.1/777/zadr-vsa/123/%s/333' % \
req = webob.Request.blank('/v1.1/fake/zadr-vsa/123/%s/333' % \
(self.test_objs))
req.method = 'DELETE'
resp = req.get_response(fakes.wsgi_app())
@@ -107,7 +107,7 @@ def setUp(self):
def test_list_extensions_json(self):
app = openstack.APIRouterV11()
ext_midware = extensions.ExtensionMiddleware(app)
request = webob.Request.blank("/123/extensions")
request = webob.Request.blank("/fake/extensions")
response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int)

@@ -133,7 +133,7 @@ def test_list_extensions_json(self):
def test_get_extension_json(self):
app = openstack.APIRouterV11()
ext_midware = extensions.ExtensionMiddleware(app)
request = webob.Request.blank("/123/extensions/FOXNSOX")
request = webob.Request.blank("/fake/extensions/FOXNSOX")
response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int)

@@ -149,14 +149,14 @@ def test_get_extension_json(self):
def test_get_non_existing_extension_json(self):
app = openstack.APIRouterV11()
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)

def test_list_extensions_xml(self):
app = openstack.APIRouterV11()
ext_midware = extensions.ExtensionMiddleware(app)
request = webob.Request.blank("/123/extensions")
request = webob.Request.blank("/fake/extensions")
request.accept = "application/xml"
response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int)
@@ -183,7 +183,7 @@ def test_list_extensions_xml(self):
def test_get_extension_xml(self):
app = openstack.APIRouterV11()
ext_midware = extensions.ExtensionMiddleware(app)
request = webob.Request.blank("/123/extensions/FOXNSOX")
request = webob.Request.blank("/fake/extensions/FOXNSOX")
request.accept = "application/xml"
response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int)
@@ -224,7 +224,7 @@ def test_get_resources(self):
manager = StubExtensionManager(res_ext)
app = openstack.APIRouterV11()
ext_midware = extensions.ExtensionMiddleware(app, manager)
request = webob.Request.blank("/123/tweedles")
request = webob.Request.blank("/fake/tweedles")
response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int)
self.assertEqual(response_body, response.body)
@@ -235,7 +235,7 @@ def test_get_resources_with_controller(self):
manager = StubExtensionManager(res_ext)
app = openstack.APIRouterV11()
ext_midware = extensions.ExtensionMiddleware(app, manager)
request = webob.Request.blank("/123/tweedles")
request = webob.Request.blank("/fake/tweedles")
response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int)
self.assertEqual(response_body, response.body)
@@ -259,7 +259,7 @@ def setUp(self):
def test_get_resources(self):
app = openstack.APIRouterV11()
ext_midware = extensions.ExtensionMiddleware(app)
request = webob.Request.blank("/123/foxnsocks")
request = webob.Request.blank("/fake/foxnsocks")
response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int)
self.assertEqual(response_body, response.body)
@@ -292,7 +292,7 @@ def _send_server_action_request(self, url, body):

def test_extended_action(self):
body = dict(add_tweedle=dict(name="test"))
url = "/123/servers/1/action"
url = "/fake/servers/1/action"
response = self._send_server_action_request(url, body)
self.assertEqual(200, response.status_int)
self.assertEqual("Tweedle Beetle Added.", response.body)
@@ -304,13 +304,13 @@ def test_extended_action(self):

def test_invalid_action_body(self):
body = dict(blah=dict(name="test")) # Doesn't exist
url = "/123/servers/1/action"
url = "/fake/servers/1/action"
response = self._send_server_action_request(url, body)
self.assertEqual(400, response.status_int)

def test_invalid_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)

@@ -332,13 +332,13 @@ def _req_handler(req, res):
return res

req_ext = extensions.RequestExtension('GET',
'/v1.1/123/flavors/:(id)',
'/v1.1/fake/flavors/:(id)',
_req_handler)

manager = StubExtensionManager(None, None, req_ext)
app = fakes.wsgi_app()
ext_midware = extensions.ExtensionMiddleware(app, manager)
request = webob.Request.blank("/v1.1/123/flavors/1?chewing=bluegoo")
request = webob.Request.blank("/v1.1/fake/flavors/1?chewing=bluegoo")
request.environ['api.version'] = '1.1'
response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int)
@@ -349,7 +349,7 @@ def test_get_resources_with_mgr(self):

app = fakes.wsgi_app()
ext_midware = extensions.ExtensionMiddleware(app)
request = webob.Request.blank("/v1.1/123/flavors/1?chewing=newblue")
request = webob.Request.blank("/v1.1/fake/flavors/1?chewing=newblue")
request.environ['api.version'] = '1.1'
response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int)
@@ -63,7 +63,7 @@ def setUp(self):
def test_index(self):
self.stubs.Set(nova.db.api, 'instance_type_extra_specs_get',
return_flavor_extra_specs)
request = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs')
request = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs')
res = request.get_response(fakes.wsgi_app())
self.assertEqual(200, res.status_int)
res_dict = json.loads(res.body)
@@ -73,7 +73,7 @@ def test_index(self):
def test_index_no_data(self):
self.stubs.Set(nova.db.api, 'instance_type_extra_specs_get',
return_empty_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs')
res = req.get_response(fakes.wsgi_app())
res_dict = json.loads(res.body)
self.assertEqual(200, res.status_int)
@@ -83,7 +83,7 @@ def test_index_no_data(self):
def test_show(self):
self.stubs.Set(nova.db.api, 'instance_type_extra_specs_get',
return_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs/key5')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs/key5')
res = req.get_response(fakes.wsgi_app())
self.assertEqual(200, res.status_int)
res_dict = json.loads(res.body)
@@ -93,15 +93,15 @@ def test_show(self):
def test_show_spec_not_found(self):
self.stubs.Set(nova.db.api, 'instance_type_extra_specs_get',
return_empty_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs/key6')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs/key6')
res = req.get_response(fakes.wsgi_app())
res_dict = json.loads(res.body)
self.assertEqual(404, res.status_int)

def test_delete(self):
self.stubs.Set(nova.db.api, 'instance_type_extra_specs_delete',
delete_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs/key5')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs/key5')
req.method = 'DELETE'
res = req.get_response(fakes.wsgi_app())
self.assertEqual(200, res.status_int)
@@ -110,7 +110,7 @@ def test_create(self):
self.stubs.Set(nova.db.api,
'instance_type_extra_specs_update_or_create',
return_create_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs')
req.method = 'POST'
req.body = '{"extra_specs": {"key1": "value1"}}'
req.headers["content-type"] = "application/json"
@@ -124,7 +124,7 @@ def test_create_empty_body(self):
self.stubs.Set(nova.db.api,
'instance_type_extra_specs_update_or_create',
return_create_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs')
req.method = 'POST'
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
@@ -134,7 +134,7 @@ def test_update_item(self):
self.stubs.Set(nova.db.api,
'instance_type_extra_specs_update_or_create',
return_create_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs/key1')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs/key1')
req.method = 'PUT'
req.body = '{"key1": "value1"}'
req.headers["content-type"] = "application/json"
@@ -148,7 +148,7 @@ def test_update_item_empty_body(self):
self.stubs.Set(nova.db.api,
'instance_type_extra_specs_update_or_create',
return_create_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs/key1')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs/key1')
req.method = 'PUT'
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
@@ -158,7 +158,7 @@ def test_update_item_too_many_keys(self):
self.stubs.Set(nova.db.api,
'instance_type_extra_specs_update_or_create',
return_create_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs/key1')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs/key1')
req.method = 'PUT'
req.body = '{"key1": "value1", "key2": "value2"}'
req.headers["content-type"] = "application/json"
@@ -169,7 +169,7 @@ def test_update_item_body_uri_mismatch(self):
self.stubs.Set(nova.db.api,
'instance_type_extra_specs_update_or_create',
return_create_flavor_extra_specs)
req = webob.Request.blank('/v1.1/123/flavors/1/os-extra_specs/bad')
req = webob.Request.blank('/v1.1/fake/flavors/1/os-extra_specs/bad')
req.method = 'PUT'
req.body = '{"key1": "value1"}'
req.headers["content-type"] = "application/json"
@@ -90,7 +90,7 @@ def setUp(self):
fakes.stub_out_glance(self.stubs, self.IMAGE_FIXTURES)

def test_index(self):
req = webob.Request.blank('/v1.1/123/images/1/metadata')
req = webob.Request.blank('/v1.1/fake/images/1/metadata')
res = req.get_response(fakes.wsgi_app())
res_dict = json.loads(res.body)
self.assertEqual(200, res.status_int)
@@ -1232,7 +1232,8 @@ def fake_get_all(context, filters=None):
fake_get_all)
self.flags(allow_admin_api=True)

req = webob.Request.blank('/v1.1/fake/servers?tenant_id=faketenant')
req = webob.Request.blank(
'/v1.1/testproject/servers?tenant_id=faketenant')
# Use admin context
context = nova.context.RequestContext('testuser', 'testproject',
is_admin=True)
@@ -1354,7 +1355,7 @@ def fake_get_all(compute_self, context, search_opts=None):
self.stubs.Set(nova.compute.API, 'get_all', fake_get_all)

query_str = "name=foo&ip=10.*&status=active&unknown_option=meow"
req = webob.Request.blank('/v1.1/fake/servers?%s' % query_str)
req = webob.Request.blank('/v1.1/testproject/servers?%s' % query_str)
# Request admin context
context = nova.context.RequestContext('testuser', 'testproject',
is_admin=True)
@@ -1388,7 +1389,7 @@ def fake_get_all(compute_self, context, search_opts=None):
self.stubs.Set(nova.compute.API, 'get_all', fake_get_all)

query_str = "name=foo&ip=10.*&status=active&unknown_option=meow"
req = webob.Request.blank('/v1.1/fake/servers?%s' % query_str)
req = webob.Request.blank('/v1.1/testproject/servers?%s' % query_str)
# Request admin context
context = nova.context.RequestContext('testuser', 'testproject',
is_admin=False)
@@ -1421,7 +1422,7 @@ def fake_get_all(compute_self, context, search_opts=None):
self.stubs.Set(nova.compute.API, 'get_all', fake_get_all)

query_str = "name=foo&ip=10.*&status=active&unknown_option=meow"
req = webob.Request.blank('/v1.1/fake/servers?%s' % query_str)
req = webob.Request.blank('/v1.1/testproject/servers?%s' % query_str)
# Request admin context
context = nova.context.RequestContext('testuser', 'testproject',
is_admin=True)
@@ -1447,7 +1448,7 @@ def fake_get_all(compute_self, context, search_opts=None):

self.stubs.Set(nova.compute.API, 'get_all', fake_get_all)

req = webob.Request.blank('/v1.1/fake/servers?ip=10\..*')
req = webob.Request.blank('/v1.1/testproject/servers?ip=10\..*')
# Request admin context
context = nova.context.RequestContext('testuser', 'testproject',
is_admin=True)
@@ -1473,7 +1474,7 @@ def fake_get_all(compute_self, context, search_opts=None):

self.stubs.Set(nova.compute.API, 'get_all', fake_get_all)

req = webob.Request.blank('/v1.1/fake/servers?ip6=ffff.*')
req = webob.Request.blank('/v1.1/testproject/servers?ip6=ffff.*')
# Request admin context
context = nova.context.RequestContext('testuser', 'testproject',
is_admin=True)
@@ -1646,7 +1647,7 @@ def snapshot(*args, **kwargs):
raise exception.InstanceSnapshotting
self.stubs.Set(nova.compute.API, 'snapshot', snapshot)

req = webob.Request.blank('/v1.1/fakes/servers/1/action')
req = webob.Request.blank('/v1.1/fake/servers/1/action')
req.method = 'POST'
req.body = json.dumps({
"createImage": {
@@ -1719,16 +1720,16 @@ def test_create_instance_with_access_ip_v1_1(self):
self._setup_for_create_instance()

# proper local hrefs must start with 'http://localhost/v1.1/'
image_href = 'http://localhost/v1.1/123/images/2'
flavor_ref = 'http://localhost/123/flavors/3'
image_href = 'http://localhost/v1.1/fake/images/2'
flavor_ref = 'http://localhost/fake/flavors/3'
access_ipv4 = '1.2.3.4'
access_ipv6 = 'fead::1234'
expected_flavor = {
"id": "3",
"links": [
{
"rel": "bookmark",
"href": 'http://localhost/123/flavors/3',
"href": 'http://localhost/fake/flavors/3',
},
],
}
@@ -1737,7 +1738,7 @@ def test_create_instance_with_access_ip_v1_1(self):
"links": [
{
"rel": "bookmark",
"href": 'http://localhost/123/images/2',
"href": 'http://localhost/fake/images/2',
},
],
}
@@ -1761,7 +1762,7 @@ def test_create_instance_with_access_ip_v1_1(self):
},
}

req = webob.Request.blank('/v1.1/123/servers')
req = webob.Request.blank('/v1.1/fake/servers')
req.method = 'POST'
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
@@ -1784,7 +1785,7 @@ def test_create_instance_v1_1(self):

# proper local hrefs must start with 'http://localhost/v1.1/'
image_href = 'http://localhost/v1.1/images/2'
flavor_ref = 'http://localhost/123/flavors/3'
flavor_ref = 'http://localhost/fake/flavors/3'
expected_flavor = {
"id": "3",
"links": [
@@ -1889,13 +1890,13 @@ def test_create_instance_v1_1_invalid_flavor_href(self):
def test_create_instance_v1_1_invalid_flavor_id_int(self):
self._setup_for_create_instance()

image_href = 'http://localhost/v1.1/123/images/2'
image_href = 'http://localhost/v1.1/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 = webob.Request.blank('/v1.1/123/servers')
req = webob.Request.blank('/v1.1/fake/servers')
req.method = 'POST'
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
@@ -1922,8 +1923,8 @@ def test_create_instance_with_config_drive_v1_1(self):
self.config_drive = True
self._setup_for_create_instance()

image_href = 'http://localhost/v1.1/123/images/2'
flavor_ref = 'http://localhost/v1.1/123/flavors/3'
image_href = 'http://localhost/v1.1/fake/images/2'
flavor_ref = 'http://localhost/v1.1/fake/flavors/3'
body = {
'server': {
'name': 'config_drive_test',
@@ -1938,7 +1939,7 @@ def test_create_instance_with_config_drive_v1_1(self):
},
}

req = webob.Request.blank('/v1.1/123/servers')
req = webob.Request.blank('/v1.1/fake/servers')
req.method = 'POST'
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
@@ -1954,8 +1955,8 @@ def test_create_instance_with_config_drive_as_id_v1_1(self):
self.config_drive = 2
self._setup_for_create_instance()

image_href = 'http://localhost/v1.1/123/images/2'
flavor_ref = 'http://localhost/v1.1/123/flavors/3'
image_href = 'http://localhost/v1.1/fake/images/2'
flavor_ref = 'http://localhost/v1.1/fake/flavors/3'
body = {
'server': {
'name': 'config_drive_test',
@@ -1970,7 +1971,7 @@ def test_create_instance_with_config_drive_as_id_v1_1(self):
},
}

req = webob.Request.blank('/v1.1/123/servers')
req = webob.Request.blank('/v1.1/fake/servers')
req.method = 'POST'
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
@@ -1987,8 +1988,8 @@ def test_create_instance_with_bad_config_drive_v1_1(self):
self.config_drive = "asdf"
self._setup_for_create_instance()

image_href = 'http://localhost/v1.1/123/images/2'
flavor_ref = 'http://localhost/v1.1/123/flavors/3'
image_href = 'http://localhost/v1.1/fake/images/2'
flavor_ref = 'http://localhost/v1.1/fake/flavors/3'
body = {
'server': {
'name': 'config_drive_test',
@@ -2003,7 +2004,7 @@ def test_create_instance_with_bad_config_drive_v1_1(self):
},
}

req = webob.Request.blank('/v1.1/123/servers')
req = webob.Request.blank('/v1.1/fake/servers')
req.method = 'POST'
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
@@ -2014,8 +2015,8 @@ def test_create_instance_with_bad_config_drive_v1_1(self):
def test_create_instance_without_config_drive_v1_1(self):
self._setup_for_create_instance()

image_href = 'http://localhost/v1.1/123/images/2'
flavor_ref = 'http://localhost/v1.1/123/flavors/3'
image_href = 'http://localhost/v1.1/fake/images/2'
flavor_ref = 'http://localhost/v1.1/fake/flavors/3'
body = {
'server': {
'name': 'config_drive_test',
@@ -2030,7 +2031,7 @@ def test_create_instance_without_config_drive_v1_1(self):
},
}

req = webob.Request.blank('/v1.1/123/servers')
req = webob.Request.blank('/v1.1/fake/servers')
req.method = 'POST'
req.body = json.dumps(body)
req.headers["content-type"] = "application/json"
@@ -2263,7 +2264,7 @@ def test_update_server_all_attributes_v1_1(self):
return_server_with_attributes(name='server_test',
access_ipv4='0.0.0.0',
access_ipv6='beef::0123'))
req = webob.Request.blank('/v1.1/123/servers/1')
req = webob.Request.blank('/v1.1/fake/servers/1')
req.method = 'PUT'
req.content_type = 'application/json'
body = {'server': {
@@ -2296,7 +2297,7 @@ def test_update_server_name_v1_1(self):
def test_update_server_access_ipv4_v1_1(self):
self.stubs.Set(nova.db.api, 'instance_get',
return_server_with_attributes(access_ipv4='0.0.0.0'))
req = webob.Request.blank('/v1.1/123/servers/1')
req = webob.Request.blank('/v1.1/fake/servers/1')
req.method = 'PUT'
req.content_type = 'application/json'
req.body = json.dumps({'server': {'accessIPv4': '0.0.0.0'}})
@@ -2309,7 +2310,7 @@ def test_update_server_access_ipv4_v1_1(self):
def test_update_server_access_ipv6_v1_1(self):
self.stubs.Set(nova.db.api, 'instance_get',
return_server_with_attributes(access_ipv6='beef::0123'))
req = webob.Request.blank('/v1.1/123/servers/1')
req = webob.Request.blank('/v1.1/fake/servers/1')
req.method = 'PUT'
req.content_type = 'application/json'
req.body = json.dumps({'server': {'accessIPv6': 'beef::0123'}})
@@ -83,7 +83,7 @@ def tearDown(self):
def test_volume_types_index(self):
self.stubs.Set(volume_types, 'get_all_types',
return_volume_types_get_all_types)
req = webob.Request.blank('/v1.1/123/os-volume-types')
req = webob.Request.blank('/v1.1/fake/os-volume-types')
res = req.get_response(fakes.wsgi_app())
self.assertEqual(200, res.status_int)
res_dict = json.loads(res.body)
@@ -97,7 +97,7 @@ def test_volume_types_index(self):
def test_volume_types_index_no_data(self):
self.stubs.Set(volume_types, 'get_all_types',
return_empty_volume_types_get_all_types)
req = webob.Request.blank('/v1.1/123/os-volume-types')
req = webob.Request.blank('/v1.1/fake/os-volume-types')
res = req.get_response(fakes.wsgi_app())
res_dict = json.loads(res.body)
self.assertEqual(200, res.status_int)
@@ -107,7 +107,7 @@ def test_volume_types_index_no_data(self):
def test_volume_types_show(self):
self.stubs.Set(volume_types, 'get_volume_type',
return_volume_types_get_volume_type)
req = webob.Request.blank('/v1.1/123/os-volume-types/1')
req = webob.Request.blank('/v1.1/fake/os-volume-types/1')
res = req.get_response(fakes.wsgi_app())
self.assertEqual(200, res.status_int)
res_dict = json.loads(res.body)
@@ -118,7 +118,7 @@ def test_volume_types_show(self):
def test_volume_types_show_not_found(self):
self.stubs.Set(volume_types, 'get_volume_type',
return_volume_types_get_volume_type)
req = webob.Request.blank('/v1.1/123/os-volume-types/777')
req = webob.Request.blank('/v1.1/fake/os-volume-types/777')
res = req.get_response(fakes.wsgi_app())
self.assertEqual(404, res.status_int)

@@ -127,7 +127,7 @@ def test_volume_types_delete(self):
return_volume_types_get_volume_type)
self.stubs.Set(volume_types, 'destroy',
return_volume_types_destroy)
req = webob.Request.blank('/v1.1/123/os-volume-types/1')
req = webob.Request.blank('/v1.1/fake/os-volume-types/1')
req.method = 'DELETE'
res = req.get_response(fakes.wsgi_app())
self.assertEqual(200, res.status_int)
@@ -137,7 +137,7 @@ def test_volume_types_delete_not_found(self):
return_volume_types_get_volume_type)
self.stubs.Set(volume_types, 'destroy',
return_volume_types_destroy)
req = webob.Request.blank('/v1.1/123/os-volume-types/777')
req = webob.Request.blank('/v1.1/fake/os-volume-types/777')
req.method = 'DELETE'
res = req.get_response(fakes.wsgi_app())
self.assertEqual(404, res.status_int)
@@ -147,7 +147,7 @@ def test_create(self):
return_volume_types_create)
self.stubs.Set(volume_types, 'get_volume_type_by_name',
return_volume_types_get_by_name)
req = webob.Request.blank('/v1.1/123/os-volume-types')
req = webob.Request.blank('/v1.1/fake/os-volume-types')
req.method = 'POST'
req.body = '{"volume_type": {"name": "vol_type_1", '\
'"extra_specs": {"key1": "value1"}}}'
@@ -164,7 +164,7 @@ def test_create_empty_body(self):
return_volume_types_create)
self.stubs.Set(volume_types, 'get_volume_type_by_name',
return_volume_types_get_by_name)
req = webob.Request.blank('/v1.1/123/os-volume-types')
req = webob.Request.blank('/v1.1/fake/os-volume-types')
req.method = 'POST'
req.headers["content-type"] = "application/json"
res = req.get_response(fakes.wsgi_app())
@@ -62,7 +62,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase):
def setUp(self):
super(VolumeTypesExtraSpecsTest, self).setUp()
fakes.stub_out_key_pair_funcs(self.stubs)
self.api_path = '/v1.1/123/os-volume-types/1/extra_specs'
self.api_path = '/v1.1/fake/os-volume-types/1/extra_specs'

def test_index(self):
self.stubs.Set(nova.db.api, 'volume_type_extra_specs_get',