openstack/tempest
Code Issues Proposed changes

Merge "Remove name checking for api version 1"

Browse Source
This commit is contained in:
Jenkins 2017-03-27 19:37:52 +00:00 committed by Gerrit Code Review
commit 39f9363fdd
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tempest/scenario/manager.py
View File

@ -230,12 +230,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
volume['id']) volume['id'])
self.addCleanup(test_utils.call_and_ignore_notfound_exc, self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.volumes_client.delete_volume, volume['id']) self.volumes_client.delete_volume, volume['id'])
self.assertEqual(name, volume['name'])
# NOTE(e0ne): Cinder API v2 uses name instead of display_name
if 'display_name' in volume:
self.assertEqual(name, volume['display_name'])
else:
self.assertEqual(name, volume['name'])
waiters.wait_for_volume_resource_status(self.volumes_client, waiters.wait_for_volume_resource_status(self.volumes_client,
volume['id'], 'available') volume['id'], 'available')
# The volume retrieved on creation has a non-up-to-date status. # The volume retrieved on creation has a non-up-to-date status.

5
tempest/scenario/test_stamp_pattern.py
View File

@ -68,10 +68,7 @@ class TestStampPattern(manager.ScenarioTest):
volume['id'], 'available') volume['id'], 'available')
waiters.wait_for_volume_resource_status(self.snapshots_client, waiters.wait_for_volume_resource_status(self.snapshots_client,
snapshot['id'], 'available') snapshot['id'], 'available')
if 'display_name' in snapshot: self.assertEqual(snapshot_name, snapshot['name'])
self.assertEqual(snapshot_name, snapshot['display_name'])
else:
self.assertEqual(snapshot_name, snapshot['name'])
return snapshot return snapshot
def _wait_for_volume_available_on_the_system(self, ip_address, def _wait_for_volume_available_on_the_system(self, ip_address,

8
tempest/scenario/test_volume_boot_pattern.py
View File

@ -81,13 +81,7 @@ class TestVolumeBootPattern(manager.ScenarioTest):
self.addCleanup(self.snapshots_client.delete_snapshot, snap['id']) self.addCleanup(self.snapshots_client.delete_snapshot, snap['id'])
waiters.wait_for_volume_resource_status(self.snapshots_client, waiters.wait_for_volume_resource_status(self.snapshots_client,
snap['id'], 'available') snap['id'], 'available')
self.assertEqual(snap_name, snap['name'])
# NOTE(e0ne): Cinder API v2 uses name instead of display_name
if 'display_name' in snap:
self.assertEqual(snap_name, snap['display_name'])
else:
self.assertEqual(snap_name, snap['name'])
return snap return snap
def _delete_server(self, server): def _delete_server(self, server):