openstack/cinder
Code Issues Proposed changes

Tests: Solidfire - Use UUIDs in object UUID fields

Browse Source 
A number of tests here throw warnings from
oslo.versionedobjects when run because UUIDFields
are populated with data other than UUIDs.

Clean this up in the tests.

Change-Id: I01456ec2000557ab4d0723a287b87356361f5cd4
This commit is contained in:
Eric Harney 2021-01-20 09:28:00 -05:00
parent e39c0406de
commit 993bf354ca
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cinder/tests/unit/volume/drivers/solidfire/test_solidfire.py
View File

@ -116,7 +116,8 @@ class SolidFireVolumeTestCase(test.TestCase):
'name': 'testvol', 'name': 'testvol',
'size': 1, 'size': 1,
'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66', 'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66',
'volume_type_id': 'fast', 'volume_type_id':
'3332b568-96fd-475e-afd7-b7a867bc5255',
'created_at': timeutils.utcnow(), 'created_at': timeutils.utcnow(),
'attributes': 'attributes':
{'uuid': '262b9ce2-a71a-4fbe-830c-c20c5596caea'}} {'uuid': '262b9ce2-a71a-4fbe-830c-c20c5596caea'}}
@ -462,7 +463,7 @@ class SolidFireVolumeTestCase(test.TestCase):
'name': 'testvol', 'name': 'testvol',
'size': 1, 'size': 1,
'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66', 'id': 'a720b3c0-d1f0-11e1-9b23-0800200c9a66',
'volume_type_id': 'fast', 'volume_type_id': '3332b568-96fd-475e-afd7-b7a867bc5255',
'created_at': timeutils.utcnow()} 'created_at': timeutils.utcnow()}
fake_sfaccounts = [{'accountID': 5, fake_sfaccounts = [{'accountID': 5,
@ -1217,7 +1218,7 @@ class SolidFireVolumeTestCase(test.TestCase):
ctx = context.get_admin_context() ctx = context.get_admin_context()
utc_now = timeutils.utcnow().isoformat() utc_now = timeutils.utcnow().isoformat()
vol_fields = { vol_fields = {
'id': f_uuid, 'id': f_uuid[0],
'created_at': utc_now 'created_at': utc_now
} }
vol = fake_volume.fake_volume_obj(ctx, **vol_fields) vol = fake_volume.fake_volume_obj(ctx, **vol_fields)
@ -3197,7 +3198,7 @@ class SolidFireVolumeTestCase(test.TestCase):
ctx = context.get_admin_context() ctx = context.get_admin_context()
utc_now = timeutils.utcnow().isoformat() utc_now = timeutils.utcnow().isoformat()
vol_fields = { vol_fields = {
'id': f_uuid, 'id': f_uuid[0],
'created_at': utc_now 'created_at': utc_now
} }
vol = fake_volume.fake_volume_obj(ctx, **vol_fields) vol = fake_volume.fake_volume_obj(ctx, **vol_fields)
@ -3228,7 +3229,7 @@ class SolidFireVolumeTestCase(test.TestCase):
ctx = context.get_admin_context() ctx = context.get_admin_context()
utc_now = timeutils.utcnow().isoformat() utc_now = timeutils.utcnow().isoformat()
vol_fields = { vol_fields = {
'id': f_uuid, 'id': f_uuid[0],
'created_at': utc_now 'created_at': utc_now
} }
vol = fake_volume.fake_volume_obj(ctx, **vol_fields) vol = fake_volume.fake_volume_obj(ctx, **vol_fields)