openstack
/
cinder-tempest-plugin
Code Issues Proposed changes

Merge "Fix internal tempest tests"

This commit is contained in:
Jenkins 2017-02-28 02:29:56 +00:00 committed by Gerrit Code Review
parent 067b0eb4b5 20da4f35ab
commit a569568d57
3 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cinder/tests/tempest/api/volume/test_consistencygroups.py
View File

@ -88,7 +88,7 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
# Create volume # Create volume
volume = self.admin_volume_client.create_volume(**params)['volume'] volume = self.admin_volume_client.create_volume(**params)['volume']
waiters.wait_for_volume_status(self.admin_volume_client, waiters.wait_for_volume_resource_status(self.admin_volume_client,
volume['id'], 'available') volume['id'], 'available')
self.consistencygroups_adm_client.wait_for_consistencygroup_status( self.consistencygroups_adm_client.wait_for_consistencygroup_status(
cg['id'], 'available') cg['id'], 'available')
@ -131,7 +131,7 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
# Create volume # Create volume
volume = self.admin_volume_client.create_volume(**params)['volume'] volume = self.admin_volume_client.create_volume(**params)['volume']
waiters.wait_for_volume_status(self.admin_volume_client, waiters.wait_for_volume_resource_status(self.admin_volume_client,
volume['id'], 'available') volume['id'], 'available')
self.consistencygroups_adm_client.wait_for_consistencygroup_status( self.consistencygroups_adm_client.wait_for_consistencygroup_status(
cg['id'], 'available') cg['id'], 'available')
@ -147,8 +147,8 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
detail=True)['snapshots'] detail=True)['snapshots']
for snap in snapshots: for snap in snapshots:
if volume['id'] == snap['volume_id']: if volume['id'] == snap['volume_id']:
waiters.wait_for_snapshot_status(self.admin_snapshots_client, waiters.wait_for_volume_resource_status(
snap['id'], 'available') self.admin_snapshots_client, snap['id'], 'available')
self.consistencygroups_adm_client.wait_for_cgsnapshot_status( self.consistencygroups_adm_client.wait_for_cgsnapshot_status(
cgsnapshot['id'], 'available') cgsnapshot['id'], 'available')
self.assertEqual(cgsnapshot_name, cgsnapshot['name']) self.assertEqual(cgsnapshot_name, cgsnapshot['name'])
@ -191,7 +191,7 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
# Create volume # Create volume
volume = self.admin_volume_client.create_volume(**params)['volume'] volume = self.admin_volume_client.create_volume(**params)['volume']
waiters.wait_for_volume_status(self.admin_volume_client, waiters.wait_for_volume_resource_status(self.admin_volume_client,
volume['id'], 'available') volume['id'], 'available')
self.consistencygroups_adm_client.wait_for_consistencygroup_status( self.consistencygroups_adm_client.wait_for_consistencygroup_status(
cg['id'], 'available') cg['id'], 'available')
@ -207,8 +207,8 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
detail=True)['snapshots'] detail=True)['snapshots']
for snap in snapshots: for snap in snapshots:
if volume['id'] == snap['volume_id']: if volume['id'] == snap['volume_id']:
waiters.wait_for_snapshot_status(self.admin_snapshots_client, waiters.wait_for_volume_resource_status(
snap['id'], 'available') self.admin_snapshots_client, snap['id'], 'available')
self.consistencygroups_adm_client.wait_for_cgsnapshot_status( self.consistencygroups_adm_client.wait_for_cgsnapshot_status(
cgsnapshot['id'], 'available') cgsnapshot['id'], 'available')
self.assertEqual(cgsnapshot_name, cgsnapshot['name']) self.assertEqual(cgsnapshot_name, cgsnapshot['name'])
@ -223,8 +223,8 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
detail=True)['volumes'] detail=True)['volumes']
for vol in vols: for vol in vols:
if vol['consistencygroup_id'] == cg2['id']: if vol['consistencygroup_id'] == cg2['id']:
waiters.wait_for_volume_status(self.admin_volume_client, waiters.wait_for_volume_resource_status(
vol['id'], 'available') self.admin_volume_client, vol['id'], 'available')
self.consistencygroups_adm_client.wait_for_consistencygroup_status( self.consistencygroups_adm_client.wait_for_consistencygroup_status(
cg2['id'], 'available') cg2['id'], 'available')
self.assertEqual(cg_name2, cg2['name']) self.assertEqual(cg_name2, cg2['name'])
@ -257,7 +257,7 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
# Create volume # Create volume
volume = self.admin_volume_client.create_volume(**params)['volume'] volume = self.admin_volume_client.create_volume(**params)['volume']
waiters.wait_for_volume_status(self.admin_volume_client, waiters.wait_for_volume_resource_status(self.admin_volume_client,
volume['id'], 'available') volume['id'], 'available')
self.consistencygroups_adm_client.wait_for_consistencygroup_status( self.consistencygroups_adm_client.wait_for_consistencygroup_status(
cg['id'], 'available') cg['id'], 'available')
@ -273,8 +273,8 @@ class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest):
detail=True)['volumes'] detail=True)['volumes']
for vol in vols: for vol in vols:
if vol['consistencygroup_id'] == cg2['id']: if vol['consistencygroup_id'] == cg2['id']:
waiters.wait_for_volume_status(self.admin_volume_client, waiters.wait_for_volume_resource_status(
vol['id'], 'available') self.admin_volume_client, vol['id'], 'available')
self.consistencygroups_adm_client.wait_for_consistencygroup_status( self.consistencygroups_adm_client.wait_for_consistencygroup_status(
cg2['id'], 'available') cg2['id'], 'available')
self.assertEqual(cg_name2, cg2['name']) self.assertEqual(cg_name2, cg2['name'])

