Codebase list cinder-tempest-plugin / a569568
Merge "Fix internal tempest tests" Jenkins authored 9 years ago Gerrit Code Review committed 9 years ago
3 changed file(s) with 30 addition(s) and 31 deletion(s). Raw diff Collapse all Expand all
+16
-16
cinder/tests/tempest/api/volume/test_consistencygroups.py less more
8787 # Create volume
8888 volume = self.admin_volume_client.create_volume(**params)['volume']
8989
90 waiters.wait_for_volume_status(self.admin_volume_client,
91 volume['id'], 'available')
90 waiters.wait_for_volume_resource_status(self.admin_volume_client,
91 volume['id'], 'available')
9292 self.consistencygroups_adm_client.wait_for_consistencygroup_status(
9393 cg['id'], 'available')
9494 self.assertEqual(cg_name, cg['name'])
130130
131131 # Create volume
132132 volume = self.admin_volume_client.create_volume(**params)['volume']
133 waiters.wait_for_volume_status(self.admin_volume_client,
134 volume['id'], 'available')
133 waiters.wait_for_volume_resource_status(self.admin_volume_client,
134 volume['id'], 'available')
135135 self.consistencygroups_adm_client.wait_for_consistencygroup_status(
136136 cg['id'], 'available')
137137 self.assertEqual(cg_name, cg['name'])
146146 detail=True)['snapshots']
147147 for snap in snapshots:
148148 if volume['id'] == snap['volume_id']:
149 waiters.wait_for_snapshot_status(self.admin_snapshots_client,
150 snap['id'], 'available')
149 waiters.wait_for_volume_resource_status(
150 self.admin_snapshots_client, snap['id'], 'available')
151151 self.consistencygroups_adm_client.wait_for_cgsnapshot_status(
152152 cgsnapshot['id'], 'available')
153153 self.assertEqual(cgsnapshot_name, cgsnapshot['name'])
190190
191191 # Create volume
192192 volume = self.admin_volume_client.create_volume(**params)['volume']
193 waiters.wait_for_volume_status(self.admin_volume_client,
194 volume['id'], 'available')
193 waiters.wait_for_volume_resource_status(self.admin_volume_client,
194 volume['id'], 'available')
195195 self.consistencygroups_adm_client.wait_for_consistencygroup_status(
196196 cg['id'], 'available')
197197 self.assertEqual(cg_name, cg['name'])
206206 detail=True)['snapshots']
207207 for snap in snapshots:
208208 if volume['id'] == snap['volume_id']:
209 waiters.wait_for_snapshot_status(self.admin_snapshots_client,
210 snap['id'], 'available')
209 waiters.wait_for_volume_resource_status(
210 self.admin_snapshots_client, snap['id'], 'available')
211211 self.consistencygroups_adm_client.wait_for_cgsnapshot_status(
212212 cgsnapshot['id'], 'available')
213213 self.assertEqual(cgsnapshot_name, cgsnapshot['name'])
222222 detail=True)['volumes']
223223 for vol in vols:
224224 if vol['consistencygroup_id'] == cg2['id']:
225 waiters.wait_for_volume_status(self.admin_volume_client,
226 vol['id'], 'available')
225 waiters.wait_for_volume_resource_status(
226 self.admin_volume_client, vol['id'], 'available')
227227 self.consistencygroups_adm_client.wait_for_consistencygroup_status(
228228 cg2['id'], 'available')
229229 self.assertEqual(cg_name2, cg2['name'])
256256
257257 # Create volume
258258 volume = self.admin_volume_client.create_volume(**params)['volume']
259 waiters.wait_for_volume_status(self.admin_volume_client,
260 volume['id'], 'available')
259 waiters.wait_for_volume_resource_status(self.admin_volume_client,
260 volume['id'], 'available')
261261 self.consistencygroups_adm_client.wait_for_consistencygroup_status(
262262 cg['id'], 'available')
263263 self.assertEqual(cg_name, cg['name'])
272272 detail=True)['volumes']
273273 for vol in vols:
274274 if vol['consistencygroup_id'] == cg2['id']:
275 waiters.wait_for_volume_status(self.admin_volume_client,
276 vol['id'], 'available')
275 waiters.wait_for_volume_resource_status(
276 self.admin_volume_client, vol['id'], 'available')
277277 self.consistencygroups_adm_client.wait_for_consistencygroup_status(
278278 cg2['id'], 'available')
279279 self.assertEqual(cg_name2, cg2['name'])
+11
-12
cinder/tests/tempest/api/volume/test_volume_backup.py less more
5454 # Get a given backup
5555 backup = self.backups_client.show_backup(
5656 backup['id'])['backup']
57 waiters.wait_for_backup_status(
57 waiters.wait_for_volume_resource_status(
5858 self.backups_client,
5959 backup['id'], 'available')
6060 self.assertEqual(volume['id'], backup['volume_id'])
7777 backup = self.backups_client.create_backup(
7878 volume_id=src_vol['id'])['backup']
7979 self.addCleanup(self.backups_client.delete_backup, backup['id'])
80 waiters.wait_for_backup_status(
80 waiters.wait_for_volume_resource_status(
8181 self.backups_client,
8282 backup['id'], 'available')
8383 # Restore to existing volume
8484 restore = self.backups_client.restore_backup(
8585 backup_id=backup['id'],
8686 volume_id=src_vol['id'])['restore']
87 waiters.wait_for_backup_status(
87 waiters.wait_for_volume_resource_status(
8888 self.backups_client,
8989 backup['id'], 'available')
90 waiters.wait_for_volume_status(
90 waiters.wait_for_volume_resource_status(
9191 self.volumes_client,
9292 src_vol['id'], 'available')
9393 self.assertEqual(src_vol['id'], restore['volume_id'])
105105 # Create backup
106106 backup = self.backups_client.create_backup(
107107 volume_id=volume['id'])['backup']
108 waiters.wait_for_backup_status(self.backups_client,
109 backup['id'],
110 'available')
108 waiters.wait_for_volume_resource_status(self.backups_client,
109 backup['id'], 'available')
111110 # Create a server
112111 bd_map = [{'volume_id': volume['id'],
113112 'delete_on_termination': '0'}]
121120 # Delete VM
122121 self.servers_client.delete_server(server['id'])
123122 # Create incremental backup
124 waiters.wait_for_volume_status(self.volumes_client, volume['id'],
125 'available')
123 waiters.wait_for_volume_resource_status(self.volumes_client,
124 volume['id'], 'available')
126125 backup_incr = self.backups_client.create_backup(
127126 volume_id=volume['id'],
128127 incremental=True)['backup']
129128
130 waiters.wait_for_backup_status(self.backups_client,
131 backup_incr['id'],
132 'available')
129 waiters.wait_for_volume_resource_status(self.backups_client,
130 backup_incr['id'],
131 'available')
133132
134133 is_incremental = self.backups_client.show_backup(
135134 backup_incr['id'])['backup']['is_incremental']
+3
-3
cinder/tests/tempest/api/volume/test_volume_unicode.py less more
4444 volume = cls.volumes_client.create_volume(**kwargs)['volume']
4545 cls.volumes.append(volume)
4646
47 waiters.wait_for_volume_status(cls.volumes_client,
48 volume['id'],
49 'available')
47 waiters.wait_for_volume_resource_status(cls.volumes_client,
48 volume['id'],
49 'available')
5050
5151 return volume
5252