openstack
/
fuel-ostf
Code Issues Proposed changes

Switch to Cinder API v2 

Cinder API v1 is deprecated since Grizzly release and will be removed
soon. Wee need to verify that v2 API works.

Closes-Bug: #1501291
Change-Id: I7fac446aec0614b8b557af9dc5c20182d4884386
This commit is contained in:
Ivan Kolodyazhny 2015-09-29 00:06:15 +03:00 committed by tatyana-leontovich
parent 37c5d61134
commit 41aa505924
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fuel_health/nmanager.py
View File

@ -72,7 +72,7 @@ class OfficialClientManager(fuel_health.manager.Manager):
"""
NOVACLIENT_VERSION = '2'
CINDERCLIENT_VERSION = '1'
CINDERCLIENT_VERSION = '2'
def __init__(self):
super(OfficialClientManager, self).__init__()
@ -328,10 +328,10 @@ class OfficialClientTest(fuel_health.test.TestCase):
if flavor.name == 'm1.micro']
def _create_volume(self, client, expected_state=None, **kwargs):
kwargs.setdefault('display_name', rand_name('ostf-test-volume'))
kwargs.setdefault('name', rand_name('ostf-test-volume'))
kwargs.setdefault('size', 1)
volume = client.volumes.create(**kwargs)
self.set_resource(kwargs['display_name'], volume)
self.set_resource(kwargs['name'], volume)
if expected_state:
def await_state():
if client.volumes.get(volume.id).status == expected_state:
@ -343,9 +343,9 @@ class OfficialClientTest(fuel_health.test.TestCase):
def _create_snapshot(self, client, volume_id, expected_state=None,
**kwargs):
kwargs.setdefault('display_name', rand_name('ostf-test-volume'))
kwargs.setdefault('name', rand_name('ostf-test-volume'))
snapshot = client.volume_snapshots.create(volume_id, **kwargs)
self.set_resource(kwargs['display_name'], snapshot)
self.set_resource(kwargs['name'], snapshot)
if expected_state:
def await_state():
if client.volume_snapshots.get(
@ -1224,14 +1224,14 @@ class SmokeChecksTest(OfficialClientTest):
return role
def _create_boot_volume(self, client, img_name=None, **kwargs):
display_name = rand_name('ost1_test-bootable-volume')
name = rand_name('ost1_test-bootable-volume')
imageRef = self.get_image_from_name(img_name=img_name)
LOG.debug(
'Image ref is {0} for volume {1}'.format(imageRef, display_name))
'Image ref is {0} for volume {1}'.format(imageRef, name))
return self._create_volume(
client, display_name=display_name, imageRef=imageRef, **kwargs)
client, name=name, imageRef=imageRef, **kwargs)
def create_instance_from_volume(self, client, volume):
if not self.find_micro_flavor():

2
fuel_health/tests/smoke/test_create_volume.py
View File

@ -87,7 +87,7 @@ class VolumesTest(nmanager.SmokeChecksTest):
volume, 'available')
self.verify_response_true(
volume.display_name.startswith('ostf-test-volume'),
volume.name.startswith('ostf-test-volume'),
'Step 3 failed: {msg}'.format(msg=msg_s1))
# create instance