openstack/deb-cinder
Code Issues Proposed changes

Merge "Fix invalid uuid warnings in test_volume.py"

Browse Source
This commit is contained in:
Jenkins 2016-03-03 23:06:56 +00:00 committed by Gerrit Code Review
commit 11edef81a5
3 changed files with 133 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cinder/tests/unit/fake_constants.py
View File

@ -14,22 +14,26 @@
attachment_id = '4dc3bb12-ad75-41b9-ab2c-7609e743e600' attachment_id = '4dc3bb12-ad75-41b9-ab2c-7609e743e600'
backup_id = '707844eb-6d8a-4ac1-8b98-618e1c0b3a3a' backup_id = '707844eb-6d8a-4ac1-8b98-618e1c0b3a3a'
volume_id = '1e5177e7-95e5-4a0f-b170-e45f4b469f6a'
volume2_id = '43a09914-e495-475f-b862-0bda3c8918e4'
volume3_id = '1b1cf149-219c-44ac-aee3-13121a7f86a7'
volume_name_id = 'ee73d33c-52ed-4cb7-a8a9-2687c1205c22'
volume2_name_id = '41de4a80-2aab-4058-8293-7fc6343dcb82'
snapshot_id = '253b2878-ec60-4793-ad19-e65496ec7aab'
snapshot2_id = 'c02c44fa-5665-4a26-9e66-2ebaf25e5d2d'
snapshot3_id = '454f9970-1e05-4193-a3ed-5c390c3faa18'
cgsnapshot_id = '5e34cce3-bc97-46b7-a127-5cfb95ef445d' cgsnapshot_id = '5e34cce3-bc97-46b7-a127-5cfb95ef445d'
cgsnapshot2_id = '5c36d762-d6ba-4f04-bd07-88a298cc410a' cgsnapshot2_id = '5c36d762-d6ba-4f04-bd07-88a298cc410a'
cgsnapshot3_id = '5f392156-fc03-492a-9cb8-e46a7eedaf33' cgsnapshot3_id = '5f392156-fc03-492a-9cb8-e46a7eedaf33'
consistency_group_id = 'f18abf73-79ee-4f2b-8d4f-1c044148f117' consistency_group_id = 'f18abf73-79ee-4f2b-8d4f-1c044148f117'
image_id = 'e79161cd-5f9d-4007-8823-81a807a64332'
object_id = 'd7c5b12f-d57d-4762-99ab-db5f62ae3569' object_id = 'd7c5b12f-d57d-4762-99ab-db5f62ae3569'
object2_id = '51f5b8fa-c13c-48ba-8c9d-b470466cbc9c' object2_id = '51f5b8fa-c13c-48ba-8c9d-b470466cbc9c'
object3_id = '7bf5ffa9-18a2-4b64-aab4-0798b53ee4e7' object3_id = '7bf5ffa9-18a2-4b64-aab4-0798b53ee4e7'
project_id = '89afd400-b646-4bbc-b12b-c0a4d63e5bd3' project_id = '89afd400-b646-4bbc-b12b-c0a4d63e5bd3'
provider_id = '60087173-e899-470a-9e3a-ba4cffa3e3e3' provider_id = '60087173-e899-470a-9e3a-ba4cffa3e3e3'
snapshot_id = '253b2878-ec60-4793-ad19-e65496ec7aab'
snapshot2_id = 'c02c44fa-5665-4a26-9e66-2ebaf25e5d2d'
snapshot3_id = '454f9970-1e05-4193-a3ed-5c390c3faa18'
user_id = 'c853ca26-e8ea-4797-8a52-ee124a013d0e' user_id = 'c853ca26-e8ea-4797-8a52-ee124a013d0e'
volume_id = '1e5177e7-95e5-4a0f-b170-e45f4b469f6a'
volume2_id = '43a09914-e495-475f-b862-0bda3c8918e4'
volume3_id = '1b1cf149-219c-44ac-aee3-13121a7f86a7'
volume4_id = '904d4602-4301-4e9b-8df1-8133b51904e6'
volume5_id = '17b0e01d-3d2d-4c31-a1aa-c962420bc3dc'
volume_name_id = 'ee73d33c-52ed-4cb7-a8a9-2687c1205c22'
volume2_name_id = '63fbdd21-03bc-4309-b867-2893848f86af'
volume_type_id = '4e9e6d23-eed0-426d-b90a-28f87a94b6fe' volume_type_id = '4e9e6d23-eed0-426d-b90a-28f87a94b6fe'
will_not_be_found_id = 'ce816f65-c5aa-46d6-bd62-5272752d584a'

223
cinder/tests/unit/test_volume.py
View File