19
cinder/tests/tempest/api/volume/test_volume_backup.py
View File

@ -55,7 +55,7 @@ class VolumesBackupsTest(volume_base.BaseVolumeTest):
# Get a given backup # Get a given backup
backup = self.backups_client.show_backup( backup = self.backups_client.show_backup(
backup['id'])['backup'] backup['id'])['backup']
waiters.wait_for_backup_status( waiters.wait_for_volume_resource_status(
self.backups_client, self.backups_client,
backup['id'], 'available') backup['id'], 'available')
self.assertEqual(volume['id'], backup['volume_id']) self.assertEqual(volume['id'], backup['volume_id'])
@ -78,17 +78,17 @@ class VolumesBackupsTest(volume_base.BaseVolumeTest):
backup = self.backups_client.create_backup( backup = self.backups_client.create_backup(
volume_id=src_vol['id'])['backup'] volume_id=src_vol['id'])['backup']
self.addCleanup(self.backups_client.delete_backup, backup['id']) self.addCleanup(self.backups_client.delete_backup, backup['id'])
waiters.wait_for_backup_status( waiters.wait_for_volume_resource_status(
self.backups_client, self.backups_client,
backup['id'], 'available') backup['id'], 'available')
# Restore to existing volume # Restore to existing volume
restore = self.backups_client.restore_backup( restore = self.backups_client.restore_backup(
backup_id=backup['id'], backup_id=backup['id'],
volume_id=src_vol['id'])['restore'] volume_id=src_vol['id'])['restore']
waiters.wait_for_backup_status( waiters.wait_for_volume_resource_status(
self.backups_client, self.backups_client,
backup['id'], 'available') backup['id'], 'available')
waiters.wait_for_volume_status( waiters.wait_for_volume_resource_status(
self.volumes_client, self.volumes_client,
src_vol['id'], 'available') src_vol['id'], 'available')
self.assertEqual(src_vol['id'], restore['volume_id']) self.assertEqual(src_vol['id'], restore['volume_id'])
@ -106,9 +106,8 @@ class VolumesBackupsTest(volume_base.BaseVolumeTest):
# Create backup # Create backup
backup = self.backups_client.create_backup( backup = self.backups_client.create_backup(
volume_id=volume['id'])['backup'] volume_id=volume['id'])['backup']
waiters.wait_for_backup_status(self.backups_client, waiters.wait_for_volume_resource_status(self.backups_client,
backup['id'], backup['id'], 'available')
'available')
# Create a server # Create a server
bd_map = [{'volume_id': volume['id'], bd_map = [{'volume_id': volume['id'],
'delete_on_termination': '0'}] 'delete_on_termination': '0'}]
@ -122,13 +121,13 @@ class VolumesBackupsTest(volume_base.BaseVolumeTest):
# Delete VM # Delete VM
self.servers_client.delete_server(server['id']) self.servers_client.delete_server(server['id'])
# Create incremental backup # Create incremental backup
waiters.wait_for_volume_status(self.volumes_client, volume['id'], waiters.wait_for_volume_resource_status(self.volumes_client,
'available') volume['id'], 'available')
backup_incr = self.backups_client.create_backup( backup_incr = self.backups_client.create_backup(
volume_id=volume['id'], volume_id=volume['id'],
incremental=True)['backup'] incremental=True)['backup']
waiters.wait_for_backup_status(self.backups_client, waiters.wait_for_volume_resource_status(self.backups_client,
backup_incr['id'], backup_incr['id'],
'available') 'available')

2
cinder/tests/tempest/api/volume/test_volume_unicode.py
View File

@ -45,7 +45,7 @@ class CinderUnicodeTest(volume_base.BaseVolumeTest):
volume = cls.volumes_client.create_volume(**kwargs)['volume'] volume = cls.volumes_client.create_volume(**kwargs)['volume']
cls.volumes.append(volume) cls.volumes.append(volume)
waiters.wait_for_volume_status(cls.volumes_client, waiters.wait_for_volume_resource_status(cls.volumes_client,
volume['id'], volume['id'],
'available') 'available')