openstack/tempest
Code Issues Proposed changes

Merge "Fix test_volumes_get volumes cleanup."

Browse Source
This commit is contained in:
Jenkins
2013-06-22 01:30:18 +00:00
committed by Gerrit Code Review
parent ae67cc4f53 a2a82181bf
commit 23a1b4f7e1
1 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
tempest/api/compute/volumes/test_volumes_get.py
View File

@@ -33,72 +33,68 @@ class VolumesGetTestJSON(base.BaseComputeTest):
def test_volume_create_get_delete(self): def test_volume_create_get_delete(self):
# CREATE, GET, DELETE Volume # CREATE, GET, DELETE Volume
volume = None volume = None
try: v_name = rand_name('Volume-%s-') % self._interface
v_name = rand_name('Volume-%s-') % self._interface metadata = {'Type': 'work'}
metadata = {'Type': 'work'} #Create volume
#Create volume resp, volume = self.client.create_volume(size=1,
resp, volume = self.client.create_volume(size=1, display_name=v_name,
display_name=v_name, metadata=metadata)
metadata=metadata) self.addCleanup(self._delete_volume, volume)
self.assertEqual(200, resp.status) self.assertEqual(200, resp.status)
self.assertTrue('id' in volume) self.assertTrue('id' in volume)
self.assertTrue('displayName' in volume) self.assertTrue('displayName' in volume)
self.assertEqual(volume['displayName'], v_name, self.assertEqual(volume['displayName'], v_name,
"The created volume name is not equal " "The created volume name is not equal "
"to the requested name") "to the requested name")
self.assertTrue(volume['id'] is not None, self.assertTrue(volume['id'] is not None,
"Field volume id is empty or not found.") "Field volume id is empty or not found.")
#Wait for Volume status to become ACTIVE #Wait for Volume status to become ACTIVE
self.client.wait_for_volume_status(volume['id'], 'available') self.client.wait_for_volume_status(volume['id'], 'available')
#GET Volume #GET Volume
resp, fetched_volume = self.client.get_volume(volume['id']) resp, fetched_volume = self.client.get_volume(volume['id'])
self.assertEqual(200, resp.status) self.assertEqual(200, resp.status)
#Verfication of details of fetched Volume #Verfication of details of fetched Volume
self.assertEqual(v_name, self.assertEqual(v_name,
fetched_volume['displayName'], fetched_volume['displayName'],
'The fetched Volume is different ' 'The fetched Volume is different '
'from the created Volume') 'from the created Volume')
self.assertEqual(volume['id'], self.assertEqual(volume['id'],
fetched_volume['id'], fetched_volume['id'],
'The fetched Volume is different ' 'The fetched Volume is different '
'from the created Volume') 'from the created Volume')
self.assertEqual(metadata, self.assertEqual(metadata,
fetched_volume['metadata'], fetched_volume['metadata'],
'The fetched Volume is different ' 'The fetched Volume is different '
'from the created Volume') 'from the created Volume')
finally:
if volume:
#Delete the Volume created in this method
resp, _ = self.client.delete_volume(volume['id'])
self.assertEqual(202, resp.status)
#Checking if the deleted Volume still exists
self.client.wait_for_resource_deletion(volume['id'])
@attr(type='gate') @attr(type='gate')
def test_volume_get_metadata_none(self): def test_volume_get_metadata_none(self):
# CREATE, GET empty metadata dict # CREATE, GET empty metadata dict
v_name = rand_name('Volume-')
#Create volume
resp, volume = self.client.create_volume(size=1,
display_name=v_name,
metadata={})
self.addCleanup(self._delete_volume, volume)
self.assertEqual(200, resp.status)
self.assertTrue('id' in volume)
self.assertTrue('displayName' in volume)
#Wait for Volume status to become ACTIVE
self.client.wait_for_volume_status(volume['id'], 'available')
#GET Volume
resp, fetched_volume = self.client.get_volume(volume['id'])
self.assertEqual(200, resp.status)
self.assertEqual(fetched_volume['metadata'], {})
def _delete_volume(self, volume):
#Delete the Volume created in this method
try: try:
v_name = rand_name('Volume-')
#Create volume
resp, volume = self.client.create_volume(size=1,
display_name=v_name,
metadata={})
self.assertEqual(200, resp.status)
self.assertTrue('id' in volume)
self.assertTrue('displayName' in volume)
#Wait for Volume status to become ACTIVE
self.client.wait_for_volume_status(volume['id'], 'available')
#GET Volume
resp, fetched_volume = self.client.get_volume(volume['id'])
self.assertEqual(200, resp.status)
self.assertEqual(fetched_volume['metadata'], {})
finally:
#Delete the Volume created in this method
resp, _ = self.client.delete_volume(volume['id']) resp, _ = self.client.delete_volume(volume['id'])
self.assertEqual(202, resp.status) self.assertEqual(202, resp.status)
#Checking if the deleted Volume still exists #Checking if the deleted Volume still exists
self.client.wait_for_resource_deletion(volume['id']) self.client.wait_for_resource_deletion(volume['id'])
except KeyError:
return
class VolumesGetTestXML(VolumesGetTestJSON): class VolumesGetTestXML(VolumesGetTestJSON):