diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py index dce24554d5c4..45a5c599ce68 100755 --- a/nova/tests/unit/compute/test_compute_mgr.py +++ b/nova/tests/unit/compute/test_compute_mgr.py @@ -306,7 +306,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase): objects.BlockDeviceMapping(source_type='volume', destination_type='volume', instance_uuid=uuids.instance)]) - net_req = net_req_obj.NetworkRequest(port_id='bar', tag='foo') + net_req = net_req_obj.NetworkRequest(port_id=uuids.bar, tag='foo') net_req_list = net_req_obj.NetworkRequestList(objects=[net_req]) with mock.patch.dict(self.compute.driver.capabilities, supports_device_tagging=False): @@ -345,7 +345,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase): destination_type='volume', tag='foo', instance_uuid=uuids.instance)]) - net_req = net_req_obj.NetworkRequest(network_id='bar') + net_req = net_req_obj.NetworkRequest(network_id=uuids.bar) net_req_list = net_req_obj.NetworkRequestList(objects=[net_req]) with mock.patch.dict(self.compute.driver.capabilities, supports_device_tagging=True): @@ -356,7 +356,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase): objects.BlockDeviceMapping(source_type='volume', destination_type='volume', instance_uuid=uuids.instance)]) - net_req = net_req_obj.NetworkRequest(network_id='bar', tag='foo') + net_req = net_req_obj.NetworkRequest(network_id=uuids.bar, tag='foo') net_req_list = net_req_obj.NetworkRequestList(objects=[net_req]) with mock.patch.dict(self.compute.driver.capabilities, supports_device_tagging=True): diff --git a/nova/tests/unit/network/test_neutronv2.py b/nova/tests/unit/network/test_neutronv2.py index c3611865c129..b3e133d96517 100644 --- a/nova/tests/unit/network/test_neutronv2.py +++ b/nova/tests/unit/network/test_neutronv2.py @@ -246,17 +246,17 @@ class TestNeutronv2Base(test.TestCase): 'availability_zone': 'nova', 'info_cache': {'network_info': []}, 'security_groups': []} - self.nets1 = [{'id': 'my_netid1', + self.nets1 = [{'id': uuids.my_netid1, 'name': 'my_netname1', 'subnets': ['mysubnid1'], 'tenant_id': uuids.my_tenant}] self.nets2 = [] self.nets2.append(self.nets1[0]) - self.nets2.append({'id': 'my_netid2', + self.nets2.append({'id': uuids.my_netid2, 'name': 'my_netname2', 'subnets': ['mysubnid2'], 'tenant_id': uuids.my_tenant}) - self.nets3 = self.nets2 + [{'id': 'my_netid3', + self.nets3 = self.nets2 + [{'id': uuids.my_netid3, 'name': 'my_netname3', 'subnets': ['mysubnid3'], 'tenant_id': uuids.my_tenant}] @@ -288,7 +288,7 @@ class TestNeutronv2Base(test.TestCase): 'router:external': True, 'shared': True, 'subnets': ['mysubnid10']}] # A network with non-blank dns_domain to test _update_port_dns_name - self.nets11 = [{'id': 'my_netid1', + self.nets11 = [{'id': uuids.my_netid1, 'name': 'my_netname1', 'subnets': ['mysubnid1'], 'tenant_id': uuids.my_tenant, @@ -299,7 +299,7 @@ class TestNeutronv2Base(test.TestCase): self.nets9, self.nets10, self.nets11] self.port_address = '10.0.1.2' - self.port_data1 = [{'network_id': 'my_netid1', + self.port_data1 = [{'network_id': uuids.my_netid1, 'device_id': self.instance2['uuid'], 'tenant_id': self.tenant_id, 'device_owner': 'compute:nova', @@ -320,7 +320,7 @@ class TestNeutronv2Base(test.TestCase): self.port_address2 = '10.0.2.2' self.port_data2 = [] self.port_data2.append(self.port_data1[0]) - self.port_data2.append({'network_id': 'my_netid2', + self.port_data2.append({'network_id': uuids.my_netid2, 'device_id': self.instance['uuid'], 'tenant_id': self.tenant_id, 'admin_state_up': True, @@ -337,7 +337,7 @@ class TestNeutronv2Base(test.TestCase): self.float_data2.append({'port_id': uuids.portid_2, 'fixed_ip_address': '10.0.2.2', 'floating_ip_address': '172.0.2.2'}) - self.port_data3 = [{'network_id': 'my_netid1', + self.port_data3 = [{'network_id': uuids.my_netid1, 'device_id': 'device_id3', 'tenant_id': self.tenant_id, 'status': 'DOWN', @@ -349,23 +349,23 @@ class TestNeutronv2Base(test.TestCase): 'mac_address': 'my_mac3', }] self.subnet_data1 = [{'id': 'my_subid1', 'cidr': '10.0.1.0/24', - 'network_id': 'my_netid1', + 'network_id': uuids.my_netid1, 'gateway_ip': '10.0.1.1', 'dns_nameservers': ['8.8.1.1', '8.8.1.2']}] self.subnet_data2 = [] self.subnet_data_n = [{'id': 'my_subid1', 'cidr': '10.0.1.0/24', - 'network_id': 'my_netid1', + 'network_id': uuids.my_netid1, 'gateway_ip': '10.0.1.1', 'dns_nameservers': ['8.8.1.1', '8.8.1.2']}, {'id': 'my_subid2', 'cidr': '20.0.1.0/24', - 'network_id': 'my_netid2', + 'network_id': uuids.my_netid2, 'gateway_ip': '20.0.1.1', 'dns_nameservers': ['8.8.1.1', '8.8.1.2']}] self.subnet_data2.append({'id': 'my_subid2', 'cidr': '10.0.2.0/24', - 'network_id': 'my_netid2', + 'network_id': uuids.my_netid2, 'gateway_ip': '10.0.2.1', 'dns_nameservers': ['8.8.2.1', '8.8.2.2']}) @@ -527,7 +527,7 @@ class TestNeutronv2Base(test.TestCase): port_req_body['port']['extra_dhcp_opts'] = dhcp_options if not request.port_id: - port_id = "fake" + port_id = uuids.fake update_port_res = {'port': { 'id': port_id, 'mac_address': 'fakemac%i' % index}} @@ -618,16 +618,16 @@ class TestNeutronv2Base(test.TestCase): self.moxed_client.show_port(request.port_id ).AndReturn( {'port': {'id': uuids.portid_3, - 'network_id': 'my_netid1', + 'network_id': uuids.my_netid1, 'tenant_id': self.tenant_id, 'mac_address': 'my_mac1', 'device_id': kwargs.get('_device') and self.instance2.uuid or ''}}) - ports['my_netid1'] = [self.port_data1[0], + ports[uuids.my_netid1] = [self.port_data1[0], self.port_data3[0]] ports[request.port_id] = self.port_data3[0] - request.network_id = 'my_netid1' + request.network_id = uuids.my_netid1 if macs is not None: macs.discard('my_mac1') elif request.port_id == uuids.non_existent_uuid: @@ -638,7 +638,7 @@ class TestNeutronv2Base(test.TestCase): else: self.moxed_client.show_port(request.port_id).AndReturn( {'port': {'id': uuids.portid_1, - 'network_id': 'my_netid1', + 'network_id': uuids.my_netid1, 'tenant_id': self.tenant_id, 'mac_address': 'my_mac1', 'device_id': kwargs.get('_device') and @@ -647,7 +647,7 @@ class TestNeutronv2Base(test.TestCase): 'dns_name': kwargs.get('_dns_name') or ''}}) ports[request.port_id] = self.port_data1[0] - request.network_id = 'my_netid1' + request.network_id = uuids.my_netid1 if macs is not None: macs.discard('my_mac1') else: @@ -698,7 +698,7 @@ class TestNeutronv2Base(test.TestCase): port_req_body_create['port']['admin_state_up'] = True port_req_body_create['port']['tenant_id'] = \ self.instance.project_id - res_port = {'port': {'id': "fake"}} + res_port = {'port': {'id': uuids.fake}} self.moxed_client.create_port( MyComparator(port_req_body_create)).AndReturn(res_port) @@ -1208,7 +1208,8 @@ class TestNeutronv2(TestNeutronv2Base): vifs_really_created = [vif for vif in self._vifs_created if vif.create.called] self.assertEqual(2, len(vifs_really_created)) - self.assertEqual([('foo', 'fakemac1/fake'), (None, 'fakemac3/fake')], + self.assertEqual([('foo', 'fakemac1/%s' % uuids.fake), + (None, 'fakemac3/%s' % uuids.fake)], [(vif.tag, vif.address) for vif in vifs_really_created]) @@ -1291,10 +1292,11 @@ class TestNeutronv2(TestNeutronv2Base): objects=[objects.NetworkRequest(network_id=net['id']) for net in (self.nets2[0], self.nets2[1])]) self.moxed_client.list_networks( - id=['my_netid1', 'my_netid2']).AndReturn({'networks': self.nets2}) + id=[uuids.my_netid1, uuids.my_netid2]).AndReturn( + {'networks': self.nets2}) mock_has_port_binding.return_value = False mock_create_ports.return_value = [ - (request, ('portid_' + request.network_id)) + (request, (getattr(uuids, 'portid_%s' % request.network_id))) for request in requested_networks ] neutronapi.get_client( @@ -1316,7 +1318,7 @@ class TestNeutronv2(TestNeutronv2Base): }, } port_req_body['port'].update(binding_port_req_body['port']) - port_id = 'portid_' + network['id'] + port_id = getattr(uuids, 'portid_%s' % network['id']) port = {'id': port_id, 'mac_address': 'foo'} if index == 0: @@ -1329,8 +1331,10 @@ class TestNeutronv2(TestNeutronv2Base): MyComparator(binding_port_req_body)).AndRaise( NeutronOverQuota) index += 1 - self.moxed_client.delete_port('portid_' + self.nets2[0]['id']) - self.moxed_client.delete_port('portid_' + self.nets2[1]['id']) + self.moxed_client.delete_port( + getattr(uuids, 'portid_%s' % self.nets2[0]['id'])) + self.moxed_client.delete_port( + getattr(uuids, 'portid_%s' % self.nets2[1]['id'])) self.mox.ReplayAll() self.assertRaises(exception.PortInUse, api.allocate_for_instance, @@ -1353,7 +1357,8 @@ class TestNeutronv2(TestNeutronv2Base): objects=[objects.NetworkRequest(network_id=net['id']) for net in (self.nets2[0], self.nets2[1])]) self.moxed_client.list_networks( - id=['my_netid1', 'my_netid2']).AndReturn({'networks': self.nets2}) + id=[uuids.my_netid1, uuids.my_netid2]).AndReturn( + {'networks': self.nets2}) port_req_body = { 'port': { 'network_id': self.nets2[0]['id'], @@ -1395,7 +1400,7 @@ class TestNeutronv2(TestNeutronv2Base): def test_allocate_for_instance_second_time(self): # Make sure that allocate_for_instance only returns ports that it # allocated during _that_ run. - new_port = {'id': 'fake'} + new_port = {'id': uuids.fake} self._returned_nw_info = self.port_data1 + [new_port] nw_info = self._allocate_for_instance() self.assertEqual([new_port], nw_info) @@ -1634,7 +1639,7 @@ class TestNeutronv2(TestNeutronv2Base): port_data[0]['id']) self.assertEqual(len(port_data[1:]), len(nwinfo)) if len(port_data) > 1: - self.assertEqual('my_netid2', nwinfo[0]['network']['id']) + self.assertEqual(uuids.my_netid2, nwinfo[0]['network']['id']) def test_deallocate_port_for_instance_1(self): # Test to deallocate the first and only port @@ -1657,9 +1662,9 @@ class TestNeutronv2(TestNeutronv2Base): neutronapi.API().show_port(self.context, 'foo') def test_validate_networks(self): - requested_networks = [('my_netid1', None, None, None), - ('my_netid2', None, None, None)] - ids = ['my_netid1', 'my_netid2'] + requested_networks = [(uuids.my_netid1, None, None, None), + (uuids.my_netid2, None, None, None)] + ids = [uuids.my_netid1, uuids.my_netid2] self.moxed_client.list_networks( id=mox.SameElementsAs(ids)).AndReturn( {'networks': self.nets2}) @@ -1674,9 +1679,9 @@ class TestNeutronv2(TestNeutronv2Base): api.validate_networks(self.context, requested_networks, 1) def test_validate_networks_without_port_quota_on_network_side(self): - requested_networks = [('my_netid1', None, None, None), - ('my_netid2', None, None, None)] - ids = ['my_netid1', 'my_netid2'] + requested_networks = [(uuids.my_netid1, None, None, None), + (uuids.my_netid2, None, None, None)] + ids = [uuids.my_netid1, uuids.my_netid2] self.moxed_client.list_networks( id=mox.SameElementsAs(ids)).AndReturn( {'networks': self.nets2}) @@ -1688,9 +1693,9 @@ class TestNeutronv2(TestNeutronv2Base): api.validate_networks(self.context, requested_networks, 1) def test_validate_networks_ex_1(self): - requested_networks = [('my_netid1', None, None, None)] + requested_networks = [(uuids.my_netid1, None, None, None)] self.moxed_client.list_networks( - id=mox.SameElementsAs(['my_netid1'])).AndReturn( + id=mox.SameElementsAs([uuids.my_netid1])).AndReturn( {'networks': self.nets1}) self.moxed_client.show_quota( tenant_id=uuids.my_tenant).AndReturn( @@ -1706,10 +1711,10 @@ class TestNeutronv2(TestNeutronv2Base): self.assertIn("my_netid2", six.text_type(ex)) def test_validate_networks_ex_2(self): - requested_networks = [('my_netid1', None, None, None), - ('my_netid2', None, None, None), - ('my_netid3', None, None, None)] - ids = ['my_netid1', 'my_netid2', 'my_netid3'] + requested_networks = [(uuids.my_netid1, None, None, None), + (uuids.my_netid2, None, None, None), + (uuids.my_netid3, None, None, None)] + ids = [uuids.my_netid1, uuids.my_netid2, uuids.my_netid3] self.moxed_client.list_networks( id=mox.SameElementsAs(ids)).AndReturn( {'networks': self.nets1}) @@ -1718,16 +1723,16 @@ class TestNeutronv2(TestNeutronv2Base): try: api.validate_networks(self.context, requested_networks, 1) except exception.NetworkNotFound as ex: - self.assertIn("my_netid2", six.text_type(ex)) - self.assertIn("my_netid3", six.text_type(ex)) + self.assertIn(uuids.my_netid2, six.text_type(ex)) + self.assertIn(uuids.my_netid3, six.text_type(ex)) def test_validate_networks_duplicate_enable(self): # Verify that no duplicateNetworks exception is thrown when duplicate # network ids are passed to validate_networks. requested_networks = objects.NetworkRequestList( - objects=[objects.NetworkRequest(network_id='my_netid1'), - objects.NetworkRequest(network_id='my_netid1')]) - ids = ['my_netid1', 'my_netid1'] + objects=[objects.NetworkRequest(network_id=uuids.my_netid1), + objects.NetworkRequest(network_id=uuids.my_netid1)]) + ids = [uuids.my_netid1, uuids.my_netid1] self.moxed_client.list_networks( id=mox.SameElementsAs(ids)).AndReturn( @@ -1761,9 +1766,9 @@ class TestNeutronv2(TestNeutronv2Base): def test_allocate_for_instance_requested_networks_duplicates_combo(self): # specify a combo net_idx=7 : net2, port in net1, net2, port in net1 requested_networks = objects.NetworkRequestList( - objects=[objects.NetworkRequest(network_id='my_netid2'), + objects=[objects.NetworkRequest(network_id=uuids.my_netid2), objects.NetworkRequest(port_id=self.port_data1[0]['id']), - objects.NetworkRequest(network_id='my_netid2'), + objects.NetworkRequest(network_id=uuids.my_netid2), objects.NetworkRequest(port_id=self.port_data3[0]['id'])]) self._allocate_for_instance(net_idx=7, requested_networks=requested_networks) @@ -1789,7 +1794,7 @@ class TestNeutronv2(TestNeutronv2Base): requested_networks = objects.NetworkRequestList( objects=[objects.NetworkRequest( - network_id='my_netid1', + network_id=uuids.my_netid1, port_id=uuids.portid_1)]) PortNotFound = exceptions.PortNotFoundClient() @@ -1810,7 +1815,7 @@ class TestNeutronv2(TestNeutronv2Base): requested_networks = objects.NetworkRequestList( objects=[objects.NetworkRequest( - network_id='my_netid1', + network_id=uuids.my_netid1, port_id=fake_port_id)]) NeutronNotFound = exceptions.NeutronClientException(status_code=0) @@ -1920,9 +1925,9 @@ class TestNeutronv2(TestNeutronv2Base): # two ports, where the quota is 2 and 2 ports are in use # => instances which can be created = 0 requested_networks = objects.NetworkRequestList( - objects=[objects.NetworkRequest(network_id='my_netid1'), - objects.NetworkRequest(network_id='my_netid2')]) - ids = ['my_netid1', 'my_netid2'] + objects=[objects.NetworkRequest(network_id=uuids.my_netid1), + objects.NetworkRequest(network_id=uuids.my_netid2)]) + ids = [uuids.my_netid1, uuids.my_netid2] self.moxed_client.list_networks( id=mox.SameElementsAs(ids)).AndReturn( {'networks': self.nets2}) @@ -1945,10 +1950,10 @@ class TestNeutronv2(TestNeutronv2Base): port_b['device_id'] = None port_b['device_owner'] = None requested_networks = objects.NetworkRequestList( - objects=[objects.NetworkRequest(network_id='my_netid1'), + objects=[objects.NetworkRequest(network_id=uuids.my_netid1), objects.NetworkRequest(port_id=port_b['id'])]) self.moxed_client.show_port(port_b['id']).AndReturn({'port': port_b}) - ids = ['my_netid1'] + ids = [uuids.my_netid1] self.moxed_client.list_networks( id=mox.SameElementsAs(ids)).AndReturn( {'networks': self.nets1}) @@ -1984,9 +1989,9 @@ class TestNeutronv2(TestNeutronv2Base): # two ports each, where the quota is 5 and 2 ports are in use # => instances which can be created = 1 requested_networks = objects.NetworkRequestList( - objects=[objects.NetworkRequest(network_id='my_netid1'), - objects.NetworkRequest(network_id='my_netid2')]) - ids = ['my_netid1', 'my_netid2'] + objects=[objects.NetworkRequest(network_id=uuids.my_netid1), + objects.NetworkRequest(network_id=uuids.my_netid2)]) + ids = [uuids.my_netid1, uuids.my_netid2] self.moxed_client.list_networks( id=mox.SameElementsAs(ids)).AndReturn( {'networks': self.nets2}) @@ -2007,9 +2012,9 @@ class TestNeutronv2(TestNeutronv2Base): # two ports each, where the quota is -1 (unlimited) # => instances which can be created = 1 requested_networks = objects.NetworkRequestList( - objects=[objects.NetworkRequest(network_id='my_netid1'), - objects.NetworkRequest(network_id='my_netid2')]) - ids = ['my_netid1', 'my_netid2'] + objects=[objects.NetworkRequest(network_id=uuids.my_netid1), + objects.NetworkRequest(network_id=uuids.my_netid2)]) + ids = [uuids.my_netid1, uuids.my_netid2] self.moxed_client.list_networks( id=mox.SameElementsAs(ids)).AndReturn( {'networks': self.nets2}) @@ -2492,7 +2497,7 @@ class TestNeutronv2(TestNeutronv2Base): instance = self._fake_instance_object(self.instance) api = neutronapi.API() self._setup_mock_for_refresh_cache(api, [instance]) - network_id = 'my_netid1' + network_id = uuids.my_netid1 search_opts = {'network_id': network_id} self.moxed_client.list_subnets( **search_opts).AndReturn({'subnets': self.subnet_data_n}) @@ -2549,7 +2554,7 @@ class TestNeutronv2(TestNeutronv2Base): self.moxed_client.list_floatingips( fixed_ip_address='1.1.1.1', port_id=1).AndRaise(NeutronNotFound) self.mox.ReplayAll() - neutronapi.get_client('fake') + neutronapi.get_client(uuids.fake) floatingips = api._get_floating_ips_by_fixed_and_port( self.moxed_client, '1.1.1.1', 1) self.assertEqual([], floatingips) @@ -2566,7 +2571,7 @@ class TestNeutronv2(TestNeutronv2Base): self.moxed_client, '1.1.1.1', 'port-id').AndReturn( [{'floating_ip_address': '10.0.0.1'}]) self.mox.ReplayAll() - neutronapi.get_client('fake') + neutronapi.get_client(uuids.fake) result = api._nw_info_get_ips(self.moxed_client, fake_port) self.assertEqual(1, len(result)) self.assertEqual('1.1.1.1', result[0]['address']) @@ -2586,7 +2591,7 @@ class TestNeutronv2(TestNeutronv2Base): api._get_subnets_from_port(self.context, fake_port).AndReturn( [fake_subnet]) self.mox.ReplayAll() - neutronapi.get_client('fake') + neutronapi.get_client(uuids.fake) subnets = api._nw_info_get_subnets(self.context, fake_port, fake_ips) self.assertEqual(1, len(subnets)) self.assertEqual(1, len(subnets[0]['ips'])) @@ -2604,7 +2609,7 @@ class TestNeutronv2(TestNeutronv2Base): 'mtu': 9000}] api = neutronapi.API() self.mox.ReplayAll() - neutronapi.get_client('fake') + neutronapi.get_client(uuids.fake) net, iid = api._nw_info_build_network(fake_port, fake_nets, fake_subnets) self.assertEqual(fake_subnets, net['subnets']) @@ -2658,7 +2663,7 @@ class TestNeutronv2(TestNeutronv2Base): fake_nets = [{'id': 'net-id2', 'name': 'foo', 'tenant_id': 'tenant'}] api = neutronapi.API() self.mox.ReplayAll() - neutronapi.get_client('fake') + neutronapi.get_client(uuids.fake) net, iid = api._nw_info_build_network(fake_port, fake_nets, fake_subnets) self.assertEqual(fake_subnets, net['subnets']) @@ -2679,7 +2684,7 @@ class TestNeutronv2(TestNeutronv2Base): fake_nets = [{'id': 'net-id', 'name': 'foo', 'tenant_id': 'tenant'}] api = neutronapi.API() self.mox.ReplayAll() - neutronapi.get_client('fake') + neutronapi.get_client(uuids.fake) net, iid = api._nw_info_build_network(fake_port, fake_nets, fake_subnets) self.assertEqual(fake_subnets, net['subnets']) @@ -2707,7 +2712,7 @@ class TestNeutronv2(TestNeutronv2Base): fake_nets = [{'id': 'net-id', 'name': 'foo', 'tenant_id': 'tenant'}] api = neutronapi.API() self.mox.ReplayAll() - neutronapi.get_client('fake') + neutronapi.get_client(uuids.fake) net, iid = api._nw_info_build_network(fake_port, fake_nets, fake_subnets) self.assertNotEqual(CONF.neutron.ovs_bridge, net['bridge']) @@ -2727,7 +2732,7 @@ class TestNeutronv2(TestNeutronv2Base): api = neutronapi.API() fake_inst = objects.Instance() - fake_inst.project_id = 'fake' + fake_inst.project_id = uuids.fake fake_inst.uuid = uuids.instance fake_inst.info_cache = objects.InstanceInfoCache() fake_inst.info_cache.network_info = model.NetworkInfo() @@ -2818,13 +2823,13 @@ class TestNeutronv2(TestNeutronv2Base): fake_nets = [ {'id': 'net-id', 'name': 'foo', - 'tenant_id': 'fake', + 'tenant_id': uuids.fake, } ] neutronapi.get_client(mox.IgnoreArg(), admin=True).MultipleTimes( ).AndReturn(self.moxed_client) self.moxed_client.list_ports( - tenant_id='fake', device_id=uuids.instance).AndReturn( + tenant_id=uuids.fake, device_id=uuids.instance).AndReturn( {'ports': fake_ports}) self.mox.StubOutWithMock(api, '_get_floating_ips_by_fixed_and_port') @@ -2842,7 +2847,7 @@ class TestNeutronv2(TestNeutronv2Base): self.mox.StubOutWithMock(api, '_get_preexisting_port_ids') api._get_preexisting_port_ids(fake_inst).AndReturn(['port5']) self.mox.ReplayAll() - neutronapi.get_client('fake') + neutronapi.get_client(uuids.fake) fake_inst.info_cache = objects.InstanceInfoCache.new( self.context, uuids.instance) fake_inst.info_cache.network_info = model.NetworkInfo.hydrate([]) @@ -2913,7 +2918,7 @@ class TestNeutronv2(TestNeutronv2Base): api = neutronapi.API() fake_inst = objects.Instance() - fake_inst.project_id = 'fake' + fake_inst.project_id = uuids.fake fake_inst.uuid = uuids.instance fake_inst.info_cache = objects.InstanceInfoCache() fake_inst.info_cache.network_info = model.NetworkInfo() @@ -2935,7 +2940,7 @@ class TestNeutronv2(TestNeutronv2Base): neutronapi.get_client(mox.IgnoreArg(), admin=True).MultipleTimes( ).AndReturn(self.moxed_client) self.moxed_client.list_ports( - tenant_id='fake', device_id=uuids.instance).AndReturn( + tenant_id=uuids.fake, device_id=uuids.instance).AndReturn( {'ports': fake_ports}) mock_gather_port_ids_and_networks.return_value = ([], []) @@ -2945,7 +2950,7 @@ class TestNeutronv2(TestNeutronv2Base): mock_nw_info_get_subnets.return_value = fake_subnets self.mox.ReplayAll() - neutronapi.get_client('fake') + neutronapi.get_client(uuids.fake) nw_infos = api._build_network_info_model( self.context, fake_inst) @@ -3191,14 +3196,14 @@ class TestNeutronv2WithMock(test.TestCase): """Test validates that a relevant exception is being raised when there are more ports defined, than there is a quota for it. """ - requested_networks = [('my_netid1', '10.0.1.2', None, None), - ('my_netid2', '10.0.1.3', None, None)] + requested_networks = [(uuids.my_netid1, '10.0.1.2', None, None), + (uuids.my_netid2, '10.0.1.3', None, None)] - list_port_values = [({'network_id': 'my_netid1', + list_port_values = [({'network_id': uuids.my_netid1, 'fixed_ips': 'ip_address=10.0.1.2', 'fields': 'device_id'}, {'ports': []}), - ({'network_id': 'my_netid2', + ({'network_id': uuids.my_netid2, 'fixed_ips': 'ip_address=10.0.1.3', 'fields': 'device_id'}, {'ports': []}), @@ -3235,14 +3240,14 @@ class TestNeutronv2WithMock(test.TestCase): # Test validation for a request for a network with a # fixed ip that is not already in use because no fixed ips in use - nets1 = [{'id': 'my_netid1', + nets1 = [{'id': uuids.my_netid1, 'name': 'my_netname1', 'subnets': ['mysubnid1'], 'tenant_id': 'fake-project'}] - requested_networks = [('my_netid1', '10.0.1.2', None, None)] - ids = ['my_netid1'] - list_port_values = [({'network_id': 'my_netid1', + requested_networks = [(uuids.my_netid1, '10.0.1.2', None, None)] + ids = [uuids.my_netid1] + list_port_values = [({'network_id': uuids.my_netid1, 'fixed_ips': 'ip_address=10.0.1.2', 'fields': 'device_id'}, {'ports': []}), @@ -3255,23 +3260,23 @@ class TestNeutronv2WithMock(test.TestCase): # Test validation for a request for a network with a # fixed ip that is not already in use because not used on this net id - nets2 = [{'id': 'my_netid1', + nets2 = [{'id': uuids.my_netid1, 'name': 'my_netname1', 'subnets': ['mysubnid1'], 'tenant_id': 'fake-project'}, - {'id': 'my_netid2', + {'id': uuids.my_netid2, 'name': 'my_netname2', 'subnets': ['mysubnid2'], 'tenant_id': 'fake-project'}] - requested_networks = [('my_netid1', '10.0.1.2', None, None), - ('my_netid2', '10.0.1.3', None, None)] - ids = ['my_netid1', 'my_netid2'] - list_port_values = [({'network_id': 'my_netid1', + requested_networks = [(uuids.my_netid1, '10.0.1.2', None, None), + (uuids.my_netid2, '10.0.1.3', None, None)] + ids = [uuids.my_netid1, uuids.my_netid2] + list_port_values = [({'network_id': uuids.my_netid1, 'fixed_ips': 'ip_address=10.0.1.2', 'fields': 'device_id'}, {'ports': []}), - ({'network_id': 'my_netid2', + ({'network_id': uuids.my_netid2, 'fixed_ips': 'ip_address=10.0.1.3', 'fields': 'device_id'}, {'ports': []}), @@ -3286,8 +3291,8 @@ class TestNeutronv2WithMock(test.TestCase): # Test validation for a request for a network with a # fixed ip that is already in use - requested_networks = [('my_netid1', '10.0.1.2', None, None)] - list_port_mock_params = {'network_id': 'my_netid1', + requested_networks = [(uuids.my_netid1, '10.0.1.2', None, None)] + list_port_mock_params = {'network_id': uuids.my_netid1, 'fixed_ips': 'ip_address=10.0.1.2', 'fields': 'device_id'} list_port_mock_return = {'ports': [({'device_id': 'my_deviceid'})]} @@ -3341,7 +3346,7 @@ class TestNeutronv2WithMock(test.TestCase): self.assertRaises(exception.NoMoreFixedIps, self.api._create_port_minimal, neutronapi.get_client(self.context), - instance, 'my_netid1') + instance, uuids.my_netid1) self.assertTrue(create_port_mock.called) @mock.patch.object(client.Client, 'update_port', @@ -3389,7 +3394,7 @@ class TestNeutronv2WithMock(test.TestCase): self.assertRaises(exception.FixedIpAlreadyInUse, self.api._create_port_minimal, neutronapi.get_client(self.context), - instance, 'my_netid1', fixed_ip=fake_ip) + instance, uuids.my_netid1, fixed_ip=fake_ip) self.assertTrue(create_port_mock.called) @mock.patch.object(client.Client, 'create_port', @@ -3401,12 +3406,12 @@ class TestNeutronv2WithMock(test.TestCase): exc = self.assertRaises(exception.InvalidInput, self.api._create_port_minimal, neutronapi.get_client(self.context), - instance, 'my_netid1', fixed_ip=fake_ip) + instance, uuids.my_netid1, fixed_ip=fake_ip) expected_exception_msg = ('Invalid input received: Fixed IP %(ip)s is ' 'not a valid ip address for network ' '%(net_id)s.' % - {'ip': fake_ip, 'net_id': 'my_netid1'}) + {'ip': fake_ip, 'net_id': uuids.my_netid1}) self.assertEqual(expected_exception_msg, str(exc)) self.assertTrue(create_port_mock.called) @@ -3493,8 +3498,8 @@ class TestNeutronv2WithMock(test.TestCase): ): self.assertRaises(exceptions.Unauthorized, api.deallocate_port_for_instance, - self.context, instance={'uuid': 'fake'}, - port_id='fake') + self.context, instance={'uuid': uuids.fake}, + port_id=uuids.fake) # make sure that we didn't try to reload nw info self.assertFalse(get_nw_info.called) @@ -3981,7 +3986,7 @@ class TestNeutronv2WithMock(test.TestCase): mock_ntrn.return_value = mock_nc mock_inst = mock.Mock(project_id="proj-1", availability_zone='zone-1', - uuid='inst-1') + uuid=uuids.inst_1) mock_avail_nets.return_value = [{'id': 'net-1', 'subnets': ['subnet1']}] mock_nc.create_port.return_value = {'port': {'id': uuids.portid_1}} @@ -4455,7 +4460,7 @@ class TestNeutronv2Portbinding(TestNeutronv2Base): instance = fake_instance.fake_instance_obj(self.context) self._test_update_port_binding_false('migrate_instance_finish', self.context, instance, - {'dest_compute': 'fake'}) + {'dest_compute': uuids.fake}) def test_migrate_instance_finish_binding_true(self): migration = {'source_compute': self.instance.get('host'), diff --git a/nova/tests/unit/scheduler/test_host_manager.py b/nova/tests/unit/scheduler/test_host_manager.py index 35b8cce8943d..d7f839e659f0 100644 --- a/nova/tests/unit/scheduler/test_host_manager.py +++ b/nova/tests/unit/scheduler/test_host_manager.py @@ -226,7 +226,7 @@ class HostManagerTestCase(test.NoDBTestCase): dest = objects.Destination(host='fake_host1', node='fake-node') fake_properties = objects.RequestSpec(requested_destination=dest, ignore_hosts=[], - instance_uuid='fake-uuid1', + instance_uuid=uuids.fake_uuid1, force_hosts=[], force_nodes=[]) @@ -243,7 +243,7 @@ class HostManagerTestCase(test.NoDBTestCase): dest = objects.Destination(host='dummy', node='fake-node') fake_properties = objects.RequestSpec(requested_destination=dest, ignore_hosts=[], - instance_uuid='fake-uuid1', + instance_uuid=uuids.fake_uuid1, force_hosts=[], force_nodes=[]) diff --git a/nova/tests/unit/virt/xenapi/test_vmops.py b/nova/tests/unit/virt/xenapi/test_vmops.py index 3750d823ed61..3fa2dce87235 100644 --- a/nova/tests/unit/virt/xenapi/test_vmops.py +++ b/nova/tests/unit/virt/xenapi/test_vmops.py @@ -896,7 +896,7 @@ class MigrateDiskAndPowerOffTestCase(VMOpsTestBase): migrate_up, migrate_down, *mocks): instance = objects.Instance( flavor=objects.Flavor(root_gb=2, ephemeral_gb=0), - uuid="uuid") + uuid=uuids.instance) flavor = fake_flavor.fake_flavor_obj(self.context, root_gb=1, ephemeral_gb=0) @@ -911,7 +911,7 @@ class MigrateDiskAndPowerOffTestCase(VMOpsTestBase): instance = objects.Instance( flavor=objects.Flavor(root_gb=1, ephemeral_gb=1), - uuid="uuid") + uuid=uuids.instance) flavor = fake_flavor.fake_flavor_obj(self.context, root_gb=2, ephemeral_gb=2) @@ -1271,7 +1271,7 @@ class ResizeVdisTestCase(VMOpsTestBase): mock_generate, mock_resize): mock_sizes.return_value = [2000, 1000] - instance = objects.Instance(uuid='a', + instance = objects.Instance(uuid=uuids.instance, flavor=objects.Flavor(root_gb=0, ephemeral_gb=3000)) ephemerals = {"4": {"ref": 4}}