openstack
/
cinder-tempest-plugin
Code Issues Proposed changes

Merge "Refactor test_volume_backup due to leftovers"

This commit is contained in:
Zuul 2022-01-10 15:21:53 +00:00 committed by Gerrit Code Review
parent 638f2308a1 e9834cd872
commit 2cb36e636b
1 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
cinder_tempest_plugin/api/volume/admin/test_volume_backup.py
View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.common import waiters
from tempest import config from tempest import config
from tempest.lib import decorators from tempest.lib import decorators
from tempest.lib import exceptions from tempest.lib import exceptions
@ -41,19 +40,10 @@ class VolumesBackupsTest(base.BaseVolumeAdminTest):
def test_backup_crossproject_admin_negative(self): def test_backup_crossproject_admin_negative(self):
# create vol as user # create vol as user
volume = self.volumes_client.create_volume( volume = self.create_volume(size=CONF.volume.volume_size)
size=CONF.volume.volume_size)['volume']
waiters.wait_for_volume_resource_status(
self.volumes_client,
volume['id'], 'available')
# create backup as user # create backup as user
backup = self.backups_client.create_backup( self.create_backup(volume_id=volume['id'])
volume_id=volume['id'])['backup']
waiters.wait_for_volume_resource_status(
self.backups_client,
backup['id'], 'available')
# try to create incremental backup as admin # try to create incremental backup as admin
self.assertRaises( self.assertRaises(
exceptions.BadRequest, self.admin_backups_client.create_backup, exceptions.BadRequest, self.admin_backups_client.create_backup,
@ -63,18 +53,12 @@ class VolumesBackupsTest(base.BaseVolumeAdminTest):
def test_backup_crossproject_user_negative(self): def test_backup_crossproject_user_negative(self):
# create vol as user # create vol as user
volume = self.volumes_client.create_volume( volume = self.create_volume(size=CONF.volume.volume_size)
size=CONF.volume.volume_size)['volume']
waiters.wait_for_volume_resource_status(
self.volumes_client,
volume['id'], 'available')
# create backup as admin # create backup as admin
backup = self.admin_backups_client.create_backup(
volume_id=volume['id'])['backup'] self.create_backup(volume_id=volume['id'],
waiters.wait_for_volume_resource_status( backup_client=self.admin_backups_client)
self.admin_backups_client,
backup['id'], 'available')
# try to create incremental backup as user # try to create incremental backup as user
self.assertRaises( self.assertRaises(
@ -85,25 +69,14 @@ class VolumesBackupsTest(base.BaseVolumeAdminTest):
def test_incremental_backup_respective_parents(self): def test_incremental_backup_respective_parents(self):
# create vol as user # create vol as user
volume = self.volumes_client.create_volume( volume = self.create_volume(size=CONF.volume.volume_size)
size=CONF.volume.volume_size)['volume']
waiters.wait_for_volume_resource_status(
self.volumes_client,
volume['id'], 'available')
# create backup as admin # create backup as admin
backup_adm = self.admin_backups_client.create_backup( backup_adm = self.create_backup(
volume_id=volume['id'])['backup'] volume_id=volume['id'], backup_client=self.admin_backups_client)
waiters.wait_for_volume_resource_status(
self.admin_backups_client,
backup_adm['id'], 'available')
# create backup as user # create backup as user
backup_usr = self.backups_client.create_backup( backup_usr = self.create_backup(volume_id=volume['id'])
volume_id=volume['id'])['backup']
waiters.wait_for_volume_resource_status(
self.backups_client,
backup_usr['id'], 'available')
# refresh admin backup and assert no child backups # refresh admin backup and assert no child backups
backup_adm = self.admin_backups_client.show_backup( backup_adm = self.admin_backups_client.show_backup(
@ -111,11 +84,8 @@ class VolumesBackupsTest(base.BaseVolumeAdminTest):
self.assertFalse(backup_adm['has_dependent_backups']) self.assertFalse(backup_adm['has_dependent_backups'])
# create incremental backup as admin # create incremental backup as admin
backup_adm_inc = self.admin_backups_client.create_backup( self.create_backup(volume_id=volume['id'], incremental=True,
volume_id=volume['id'], incremental=True)['backup'] backup_client=self.admin_backups_client)
waiters.wait_for_volume_resource_status(
self.admin_backups_client,
backup_adm_inc['id'], 'available')
# refresh user backup and assert no child backups # refresh user backup and assert no child backups
backup_usr = self.backups_client.show_backup( backup_usr = self.backups_client.show_backup(
@ -128,11 +98,8 @@ class VolumesBackupsTest(base.BaseVolumeAdminTest):
self.assertTrue(backup_adm['has_dependent_backups']) self.assertTrue(backup_adm['has_dependent_backups'])
# create incremental backup as user # create incremental backup as user
backup_usr_inc = self.backups_client.create_backup( self.create_backup(volume_id=volume['id'],
volume_id=volume['id'], incremental=True)['backup'] incremental=True)
waiters.wait_for_volume_resource_status(
self.backups_client,
backup_usr_inc['id'], 'available')
# refresh user backup and assert it has childs # refresh user backup and assert it has childs
backup_usr = self.backups_client.show_backup( backup_usr = self.backups_client.show_backup(