@ -55,6 +55,7 @@ from cinder import test
from cinder.tests.unit.api import fakes from cinder.tests.unit.api import fakes
from cinder.tests.unit.brick import fake_lvm from cinder.tests.unit.brick import fake_lvm
from cinder.tests.unit import conf_fixture from cinder.tests.unit import conf_fixture
from cinder.tests.unit import fake_constants as fake
from cinder.tests.unit import fake_driver from cinder.tests.unit import fake_driver
from cinder.tests.unit import fake_snapshot from cinder.tests.unit import fake_snapshot
from cinder.tests.unit import fake_volume from cinder.tests.unit import fake_volume
@ -92,8 +93,8 @@ def create_snapshot(volume_id, size=1, metadata=None, ctxt=None,
metadata = metadata or {} metadata = metadata or {}
snap = objects.Snapshot(ctxt or context.get_admin_context()) snap = objects.Snapshot(ctxt or context.get_admin_context())
snap.volume_size = size snap.volume_size = size
snap.user_id = 'fake' snap.user_id = fake.user_id
snap.project_id = 'fake' snap.project_id = fake.project_id
snap.volume_id = volume_id snap.volume_id = volume_id
snap.status = "creating" snap.status = "creating"
if metadata is not None: if metadata is not None:
@ -131,7 +132,7 @@ class BaseVolumeTestCase(test.TestCase):
self.volume = importutils.import_object(CONF.volume_manager) self.volume = importutils.import_object(CONF.volume_manager)
self.configuration = mock.Mock(conf.Configuration) self.configuration = mock.Mock(conf.Configuration)
self.context = context.get_admin_context() self.context = context.get_admin_context()
self.context.user_id = 'fake' self.context.user_id = fake.user_id
# NOTE(mriedem): The id is hard-coded here for tracking race fail # NOTE(mriedem): The id is hard-coded here for tracking race fail
# assertions with the notification code, it's part of an # assertions with the notification code, it's part of an
# elastic-recheck query so don't remove it or change it. # elastic-recheck query so don't remove it or change it.
@ -597,7 +598,7 @@ class VolumeTestCase(BaseVolumeTestCase):
'volume_id': volume_id, 'volume_id': volume_id,
'volume_type': None, 'volume_type': None,
'snapshot_id': None, 'snapshot_id': None,
'user_id': 'fake', 'user_id': fake.user_id,
'launched_at': 'DONTCARE', 'launched_at': 'DONTCARE',
'size': 1, 'size': 1,
'replication_status': 'disabled', 'replication_status': 'disabled',
@ -963,21 +964,21 @@ class VolumeTestCase(BaseVolumeTestCase):
self.assertIsNotNone(volume['encryption_key_id']) self.assertIsNotNone(volume['encryption_key_id'])
def test_create_volume_with_provider_id(self): def test_create_volume_with_provider_id(self):
volume_params_with_provider_id = dict(provider_id='1111-aaaa', volume_params_with_provider_id = dict(provider_id=fake.provider_id,
**self.volume_params) **self.volume_params)
volume = tests_utils.create_volume(self.context, volume = tests_utils.create_volume(self.context,
**volume_params_with_provider_id) **volume_params_with_provider_id)
self.volume.create_volume(self.context, volume['id']) self.volume.create_volume(self.context, volume['id'])
self.assertEqual('1111-aaaa', volume['provider_id']) self.assertEqual(fake.provider_id, volume['provider_id'])
@mock.patch.object(keymgr, 'API', new=fake_keymgr.fake_api) @mock.patch.object(keymgr, 'API', new=fake_keymgr.fake_api)
def test_create_delete_volume_with_encrypted_volume_type(self): def test_create_delete_volume_with_encrypted_volume_type(self):
db_vol_type = db.volume_type_create(self.context, db_vol_type = db.volume_type_create(
{'id': 'type-id', 'name': 'LUKS'}) self.context, {'id': fake.volume_type_id, 'name': 'LUKS'})
db.volume_type_encryption_create( db.volume_type_encryption_create(
self.context, 'type-id', self.context, fake.volume_type_id,
{'control_location': 'front-end', 'provider': ENCRYPTION_PROVIDER}) {'control_location': 'front-end', 'provider': ENCRYPTION_PROVIDER})
volume = self.volume_api.create(self.context, volume = self.volume_api.create(self.context,
@ -1087,10 +1088,10 @@ class VolumeTestCase(BaseVolumeTestCase):
'volume_get_all_by_project') as by_project: 'volume_get_all_by_project') as by_project:
with mock.patch.object(volume_api.db, with mock.patch.object(volume_api.db,
'volume_get_all') as get_all: 'volume_get_all') as get_all:
db_volume = {'volume_type_id': 'fake_type_id', db_volume = {'volume_type_id': fake.volume_type_id,
'name': 'fake_name', 'name': 'fake_name',
'host': 'fake_host', 'host': 'fake_host',
'id': 'fake_volume_id'} 'id': fake.volume_id}
volume = fake_volume.fake_db_volume(**db_volume) volume = fake_volume.fake_db_volume(**db_volume)
by_project.return_value = [volume] by_project.return_value = [volume]
@ -1178,7 +1179,7 @@ class VolumeTestCase(BaseVolumeTestCase):
biz_type = db.volume_type_get_by_name(context.get_admin_context(), biz_type = db.volume_type_get_by_name(context.get_admin_context(),
'biz') 'biz')
snapshot = {'id': 1234, snapshot = {'id': fake.snapshot_id,
'status': 'available', 'status': 'available',
'volume_size': 10, 'volume_size': 10,
'volume_type_id': biz_type['id']} 'volume_type_id': biz_type['id']}
@ -1239,7 +1240,7 @@ class VolumeTestCase(BaseVolumeTestCase):
biz_type = db.volume_type_get_by_name(context.get_admin_context(), biz_type = db.volume_type_get_by_name(context.get_admin_context(),
'biz') 'biz')
source_vol = {'id': 1234, source_vol = {'id': fake.volume_id,
'status': 'available', 'status': 'available',
'volume_size': 10, 'volume_size': 10,
'volume_type': biz_type, 'volume_type': biz_type,
@ -1310,7 +1311,7 @@ class VolumeTestCase(BaseVolumeTestCase):
'id': '34e54c31-3bc8-5c1d-9fff-2225bcce4b59', 'id': '34e54c31-3bc8-5c1d-9fff-2225bcce4b59',
'description': None} 'description': None}
source_vol = {'id': 1234, source_vol = {'id': fake.volume_id,
'status': 'available', 'status': 'available',
'volume_size': 10, 'volume_size': 10,
'volume_type': biz_type, 'volume_type': biz_type,
@ -1355,13 +1356,13 @@ class VolumeTestCase(BaseVolumeTestCase):
'id': '34e54c31-3bc8-5c1d-9fff-2225bcce4b59', 'id': '34e54c31-3bc8-5c1d-9fff-2225bcce4b59',
'description': None} 'description': None}
source_vol = {'id': 1234, source_vol = {'id': fake.volume_id,
'status': 'available', 'status': 'available',
'volume_size': 10, 'volume_size': 10,
'volume_type': biz_type, 'volume_type': biz_type,
'volume_type_id': biz_type['id']} 'volume_type_id': biz_type['id']}
snapshot = {'id': 1234, snapshot = {'id': fake.snapshot_id,
'status': 'available', 'status': 'available',
'volume_size': 10, 'volume_size': 10,
'volume_type_id': biz_type['id']} 'volume_type_id': biz_type['id']}
@ -1952,7 +1953,7 @@ class VolumeTestCase(BaseVolumeTestCase):
def test_create_volume_from_snapshot_fail_bad_size(self): def test_create_volume_from_snapshot_fail_bad_size(self):
"""Test volume can't be created from snapshot with bad volume size.""" """Test volume can't be created from snapshot with bad volume size."""
volume_api = cinder.volume.api.API() volume_api = cinder.volume.api.API()
snapshot = {'id': 1234, snapshot = {'id': fake.snapshot_id,
'status': 'available', 'status': 'available',
'volume_size': 10} 'volume_size': 10}
snapshot_obj = fake_snapshot.fake_snapshot_obj(self.context, snapshot_obj = fake_snapshot.fake_snapshot_obj(self.context,
@ -2011,9 +2012,9 @@ class VolumeTestCase(BaseVolumeTestCase):
1, 1,
'name', 'name',
'description', 'description',
snapshot='fake_id', snapshot=fake.snapshot_id,
image_id='fake_id', image_id=fake.image_id,
source_volume='fake_id') source_volume=fake.volume_id)
@mock.patch.object(cinder.volume.targets.iscsi.ISCSITarget, @mock.patch.object(cinder.volume.targets.iscsi.ISCSITarget,
'_get_target_chap_auth') '_get_target_chap_auth')
@ -2027,10 +2028,10 @@ class VolumeTestCase(BaseVolumeTestCase):
mock_get_target): mock_get_target):
"""Make sure initialize_connection returns correct information.""" """Make sure initialize_connection returns correct information."""
_fake_admin_meta = {'fake-key': 'fake-value'} _fake_admin_meta = {'fake-key': 'fake-value'}
_fake_volume = {'volume_type_id': 'fake_type_id', _fake_volume = {'volume_type_id': fake.volume_type_id,
'name': 'fake_name', 'name': 'fake_name',
'host': 'fake_host', 'host': 'fake_host',
'id': 'fake_volume_id', 'id': fake.volume_id,
'volume_admin_metadata': _fake_admin_meta} 'volume_admin_metadata': _fake_admin_meta}
_mock_volume_get.return_value = _fake_volume _mock_volume_get.return_value = _fake_volume
@ -2056,14 +2057,14 @@ class VolumeTestCase(BaseVolumeTestCase):
# initialize_connection() passes qos_specs that is designated to # initialize_connection() passes qos_specs that is designated to
# be consumed by front-end or both front-end and back-end # be consumed by front-end or both front-end and back-end
conn_info = self.volume.initialize_connection(self.context, conn_info = self.volume.initialize_connection(self.context,
'fake_volume_id', fake.volume_id,
connector) connector)
self.assertDictMatch(qos_specs_expected, self.assertDictMatch(qos_specs_expected,
conn_info['data']['qos_specs']) conn_info['data']['qos_specs'])
qos_values.update({'consumer': 'both'}) qos_values.update({'consumer': 'both'})
conn_info = self.volume.initialize_connection(self.context, conn_info = self.volume.initialize_connection(self.context,
'fake_volume_id', fake.volume_id,
connector) connector)
self.assertDictMatch(qos_specs_expected, self.assertDictMatch(qos_specs_expected,
conn_info['data']['qos_specs']) conn_info['data']['qos_specs'])
@ -2072,7 +2073,7 @@ class VolumeTestCase(BaseVolumeTestCase):
qos_values.update({'consumer': 'back-end'}) qos_values.update({'consumer': 'back-end'})
type_qos.return_value = dict(qos_specs=qos_values) type_qos.return_value = dict(qos_specs=qos_values)
conn_info = self.volume.initialize_connection(self.context, conn_info = self.volume.initialize_connection(self.context,
'fake_volume_id', fake.volume_id,
connector) connector)
self.assertIsNone(conn_info['data']['qos_specs']) self.assertIsNone(conn_info['data']['qos_specs'])
@ -2085,10 +2086,10 @@ class VolumeTestCase(BaseVolumeTestCase):
_mock_create_export): _mock_create_export):
"""Test exception path for create_export failure.""" """Test exception path for create_export failure."""
_fake_admin_meta = {'fake-key': 'fake-value'} _fake_admin_meta = {'fake-key': 'fake-value'}
_fake_volume = {'volume_type_id': 'fake_type_id', _fake_volume = {'volume_type_id': fake.volume_type_id,
'name': 'fake_name', 'name': 'fake_name',
'host': 'fake_host', 'host': 'fake_host',
'id': 'fake_volume_id', 'id': fake.volume_id,
'volume_admin_metadata': _fake_admin_meta} 'volume_admin_metadata': _fake_admin_meta}
_mock_volume_get.return_value = _fake_volume _mock_volume_get.return_value = _fake_volume
@ -2100,7 +2101,7 @@ class VolumeTestCase(BaseVolumeTestCase):
self.assertRaises(exception.VolumeBackendAPIException, self.assertRaises(exception.VolumeBackendAPIException,
self.volume.initialize_connection, self.volume.initialize_connection,
self.context, self.context,
'fake_volume_id', fake.volume_id,
connector) connector)
@mock.patch.object(cinder.volume.targets.iscsi.ISCSITarget, @mock.patch.object(cinder.volume.targets.iscsi.ISCSITarget,
@ -2123,7 +2124,7 @@ class VolumeTestCase(BaseVolumeTestCase):
fake_volume = {'volume_type_id': None, fake_volume = {'volume_type_id': None,
'name': 'fake_name', 'name': 'fake_name',
'host': 'fake_host', 'host': 'fake_host',
'id': 'fake_volume_id', 'id': fake.volume_id,
'volume_admin_metadata': fake_admin_meta, 'volume_admin_metadata': fake_admin_meta,
'encryption_key_id': ('d371e7bb-7392-4c27-' 'encryption_key_id': ('d371e7bb-7392-4c27-'
'ac0b-ebd9f5d16078')} 'ac0b-ebd9f5d16078')}
@ -2994,8 +2995,8 @@ class VolumeTestCase(BaseVolumeTestCase):
'display_name': None, 'display_name': None,
'snapshot_id': snapshot_id, 'snapshot_id': snapshot_id,
'status': 'creating', 'status': 'creating',
'tenant_id': 'fake', 'tenant_id': fake.project_id,
'user_id': 'fake', 'user_id': fake.user_id,
'volume_id': volume['id'], 'volume_id': volume['id'],
'volume_size': 1, 'volume_size': 1,
'availability_zone': 'nova', 'availability_zone': 'nova',
@ -4360,8 +4361,8 @@ class VolumeMigrationTestCase(BaseVolumeTestCase):
"""Test volume migration done by driver.""" """Test volume migration done by driver."""
# stub out driver and rpc functions # stub out driver and rpc functions
self.stubs.Set(self.volume.driver, 'migrate_volume', self.stubs.Set(self.volume.driver, 'migrate_volume',
lambda x, y, z, new_type_id=None: (True, lambda x, y, z, new_type_id=None: (
{'user_id': 'foo'})) True, {'user_id': fake.user_id}))
volume = tests_utils.create_volume(self.context, size=0, volume = tests_utils.create_volume(self.context, size=0,
host=CONF.host, host=CONF.host,
@ -4412,8 +4413,7 @@ class VolumeMigrationTestCase(BaseVolumeTestCase):
def test_migrate_volume_generic(self, volume_get, def test_migrate_volume_generic(self, volume_get,
migrate_volume_completion, migrate_volume_completion,
nova_api): nova_api):
fake_volume_id = 'fake_volume_id' fake_db_new_volume = {'status': 'available', 'id': fake.volume_id}
fake_db_new_volume = {'status': 'available', 'id': fake_volume_id}
fake_new_volume = fake_volume.fake_db_volume(**fake_db_new_volume) fake_new_volume = fake_volume.fake_db_volume(**fake_db_new_volume)
new_volume_obj = fake_volume.fake_volume_obj(self.context, new_volume_obj = fake_volume.fake_volume_obj(self.context,
**fake_new_volume) **fake_new_volume)
@ -4441,7 +4441,7 @@ class VolumeMigrationTestCase(BaseVolumeTestCase):
migrate_volume_completion, migrate_volume_completion,
nova_api): nova_api):
attached_host = 'some-host' attached_host = 'some-host'
fake_volume_id = 'fake_volume_id' fake_volume_id = fake.volume_id
fake_db_new_volume = {'status': 'available', 'id': fake_volume_id} fake_db_new_volume = {'status': 'available', 'id': fake_volume_id}
fake_new_volume = fake_volume.fake_db_volume(**fake_db_new_volume) fake_new_volume = fake_volume.fake_db_volume(**fake_db_new_volume)
host_obj = {'host': 'newhost', 'capabilities': {}} host_obj = {'host': 'newhost', 'capabilities': {}}
@ -4523,7 +4523,7 @@ class VolumeMigrationTestCase(BaseVolumeTestCase):
def test_update_migrated_volume(self, volume_update): def test_update_migrated_volume(self, volume_update):
fake_host = 'fake_host' fake_host = 'fake_host'
fake_new_host = 'fake_new_host' fake_new_host = 'fake_new_host'
fake_update = {'_name_id': 'updated_id', fake_update = {'_name_id': fake.volume2_name_id,
'provider_location': 'updated_location'} 'provider_location': 'updated_location'}
fake_elevated = context.RequestContext('fake', self.project_id, fake_elevated = context.RequestContext('fake', self.project_id,
is_admin=True) is_admin=True)
@ -4534,9 +4534,9 @@ class VolumeMigrationTestCase(BaseVolumeTestCase):
self.context, size=1, self.context, size=1,
status='available', status='available',
provider_location='fake_provider_location', provider_location='fake_provider_location',
_name_id='fake_name_id', _name_id=fake.volume_name_id,
host=fake_new_host) host=fake_new_host)
new_volume._name_id = 'fake_name_id' new_volume._name_id = fake.volume_name_id
new_volume.provider_location = 'fake_provider_location' new_volume.provider_location = 'fake_provider_location'
fake_update_error = {'_name_id': new_volume._name_id, fake_update_error = {'_name_id': new_volume._name_id,
'provider_location': 'provider_location':
@ -4560,7 +4560,7 @@ class VolumeMigrationTestCase(BaseVolumeTestCase):
volume_update.reset_mock() volume_update.reset_mock()
# Reset the volume objects to their original value, since they # Reset the volume objects to their original value, since they
# were changed in the last call. # were changed in the last call.
new_volume._name_id = 'fake_name_id' new_volume._name_id = fake.volume_name_id
new_volume.provider_location = 'fake_provider_location' new_volume.provider_location = 'fake_provider_location'
migrate_update.side_effect = NotImplementedError migrate_update.side_effect = NotImplementedError
self.volume.update_migrated_volume(self.context, volume, self.volume.update_migrated_volume(self.context, volume,
@ -5044,7 +5044,7 @@ class VolumeMigrationTestCase(BaseVolumeTestCase):
class ConsistencyGroupTestCase(BaseVolumeTestCase): class ConsistencyGroupTestCase(BaseVolumeTestCase):
def test_delete_volume_in_consistency_group(self): def test_delete_volume_in_consistency_group(self):
"""Test deleting a volume that's tied to a consistency group fails.""" """Test deleting a volume that's tied to a consistency group fails."""
consistencygroup_id = '12345678-1234-5678-1234-567812345678' consistencygroup_id = fake.consistency_group_id
volume_api = cinder.volume.api.API() volume_api = cinder.volume.api.API()
self.volume_params.update({'status': 'available', self.volume_params.update({'status': 'available',
'consistencygroup_id': consistencygroup_id}) 'consistencygroup_id': consistencygroup_id})
@ -5095,7 +5095,7 @@ class ConsistencyGroupTestCase(BaseVolumeTestCase):
'availability_zone': 'nova', 'availability_zone': 'nova',
'tenant_id': self.context.project_id, 'tenant_id': self.context.project_id,
'created_at': 'DONTCARE', 'created_at': 'DONTCARE',
'user_id': 'fake', 'user_id': fake.user_id,
'consistencygroup_id': group.id 'consistencygroup_id': group.id
} }
self.assertDictMatch(expected, msg['payload']) self.assertDictMatch(expected, msg['payload'])
@ -5173,7 +5173,7 @@ class ConsistencyGroupTestCase(BaseVolumeTestCase):
'availability_zone': 'nova', 'availability_zone': 'nova',
'tenant_id': self.context.project_id, 'tenant_id': self.context.project_id,
'created_at': 'DONTCARE', 'created_at': 'DONTCARE',
'user_id': 'fake', 'user_id': fake.user_id,
'consistencygroup_id': group.id 'consistencygroup_id': group.id
} }
self.assertEqual(fields.ConsistencyGroupStatus.AVAILABLE, cg.status) self.assertEqual(fields.ConsistencyGroupStatus.AVAILABLE, cg.status)
@ -5279,7 +5279,7 @@ class ConsistencyGroupTestCase(BaseVolumeTestCase):
'availability_zone': 'nova', 'availability_zone': 'nova',
'tenant_id': self.context.project_id, 'tenant_id': self.context.project_id,
'created_at': 'DONTCARE', 'created_at': 'DONTCARE',
'user_id': 'fake', 'user_id': fake.user_id,
'consistencygroup_id': group2.id, 'consistencygroup_id': group2.id,
} }
self.assertEqual(fields.ConsistencyGroupStatus.AVAILABLE, cg2.status) self.assertEqual(fields.ConsistencyGroupStatus.AVAILABLE, cg2.status)
@ -5352,21 +5352,21 @@ class ConsistencyGroupTestCase(BaseVolumeTestCase):
self.volume.delete_consistencygroup(self.context, group) self.volume.delete_consistencygroup(self.context, group)
def test_sort_snapshots(self): def test_sort_snapshots(self):
vol1 = {'id': '1', 'name': 'volume 1', vol1 = {'id': fake.volume_id, 'name': 'volume 1',
'snapshot_id': '1', 'snapshot_id': fake.snapshot_id,
'consistencygroup_id': '1'} 'consistencygroup_id': fake.consistency_group_id}
vol2 = {'id': '2', 'name': 'volume 2', vol2 = {'id': fake.volume2_id, 'name': 'volume 2',
'snapshot_id': '2', 'snapshot_id': fake.snapshot2_id,
'consistencygroup_id': '1'} 'consistencygroup_id': fake.consistency_group_id}
vol3 = {'id': '3', 'name': 'volume 3', vol3 = {'id': fake.volume3_id, 'name': 'volume 3',
'snapshot_id': '3', 'snapshot_id': fake.snapshot3_id,
'consistencygroup_id': '1'} 'consistencygroup_id': fake.consistency_group_id}
snp1 = {'id': '1', 'name': 'snap 1', snp1 = {'id': fake.snapshot_id, 'name': 'snap 1',
'cgsnapshot_id': '1'} 'cgsnapshot_id': fake.consistency_group_id}
snp2 = {'id': '2', 'name': 'snap 2', snp2 = {'id': fake.snapshot2_id, 'name': 'snap 2',
'cgsnapshot_id': '1'} 'cgsnapshot_id': fake.consistency_group_id}
snp3 = {'id': '3', 'name': 'snap 3', snp3 = {'id': fake.snapshot3_id, 'name': 'snap 3',
'cgsnapshot_id': '1'} 'cgsnapshot_id': fake.consistency_group_id}
snp1_obj = fake_snapshot.fake_snapshot_obj(self.context, **snp1) snp1_obj = fake_snapshot.fake_snapshot_obj(self.context, **snp1)
snp2_obj = fake_snapshot.fake_snapshot_obj(self.context, **snp2) snp2_obj = fake_snapshot.fake_snapshot_obj(self.context, **snp2)
snp3_obj = fake_snapshot.fake_snapshot_obj(self.context, **snp3) snp3_obj = fake_snapshot.fake_snapshot_obj(self.context, **snp3)
@ -5390,7 +5390,7 @@ class ConsistencyGroupTestCase(BaseVolumeTestCase):
i += 1 i += 1
self.assertEqual(vol['snapshot_id'], snap.id) self.assertEqual(vol['snapshot_id'], snap.id)
snapshots[2]['id'] = '9999' snapshots[2]['id'] = fake.will_not_be_found_id
self.assertRaises(exception.SnapshotNotFound, self.assertRaises(exception.SnapshotNotFound,
self.volume._sort_snapshots, self.volume._sort_snapshots,
volumes, snapshots) volumes, snapshots)
@ -5447,8 +5447,8 @@ class ConsistencyGroupTestCase(BaseVolumeTestCase):
def _create_cgsnapshot(self, group_id, volume_id, size='0'): def _create_cgsnapshot(self, group_id, volume_id, size='0'):
"""Create a cgsnapshot object.""" """Create a cgsnapshot object."""
cgsnap = objects.CGSnapshot(self.context) cgsnap = objects.CGSnapshot(self.context)
cgsnap.user_id = 'fake' cgsnap.user_id = fake.user_id
cgsnap.project_id = 'fake' cgsnap.project_id = fake.project_id
cgsnap.consistencygroup_id = group_id cgsnap.consistencygroup_id = group_id
cgsnap.status = "creating" cgsnap.status = "creating"
cgsnap.create() cgsnap.create()
@ -5456,8 +5456,8 @@ class ConsistencyGroupTestCase(BaseVolumeTestCase):
# Create a snapshot object # Create a snapshot object
snap = objects.Snapshot(context.get_admin_context()) snap = objects.Snapshot(context.get_admin_context())
snap.volume_size = size snap.volume_size = size
snap.user_id = 'fake' snap.user_id = fake.user_id
snap.project_id = 'fake' snap.project_id = fake.project_id
snap.volume_id = volume_id snap.volume_id = volume_id
snap.status = "available" snap.status = "available"
snap.cgsnapshot_id = cgsnap.id snap.cgsnapshot_id = cgsnap.id
@ -5518,8 +5518,8 @@ class ConsistencyGroupTestCase(BaseVolumeTestCase):
'name': None, 'name': None,
'cgsnapshot_id': cgsnapshot.id, 'cgsnapshot_id': cgsnapshot.id,
'status': 'creating', 'status': 'creating',
'tenant_id': 'fake', 'tenant_id': fake.project_id,
'user_id': 'fake', 'user_id': fake.user_id,
'consistencygroup_id': group.id 'consistencygroup_id': group.id
} }
self.assertDictMatch(expected, msg['payload']) self.assertDictMatch(expected, msg['payload'])
@ -6127,40 +6127,40 @@ class GetActiveByWindowTestCase(BaseVolumeTestCase):
self.ctx = context.get_admin_context(read_deleted="yes") self.ctx = context.get_admin_context(read_deleted="yes")
self.db_attrs = [ self.db_attrs = [
{ {
'id': 1, 'id': fake.volume_id,
'host': 'devstack', 'host': 'devstack',
'project_id': 'p1', 'project_id': fake.project_id,
'created_at': datetime.datetime(1, 1, 1, 1, 1, 1), 'created_at': datetime.datetime(1, 1, 1, 1, 1, 1),
'deleted': True, 'status': 'deleted', 'deleted': True, 'status': 'deleted',
'deleted_at': datetime.datetime(1, 2, 1, 1, 1, 1), 'deleted_at': datetime.datetime(1, 2, 1, 1, 1, 1),
}, },
{ {
'id': 2, 'id': fake.volume2_id,
'host': 'devstack', 'host': 'devstack',
'project_id': 'p1', 'project_id': fake.project_id,
'created_at': datetime.datetime(1, 1, 1, 1, 1, 1), 'created_at': datetime.datetime(1, 1, 1, 1, 1, 1),
'deleted': True, 'status': 'deleted', 'deleted': True, 'status': 'deleted',
'deleted_at': datetime.datetime(1, 3, 10, 1, 1, 1), 'deleted_at': datetime.datetime(1, 3, 10, 1, 1, 1),
}, },
{ {
'id': 3, 'id': fake.volume3_id,
'host': 'devstack', 'host': 'devstack',
'project_id': 'p1', 'project_id': fake.project_id,
'created_at': datetime.datetime(1, 1, 1, 1, 1, 1), 'created_at': datetime.datetime(1, 1, 1, 1, 1, 1),
'deleted': True, 'status': 'deleted', 'deleted': True, 'status': 'deleted',
'deleted_at': datetime.datetime(1, 5, 1, 1, 1, 1), 'deleted_at': datetime.datetime(1, 5, 1, 1, 1, 1),
}, },
{ {
'id': 4, 'id': fake.volume4_id,
'host': 'devstack', 'host': 'devstack',
'project_id': 'p1', 'project_id': fake.project_id,
'created_at': datetime.datetime(1, 3, 10, 1, 1, 1), 'created_at': datetime.datetime(1, 3, 10, 1, 1, 1),
}, },
{ {
'id': 5, 'id': fake.volume5_id,
'host': 'devstack', 'host': 'devstack',
'project_id': 'p1', 'project_id': fake.project_id,
'created_at': datetime.datetime(1, 5, 1, 1, 1, 1), 'created_at': datetime.datetime(1, 5, 1, 1, 1, 1),
} }
] ]
@ -6187,17 +6187,17 @@ class GetActiveByWindowTestCase(BaseVolumeTestCase):
self.context, self.context,
datetime.datetime(1, 3, 1, 1, 1, 1), datetime.datetime(1, 3, 1, 1, 1, 1),
datetime.datetime(1, 4, 1, 1, 1, 1), datetime.datetime(1, 4, 1, 1, 1, 1),
project_id='p1') project_id=fake.project_id)
self.assertEqual(3, len(volumes)) self.assertEqual(3, len(volumes))
self.assertEqual(u'2', volumes[0].id) self.assertEqual(fake.volume2_id, volumes[0].id)
self.assertEqual(u'3', volumes[1].id) self.assertEqual(fake.volume3_id, volumes[1].id)
self.assertEqual(u'4', volumes[2].id) self.assertEqual(fake.volume4_id, volumes[2].id)
def test_snapshot_get_active_by_window(self): def test_snapshot_get_active_by_window(self):
# Find all all snapshots valid within a timeframe window. # Find all all snapshots valid within a timeframe window.
db.volume_create(self.context, {'id': 1}) db.volume_create(self.context, {'id': fake.volume_id})
for i in range(5): for i in range(5):
self.db_attrs[i]['volume_id'] = 1 self.db_attrs[i]['volume_id'] = fake.volume_id
# Not in window # Not in window
del self.db_attrs[0]['id'] del self.db_attrs[0]['id']
@ -6230,11 +6230,11 @@ class GetActiveByWindowTestCase(BaseVolumeTestCase):
datetime.datetime(1, 4, 1, 1, 1, 1)).objects datetime.datetime(1, 4, 1, 1, 1, 1)).objects
self.assertEqual(3, len(snapshots)) self.assertEqual(3, len(snapshots))
self.assertEqual(snap2.id, snapshots[0].id) self.assertEqual(snap2.id, snapshots[0].id)
self.assertEqual(u'1', snapshots[0].volume_id) self.assertEqual(fake.volume_id, snapshots[0].volume_id)
self.assertEqual(snap3.id, snapshots[1].id) self.assertEqual(snap3.id, snapshots[1].id)
self.assertEqual(u'1', snapshots[1].volume_id) self.assertEqual(fake.volume_id, snapshots[1].volume_id)
self.assertEqual(snap4.id, snapshots[2].id) self.assertEqual(snap4.id, snapshots[2].id)
self.assertEqual(u'1', snapshots[2].volume_id) self.assertEqual(fake.volume_id, snapshots[2].volume_id)
class DriverTestCase(test.TestCase): class DriverTestCase(test.TestCase):
@ -6293,8 +6293,8 @@ class GenericVolumeDriverTestCase(DriverTestCase):
mock_file_open, mock_file_open,
mock_temporary_chown): mock_temporary_chown):
vol = tests_utils.create_volume(self.context) vol = tests_utils.create_volume(self.context)
self.context.user_id = 'fake' self.context.user_id = fake.user_id
self.context.project_id = 'fake' self.context.project_id = fake.project_id
backup = tests_utils.create_backup(self.context, backup = tests_utils.create_backup(self.context,
vol['id']) vol['id'])
backup_obj = objects.Backup.get_by_id(self.context, backup.id) backup_obj = objects.Backup.get_by_id(self.context, backup.id)
@ -6333,8 +6333,8 @@ class GenericVolumeDriverTestCase(DriverTestCase):
status='backing-up', status='backing-up',
previous_status='in-use') previous_status='in-use')
temp_vol = tests_utils.create_volume(self.context) temp_vol = tests_utils.create_volume(self.context)
self.context.user_id = 'fake' self.context.user_id = fake.user_id
self.context.project_id = 'fake' self.context.project_id = fake.project_id
backup = tests_utils.create_backup(self.context, backup = tests_utils.create_backup(self.context,
vol['id']) vol['id'])
backup_obj = objects.Backup.get_by_id(self.context, backup.id) backup_obj = objects.Backup.get_by_id(self.context, backup.id)
@ -6389,8 +6389,8 @@ class GenericVolumeDriverTestCase(DriverTestCase):
vol = tests_utils.create_volume(self.context, vol = tests_utils.create_volume(self.context,
status='backing-up', status='backing-up',
previous_status='in-use') previous_status='in-use')
self.context.user_id = 'fake' self.context.user_id = fake.user_id
self.context.project_id = 'fake' self.context.project_id = fake.project_id
backup = tests_utils.create_backup(self.context, backup = tests_utils.create_backup(self.context,
vol['id']) vol['id'])
backup_obj = objects.Backup.get_by_id(self.context, backup.id) backup_obj = objects.Backup.get_by_id(self.context, backup.id)
@ -6493,8 +6493,8 @@ class GenericVolumeDriverTestCase(DriverTestCase):
def test_get_backup_device_available(self): def test_get_backup_device_available(self):
vol = tests_utils.create_volume(self.context) vol = tests_utils.create_volume(self.context)
self.context.user_id = 'fake' self.context.user_id = fake.user_id
self.context.project_id = 'fake' self.context.project_id = fake.project_id
backup = tests_utils.create_backup(self.context, backup = tests_utils.create_backup(self.context,
vol['id']) vol['id'])
backup_obj = objects.Backup.get_by_id(self.context, backup.id) backup_obj = objects.Backup.get_by_id(self.context, backup.id)
@ -6511,8 +6511,8 @@ class GenericVolumeDriverTestCase(DriverTestCase):
status='backing-up', status='backing-up',
previous_status='in-use') previous_status='in-use')
temp_vol = tests_utils.create_volume(self.context) temp_vol = tests_utils.create_volume(self.context)
self.context.user_id = 'fake' self.context.user_id = fake.user_id
self.context.project_id = 'fake' self.context.project_id = fake.project_id
backup = tests_utils.create_backup(self.context, backup = tests_utils.create_backup(self.context,
vol['id']) vol['id'])
backup_obj = objects.Backup.get_by_id(self.context, backup.id) backup_obj = objects.Backup.get_by_id(self.context, backup.id)
@ -6700,8 +6700,8 @@ class LVMVolumeDriverTestCase(DriverTestCase):
backup = {} backup = {}
backup['volume_id'] = volume_id backup['volume_id'] = volume_id
backup['user_id'] = 'fake' backup['user_id'] = fake.user_id
backup['project_id'] = 'fake' backup['project_id'] = fake.project_id
backup['host'] = socket.gethostname() backup['host'] = socket.gethostname()
backup['availability_zone'] = '1' backup['availability_zone'] = '1'
backup['display_name'] = 'test_check_for_setup_error' backup['display_name'] = 'test_check_for_setup_error'
@ -6727,8 +6727,8 @@ class LVMVolumeDriverTestCase(DriverTestCase):
mock_file_open, mock_file_open,
mock_temporary_chown): mock_temporary_chown):
vol = tests_utils.create_volume(self.context) vol = tests_utils.create_volume(self.context)
self.context.user_id = 'fake' self.context.user_id = fake.user_id
self.context.project_id = 'fake' self.context.project_id = fake.project_id
backup = tests_utils.create_backup(self.context, backup = tests_utils.create_backup(self.context,
vol['id']) vol['id'])
backup_obj = objects.Backup.get_by_id(self.context, backup.id) backup_obj = objects.Backup.get_by_id(self.context, backup.id)
@ -6763,8 +6763,8 @@ class LVMVolumeDriverTestCase(DriverTestCase):
self.assertTrue(retyped) self.assertTrue(retyped)
def test_update_migrated_volume(self): def test_update_migrated_volume(self):
fake_volume_id = 'vol1' fake_volume_id = fake.volume_id
fake_new_volume_id = 'vol2' fake_new_volume_id = fake.volume2_id
fake_provider = 'fake_provider' fake_provider = 'fake_provider'
original_volume_name = CONF.volume_name_template % fake_volume_id original_volume_name = CONF.volume_name_template % fake_volume_id
current_name = CONF.volume_name_template % fake_new_volume_id current_name = CONF.volume_name_template % fake_new_volume_id
@ -6812,8 +6812,8 @@ class LVMVolumeDriverTestCase(DriverTestCase):
vol = tests_utils.create_volume(self.context, vol = tests_utils.create_volume(self.context,
status='backing-up', status='backing-up',
previous_status='in-use') previous_status='in-use')
self.context.user_id = 'fake' self.context.user_id = fake.user_id
self.context.project_id = 'fake' self.context.project_id = fake.project_id
mock_volume_get.return_value = vol mock_volume_get.return_value = vol
temp_snapshot = tests_utils.create_snapshot(self.context, vol['id']) temp_snapshot = tests_utils.create_snapshot(self.context, vol['id'])
@ -7223,7 +7223,7 @@ class LVMVolumeDriverTestCase(DriverTestCase):
vol_name = 'volume-d8cd1feb-2dcc-404d-9b15-b86fe3bec0a1' vol_name = 'volume-d8cd1feb-2dcc-404d-9b15-b86fe3bec0a1'
ref = {'source-name': 'fake_lv'} ref = {'source-name': 'fake_lv'}
vol = {'name': vol_name, 'id': 1, 'size': 0} vol = {'name': vol_name, 'id': fake.volume_id, 'size': 0}
with mock.patch.object(self.volume.driver.vg, 'rename_volume'): with mock.patch.object(self.volume.driver.vg, 'rename_volume'):
model_update = self.volume.driver.manage_existing(vol, ref) model_update = self.volume.driver.manage_existing(vol, ref)
@ -7254,7 +7254,7 @@ class LVMVolumeDriverTestCase(DriverTestCase):
self._setup_stubs_for_manage_existing() self._setup_stubs_for_manage_existing()
ref = {'source-name': 'fake_lv'} ref = {'source-name': 'fake_lv'}
vol = {'name': 'test', 'id': 1, 'size': 0} vol = {'name': 'test', 'id': fake.volume_id, 'size': 0}
def _rename_volume(old_name, new_name): def _rename_volume(old_name, new_name):
self.assertEqual(ref['source-name'], old_name) self.assertEqual(ref['source-name'], old_name)
@ -7278,7 +7278,7 @@ class LVMVolumeDriverTestCase(DriverTestCase):
self._setup_stubs_for_manage_existing() self._setup_stubs_for_manage_existing()
ref = {'source-name': 'fake_lv_bad_size'} ref = {'source-name': 'fake_lv_bad_size'}
vol = {'name': 'test', 'id': 1, 'size': 2} vol = {'name': 'test', 'id': fake.volume_id, 'size': 2}
self.assertRaises(exception.VolumeBackendAPIException, self.assertRaises(exception.VolumeBackendAPIException,
self.volume.driver.manage_existing_get_size, self.volume.driver.manage_existing_get_size,
@ -7311,7 +7311,7 @@ class LVMVolumeDriverTestCase(DriverTestCase):
self._setup_stubs_for_manage_existing() self._setup_stubs_for_manage_existing()
ref = {'source-name': 'fake_lv'} ref = {'source-name': 'fake_lv'}
snp = {'name': 'test', 'id': 1, 'size': 0} snp = {'name': 'test', 'id': fake.snapshot_id, 'size': 0}
def _rename_volume(old_name, new_name): def _rename_volume(old_name, new_name):
self.assertEqual(ref['source-name'], old_name) self.assertEqual(ref['source-name'], old_name)
@ -7337,7 +7337,12 @@ class LVMVolumeDriverTestCase(DriverTestCase):
self._setup_stubs_for_manage_existing() self._setup_stubs_for_manage_existing()
ref = {'source-name': 'fake_nonexistent_lv'} ref = {'source-name': 'fake_nonexistent_lv'}
snp = {'name': 'test', 'id': 1, 'size': 0, 'status': 'available'} snp = {
'name': 'test',
'id': fake.snapshot_id,
'size': 0,
'status': 'available',
}
self.assertRaises(exception.ManageExistingInvalidReference, self.assertRaises(exception.ManageExistingInvalidReference,
self.volume.driver.manage_existing_snapshot_get_size, self.volume.driver.manage_existing_snapshot_get_size,
@ -7353,7 +7358,7 @@ class LVMVolumeDriverTestCase(DriverTestCase):
self._setup_stubs_for_manage_existing() self._setup_stubs_for_manage_existing()
ref = {'source-name': 'fake_lv_bad_size'} ref = {'source-name': 'fake_lv_bad_size'}
snp = {'name': 'test', 'id': 1, 'size': 2} snp = {'name': 'test', 'id': fake.snapshot_id, 'size': 2}
self.assertRaises(exception.VolumeBackendAPIException, self.assertRaises(exception.VolumeBackendAPIException,
self.volume.driver.manage_existing_snapshot_get_size, self.volume.driver.manage_existing_snapshot_get_size,

13
cinder/tests/unit/utils.py
View File

@ -25,6 +25,7 @@ from cinder import context
from cinder import db from cinder import db
from cinder import objects from cinder import objects
from cinder.objects import fields from cinder.objects import fields
from cinder.tests.unit import fake_constants as fake
def get_test_admin_context(): def get_test_admin_context():
@ -103,8 +104,8 @@ def create_snapshot(ctxt,
vol = db.volume_get(ctxt, volume_id) vol = db.volume_get(ctxt, volume_id)
snap = objects.Snapshot(ctxt) snap = objects.Snapshot(ctxt)
snap.volume_id = volume_id snap.volume_id = volume_id
snap.user_id = ctxt.user_id or 'fake_user_id' snap.user_id = ctxt.user_id or fake.user_id
snap.project_id = ctxt.project_id or 'fake_project_id' snap.project_id = ctxt.project_id or fake.project_id
snap.status = status snap.status = status
snap.volume_size = vol['size'] snap.volume_size = vol['size']
snap.display_name = display_name snap.display_name = display_name
@ -128,8 +129,8 @@ def create_consistencygroup(ctxt,
cg = objects.ConsistencyGroup(ctxt) cg = objects.ConsistencyGroup(ctxt)
cg.host = host cg.host = host
cg.user_id = ctxt.user_id or 'fake_user_id' cg.user_id = ctxt.user_id or fake.user_id
cg.project_id = ctxt.project_id or 'fake_project_id' cg.project_id = ctxt.project_id or fake.project_id
cg.status = status cg.status = status
cg.name = name cg.name = name
cg.description = description cg.description = description
@ -153,8 +154,8 @@ def create_cgsnapshot(ctxt,
**kwargs): **kwargs):
"""Create a cgsnapshot object in the DB.""" """Create a cgsnapshot object in the DB."""
cgsnap = objects.CGSnapshot(ctxt) cgsnap = objects.CGSnapshot(ctxt)
cgsnap.user_id = ctxt.user_id or 'fake_user_id' cgsnap.user_id = ctxt.user_id or fake.user_id
cgsnap.project_id = ctxt.project_id or 'fake_project_id' cgsnap.project_id = ctxt.project_id or fake.project_id
cgsnap.status = status cgsnap.status = status
cgsnap.name = name cgsnap.name = name
cgsnap.description = description cgsnap.description = description