Fix invalid uuid warnings in objects testcases

Currently, unit testcases of objects emit FutureWarnings
from oslo.versionedobjects about invalid uuids as documented here[1].

This commit changes these tests to use valid uuids so
that when they are run these warnings are no longer emitted.

Fake constants are defined for project_id and user_id as they
are used without '-' at keystone side

[1] http://docs.openstack.org/developer/oslo.versionedobjects/api/fields.html#oslo_versionedobjects.fields.UUIDField

Partial-Bug: #1557378
Change-Id: Ia28952ecfeaa5090fa65638af488f88400dc02d2
This commit is contained in:
srushti 2016-04-13 09:42:12 +00:00
parent 50354963ce
commit 69700590db
13 changed files with 118 additions and 101 deletions

View File

@ -21,6 +21,7 @@ from nova import db
from nova.objects import bandwidth_usage
from nova import test
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
class _TestBandwidthUsage(test.TestCase):
@ -55,7 +56,7 @@ class _TestBandwidthUsage(test.TestCase):
'updated_at': None,
'deleted_at': None,
'deleted': 0,
'uuid': 'fake_uuid1',
'uuid': uuids.instance,
'mac': 'fake_mac1',
'start_period': start_period,
'bw_in': bw_in,
@ -77,7 +78,7 @@ class _TestBandwidthUsage(test.TestCase):
def test_get_by_instance_uuid_and_mac(self, mock_get):
mock_get.return_value = self.expected_bw_usage
bw_usage = bandwidth_usage.BandwidthUsage.get_by_instance_uuid_and_mac(
self.context, 'fake_uuid', 'fake_mac',
self.context, uuids.instance, 'fake_mac',
start_period=self.expected_bw_usage['start_period'])
self._compare(self, self.expected_bw_usage, bw_usage)
@ -86,7 +87,7 @@ class _TestBandwidthUsage(test.TestCase):
mock_get_by_uuids.return_value = [self.expected_bw_usage]
bw_usages = bandwidth_usage.BandwidthUsageList.get_by_uuids(
self.context, ['fake_uuid'],
self.context, [uuids.instance],
start_period=self.expected_bw_usage['start_period'])
self.assertEqual(1, len(bw_usages))
self._compare(self, self.expected_bw_usage, bw_usages[0])
@ -96,7 +97,7 @@ class _TestBandwidthUsage(test.TestCase):
mock_create.return_value = self.expected_bw_usage
bw_usage = bandwidth_usage.BandwidthUsage(context=self.context)
bw_usage.create('fake_uuid', 'fake_mac',
bw_usage.create(uuids.instance, 'fake_mac',
100, 200, 12345, 67890,
start_period=self.expected_bw_usage['start_period'])
@ -109,12 +110,12 @@ class _TestBandwidthUsage(test.TestCase):
last_ctr_in=42, last_ctr_out=42)
bw_usage = bandwidth_usage.BandwidthUsage(context=self.context)
bw_usage.create('fake_uuid1', 'fake_mac1',
bw_usage.create(uuids.instance, 'fake_mac1',
100, 200, 42, 42,
start_period=self.expected_bw_usage['start_period'])
self._compare(self, expected_bw_usage1, bw_usage,
ignored_fields=['last_refreshed', 'created_at'])
bw_usage.create('fake_uuid1', 'fake_mac1',
bw_usage.create(uuids.instance, 'fake_mac1',
100, 200, 12345, 67890,
start_period=self.expected_bw_usage['start_period'])
self._compare(self, self.expected_bw_usage, bw_usage,

View File

@ -25,6 +25,7 @@ from nova import test
from nova.tests.unit import fake_block_device
from nova.tests.unit import fake_instance
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
class _TestBlockDeviceMappingObject(object):
@ -32,7 +33,7 @@ class _TestBlockDeviceMappingObject(object):
instance = instance or {}
fake_bdm = fake_block_device.FakeDbBlockDeviceDict({
'id': 123,
'instance_uuid': instance.get('uuid') or 'fake-instance',
'instance_uuid': instance.get('uuid') or uuids.instance,
'device_name': '/dev/sda2',
'source_type': 'snapshot',
'destination_type': 'volume',
@ -215,7 +216,7 @@ class _TestBlockDeviceMappingObject(object):
self.flags(enable=False, group='cells')
values = {'source_type': 'volume', 'volume_id': 'fake-vol-id',
'destination_type': 'volume',
'instance_uuid': 'fake-instance'}
'instance_uuid': uuids.instance}
if device_name:
values['device_name'] = device_name
fake_bdm = fake_block_device.FakeDbBlockDeviceDict(values)
@ -282,7 +283,7 @@ class _TestBlockDeviceMappingObject(object):
def test_create(self):
values = {'source_type': 'volume', 'volume_id': 'fake-vol-id',
'destination_type': 'volume',
'instance_uuid': 'fake-instance'}
'instance_uuid': uuids.instance}
bdm = objects.BlockDeviceMapping(context=self.context, **values)
with mock.patch.object(cells_rpcapi.CellsAPI,
'bdm_update_or_create_at_top'):
@ -294,7 +295,7 @@ class _TestBlockDeviceMappingObject(object):
def test_create_fails(self):
values = {'source_type': 'volume', 'volume_id': 'fake-vol-id',
'destination_type': 'volume',
'instance_uuid': 'fake-instance'}
'instance_uuid': uuids.instance}
bdm = objects.BlockDeviceMapping(context=self.context, **values)
bdm.create()
@ -304,7 +305,7 @@ class _TestBlockDeviceMappingObject(object):
def test_create_fails_instance(self):
values = {'source_type': 'volume', 'volume_id': 'fake-vol-id',
'destination_type': 'volume',
'instance_uuid': 'fake-instance',
'instance_uuid': uuids.instance,
'instance': objects.Instance()}
bdm = objects.BlockDeviceMapping(context=self.context, **values)
self.assertRaises(exception.ObjectActionError,
@ -313,7 +314,7 @@ class _TestBlockDeviceMappingObject(object):
def _test_destroy_mocked(self, cell_type=None):
values = {'source_type': 'volume', 'volume_id': 'fake-vol-id',
'destination_type': 'volume', 'id': 1,
'instance_uuid': 'fake-instance', 'device_name': 'fake'}
'instance_uuid': uuids.instance, 'device_name': 'fake'}
if cell_type:
self.flags(enable=True, cell_type=cell_type, group='cells')
else:
@ -365,7 +366,7 @@ class _TestBlockDeviceMappingObject(object):
def test_obj_make_compatible_pre_1_17(self):
values = {'source_type': 'volume', 'volume_id': 'fake-vol-id',
'destination_type': 'volume',
'instance_uuid': 'fake-instance'}
'instance_uuid': uuids.instance}
bdm = objects.BlockDeviceMapping(context=self.context, **values)
primitive = bdm.obj_to_primitive(target_version='1.16')
self.assertNotIn('tag', primitive)
@ -382,7 +383,7 @@ class TestRemoteBlockDeviceMappingObject(test_objects._RemoteTest,
class _TestBlockDeviceMappingListObject(object):
def fake_bdm(self, bdm_id, boot_index=-1, instance_uuid='fake-instance'):
def fake_bdm(self, bdm_id, boot_index=-1, instance_uuid=uuids.instance):
fake_bdm = fake_block_device.FakeDbBlockDeviceDict({
'id': bdm_id,
'boot_index': boot_index,
@ -400,11 +401,11 @@ class _TestBlockDeviceMappingListObject(object):
fakes = [self.fake_bdm(123), self.fake_bdm(456)]
get_all_by_inst_uuids.return_value = fakes
bdms_by_uuid = objects.BlockDeviceMappingList.bdms_by_instance_uuid(
self.context, ['fake-instance'])
self.assertEqual(['fake-instance'], list(bdms_by_uuid.keys()))
self.context, [uuids.instance])
self.assertEqual([uuids.instance], list(bdms_by_uuid.keys()))
self.assertIsInstance(
bdms_by_uuid['fake-instance'], objects.BlockDeviceMappingList)
for faked, got in zip(fakes, bdms_by_uuid['fake-instance']):
bdms_by_uuid[uuids.instance], objects.BlockDeviceMappingList)
for faked, got in zip(fakes, bdms_by_uuid[uuids.instance]):
self.assertIsInstance(got, objects.BlockDeviceMapping)
self.assertEqual(faked['id'], got.id)
@ -412,7 +413,7 @@ class _TestBlockDeviceMappingListObject(object):
def test_bdms_by_instance_uuid_no_result(self, get_all_by_inst_uuids):
get_all_by_inst_uuids.return_value = None
bdms_by_uuid = objects.BlockDeviceMappingList.bdms_by_instance_uuid(
self.context, ['fake-instance'])
self.context, [uuids.instance])
self.assertEqual({}, bdms_by_uuid)
@mock.patch.object(db, 'block_device_mapping_get_all_by_instance_uuids')
@ -420,7 +421,7 @@ class _TestBlockDeviceMappingListObject(object):
fakes = [self.fake_bdm(123), self.fake_bdm(456)]
get_all_by_inst_uuids.return_value = fakes
bdm_list = objects.BlockDeviceMappingList.get_by_instance_uuids(
self.context, ['fake-instance'])
self.context, [uuids.instance])
for faked, got in zip(fakes, bdm_list):
self.assertIsInstance(got, objects.BlockDeviceMapping)
self.assertEqual(faked['id'], got.id)
@ -429,7 +430,7 @@ class _TestBlockDeviceMappingListObject(object):
def test_get_by_instance_uuids_no_result(self, get_all_by_inst_uuids):
get_all_by_inst_uuids.return_value = None
bdm_list = objects.BlockDeviceMappingList.get_by_instance_uuids(
self.context, ['fake-instance'])
self.context, [uuids.instance])
self.assertEqual(0, len(bdm_list))
@mock.patch.object(db, 'block_device_mapping_get_all_by_instance')
@ -437,7 +438,7 @@ class _TestBlockDeviceMappingListObject(object):
fakes = [self.fake_bdm(123), self.fake_bdm(456)]
get_all_by_inst.return_value = fakes
bdm_list = objects.BlockDeviceMappingList.get_by_instance_uuid(
self.context, 'fake-instance')
self.context, uuids.instance)
for faked, got in zip(fakes, bdm_list):
self.assertIsInstance(got, objects.BlockDeviceMapping)
self.assertEqual(faked['id'], got.id)
@ -446,7 +447,7 @@ class _TestBlockDeviceMappingListObject(object):
def test_get_by_instance_uuid_no_result(self, get_all_by_inst):
get_all_by_inst.return_value = None
bdm_list = objects.BlockDeviceMappingList.get_by_instance_uuid(
self.context, 'fake-instance')
self.context, uuids.instance)
self.assertEqual(0, len(bdm_list))
@mock.patch.object(db, 'block_device_mapping_get_all_by_instance')
@ -454,25 +455,25 @@ class _TestBlockDeviceMappingListObject(object):
fakes = [self.fake_bdm(123), self.fake_bdm(456, boot_index=0)]
get_all_by_inst.return_value = fakes
bdm_list = objects.BlockDeviceMappingList.get_by_instance_uuid(
self.context, 'fake-instance')
self.context, uuids.instance)
self.assertEqual(456, bdm_list.root_bdm().id)
@mock.patch.object(db, 'block_device_mapping_get_all_by_instance')
def test_root_bdm_empty_bdm_list(self, get_all_by_inst):
get_all_by_inst.return_value = None
bdm_list = objects.BlockDeviceMappingList.get_by_instance_uuid(
self.context, 'fake-instance')
self.context, uuids.instance)
self.assertIsNone(bdm_list.root_bdm())
@mock.patch.object(db, 'block_device_mapping_get_all_by_instance')
def test_root_bdm_undefined(self, get_all_by_inst):
fakes = [
self.fake_bdm(123, instance_uuid='uuid_1'),
self.fake_bdm(456, instance_uuid='uuid_2')
self.fake_bdm(123, instance_uuid=uuids.instance_1),
self.fake_bdm(456, instance_uuid=uuids.instance_2)
]
get_all_by_inst.return_value = fakes
bdm_list = objects.BlockDeviceMappingList.get_by_instance_uuid(
self.context, 'fake-instance')
self.context, uuids.bdm_instance)
self.assertRaises(exception.UndefinedRootBDM, bdm_list.root_bdm)

