openstack/nova
Code Issues Proposed changes

Merge "Fixes invalid uuid usages in test_neutronv2"

Browse Source
This commit is contained in:
Jenkins 2016-06-02 21:00:25 +00:00 committed by Gerrit Code Review
commit f610cbc8cc
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
nova/tests/unit/network/test_neutronv2.py
View File

@ -124,7 +124,7 @@ class TestNeutronClient(test.NoDBTestCase):
self.flags(url='http://anyhost/', group='neutron') self.flags(url='http://anyhost/', group='neutron')
self.flags(timeout=30, group='neutron') self.flags(timeout=30, group='neutron')
my_context = context.RequestContext('userid', my_context = context.RequestContext('userid',
'my_tenantid', uuids.my_tenant,
auth_token='token') auth_token='token')
cl = neutronapi.get_client(my_context) cl = neutronapi.get_client(my_context)
@ -134,7 +134,7 @@ class TestNeutronClient(test.NoDBTestCase):
self.assertEqual(CONF.neutron.timeout, cl.httpclient.session.timeout) self.assertEqual(CONF.neutron.timeout, cl.httpclient.session.timeout)
def test_withouttoken(self): def test_withouttoken(self):
my_context = context.RequestContext('userid', 'my_tenantid') my_context = context.RequestContext('userid', uuids.my_tenant)
self.assertRaises(exceptions.Unauthorized, self.assertRaises(exceptions.Unauthorized,
neutronapi.get_client, neutronapi.get_client,
my_context) my_context)
@ -143,7 +143,7 @@ class TestNeutronClient(test.NoDBTestCase):
self.flags(url='http://anyhost/', group='neutron') self.flags(url='http://anyhost/', group='neutron')
self.flags(timeout=30, group='neutron') self.flags(timeout=30, group='neutron')
my_context = context.RequestContext('userid', my_context = context.RequestContext('userid',
'my_tenantid', uuids.my_tenant,
auth_token='token', auth_token='token',
is_admin=True) is_admin=True)
cl = neutronapi.get_client(my_context) cl = neutronapi.get_client(my_context)
@ -155,7 +155,7 @@ class TestNeutronClient(test.NoDBTestCase):
def test_withouttoken_keystone_connection_error(self): def test_withouttoken_keystone_connection_error(self):
self.flags(url='http://anyhost/', group='neutron') self.flags(url='http://anyhost/', group='neutron')
my_context = context.RequestContext('userid', 'my_tenantid') my_context = context.RequestContext('userid', uuids.my_tenant)
self.assertRaises(NEUTRON_CLIENT_EXCEPTION, self.assertRaises(NEUTRON_CLIENT_EXCEPTION,
neutronapi.get_client, neutronapi.get_client,
my_context) my_context)
@ -164,7 +164,7 @@ class TestNeutronClient(test.NoDBTestCase):
@mock.patch.object(client.Client, "list_networks", new=mock.Mock()) @mock.patch.object(client.Client, "list_networks", new=mock.Mock())
def test_reuse_admin_token(self, m): def test_reuse_admin_token(self, m):
self.flags(url='http://anyhost/', group='neutron') self.flags(url='http://anyhost/', group='neutron')
my_context = context.RequestContext('userid', 'my_tenantid', my_context = context.RequestContext('userid', uuids.my_tenant,
auth_token='token') auth_token='token')
tokens = ['new_token2', 'new_token1'] tokens = ['new_token2', 'new_token1']
@ -194,7 +194,7 @@ class TestNeutronv2Base(test.TestCase):
def setUp(self): def setUp(self):
super(TestNeutronv2Base, self).setUp() super(TestNeutronv2Base, self).setUp()
self.context = context.RequestContext('userid', 'my_tenantid') self.context = context.RequestContext('userid', uuids.my_tenant)
setattr(self.context, setattr(self.context,
'auth_token', 'auth_token',
'bff4a5a6b9eb4ea2a6efec6eefb77936') 'bff4a5a6b9eb4ea2a6efec6eefb77936')
@ -216,17 +216,17 @@ class TestNeutronv2Base(test.TestCase):
self.nets1 = [{'id': 'my_netid1', self.nets1 = [{'id': 'my_netid1',
'name': 'my_netname1', 'name': 'my_netname1',
'subnets': ['mysubnid1'], 'subnets': ['mysubnid1'],
'tenant_id': 'my_tenantid'}] 'tenant_id': uuids.my_tenant}]
self.nets2 = [] self.nets2 = []
self.nets2.append(self.nets1[0]) self.nets2.append(self.nets1[0])
self.nets2.append({'id': 'my_netid2', self.nets2.append({'id': 'my_netid2',
'name': 'my_netname2', 'name': 'my_netname2',
'subnets': ['mysubnid2'], 'subnets': ['mysubnid2'],
'tenant_id': 'my_tenantid'}) 'tenant_id': uuids.my_tenant})
self.nets3 = self.nets2 + [{'id': 'my_netid3', self.nets3 = self.nets2 + [{'id': 'my_netid3',
'name': 'my_netname3', 'name': 'my_netname3',
'subnets': ['mysubnid3'], 'subnets': ['mysubnid3'],
'tenant_id': 'my_tenantid'}] 'tenant_id': uuids.my_tenant}]
self.nets4 = [{'id': 'his_netid4', self.nets4 = [{'id': 'his_netid4',
'name': 'his_netname4', 'name': 'his_netname4',
'tenant_id': 'his_tenantid'}] 'tenant_id': 'his_tenantid'}]
@ -258,7 +258,7 @@ class TestNeutronv2Base(test.TestCase):
self.nets11 = [{'id': 'my_netid1', self.nets11 = [{'id': 'my_netid1',
'name': 'my_netname1', 'name': 'my_netname1',
'subnets': ['mysubnid1'], 'subnets': ['mysubnid1'],
'tenant_id': 'my_tenantid', 'tenant_id': uuids.my_tenant,
'dns_domain': 'my-domain.org.'}] 'dns_domain': 'my-domain.org.'}]
self.nets = [self.nets1, self.nets2, self.nets3, self.nets4, self.nets = [self.nets1, self.nets2, self.nets3, self.nets4,
@ -344,16 +344,16 @@ class TestNeutronv2Base(test.TestCase):
'name': 'nova', 'name': 'nova',
'router:external': True, 'router:external': True,
'tenant_id': 'admin_tenantid'} 'tenant_id': 'admin_tenantid'}
self.fip_unassociated = {'tenant_id': 'my_tenantid', self.fip_unassociated = {'tenant_id': uuids.my_tenant,
'id': 'fip_id1', 'id': uuids.fip_id1,
'floating_ip_address': '172.24.4.227', 'floating_ip_address': '172.24.4.227',
'floating_network_id': self.fip_pool['id'], 'floating_network_id': self.fip_pool['id'],
'port_id': None, 'port_id': None,
'fixed_ip_address': None, 'fixed_ip_address': None,
'router_id': None} 'router_id': None}
fixed_ip_address = self.port_data2[1]['fixed_ips'][0]['ip_address'] fixed_ip_address = self.port_data2[1]['fixed_ips'][0]['ip_address']
self.fip_associated = {'tenant_id': 'my_tenantid', self.fip_associated = {'tenant_id': uuids.my_tenant,
'id': 'fip_id2', 'id': uuids.fip_id2,
'floating_ip_address': '172.24.4.228', 'floating_ip_address': '172.24.4.228',
'floating_network_id': self.fip_pool['id'], 'floating_network_id': self.fip_pool['id'],
'port_id': self.port_data2[1]['id'], 'port_id': self.port_data2[1]['id'],
@ -1383,14 +1383,14 @@ class TestNeutronv2(TestNeutronv2Base):
"""Only one network is available, it's external, and the client """Only one network is available, it's external, and the client
is authorized. is authorized.
""" """
admin_ctx = context.RequestContext('userid', 'my_tenantid', admin_ctx = context.RequestContext('userid', uuids.my_tenant,
is_admin=True) is_admin=True)
api = self._stub_allocate_for_instance(net_idx=8) api = self._stub_allocate_for_instance(net_idx=8)
api.allocate_for_instance(admin_ctx, self.instance) api.allocate_for_instance(admin_ctx, self.instance)
def test_allocate_for_instance_with_external_shared_net(self): def test_allocate_for_instance_with_external_shared_net(self):
"""Only one network is available, it's external and shared.""" """Only one network is available, it's external and shared."""
ctx = context.RequestContext('userid', 'my_tenantid') ctx = context.RequestContext('userid', uuids.my_tenant)
api = self._stub_allocate_for_instance(net_idx=10) api = self._stub_allocate_for_instance(net_idx=10)
api.allocate_for_instance(ctx, self.instance) api.allocate_for_instance(ctx, self.instance)
@ -1568,10 +1568,10 @@ class TestNeutronv2(TestNeutronv2Base):
id=mox.SameElementsAs(ids)).AndReturn( id=mox.SameElementsAs(ids)).AndReturn(
{'networks': self.nets2}) {'networks': self.nets2})
self.moxed_client.show_quota( self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn( tenant_id=uuids.my_tenant).AndReturn(
{'quota': {'port': 50}}) {'quota': {'port': 50}})
self.moxed_client.list_ports( self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn( tenant_id=uuids.my_tenant, fields=['id']).AndReturn(
{'ports': []}) {'ports': []})
self.mox.ReplayAll() self.mox.ReplayAll()
api = neutronapi.API() api = neutronapi.API()
@ -1585,7 +1585,7 @@ class TestNeutronv2(TestNeutronv2Base):
id=mox.SameElementsAs(ids)).AndReturn( id=mox.SameElementsAs(ids)).AndReturn(
{'networks': self.nets2}) {'networks': self.nets2})
self.moxed_client.show_quota( self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn( tenant_id=uuids.my_tenant).AndReturn(
{'quota': {}}) {'quota': {}})
self.mox.ReplayAll() self.mox.ReplayAll()
api = neutronapi.API() api = neutronapi.API()
@ -1597,10 +1597,10 @@ class TestNeutronv2(TestNeutronv2Base):
id=mox.SameElementsAs(['my_netid1'])).AndReturn( id=mox.SameElementsAs(['my_netid1'])).AndReturn(
{'networks': self.nets1}) {'networks': self.nets1})
self.moxed_client.show_quota( self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn( tenant_id=uuids.my_tenant).AndReturn(
{'quota': {'port': 50}}) {'quota': {'port': 50}})
self.moxed_client.list_ports( self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn( tenant_id=uuids.my_tenant, fields=['id']).AndReturn(
{'ports': []}) {'ports': []})
self.mox.ReplayAll() self.mox.ReplayAll()
api = neutronapi.API() api = neutronapi.API()
@ -1637,10 +1637,10 @@ class TestNeutronv2(TestNeutronv2Base):
id=mox.SameElementsAs(ids)).AndReturn( id=mox.SameElementsAs(ids)).AndReturn(
{'networks': self.nets1}) {'networks': self.nets1})
self.moxed_client.show_quota( self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn( tenant_id=uuids.my_tenant).AndReturn(
{'quota': {'port': 50}}) {'quota': {'port': 50}})
self.moxed_client.list_ports( self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn( tenant_id=uuids.my_tenant, fields=['id']).AndReturn(
{'ports': []}) {'ports': []})
self.mox.ReplayAll() self.mox.ReplayAll()
api = neutronapi.API() api = neutronapi.API()
@ -1831,10 +1831,10 @@ class TestNeutronv2(TestNeutronv2Base):
id=mox.SameElementsAs(ids)).AndReturn( id=mox.SameElementsAs(ids)).AndReturn(
{'networks': self.nets2}) {'networks': self.nets2})
self.moxed_client.show_quota( self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn( tenant_id=uuids.my_tenant).AndReturn(
{'quota': {'port': 2}}) {'quota': {'port': 2}})
self.moxed_client.list_ports( self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn( tenant_id=uuids.my_tenant, fields=['id']).AndReturn(
{'ports': self.port_data2}) {'ports': self.port_data2})
self.mox.ReplayAll() self.mox.ReplayAll()
api = neutronapi.API() api = neutronapi.API()
@ -1857,10 +1857,10 @@ class TestNeutronv2(TestNeutronv2Base):
id=mox.SameElementsAs(ids)).AndReturn( id=mox.SameElementsAs(ids)).AndReturn(
{'networks': self.nets1}) {'networks': self.nets1})
self.moxed_client.show_quota( self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn( tenant_id=uuids.my_tenant).AndReturn(
{'quota': {'port': 5}}) {'quota': {'port': 5}})
self.moxed_client.list_ports( self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn( tenant_id=uuids.my_tenant, fields=['id']).AndReturn(
{'ports': self.port_data2}) {'ports': self.port_data2})
self.mox.ReplayAll() self.mox.ReplayAll()
api = neutronapi.API() api = neutronapi.API()
@ -1895,10 +1895,10 @@ class TestNeutronv2(TestNeutronv2Base):
id=mox.SameElementsAs(ids)).AndReturn( id=mox.SameElementsAs(ids)).AndReturn(
{'networks': self.nets2}) {'networks': self.nets2})
self.moxed_client.show_quota( self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn( tenant_id=uuids.my_tenant).AndReturn(
{'quota': {'port': 5}}) {'quota': {'port': 5}})
self.moxed_client.list_ports( self.moxed_client.list_ports(
tenant_id='my_tenantid', fields=['id']).AndReturn( tenant_id=uuids.my_tenant, fields=['id']).AndReturn(
{'ports': self.port_data2}) {'ports': self.port_data2})
self.mox.ReplayAll() self.mox.ReplayAll()
api = neutronapi.API() api = neutronapi.API()
@ -1918,7 +1918,7 @@ class TestNeutronv2(TestNeutronv2Base):
id=mox.SameElementsAs(ids)).AndReturn( id=mox.SameElementsAs(ids)).AndReturn(
{'networks': self.nets2}) {'networks': self.nets2})
self.moxed_client.show_quota( self.moxed_client.show_quota(
tenant_id='my_tenantid').AndReturn( tenant_id=uuids.my_tenant).AndReturn(
{'quota': {'port': -1}}) {'quota': {'port': -1}})
self.mox.ReplayAll() self.mox.ReplayAll()
api = neutronapi.API() api = neutronapi.API()
@ -4331,7 +4331,7 @@ class TestNeutronClientForAdminScenarios(test.NoDBTestCase):
if admin_context: if admin_context:
my_context = context.get_admin_context() my_context = context.get_admin_context()
else: else:
my_context = context.RequestContext('userid', 'my_tenantid', my_context = context.RequestContext('userid', uuids.my_tenant,
auth_token='token') auth_token='token')
# clean global # clean global