More volume functional test fixes

Remove the use of class setup/teardown from volume transfer functional tests
as that just doesn't work too well here. Also wait for volume status before
attempting transfer request operations, some test nodes take a while to
create the volumes.

Change-Id: Ib9378ab5c973deb2aa86c9b9ed31408f3a05115a
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2018-12-17 14:58:02 -06:00
parent 5303bca361
commit f9df3ce3cd
1 changed files with 48 additions and 43 deletions

View File

@ -19,75 +19,80 @@ from openstackclient.tests.functional.volume.v2 import common
class TransferRequestTests(common.BaseVolumeTests):
"""Functional tests for transfer request. """
NAME = uuid.uuid4().hex
VOLUME_NAME = uuid.uuid4().hex
API_VERSION = '2'
@classmethod
def setUpClass(cls):
super(TransferRequestTests, cls).setUpClass()
cmd_output = json.loads(cls.openstack(
'--os-volume-api-version ' + cls.API_VERSION + ' ' +
'volume create -f json --size 1 ' + cls.VOLUME_NAME))
cls.assertOutput(cls.VOLUME_NAME, cmd_output['name'])
cls.wait_for_status("volume", cls.VOLUME_NAME, "available")
@classmethod
def tearDownClass(cls):
try:
raw_output_volume = cls.openstack(
'volume delete ' + cls.VOLUME_NAME)
cls.assertOutput('', raw_output_volume)
finally:
super(TransferRequestTests, cls).tearDownClass()
def test_volume_transfer_request_accept(self):
volume_name = uuid.uuid4().hex
name = uuid.uuid4().hex
xfer_name = uuid.uuid4().hex
# create a volume
cmd_output = json.loads(self.openstack(
'volume create -f json --size 1 ' + volume_name))
'volume create -f json ' +
'--size 1 ' +
volume_name
))
self.assertEqual(volume_name, cmd_output['name'])
self.addCleanup(
self.openstack,
'--os-volume-api-version ' + self.API_VERSION + ' ' +
'volume delete ' +
volume_name
)
self.wait_for_status("volume", volume_name, "available")
# create volume transfer request for the volume
# and get the auth_key of the new transfer request
cmd_output = json.loads(self.openstack(
'--os-volume-api-version ' + self.API_VERSION + ' ' +
'volume transfer request create -f json ' +
volume_name +
' --name ' + name))
' --name ' + xfer_name + ' ' +
volume_name
))
self.assertEqual(xfer_name, cmd_output['name'])
auth_key = cmd_output['auth_key']
self.assertTrue(auth_key)
# accept the volume transfer request
cmd_output = json.loads(self.openstack(
'--os-volume-api-version ' + self.API_VERSION + ' ' +
'volume transfer request accept -f json ' +
name + ' ' +
'--auth-key ' + auth_key
'--auth-key ' + auth_key + ' ' +
xfer_name
))
self.assertEqual(name, cmd_output['name'])
# the volume transfer will be removed by default after accepted
# so just need to delete the volume here
raw_output = self.openstack(
'volume delete ' + volume_name)
self.assertEqual('', raw_output)
self.assertEqual(xfer_name, cmd_output['name'])
def test_volume_transfer_request_list_show(self):
name = uuid.uuid4().hex
volume_name = uuid.uuid4().hex
xfer_name = uuid.uuid4().hex
# create a volume
cmd_output = json.loads(self.openstack(
'volume create -f json ' +
'--size 1 ' +
volume_name
))
self.assertEqual(volume_name, cmd_output['name'])
self.addCleanup(
self.openstack,
'--os-volume-api-version ' + self.API_VERSION + ' ' +
'volume delete ' +
volume_name
)
self.wait_for_status("volume", volume_name, "available")
cmd_output = json.loads(self.openstack(
'--os-volume-api-version ' + self.API_VERSION + ' ' +
'volume transfer request create -f json ' +
' --name ' + name + ' ' +
self.VOLUME_NAME
' --name ' + xfer_name + ' ' +
volume_name
))
self.addCleanup(
self.openstack,
'volume transfer request delete ' + name
'--os-volume-api-version ' + self.API_VERSION + ' ' +
'volume transfer request delete ' +
xfer_name
)
self.assertEqual(name, cmd_output['name'])
self.assertEqual(xfer_name, cmd_output['name'])
auth_key = cmd_output['auth_key']
self.assertTrue(auth_key)
@ -95,11 +100,11 @@ class TransferRequestTests(common.BaseVolumeTests):
'--os-volume-api-version ' + self.API_VERSION + ' ' +
'volume transfer request list -f json'
))
self.assertIn(name, [req['Name'] for req in cmd_output])
self.assertIn(xfer_name, [req['Name'] for req in cmd_output])
cmd_output = json.loads(self.openstack(
'--os-volume-api-version ' + self.API_VERSION + ' ' +
'volume transfer request show -f json ' +
name
xfer_name
))
self.assertEqual(name, cmd_output['name'])
self.assertEqual(xfer_name, cmd_output['name'])