View File

@ -18,6 +18,7 @@ from nova import db
from nova import objects
from nova.objects import ec2 as ec2_obj
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
fake_map = {
@ -26,7 +27,7 @@ fake_map = {
'deleted_at': None,
'deleted': 0,
'id': 1,
'uuid': 'fake-uuid-2',
'uuid': uuids.ec2_map_uuid,
}
@ -38,7 +39,7 @@ class _TestEC2InstanceMapping(object):
def test_create(self):
imap = ec2_obj.EC2InstanceMapping(context=self.context)
imap.uuid = 'fake-uuid-2'
imap.uuid = uuids.ec2_map_uuid
with mock.patch.object(db, 'ec2_instance_create') as create:
create.return_value = fake_map
@ -52,7 +53,7 @@ class _TestEC2InstanceMapping(object):
with mock.patch.object(db, 'ec2_instance_get_by_uuid') as get:
get.return_value = fake_map
imap = ec2_obj.EC2InstanceMapping.get_by_uuid(self.context,
'fake-uuid-2')
uuids.ec2_map_uuid)
self._compare(self, fake_map, imap)
def test_get_by_ec2_id(self):
@ -79,7 +80,7 @@ class _TestEC2VolumeMapping(object):
def test_create(self):
vmap = ec2_obj.EC2VolumeMapping(context=self.context)
vmap.uuid = 'fake-uuid-2'
vmap.uuid = uuids.ec2_map_uuid
with mock.patch.object(db, 'ec2_volume_create') as create:
create.return_value = fake_map
@ -93,7 +94,7 @@ class _TestEC2VolumeMapping(object):
with mock.patch.object(db, 'ec2_volume_get_by_uuid') as get:
get.return_value = fake_map
vmap = ec2_obj.EC2VolumeMapping.get_by_uuid(self.context,
'fake-uuid-2')
uuids.ec2_map_uuid)
self._compare(self, fake_map, vmap)
def test_get_by_ec2_id(self):
@ -120,7 +121,7 @@ class _TestEC2SnapshotMapping(object):
def test_create(self):
smap = ec2_obj.EC2SnapshotMapping(context=self.context)
smap.uuid = 'fake-uuid-2'
smap.uuid = uuids.ec2_map_uuid
with mock.patch.object(db, 'ec2_snapshot_create') as create:
create.return_value = fake_map
@ -134,7 +135,7 @@ class _TestEC2SnapshotMapping(object):
with mock.patch.object(db, 'ec2_snapshot_get_by_uuid') as get:
get.return_value = fake_map
smap = ec2_obj.EC2SnapshotMapping.get_by_uuid(self.context,
'fake-uuid-2')
uuids.ec2_map_uuid)
self._compare(self, fake_map, smap)
def test_get_by_ec2_id(self):
@ -161,7 +162,7 @@ class _TestS3ImageMapping(object):
def test_create(self):
s3imap = ec2_obj.S3ImageMapping(context=self.context)
s3imap.uuid = 'fake-uuid-2'
s3imap.uuid = uuids.ec2_map_uuid
with mock.patch.object(db, 's3_image_create') as create:
create.return_value = fake_map
@ -175,7 +176,7 @@ class _TestS3ImageMapping(object):
with mock.patch.object(db, 's3_image_get_by_uuid') as get:
get.return_value = fake_map
s3imap = ec2_obj.S3ImageMapping.get_by_uuid(self.context,
'fake-uuid-2')
uuids.ec2_map_uuid)
self._compare(self, fake_map, s3imap)
def test_get_by_s3_id(self):
@ -204,7 +205,8 @@ class _TestEC2Ids(object):
'fake-ec2-ramdisk-id']
mock_type.side_effect = [mock.sentinel.ec2_kernel_type,
mock.sentinel.ec2_ramdisk_type]
inst = objects.Instance(uuid='fake-uuid', image_ref='fake-image-id',
inst = objects.Instance(uuid=uuids.instance,
image_ref='fake-image-id',
kernel_id='fake-kernel-id',
ramdisk_id='fake-ramdisk-id')
@ -220,7 +222,7 @@ class _TestEC2Ids(object):
def test_get_by_instance_no_image_ref(self, mock_inst, mock_glance):
mock_inst.return_value = 'fake-ec2-inst-id'
mock_glance.return_value = None
inst = objects.Instance(uuid='fake-uuid', image_ref=None,
inst = objects.Instance(uuid=uuids.instance, image_ref=None,
kernel_id=None, ramdisk_id=None)
result = ec2_obj.EC2Ids.get_by_instance(self.context, inst)
@ -239,7 +241,8 @@ class _TestEC2Ids(object):
mock_glance.side_effect = ['fake-ec2-ami-id',
'fake-ec2-ramdisk-id']
mock_type.return_value = mock.sentinel.ec2_ramdisk_type
inst = objects.Instance(uuid='fake-uuid', image_ref='fake-image-id',
inst = objects.Instance(uuid=uuids.instance,
image_ref='fake-image-id',
kernel_id=None, ramdisk_id='fake-ramdisk-id')
result = ec2_obj.EC2Ids.get_by_instance(self.context, inst)
@ -258,7 +261,8 @@ class _TestEC2Ids(object):
mock_glance.side_effect = ['fake-ec2-ami-id',
'fake-ec2-kernel-id']
mock_type.return_value = mock.sentinel.ec2_kernel_type
inst = objects.Instance(uuid='fake-uuid', image_ref='fake-image-id',
inst = objects.Instance(uuid=uuids.instance,
image_ref='fake-image-id',
kernel_id='fake-kernel-id', ramdisk_id=None)
result = ec2_obj.EC2Ids.get_by_instance(self.context, inst)

View File

@ -25,6 +25,7 @@ from nova.objects import fixed_ip
from nova.tests.unit import fake_instance
from nova.tests.unit.objects import test_network
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
from nova import utils
fake_fixed_ip = {
@ -162,8 +163,8 @@ class _TestFixedIPObject(object):
def test_associate(self, associate):
associate.return_value = fake_fixed_ip
fixedip = fixed_ip.FixedIP.associate(self.context, '1.2.3.4',
'fake-uuid')
associate.assert_called_with(self.context, '1.2.3.4', 'fake-uuid',
uuids.instance)
associate.assert_called_with(self.context, '1.2.3.4', uuids.instance,
network_id=None, reserved=False,
virtual_interface_id=None)
self._compare(fixedip, fake_fixed_ip)
@ -172,10 +173,10 @@ class _TestFixedIPObject(object):
def test_associate_with_vif(self, associate):
associate.return_value = fake_fixed_ip
fixedip = fixed_ip.FixedIP.associate(self.context, '1.2.3.4',
'fake-uuid',
uuids.instance,
vif_id=0)
associate.assert_called_with(self.context, '1.2.3.4',
'fake-uuid',
uuids.instance,
network_id=None, reserved=False,
virtual_interface_id=0)
self._compare(fixedip, fake_fixed_ip)
@ -184,9 +185,9 @@ class _TestFixedIPObject(object):
def test_associate_pool(self, associate):
associate.return_value = fake_fixed_ip
fixedip = fixed_ip.FixedIP.associate_pool(self.context, 123,
'fake-uuid', 'host')
uuids.instance, 'host')
associate.assert_called_with(self.context, 123,
instance_uuid='fake-uuid',
instance_uuid=uuids.instance,
host='host', virtual_interface_id=None)
self._compare(fixedip, fake_fixed_ip)
@ -194,10 +195,10 @@ class _TestFixedIPObject(object):
def test_associate_pool_with_vif(self, associate):
associate.return_value = fake_fixed_ip
fixedip = fixed_ip.FixedIP.associate_pool(self.context, 123,
'fake-uuid', 'host',
uuids.instance, 'host',
vif_id=0)
associate.assert_called_with(self.context, 123,
instance_uuid='fake-uuid',
instance_uuid=uuids.instance,
host='host', virtual_interface_id=0)
self._compare(fixedip, fake_fixed_ip)
@ -235,17 +236,17 @@ class _TestFixedIPObject(object):
def test_save(self, update):
update.return_value = fake_fixed_ip
fixedip = fixed_ip.FixedIP(context=self.context, address='1.2.3.4',
instance_uuid='fake-uuid')
instance_uuid=uuids.instance)
self.assertRaises(exception.ObjectActionError, fixedip.save)
fixedip.obj_reset_changes(['address'])
fixedip.save()
update.assert_called_once_with(self.context, '1.2.3.4',
{'instance_uuid': 'fake-uuid'})
{'instance_uuid': uuids.instance})
@mock.patch('nova.db.fixed_ip_disassociate')
def test_disassociate(self, disassociate):
fixedip = fixed_ip.FixedIP(context=self.context, address='1.2.3.4',
instance_uuid='fake-uuid')
instance_uuid=uuids.instance)
fixedip.obj_reset_changes()
fixedip.disassociate()
disassociate.assert_called_once_with(self.context, '1.2.3.4')
@ -263,9 +264,9 @@ class _TestFixedIPObject(object):
def test_get_by_instance(self, get):
get.return_value = [fake_fixed_ip]
fixedips = fixed_ip.FixedIPList.get_by_instance_uuid(self.context,
'fake-uuid')
uuids.instance)
self.assertEqual(1, len(fixedips))
get.assert_called_once_with(self.context, 'fake-uuid')
get.assert_called_once_with(self.context, uuids.instance)
self._compare(fixedips[0], fake_fixed_ip)
@mock.patch('nova.db.fixed_ip_get_by_host')
@ -301,7 +302,7 @@ class _TestFixedIPObject(object):
@mock.patch('nova.db.network_get_associated_fixed_ips')
def test_get_by_network(self, get):
info = {'address': '1.2.3.4',
'instance_uuid': 'fake-uuid',
'instance_uuid': uuids.instance,
'network_id': 0,
'vif_id': 1,
'vif_address': 'de:ad:be:ee:f0:00',
@ -319,12 +320,12 @@ class _TestFixedIPObject(object):
self.assertEqual(1, len(fixed_ips))
fip = fixed_ips[0]
self.assertEqual('1.2.3.4', str(fip.address))
self.assertEqual('fake-uuid', fip.instance_uuid)
self.assertEqual(uuids.instance, fip.instance_uuid)
self.assertEqual(0, fip.network_id)
self.assertEqual(1, fip.virtual_interface_id)
self.assertTrue(fip.allocated)
self.assertTrue(fip.leased)
self.assertEqual('fake-uuid', fip.instance.uuid)
self.assertEqual(uuids.instance, fip.instance.uuid)
self.assertEqual('fake-host', fip.instance.hostname)
self.assertIsInstance(fip.instance.created_at, datetime.datetime)
self.assertIsInstance(fip.instance.updated_at, datetime.datetime)
@ -334,7 +335,7 @@ class _TestFixedIPObject(object):
@mock.patch('nova.db.network_get_associated_fixed_ips')
def test_backport_default_route(self, mock_get):
info = {'address': '1.2.3.4',
'instance_uuid': 'fake-uuid',
'instance_uuid': uuids.instance,
'network_id': 0,
'vif_id': 1,
'vif_address': 'de:ad:be:ee:f0:00',

View File

@ -21,6 +21,7 @@ from nova import exception
from nova import objects
from nova.objects import floating_ip
from nova import test
from nova.tests.unit.api.openstack import fakes
from nova.tests.unit.objects import test_fixed_ip
from nova.tests.unit.objects import test_network
from nova.tests.unit.objects import test_objects
@ -222,7 +223,7 @@ class _TestFloatingIPObject(object):
def test_bulk_create(self, create_mock):
def fake_create(ctxt, ip_info, want_result=False):
return [{'id': 1, 'address': ip['address'], 'fixed_ip_id': 1,
'project_id': 'foo', 'host': 'host',
'project_id': fakes.FAKE_PROJECT_ID, 'host': 'host',
'auto_assigned': False, 'pool': ip['pool'],
'interface': ip['interface'], 'fixed_ip': None,
'created_at': None, 'updated_at': None,

View File

@ -1287,7 +1287,7 @@ class _TestInstanceObject(object):
secgroups.append(secgroup)
fake_secgroups = security_group.SecurityGroupList(objects=secgroups)
mock_get.return_value = fake_secgroups
inst = objects.Instance(context=self.context, uuid='fake')
inst = objects.Instance(context=self.context, uuid=uuids.instance)
secgroups = inst.security_groups
mock_get.assert_called_once_with(self.context, inst)
self.assertEqual(fake_secgroups, secgroups)

View File

@ -23,6 +23,7 @@ from nova import db
from nova.objects import instance_action
from nova import test
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
NOW = timeutils.utcnow().replace(microsecond=0)
@ -33,7 +34,7 @@ fake_action = {
'deleted': False,
'id': 123,
'action': 'fake-action',
'instance_uuid': 'fake-uuid',
'instance_uuid': uuids.instance,
'request_id': 'fake-request',
'user_id': 'fake-user',
'project_id': 'fake-project',
@ -144,19 +145,19 @@ class _TestInstanceActionObject(object):
'request_id': self.context.request_id,
'user_id': self.context.user_id,
'project_id': self.context.project_id,
'instance_uuid': 'fake-uuid',
'instance_uuid': uuids.instance,
'action': 'fake-action',
'start_time': self.context.timestamp,
}
expected_packed_action_finish = {
'request_id': self.context.request_id,
'instance_uuid': 'fake-uuid',
'instance_uuid': uuids.instance,
'finish_time': NOW,
}
mock_start.return_value = fake_action
mock_finish.return_value = fake_action
action = instance_action.InstanceAction.action_start(
self.context, 'fake-uuid', 'fake-action')
self.context, uuids.instance, 'fake-action')
action.finish()
mock_start.assert_called_once_with(self.context,
expected_packed_action_start)

View File

@ -15,6 +15,7 @@ from oslo_serialization import jsonutils
from nova import objects
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
FAKE_UUID = '79a53d6b-0893-4838-a971-15f4f382e7c2'
@ -72,36 +73,36 @@ class _TestInstancePCIRequests(object):
def test_get_by_instance_uuid_and_newness(self, mock_get):
pcir = objects.InstancePCIRequests
mock_get.return_value = objects.InstancePCIRequests(
instance_uuid='fake-uuid',
instance_uuid=uuids.instance,
requests=[objects.InstancePCIRequest(count=1, is_new=False),
objects.InstancePCIRequest(count=2, is_new=True)])
old_req = pcir.get_by_instance_uuid_and_newness(self.context,
'fake-uuid',
uuids.instance,
False)
mock_get.return_value = objects.InstancePCIRequests(
instance_uuid='fake-uuid',
instance_uuid=uuids.instance,
requests=[objects.InstancePCIRequest(count=1, is_new=False),
objects.InstancePCIRequest(count=2, is_new=True)])
new_req = pcir.get_by_instance_uuid_and_newness(self.context,
'fake-uuid',
uuids.instance,
True)
self.assertEqual(1, old_req.requests[0].count)
self.assertEqual(2, new_req.requests[0].count)
@mock.patch('nova.objects.InstancePCIRequests.get_by_instance_uuid')
def test_get_by_instance_current(self, mock_get):
instance = objects.Instance(uuid='fake-uuid',
instance = objects.Instance(uuid=uuids.instance,
system_metadata={})
objects.InstancePCIRequests.get_by_instance(self.context,
instance)
mock_get.assert_called_once_with(self.context, 'fake-uuid')
mock_get.assert_called_once_with(self.context, uuids.instance)
def test_get_by_instance_legacy(self):
fakesysmeta = {
'pci_requests': jsonutils.dumps([fake_legacy_pci_requests[0]]),
'new_pci_requests': jsonutils.dumps([fake_legacy_pci_requests[1]]),
}
instance = objects.Instance(uuid='fake-uuid',
instance = objects.Instance(uuid=uuids.instance,
system_metadata=fakesysmeta)
requests = objects.InstancePCIRequests.get_by_instance(self.context,
instance)

View File

@ -27,6 +27,7 @@ from nova.objects import instance
from nova.objects import pci_device
from nova import test
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
dev_dict = {
'compute_node_id': 1,
@ -108,7 +109,7 @@ fake_db_dev_old = {
class _TestPciDeviceObject(object):
def _create_fake_instance(self):
self.inst = instance.Instance()
self.inst.uuid = 'fake-inst-uuid'
self.inst.uuid = uuids.instance
self.inst.pci_devices = pci_device.PciDeviceList()
def _create_fake_pci_device(self, ctxt=None):
@ -370,7 +371,7 @@ class _TestPciDeviceObject(object):
devobj.allocate(self.inst)
self.assertEqual(devobj.status,
fields.PciDeviceStatus.ALLOCATED)
self.assertEqual(devobj.instance_uuid, 'fake-inst-uuid')
self.assertEqual(devobj.instance_uuid, uuids.instance)
self.assertEqual(len(self.inst.pci_devices), 1)
self.assertEqual(self.inst.pci_devices[0].vendor_id,
'v')
@ -387,7 +388,7 @@ class _TestPciDeviceObject(object):
def test_allocate_device_fail_owner(self):
self._create_fake_instance()
inst_2 = instance.Instance()
inst_2.uuid = 'fake-inst-uuid-2'
inst_2.uuid = uuids.instance_2
devobj = pci_device.PciDevice.create(None, dev_dict)
devobj.claim(self.inst)
self.assertRaises(exception.PciDeviceInvalidOwner,
@ -525,7 +526,7 @@ class _TestSRIOVPciDeviceObject(object):
def _create_fake_instance(self):
self.inst = instance.Instance()
self.inst.uuid = 'fake-inst-uuid'
self.inst.uuid = uuids.instance
self.inst.pci_devices = pci_device.PciDeviceList()
def _create_fake_pci_device(self, ctxt=None):

View File

@ -21,10 +21,12 @@ from nova import exception
from nova import objects
from nova.objects import base
from nova.objects import request_spec
from nova.tests.unit.api.openstack import fakes
from nova.tests.unit import fake_flavor
from nova.tests.unit import fake_instance
from nova.tests.unit import fake_request_spec
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
class _TestRequestSpecObject(object):
@ -74,7 +76,7 @@ class _TestRequestSpecObject(object):
instance.uuid = uuidutils.generate_uuid()
instance.numa_topology = None
instance.pci_requests = None
instance.project_id = '1'
instance.project_id = fakes.FAKE_PROJECT_ID
instance.availability_zone = 'nova'
spec = objects.RequestSpec()
@ -93,7 +95,7 @@ class _TestRequestSpecObject(object):
instance = dict(uuid=uuidutils.generate_uuid(),
numa_topology=None,
pci_requests=None,
project_id='1',
project_id=fakes.FAKE_PROJECT_ID,
availability_zone='nova')
spec = objects.RequestSpec()
@ -120,7 +122,7 @@ class _TestRequestSpecObject(object):
memory_mb=10,
vcpus=1,
numa_topology=None,
project_id='1',
project_id=fakes.FAKE_PROJECT_ID,
availability_zone='nova',
pci_requests={
'instance_uuid': 'fakeid',
@ -138,7 +140,7 @@ class _TestRequestSpecObject(object):
ephemeral_gb=0,
memory_mb=10,
vcpus=1,
project_id='1',
project_id=fakes.FAKE_PROJECT_ID,
availability_zone='nova',
pci_requests=None,
numa_topology={'cells': [{'id': 1, 'cpuset': ['1'], 'memory': 8192,
@ -176,7 +178,7 @@ class _TestRequestSpecObject(object):
vcpus=1)
spec.numa_topology = None
spec.pci_requests = None
spec.project_id = '1'
spec.project_id = fakes.FAKE_PROJECT_ID
spec.availability_zone = 'nova'
instance = spec._to_legacy_instance()
@ -186,7 +188,7 @@ class _TestRequestSpecObject(object):
'vcpus': 1,
'numa_topology': None,
'pci_requests': None,
'project_id': '1',
'project_id': fakes.FAKE_PROJECT_ID,
'availability_zone': 'nova'}, instance)
def test_to_legacy_instance_with_unset_values(self):
@ -298,13 +300,13 @@ class _TestRequestSpecObject(object):
def test_from_components(self):
ctxt = context.RequestContext('fake-user', 'fake-project')
instance = fake_instance.fake_instance_obj(ctxt)
image = {'id': 'fake-image-id', 'properties': {'mappings': []},
image = {'id': uuids.image_id, 'properties': {'mappings': []},
'status': 'fake-status', 'location': 'far-away'}
flavor = fake_flavor.fake_flavor_obj(ctxt)
filter_properties = {}
instance_group = None
spec = objects.RequestSpec.from_components(ctxt, instance, image,
spec = objects.RequestSpec.from_components(ctxt, instance.uuid, image,
flavor, instance.numa_topology, instance.pci_requests,
filter_properties, instance_group, instance.availability_zone)
# Make sure that all fields are set using that helper method
@ -320,13 +322,13 @@ class _TestRequestSpecObject(object):
# to from_components
ctxt = context.RequestContext('fake-user', 'fake-project')
instance = fake_instance.fake_instance_obj(ctxt)
image = {'id': 'fake-image-id', 'properties': {'mappings': []},
image = {'id': uuids.image_id, 'properties': {'mappings': []},
'status': 'fake-status', 'location': 'far-away'}
flavor = fake_flavor.fake_flavor_obj(ctxt)
filter_properties = {'fake': 'property'}
instance_group = objects.InstanceGroup()
objects.RequestSpec.from_components(ctxt, instance, image,
objects.RequestSpec.from_components(ctxt, instance.uuid, image,
flavor, instance.numa_topology, instance.pci_requests,
filter_properties, instance_group, instance.availability_zone)
@ -336,14 +338,15 @@ class _TestRequestSpecObject(object):
def test_from_components_without_instance_group(self, mock_pgi):
# This test makes sure that we populate instance group if not
# present
ctxt = context.RequestContext('fake-user', 'fake-project')
ctxt = context.RequestContext(fakes.FAKE_USER_ID,
fakes.FAKE_PROJECT_ID)
instance = fake_instance.fake_instance_obj(ctxt)
image = {'id': 'fake-image-id', 'properties': {'mappings': []},
image = {'id': uuids.image_id, 'properties': {'mappings': []},
'status': 'fake-status', 'location': 'far-away'}
flavor = fake_flavor.fake_flavor_obj(ctxt)
filter_properties = {'fake': 'property'}
objects.RequestSpec.from_components(ctxt, instance, image,
objects.RequestSpec.from_components(ctxt, instance.uuid, image,
flavor, instance.numa_topology, instance.pci_requests,
filter_properties, None, instance.availability_zone)
@ -375,7 +378,7 @@ class _TestRequestSpecObject(object):
'vcpus': 1,
'numa_topology': None,
'pci_requests': None,
'project_id': '1',
'project_id': fakes.FAKE_PROJECT_ID,
'availability_zone': 'nova',
'uuid': '1'}
spec_to_legacy_instance.return_value = fake_instance
@ -391,7 +394,7 @@ class _TestRequestSpecObject(object):
pci_requests=None,
project_id=1,
availability_zone='nova',
instance_uuid='1',
instance_uuid=uuids.instance,
flavor=fake_flavor)
spec_dict = spec.to_legacy_request_spec_dict()
expected = {'num_instances': 1,

View File

@ -16,6 +16,7 @@ from nova import db
from nova.objects import instance
from nova.objects import security_group
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
fake_secgroup = {
@ -148,10 +149,10 @@ class _TestSecurityGroupListObject(object):
def test_get_by_instance(self):
inst = instance.Instance()
inst.uuid = 'fake-inst-uuid'
inst.uuid = uuids.instance
self.mox.StubOutWithMock(db, 'security_group_get_by_instance')
db.security_group_get_by_instance(self.context,
'fake-inst-uuid').AndReturn(
uuids.instance).AndReturn(
fake_secgroups)
self.mox.ReplayAll()
secgroup_list = security_group.SecurityGroupList.get_by_instance(

View File

@ -20,6 +20,7 @@ from nova import db
from nova import objects
from nova.tests.unit.objects import test_objects
from nova.tests.unit.objects import test_security_group
from nova.tests import uuidsentinel as uuids
fake_rule = {
'created_at': None,
@ -107,7 +108,7 @@ class _TestSecurityGroupRuleListObject(object):
@mock.patch('nova.db.security_group_rule_get_by_instance')
def test_get_by_instance(self, mock_get):
mock_get.return_value = fake_rules
instance = objects.Instance(uuid='fake-uuid')
instance = objects.Instance(uuid=uuids.instance)
rules = objects.SecurityGroupRuleList.get_by_instance(self.context,
instance)
mock_get.assert_called_once_with(self.context, instance.uuid)

View File

@ -15,6 +15,7 @@ from oslo_utils import timeutils
from nova import objects
from nova.tests.unit.objects import test_objects
from nova.tests import uuidsentinel as uuids
NOW = timeutils.utcnow().replace(microsecond=0)
@ -25,8 +26,8 @@ fake_vol_usage = {
'deleted_at': None,
'deleted': 0,
'id': 1,
'volume_id': 'fake-vol-id',
'instance_uuid': 'fake-inst-uuid',
'volume_id': uuids.volume_id,
'instance_uuid': uuids.instance,
'project_id': 'fake-project-id',
'user_id': 'fake-user-id',
'availability_zone': None,
@ -47,8 +48,8 @@ class _TestVolumeUsage(object):
@mock.patch('nova.db.vol_usage_update', return_value=fake_vol_usage)
def test_save(self, mock_upd):
vol_usage = objects.VolumeUsage(self.context)
vol_usage.volume_id = 'fake-vol-id'
vol_usage.instance_uuid = 'fake-inst-uuid'
vol_usage.volume_id = uuids.volume_id
vol_usage.instance_uuid = uuids.instance
vol_usage.project_id = 'fake-project-id'
vol_usage.user_id = 'fake-user-id'
vol_usage.availability_zone = None
@ -58,15 +59,15 @@ class _TestVolumeUsage(object):
vol_usage.curr_write_bytes = 40
vol_usage.save()
mock_upd.assert_called_once_with(
self.context, 'fake-vol-id', 10, 20, 30, 40, 'fake-inst-uuid',
self.context, uuids.volume_id, 10, 20, 30, 40, uuids.instance,
'fake-project-id', 'fake-user-id', None, update_totals=False)
self.compare_obj(vol_usage, fake_vol_usage)
@mock.patch('nova.db.vol_usage_update', return_value=fake_vol_usage)
def test_save_update_totals(self, mock_upd):
vol_usage = objects.VolumeUsage(self.context)
vol_usage.volume_id = 'fake-vol-id'
vol_usage.instance_uuid = 'fake-inst-uuid'
vol_usage.volume_id = uuids.volume_id
vol_usage.instance_uuid = uuids.instance
vol_usage.project_id = 'fake-project-id'
vol_usage.user_id = 'fake-user-id'
vol_usage.availability_zone = None
@ -76,7 +77,7 @@ class _TestVolumeUsage(object):
vol_usage.curr_write_bytes = 40
vol_usage.save(update_totals=True)
mock_upd.assert_called_once_with(
self.context, 'fake-vol-id', 10, 20, 30, 40, 'fake-inst-uuid',
self.context, uuids.volume_id, 10, 20, 30, 40, uuids.instance,
'fake-project-id', 'fake-user-id', None, update_totals=True)
self.compare_obj(vol_usage, fake_vol_usage)