diff options
| author | Stephen Finucane <sfinucan@redhat.com> | 2023-05-08 10:54:22 +0100 |
|---|---|---|
| committer | Stephen Finucane <sfinucan@redhat.com> | 2023-05-10 10:51:30 +0100 |
| commit | 35ba1d8f1304d3255b96b704d524666ec5b6fea2 (patch) | |
| tree | 6d4ab560d4086e8b1a1f935b8531d7e85550cc36 /openstackclient/tests/functional | |
| parent | 28ffa2bf9f017212da5eb84b0cf74df62e2f5eb9 (diff) | |
| download | python-openstackclient-35ba1d8f1304d3255b96b704d524666ec5b6fea2.tar.gz | |
Blacken openstackclient.volume
Black used with the '-l 79 -S' flags.
A future change will ignore this commit in git-blame history by adding a
'git-blame-ignore-revs' file.
Change-Id: Ic318617c67ab7ce6527f9016b759a1d4b0b80802
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Diffstat (limited to 'openstackclient/tests/functional')
21 files changed, 622 insertions, 862 deletions
diff --git a/openstackclient/tests/functional/volume/base.py b/openstackclient/tests/functional/volume/base.py index 041d8d07..f15a3145 100644 --- a/openstackclient/tests/functional/volume/base.py +++ b/openstackclient/tests/functional/volume/base.py @@ -16,11 +16,18 @@ from openstackclient.tests.functional import base class BaseVolumeTests(base.TestCase): - """Base class for Volume functional tests. """ + """Base class for Volume functional tests.""" @classmethod - def wait_for_status(cls, check_type, check_name, desired_status, - wait=120, interval=5, failures=None): + def wait_for_status( + cls, + check_type, + check_name, + desired_status, + wait=120, + interval=5, + failures=None, + ): current_status = "notset" if failures is None: failures = ['error'] @@ -32,23 +39,31 @@ class BaseVolumeTests(base.TestCase): ) current_status = output['status'] if current_status == desired_status: - print('{} {} now has status {}' - .format(check_type, check_name, current_status)) + print( + '{} {} now has status {}'.format( + check_type, check_name, current_status + ) + ) return - print('Checking {} {} Waiting for {} current status: {}' - .format(check_type, check_name, - desired_status, current_status)) + print( + 'Checking {} {} Waiting for {} current status: {}'.format( + check_type, check_name, desired_status, current_status + ) + ) if current_status in failures: raise Exception( - 'Current status {} of {} {} is one of failures {}' - .format(current_status, check_type, check_name, failures)) + 'Current status {} of {} {} is one of failures {}'.format( + current_status, check_type, check_name, failures + ) + ) time.sleep(interval) total_sleep += interval cls.assertOutput(desired_status, current_status) @classmethod - def wait_for_delete(cls, check_type, check_name, wait=120, interval=5, - name_field=None): + def wait_for_delete( + cls, check_type, check_name, wait=120, interval=5, name_field=None + ): total_sleep = 0 name_field = name_field or 'Name' while total_sleep < wait: @@ -57,9 +72,15 @@ class BaseVolumeTests(base.TestCase): if check_name not in names: print('{} {} is now deleted'.format(check_type, check_name)) return - print('Checking {} {} Waiting for deleted' - .format(check_type, check_name)) + print( + 'Checking {} {} Waiting for deleted'.format( + check_type, check_name + ) + ) time.sleep(interval) total_sleep += interval - raise Exception('Timeout: {} {} was not deleted in {} seconds' - .format(check_type, check_name, wait)) + raise Exception( + 'Timeout: {} {} was not deleted in {} seconds'.format( + check_type, check_name, wait + ) + ) diff --git a/openstackclient/tests/functional/volume/v1/test_qos.py b/openstackclient/tests/functional/volume/v1/test_qos.py index c449938e..cabcd19e 100644 --- a/openstackclient/tests/functional/volume/v1/test_qos.py +++ b/openstackclient/tests/functional/volume/v1/test_qos.py @@ -16,31 +16,23 @@ from openstackclient.tests.functional.volume.v1 import common class QosTests(common.BaseVolumeTests): - """Functional tests for volume qos. """ + """Functional tests for volume qos.""" def test_volume_qos_create_list(self): """Test create, list, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - name1, + 'volume qos create ' + name1, parse_output=True, ) - self.assertEqual( - name1, - cmd_output['name'] - ) + self.assertEqual(name1, cmd_output['name']) name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - name2, + 'volume qos create ' + name2, parse_output=True, ) - self.assertEqual( - name2, - cmd_output['name'] - ) + self.assertEqual(name2, cmd_output['name']) # Test list cmd_output = self.openstack( @@ -60,67 +52,43 @@ class QosTests(common.BaseVolumeTests): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - '--consumer front-end ' - '--property Alpha=a ' + - name, + 'volume qos create ' + '--consumer front-end ' + '--property Alpha=a ' + name, parse_output=True, ) self.addCleanup(self.openstack, 'volume qos delete ' + name) - self.assertEqual( - name, - cmd_output['name'] - ) + self.assertEqual(name, cmd_output['name']) - self.assertEqual( - "front-end", - cmd_output['consumer'] - ) + self.assertEqual("front-end", cmd_output['consumer']) # Test volume qos set raw_output = self.openstack( - 'volume qos set ' + - '--property Alpha=c ' + - '--property Beta=b ' + - name, + 'volume qos set ' + + '--property Alpha=c ' + + '--property Beta=b ' + + name, ) self.assertOutput('', raw_output) # Test volume qos show cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) - self.assertEqual( - name, - cmd_output['name'] - ) - self.assertEqual( - {'Alpha': 'c', 'Beta': 'b'}, - cmd_output['properties'] - ) + self.assertEqual(name, cmd_output['name']) + self.assertEqual({'Alpha': 'c', 'Beta': 'b'}, cmd_output['properties']) # Test volume qos unset raw_output = self.openstack( - 'volume qos unset ' + - '--property Alpha ' + - name, + 'volume qos unset ' + '--property Alpha ' + name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) - self.assertEqual( - name, - cmd_output['name'] - ) - self.assertEqual( - {'Beta': 'b'}, - cmd_output['properties'] - ) + self.assertEqual(name, cmd_output['name']) + self.assertEqual({'Beta': 'b'}, cmd_output['properties']) # TODO(qiangjiahui): Add tests for associate and disassociate volume type diff --git a/openstackclient/tests/functional/volume/v1/test_service.py b/openstackclient/tests/functional/volume/v1/test_service.py index 7de2de55..0f510a8a 100644 --- a/openstackclient/tests/functional/volume/v1/test_service.py +++ b/openstackclient/tests/functional/volume/v1/test_service.py @@ -24,22 +24,16 @@ class VolumeServiceTests(common.BaseVolumeTests): # Test volume service list --service cmd_output = self.openstack( - 'volume service list ' + - '--service ' + - services[0], + 'volume service list ' + '--service ' + services[0], parse_output=True, ) for x in cmd_output: - self.assertEqual( - services[0], - x['Binary'] - ) + self.assertEqual(services[0], x['Binary']) # TODO(zhiyong.dai): test volume service list --host after solving # https://bugs.launchpad.net/python-openstackclient/+bug/1664451 def test_volume_service_set(self): - # Get a service and host cmd_output = self.openstack( 'volume service list', @@ -50,9 +44,7 @@ class VolumeServiceTests(common.BaseVolumeTests): # Test volume service set --enable raw_output = self.openstack( - 'volume service set --enable ' + - host_1 + ' ' + - service_1 + 'volume service set --enable ' + host_1 + ' ' + service_1 ) self.assertOutput('', raw_output) @@ -60,20 +52,19 @@ class VolumeServiceTests(common.BaseVolumeTests): 'volume service list --long', parse_output=True, ) - self.assertEqual( - 'enabled', - cmd_output[0]['Status'] - ) + self.assertEqual('enabled', cmd_output[0]['Status']) self.assertIsNone(cmd_output[0]['Disabled Reason']) # Test volume service set --disable and --disable-reason disable_reason = 'disable_reason' raw_output = self.openstack( - 'volume service set --disable ' + - '--disable-reason ' + - disable_reason + ' ' + - host_1 + ' ' + - service_1 + 'volume service set --disable ' + + '--disable-reason ' + + disable_reason + + ' ' + + host_1 + + ' ' + + service_1 ) self.assertOutput('', raw_output) @@ -81,11 +72,5 @@ class VolumeServiceTests(common.BaseVolumeTests): 'volume service list --long', parse_output=True, ) - self.assertEqual( - 'disabled', - cmd_output[0]['Status'] - ) - self.assertEqual( - disable_reason, - cmd_output[0]['Disabled Reason'] - ) + self.assertEqual('disabled', cmd_output[0]['Status']) + self.assertEqual(disable_reason, cmd_output[0]['Disabled Reason']) diff --git a/openstackclient/tests/functional/volume/v1/test_snapshot.py b/openstackclient/tests/functional/volume/v1/test_snapshot.py index c8c956d1..52877d5a 100644 --- a/openstackclient/tests/functional/volume/v1/test_snapshot.py +++ b/openstackclient/tests/functional/volume/v1/test_snapshot.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume.v1 import common class VolumeSnapshotTests(common.BaseVolumeTests): - """Functional tests for volume snapshot. """ + """Functional tests for volume snapshot.""" VOLLY = uuid.uuid4().hex @@ -25,9 +25,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): super(VolumeSnapshotTests, cls).setUpClass() # create a volume for all tests to create snapshot cmd_output = cls.openstack( - 'volume create ' + - '--size 1 ' + - cls.VOLLY, + 'volume create ' + '--size 1 ' + cls.VOLLY, parse_output=True, ) cls.wait_for_status('volume', cls.VOLLY, 'available') @@ -46,9 +44,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): """Test create, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name1 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY, parse_output=True, ) self.assertEqual( @@ -58,9 +54,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name2 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY, parse_output=True, ) self.assertEqual( @@ -72,7 +66,8 @@ class VolumeSnapshotTests(common.BaseVolumeTests): self.wait_for_status('volume snapshot', name2, 'available') del_output = self.openstack( - 'volume snapshot delete ' + name1 + ' ' + name2) + 'volume snapshot delete ' + name1 + ' ' + name2 + ) self.assertOutput('', del_output) self.wait_for_delete('volume snapshot', name1) self.wait_for_delete('volume snapshot', name2) @@ -81,9 +76,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): """Test create, list filter""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name1 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY, parse_output=True, ) self.addCleanup(self.wait_for_delete, 'volume snapshot', name1) @@ -104,9 +97,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name2 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY, parse_output=True, ) self.addCleanup(self.wait_for_delete, 'volume snapshot', name2) @@ -127,9 +118,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test list --long, --status cmd_output = self.openstack( - 'volume snapshot list ' + - '--long ' + - '--status error', + 'volume snapshot list ' + '--long ' + '--status error', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -138,8 +127,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test list --volume cmd_output = self.openstack( - 'volume snapshot list ' + - '--volume ' + self.VOLLY, + 'volume snapshot list ' + '--volume ' + self.VOLLY, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -148,8 +136,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test list --name cmd_output = self.openstack( - 'volume snapshot list ' + - '--name ' + name1, + 'volume snapshot list ' + '--name ' + name1, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -161,10 +148,11 @@ class VolumeSnapshotTests(common.BaseVolumeTests): name = uuid.uuid4().hex new_name = name + "_" cmd_output = self.openstack( - 'volume snapshot create ' + - '--volume ' + self.VOLLY + - ' --description aaaa ' + - name, + 'volume snapshot create ' + + '--volume ' + + self.VOLLY + + ' --description aaaa ' + + name, parse_output=True, ) self.addCleanup(self.wait_for_delete, 'volume snapshot', new_name) @@ -185,19 +173,19 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test volume snapshot set raw_output = self.openstack( - 'volume snapshot set ' + - '--name ' + new_name + - ' --description bbbb ' + - '--property Alpha=a ' + - '--property Beta=b ' + - name, + 'volume snapshot set ' + + '--name ' + + new_name + + ' --description bbbb ' + + '--property Alpha=a ' + + '--property Beta=b ' + + name, ) self.assertOutput('', raw_output) # Show snapshot set result cmd_output = self.openstack( - 'volume snapshot show ' + - new_name, + 'volume snapshot show ' + new_name, parse_output=True, ) self.assertEqual( @@ -219,15 +207,12 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test volume unset raw_output = self.openstack( - 'volume snapshot unset ' + - '--property Alpha ' + - new_name, + 'volume snapshot unset ' + '--property Alpha ' + new_name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume snapshot show ' + - new_name, + 'volume snapshot show ' + new_name, parse_output=True, ) self.assertEqual( @@ -237,14 +222,11 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test volume snapshot set --no-property raw_output = self.openstack( - 'volume snapshot set ' + - '--no-property ' + - new_name, + 'volume snapshot set ' + '--no-property ' + new_name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume snapshot show ' + - new_name, + 'volume snapshot show ' + new_name, parse_output=True, ) self.assertEqual({}, cmd_output["properties"]) diff --git a/openstackclient/tests/functional/volume/v1/test_transfer_request.py b/openstackclient/tests/functional/volume/v1/test_transfer_request.py index 0ee73d8a..37aa4ca2 100644 --- a/openstackclient/tests/functional/volume/v1/test_transfer_request.py +++ b/openstackclient/tests/functional/volume/v1/test_transfer_request.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume.v1 import common class TransferRequestTests(common.BaseVolumeTests): - """Functional tests for transfer request. """ + """Functional tests for transfer request.""" NAME = uuid.uuid4().hex VOLUME_NAME = uuid.uuid4().hex @@ -36,7 +36,8 @@ class TransferRequestTests(common.BaseVolumeTests): def tearDownClass(cls): try: raw_output_volume = cls.openstack( - 'volume delete ' + cls.VOLUME_NAME) + 'volume delete ' + cls.VOLUME_NAME + ) cls.assertOutput('', raw_output_volume) finally: super(TransferRequestTests, cls).tearDownClass() @@ -55,9 +56,10 @@ class TransferRequestTests(common.BaseVolumeTests): # create volume transfer request for the volume # and get the auth_key of the new transfer request cmd_output = self.openstack( - 'volume transfer request create ' + - volume_name + - ' --name ' + name, + 'volume transfer request create ' + + volume_name + + ' --name ' + + name, parse_output=True, ) auth_key = cmd_output['auth_key'] @@ -65,30 +67,32 @@ class TransferRequestTests(common.BaseVolumeTests): # accept the volume transfer request output = self.openstack( - 'volume transfer request accept ' + - name + ' ' + - '--auth-key ' + auth_key, + 'volume transfer request accept ' + + name + + ' ' + + '--auth-key ' + + auth_key, parse_output=True, ) self.assertEqual(name, output.get('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) + raw_output = self.openstack('volume delete ' + volume_name) self.assertEqual('', raw_output) def test_volume_transfer_request_list_show(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume transfer request create ' + - ' --name ' + name + ' ' + - self.VOLUME_NAME, + 'volume transfer request create ' + + ' --name ' + + name + + ' ' + + self.VOLUME_NAME, parse_output=True, ) self.addCleanup( - self.openstack, - 'volume transfer request delete ' + name + self.openstack, 'volume transfer request delete ' + name ) self.assertOutput(name, cmd_output['name']) auth_key = cmd_output['auth_key'] @@ -101,8 +105,7 @@ class TransferRequestTests(common.BaseVolumeTests): self.assertIn(name, [req['Name'] for req in cmd_output]) cmd_output = self.openstack( - 'volume transfer request show ' + - name, + 'volume transfer request show ' + name, parse_output=True, ) self.assertEqual(name, cmd_output['name']) diff --git a/openstackclient/tests/functional/volume/v1/test_volume.py b/openstackclient/tests/functional/volume/v1/test_volume.py index 727ee73b..7c6cc035 100644 --- a/openstackclient/tests/functional/volume/v1/test_volume.py +++ b/openstackclient/tests/functional/volume/v1/test_volume.py @@ -16,15 +16,13 @@ from openstackclient.tests.functional.volume.v1 import common class VolumeTests(common.BaseVolumeTests): - """Functional tests for volume. """ + """Functional tests for volume.""" def test_volume_create_and_delete(self): """Test create, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - name1, + 'volume create ' + '--size 1 ' + name1, parse_output=True, ) self.assertEqual( @@ -34,9 +32,7 @@ class VolumeTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 2 ' + - name2, + 'volume create ' + '--size 2 ' + name2, parse_output=True, ) self.assertEqual( @@ -53,9 +49,7 @@ class VolumeTests(common.BaseVolumeTests): """Test create, list filter""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - name1, + 'volume create ' + '--size 1 ' + name1, parse_output=True, ) self.addCleanup(self.openstack, 'volume delete ' + name1) @@ -67,9 +61,7 @@ class VolumeTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 2 ' + - name2, + 'volume create ' + '--size 2 ' + name2, parse_output=True, ) self.addCleanup(self.openstack, 'volume delete ' + name2) @@ -98,8 +90,7 @@ class VolumeTests(common.BaseVolumeTests): # Test list --name cmd_output = self.openstack( - 'volume list ' + - '--name ' + name1, + 'volume list ' + '--name ' + name1, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -110,11 +101,11 @@ class VolumeTests(common.BaseVolumeTests): """Tests create volume, set, unset, show, delete""" name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - '--description aaaa ' + - '--property Alpha=a ' + - name, + 'volume create ' + + '--size 1 ' + + '--description aaaa ' + + '--property Alpha=a ' + + name, parse_output=True, ) self.assertEqual( @@ -143,21 +134,21 @@ class VolumeTests(common.BaseVolumeTests): new_name = uuid.uuid4().hex self.addCleanup(self.openstack, 'volume delete ' + new_name) raw_output = self.openstack( - 'volume set ' + - '--name ' + new_name + - ' --size 2 ' + - '--description bbbb ' + - '--no-property ' + - '--property Beta=b ' + - '--property Gamma=c ' + - '--bootable ' + - name, + 'volume set ' + + '--name ' + + new_name + + ' --size 2 ' + + '--description bbbb ' + + '--no-property ' + + '--property Beta=b ' + + '--property Gamma=c ' + + '--bootable ' + + name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume show ' + - new_name, + 'volume show ' + new_name, parse_output=True, ) self.assertEqual( @@ -183,15 +174,12 @@ class VolumeTests(common.BaseVolumeTests): # Test volume unset raw_output = self.openstack( - 'volume unset ' + - '--property Beta ' + - new_name, + 'volume unset ' + '--property Beta ' + new_name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume show ' + - new_name, + 'volume show ' + new_name, parse_output=True, ) self.assertEqual( @@ -203,10 +191,7 @@ class VolumeTests(common.BaseVolumeTests): """Test backward compatibility of create, list, show""" name1 = uuid.uuid4().hex output = self.openstack( - 'volume create ' + - '-c display_name -c id ' + - '--size 1 ' + - name1, + 'volume create ' + '-c display_name -c id ' + '--size 1 ' + name1, parse_output=True, ) self.assertIn('display_name', output) @@ -220,25 +205,21 @@ class VolumeTests(common.BaseVolumeTests): self.wait_for_status("volume", name1, "available") output = self.openstack( - 'volume list ' + - '-c "Display Name"', + 'volume list ' + '-c "Display Name"', parse_output=True, ) for each_volume in output: self.assertIn('Display Name', each_volume) output = self.openstack( - 'volume list ' + - '-c "Name"', + 'volume list ' + '-c "Name"', parse_output=True, ) for each_volume in output: self.assertIn('Name', each_volume) output = self.openstack( - 'volume show ' + - '-c display_name -c id ' + - name1, + 'volume show ' + '-c display_name -c id ' + name1, parse_output=True, ) self.assertIn('display_name', output) diff --git a/openstackclient/tests/functional/volume/v1/test_volume_type.py b/openstackclient/tests/functional/volume/v1/test_volume_type.py index 037d45f0..6448af6e 100644 --- a/openstackclient/tests/functional/volume/v1/test_volume_type.py +++ b/openstackclient/tests/functional/volume/v1/test_volume_type.py @@ -17,19 +17,17 @@ from openstackclient.tests.functional.volume.v1 import common class VolumeTypeTests(common.BaseVolumeTests): - """Functional tests for volume type. """ + """Functional tests for volume type.""" def test_volume_type_create_list(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) self.addCleanup( self.openstack, - 'volume type delete ' + - name, + 'volume type delete ' + name, ) self.assertEqual(name, cmd_output['name']) @@ -52,14 +50,10 @@ class VolumeTypeTests(common.BaseVolumeTests): def test_volume_type_set_unset_properties(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'volume type delete ' + name - ) + self.addCleanup(self.openstack, 'volume type delete ' + name) self.assertEqual(name, cmd_output['name']) raw_output = self.openstack( @@ -72,9 +66,7 @@ class VolumeTypeTests(common.BaseVolumeTests): ) self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties']) - raw_output = self.openstack( - 'volume type unset --property a %s' % name - ) + raw_output = self.openstack('volume type unset --property a %s' % name) self.assertEqual("", raw_output) cmd_output = self.openstack( 'volume type show %s' % name, @@ -85,14 +77,10 @@ class VolumeTypeTests(common.BaseVolumeTests): def test_volume_type_set_unset_multiple_properties(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'volume type delete ' + name - ) + self.addCleanup(self.openstack, 'volume type delete ' + name) self.assertEqual(name, cmd_output['name']) raw_output = self.openstack( @@ -138,12 +126,14 @@ class VolumeTypeTests(common.BaseVolumeTests): '--encryption-provider LuksEncryptor ' '--encryption-cipher aes-xts-plain64 ' '--encryption-key-size 128 ' - '--encryption-control-location front-end ' + - encryption_type) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + '--encryption-control-location front-end ' + encryption_type + ) + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test show encryption type @@ -151,10 +141,12 @@ class VolumeTypeTests(common.BaseVolumeTests): 'volume type show --encryption-type ' + encryption_type, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test list encryption type @@ -162,12 +154,15 @@ class VolumeTypeTests(common.BaseVolumeTests): 'volume type list --encryption-type', parse_output=True, ) - encryption_output = [t['Encryption'] for t in cmd_output - if t['Name'] == encryption_type][0] - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + encryption_output = [ + t['Encryption'] for t in cmd_output if t['Name'] == encryption_type + ][0] + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, encryption_output[attr]) # test set new encryption type @@ -176,8 +171,8 @@ class VolumeTypeTests(common.BaseVolumeTests): '--encryption-provider LuksEncryptor ' '--encryption-cipher aes-xts-plain64 ' '--encryption-key-size 128 ' - '--encryption-control-location front-end ' + - self.NAME) + '--encryption-control-location front-end ' + self.NAME + ) self.assertEqual('', raw_output) name = uuid.uuid4().hex @@ -195,10 +190,12 @@ class VolumeTypeTests(common.BaseVolumeTests): 'volume type show --encryption-type ' + name, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test unset encryption type diff --git a/openstackclient/tests/functional/volume/v2/common.py b/openstackclient/tests/functional/volume/v2/common.py index 7e3a8084..f15d4d96 100644 --- a/openstackclient/tests/functional/volume/v2/common.py +++ b/openstackclient/tests/functional/volume/v2/common.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume import base class BaseVolumeTests(base.BaseVolumeTests): - """Base class for Volume functional tests. """ + """Base class for Volume functional tests.""" @classmethod def setUpClass(cls): diff --git a/openstackclient/tests/functional/volume/v2/test_qos.py b/openstackclient/tests/functional/volume/v2/test_qos.py index 0a540573..4f07084a 100644 --- a/openstackclient/tests/functional/volume/v2/test_qos.py +++ b/openstackclient/tests/functional/volume/v2/test_qos.py @@ -16,31 +16,23 @@ from openstackclient.tests.functional.volume.v2 import common class QosTests(common.BaseVolumeTests): - """Functional tests for volume qos. """ + """Functional tests for volume qos.""" def test_volume_qos_create_delete_list(self): """Test create, list, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - name1, + 'volume qos create ' + name1, parse_output=True, ) - self.assertEqual( - name1, - cmd_output['name'] - ) + self.assertEqual(name1, cmd_output['name']) name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - name2, + 'volume qos create ' + name2, parse_output=True, ) - self.assertEqual( - name2, - cmd_output['name'] - ) + self.assertEqual(name2, cmd_output['name']) # Test list cmd_output = self.openstack( @@ -60,126 +52,84 @@ class QosTests(common.BaseVolumeTests): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - '--consumer front-end ' - '--property Alpha=a ' + - name, + 'volume qos create ' + '--consumer front-end ' + '--property Alpha=a ' + name, parse_output=True, ) self.addCleanup(self.openstack, 'volume qos delete ' + name) - self.assertEqual( - name, - cmd_output['name'] - ) + self.assertEqual(name, cmd_output['name']) - self.assertEqual( - "front-end", - cmd_output['consumer'] - ) - self.assertEqual( - {'Alpha': 'a'}, - cmd_output['properties'] - ) + self.assertEqual("front-end", cmd_output['consumer']) + self.assertEqual({'Alpha': 'a'}, cmd_output['properties']) # Test volume qos set raw_output = self.openstack( - 'volume qos set ' + - '--property Alpha=c ' + - '--property Beta=b ' + - name, + 'volume qos set ' + + '--property Alpha=c ' + + '--property Beta=b ' + + name, ) self.assertOutput('', raw_output) # Test volume qos show cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) - self.assertEqual( - name, - cmd_output['name'] - ) - self.assertEqual( - {'Alpha': 'c', 'Beta': 'b'}, - cmd_output['properties'] - ) + self.assertEqual(name, cmd_output['name']) + self.assertEqual({'Alpha': 'c', 'Beta': 'b'}, cmd_output['properties']) # Test volume qos unset raw_output = self.openstack( - 'volume qos unset ' + - '--property Alpha ' + - name, + 'volume qos unset ' + '--property Alpha ' + name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) - self.assertEqual( - name, - cmd_output['name'] - ) - self.assertEqual( - {'Beta': 'b'}, - cmd_output['properties'] - ) + self.assertEqual(name, cmd_output['name']) + self.assertEqual({'Beta': 'b'}, cmd_output['properties']) def test_volume_qos_asso_disasso(self): """Tests associate and disassociate qos with volume type""" vol_type1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create ' + - vol_type1, + 'volume type create ' + vol_type1, parse_output=True, ) - self.assertEqual( - vol_type1, - cmd_output['name'] - ) + self.assertEqual(vol_type1, cmd_output['name']) self.addCleanup(self.openstack, 'volume type delete ' + vol_type1) vol_type2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create ' + - vol_type2, + 'volume type create ' + vol_type2, parse_output=True, ) - self.assertEqual( - vol_type2, - cmd_output['name'] - ) + self.assertEqual(vol_type2, cmd_output['name']) self.addCleanup(self.openstack, 'volume type delete ' + vol_type2) name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - name, + 'volume qos create ' + name, parse_output=True, ) - self.assertEqual( - name, - cmd_output['name'] - ) + self.assertEqual(name, cmd_output['name']) self.addCleanup(self.openstack, 'volume qos delete ' + name) # Test associate raw_output = self.openstack( - 'volume qos associate ' + - name + ' ' + vol_type1 + 'volume qos associate ' + name + ' ' + vol_type1 ) self.assertOutput('', raw_output) raw_output = self.openstack( - 'volume qos associate ' + - name + ' ' + vol_type2 + 'volume qos associate ' + name + ' ' + vol_type2 ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) types = cmd_output["associations"] @@ -188,14 +138,15 @@ class QosTests(common.BaseVolumeTests): # Test disassociate raw_output = self.openstack( - 'volume qos disassociate ' + - '--volume-type ' + vol_type1 + - ' ' + name + 'volume qos disassociate ' + + '--volume-type ' + + vol_type1 + + ' ' + + name ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) types = cmd_output["associations"] @@ -204,13 +155,11 @@ class QosTests(common.BaseVolumeTests): # Test disassociate --all raw_output = self.openstack( - 'volume qos associate ' + - name + ' ' + vol_type1 + 'volume qos associate ' + name + ' ' + vol_type1 ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) types = cmd_output["associations"] @@ -218,13 +167,11 @@ class QosTests(common.BaseVolumeTests): self.assertIn(vol_type2, types) raw_output = self.openstack( - 'volume qos disassociate ' + - '--all ' + name + 'volume qos disassociate ' + '--all ' + name ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) self.assertNotIn("associations", cmd_output.keys()) diff --git a/openstackclient/tests/functional/volume/v2/test_service.py b/openstackclient/tests/functional/volume/v2/test_service.py index 5794f81f..1101affc 100644 --- a/openstackclient/tests/functional/volume/v2/test_service.py +++ b/openstackclient/tests/functional/volume/v2/test_service.py @@ -25,32 +25,21 @@ class VolumeServiceTests(common.BaseVolumeTests): # Test volume service list --service cmd_output = self.openstack( - 'volume service list ' + - '--service ' + - services[0], + 'volume service list ' + '--service ' + services[0], parse_output=True, ) for x in cmd_output: - self.assertEqual( - services[0], - x['Binary'] - ) + self.assertEqual(services[0], x['Binary']) # Test volume service list --host cmd_output = self.openstack( - 'volume service list ' + - '--host ' + - hosts[0], + 'volume service list ' + '--host ' + hosts[0], parse_output=True, ) for x in cmd_output: - self.assertIn( - hosts[0], - x['Host'] - ) + self.assertIn(hosts[0], x['Host']) def test_volume_service_set(self): - # Get a service and host cmd_output = self.openstack( 'volume service list', @@ -61,9 +50,7 @@ class VolumeServiceTests(common.BaseVolumeTests): # Test volume service set --enable raw_output = self.openstack( - 'volume service set --enable ' + - host_1 + ' ' + - service_1 + 'volume service set --enable ' + host_1 + ' ' + service_1 ) self.assertOutput('', raw_output) @@ -71,22 +58,19 @@ class VolumeServiceTests(common.BaseVolumeTests): 'volume service list --long', parse_output=True, ) - self.assertEqual( - 'enabled', - cmd_output[0]['Status'] - ) - self.assertIsNone( - cmd_output[0]['Disabled Reason'] - ) + self.assertEqual('enabled', cmd_output[0]['Status']) + self.assertIsNone(cmd_output[0]['Disabled Reason']) # Test volume service set --disable and --disable-reason disable_reason = 'disable_reason' raw_output = self.openstack( - 'volume service set --disable ' + - '--disable-reason ' + - disable_reason + ' ' + - host_1 + ' ' + - service_1 + 'volume service set --disable ' + + '--disable-reason ' + + disable_reason + + ' ' + + host_1 + + ' ' + + service_1 ) self.assertOutput('', raw_output) @@ -94,11 +78,5 @@ class VolumeServiceTests(common.BaseVolumeTests): 'volume service list --long', parse_output=True, ) - self.assertEqual( - 'disabled', - cmd_output[0]['Status'] - ) - self.assertEqual( - disable_reason, - cmd_output[0]['Disabled Reason'] - ) + self.assertEqual('disabled', cmd_output[0]['Status']) + self.assertEqual(disable_reason, cmd_output[0]['Disabled Reason']) diff --git a/openstackclient/tests/functional/volume/v2/test_transfer_request.py b/openstackclient/tests/functional/volume/v2/test_transfer_request.py index ac71cba2..07d70f0f 100644 --- a/openstackclient/tests/functional/volume/v2/test_transfer_request.py +++ b/openstackclient/tests/functional/volume/v2/test_transfer_request.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume.v2 import common class TransferRequestTests(common.BaseVolumeTests): - """Functional tests for transfer request. """ + """Functional tests for transfer request.""" API_VERSION = '2' @@ -26,27 +26,31 @@ class TransferRequestTests(common.BaseVolumeTests): # create a volume cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - volume_name, + 'volume create ' + '--size 1 ' + volume_name, parse_output=True, ) self.assertEqual(volume_name, cmd_output['name']) self.addCleanup( self.openstack, - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume delete ' + - volume_name + '--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 = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request create ' + - ' --name ' + xfer_name + ' ' + - volume_name, + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request create ' + + ' --name ' + + xfer_name + + ' ' + + volume_name, parse_output=True, ) self.assertEqual(xfer_name, cmd_output['name']) @@ -57,10 +61,14 @@ class TransferRequestTests(common.BaseVolumeTests): # accept the volume transfer request cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request accept ' + - '--auth-key ' + auth_key + ' ' + - xfer_id, + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request accept ' + + '--auth-key ' + + auth_key + + ' ' + + xfer_id, parse_output=True, ) self.assertEqual(xfer_name, cmd_output['name']) @@ -72,25 +80,29 @@ class TransferRequestTests(common.BaseVolumeTests): # create a volume cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - volume_name, + 'volume create ' + '--size 1 ' + volume_name, parse_output=True, ) self.assertEqual(volume_name, cmd_output['name']) self.addCleanup( self.openstack, - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume delete ' + - volume_name + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume delete ' + + volume_name, ) self.wait_for_status("volume", volume_name, "available") cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request create ' + - ' --name ' + xfer_name + ' ' + - volume_name, + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request create ' + + ' --name ' + + xfer_name + + ' ' + + volume_name, parse_output=True, ) self.assertEqual(xfer_name, cmd_output['name']) @@ -100,16 +112,20 @@ class TransferRequestTests(common.BaseVolumeTests): self.wait_for_status("volume", volume_name, "awaiting-transfer") cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request list', + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request list', parse_output=True, ) self.assertIn(xfer_name, [req['Name'] for req in cmd_output]) cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request show ' + - xfer_id, + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request show ' + + xfer_id, parse_output=True, ) self.assertEqual(xfer_name, cmd_output['name']) @@ -120,8 +136,10 @@ class TransferRequestTests(common.BaseVolumeTests): # to become 'available' before attempting to delete # the volume. cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request delete ' + - xfer_id + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request delete ' + + xfer_id ) self.wait_for_status("volume", volume_name, "available") diff --git a/openstackclient/tests/functional/volume/v2/test_volume.py b/openstackclient/tests/functional/volume/v2/test_volume.py index 832dabe6..46678587 100644 --- a/openstackclient/tests/functional/volume/v2/test_volume.py +++ b/openstackclient/tests/functional/volume/v2/test_volume.py @@ -16,15 +16,13 @@ from openstackclient.tests.functional.volume.v2 import common class VolumeTests(common.BaseVolumeTests): - """Functional tests for volume. """ + """Functional tests for volume.""" def test_volume_delete(self): """Test create, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - name1, + 'volume create ' + '--size 1 ' + name1, parse_output=True, ) self.assertEqual( @@ -34,9 +32,7 @@ class VolumeTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 2 ' + - name2, + 'volume create ' + '--size 2 ' + name2, parse_output=True, ) self.assertEqual( @@ -53,9 +49,7 @@ class VolumeTests(common.BaseVolumeTests): """Test create, list filter""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - name1, + 'volume create ' + '--size 1 ' + name1, parse_output=True, ) self.addCleanup(self.openstack, 'volume delete ' + name1) @@ -67,9 +61,7 @@ class VolumeTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 2 ' + - name2, + 'volume create ' + '--size 2 ' + name2, parse_output=True, ) self.addCleanup(self.openstack, 'volume delete ' + name2) @@ -78,17 +70,12 @@ class VolumeTests(common.BaseVolumeTests): cmd_output["size"], ) self.wait_for_status("volume", name2, "available") - raw_output = self.openstack( - 'volume set ' + - '--state error ' + - name2 - ) + raw_output = self.openstack('volume set ' + '--state error ' + name2) self.assertOutput('', raw_output) # Test list --long cmd_output = self.openstack( - 'volume list ' + - '--long', + 'volume list ' + '--long', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -97,8 +84,7 @@ class VolumeTests(common.BaseVolumeTests): # Test list --status cmd_output = self.openstack( - 'volume list ' + - '--status error', + 'volume list ' + '--status error', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -113,11 +99,11 @@ class VolumeTests(common.BaseVolumeTests): name = uuid.uuid4().hex new_name = name + "_" cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - '--description aaaa ' + - '--property Alpha=a ' + - name, + 'volume create ' + + '--size 1 ' + + '--description aaaa ' + + '--property Alpha=a ' + + name, parse_output=True, ) self.addCleanup(self.openstack, 'volume delete ' + new_name) @@ -145,23 +131,23 @@ class VolumeTests(common.BaseVolumeTests): # Test volume set raw_output = self.openstack( - 'volume set ' + - '--name ' + new_name + - ' --size 2 ' + - '--description bbbb ' + - '--no-property ' + - '--property Beta=b ' + - '--property Gamma=c ' + - '--image-property a=b ' + - '--image-property c=d ' + - '--bootable ' + - name, + 'volume set ' + + '--name ' + + new_name + + ' --size 2 ' + + '--description bbbb ' + + '--no-property ' + + '--property Beta=b ' + + '--property Gamma=c ' + + '--image-property a=b ' + + '--image-property c=d ' + + '--bootable ' + + name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume show ' + - new_name, + 'volume show ' + new_name, parse_output=True, ) self.assertEqual( @@ -191,16 +177,15 @@ class VolumeTests(common.BaseVolumeTests): # Test volume unset raw_output = self.openstack( - 'volume unset ' + - '--property Beta ' + - '--image-property a ' + - new_name, + 'volume unset ' + + '--property Beta ' + + '--image-property a ' + + new_name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume show ' + - new_name, + 'volume show ' + new_name, parse_output=True, ) self.assertEqual( @@ -219,9 +204,7 @@ class VolumeTests(common.BaseVolumeTests): snapshot_name = uuid.uuid4().hex # Make a snapshot cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - volume_name, + 'volume create ' + '--size 1 ' + volume_name, parse_output=True, ) self.wait_for_status("volume", volume_name, "available") @@ -230,9 +213,10 @@ class VolumeTests(common.BaseVolumeTests): cmd_output["name"], ) cmd_output = self.openstack( - 'volume snapshot create ' + - snapshot_name + - ' --volume ' + volume_name, + 'volume snapshot create ' + + snapshot_name + + ' --volume ' + + volume_name, parse_output=True, ) self.wait_for_status("volume snapshot", snapshot_name, "available") @@ -240,9 +224,7 @@ class VolumeTests(common.BaseVolumeTests): name = uuid.uuid4().hex # Create volume from snapshot cmd_output = self.openstack( - 'volume create ' + - '--snapshot ' + snapshot_name + - ' ' + name, + 'volume create ' + '--snapshot ' + snapshot_name + ' ' + name, parse_output=True, ) self.addCleanup(self.openstack, 'volume delete ' + name) @@ -254,8 +236,7 @@ class VolumeTests(common.BaseVolumeTests): self.wait_for_status("volume", name, "available") # Delete snapshot - raw_output = self.openstack( - 'volume snapshot delete ' + snapshot_name) + raw_output = self.openstack('volume snapshot delete ' + snapshot_name) self.assertOutput('', raw_output) # Deleting snapshot may take time. If volume snapshot still exists when # a parent volume delete is requested, the volume deletion will fail. @@ -265,9 +246,7 @@ class VolumeTests(common.BaseVolumeTests): """Test backward compatibility of list command""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - name1, + 'volume create ' + '--size 1 ' + name1, parse_output=True, ) self.addCleanup(self.openstack, 'volume delete ' + name1) @@ -279,8 +258,7 @@ class VolumeTests(common.BaseVolumeTests): # Test list -c "Display Name" cmd_output = self.openstack( - 'volume list ' + - '-c "Display Name"', + 'volume list ' + '-c "Display Name"', parse_output=True, ) for each_volume in cmd_output: @@ -288,8 +266,7 @@ class VolumeTests(common.BaseVolumeTests): # Test list -c "Name" cmd_output = self.openstack( - 'volume list ' + - '-c "Name"', + 'volume list ' + '-c "Name"', parse_output=True, ) for each_volume in cmd_output: diff --git a/openstackclient/tests/functional/volume/v2/test_volume_backup.py b/openstackclient/tests/functional/volume/v2/test_volume_backup.py index 07bd2d16..e6f7dec9 100644 --- a/openstackclient/tests/functional/volume/v2/test_volume_backup.py +++ b/openstackclient/tests/functional/volume/v2/test_volume_backup.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume.v2 import common class VolumeBackupTests(common.BaseVolumeTests): - """Functional tests for volume backups. """ + """Functional tests for volume backups.""" def setUp(self): super(VolumeBackupTests, self).setUp() @@ -34,29 +34,26 @@ class VolumeBackupTests(common.BaseVolumeTests): vol_id = uuid.uuid4().hex # create a volume self.openstack( - 'volume create ' + - '--size 1 ' + - vol_id, + 'volume create ' + '--size 1 ' + vol_id, parse_output=True, ) self.wait_for_status("volume", vol_id, "available") # create a backup backup = self.openstack( - 'volume backup create ' + - vol_id, + 'volume backup create ' + vol_id, parse_output=True, ) self.wait_for_status("volume backup", backup['id'], "available") # restore the backup backup_restored = self.openstack( - 'volume backup restore %s %s' - % (backup['id'], vol_id), + 'volume backup restore %s %s' % (backup['id'], vol_id), parse_output=True, ) self.assertEqual(backup_restored['backup_id'], backup['id']) self.wait_for_status("volume backup", backup['id'], "available") - self.wait_for_status("volume", backup_restored['volume_id'], - "available") + self.wait_for_status( + "volume", backup_restored['volume_id'], "available" + ) self.addCleanup(self.openstack, 'volume delete %s' % vol_id) diff --git a/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py b/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py index 12fdad2c..7aefdf29 100644 --- a/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py +++ b/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume.v2 import common class VolumeSnapshotTests(common.BaseVolumeTests): - """Functional tests for volume snapshot. """ + """Functional tests for volume snapshot.""" VOLLY = uuid.uuid4().hex @@ -25,9 +25,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): super(VolumeSnapshotTests, cls).setUpClass() # create a volume for all tests to create snapshot cmd_output = cls.openstack( - 'volume create ' + - '--size 1 ' + - cls.VOLLY, + 'volume create ' + '--size 1 ' + cls.VOLLY, parse_output=True, ) cls.wait_for_status('volume', cls.VOLLY, 'available') @@ -37,8 +35,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): def tearDownClass(cls): try: cls.wait_for_status('volume', cls.VOLLY, 'available') - raw_output = cls.openstack( - 'volume delete --force ' + cls.VOLLY) + raw_output = cls.openstack('volume delete --force ' + cls.VOLLY) cls.assertOutput('', raw_output) finally: super(VolumeSnapshotTests, cls).tearDownClass() @@ -47,9 +44,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): """Test create, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name1 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY, parse_output=True, ) self.assertEqual( @@ -59,9 +54,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name2 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY, parse_output=True, ) self.assertEqual( @@ -73,7 +66,8 @@ class VolumeSnapshotTests(common.BaseVolumeTests): self.wait_for_status('volume snapshot', name2, 'available') del_output = self.openstack( - 'volume snapshot delete ' + name1 + ' ' + name2) + 'volume snapshot delete ' + name1 + ' ' + name2 + ) self.assertOutput('', del_output) self.wait_for_delete('volume snapshot', name1) self.wait_for_delete('volume snapshot', name2) @@ -82,9 +76,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): """Test create, list filter""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name1 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY, parse_output=True, ) self.addCleanup(self.wait_for_delete, 'volume snapshot', name1) @@ -105,9 +97,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name2 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY, parse_output=True, ) self.addCleanup(self.wait_for_delete, 'volume snapshot', name2) @@ -127,17 +117,13 @@ class VolumeSnapshotTests(common.BaseVolumeTests): self.wait_for_status('volume snapshot', name2, 'available') raw_output = self.openstack( - 'volume snapshot set ' + - '--state error_deleting ' + - name2 + 'volume snapshot set ' + '--state error_deleting ' + name2 ) self.assertOutput('', raw_output) # Test list --long, --status cmd_output = self.openstack( - 'volume snapshot list ' + - '--long ' + - '--status error_deleting', + 'volume snapshot list ' + '--long ' + '--status error_deleting', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -145,17 +131,13 @@ class VolumeSnapshotTests(common.BaseVolumeTests): self.assertIn(name2, names) raw_output = self.openstack( - 'volume snapshot set ' + - '--state error ' + - name2 + 'volume snapshot set ' + '--state error ' + name2 ) self.assertOutput('', raw_output) # Test list --long, --status cmd_output = self.openstack( - 'volume snapshot list ' + - '--long ' + - '--status error', + 'volume snapshot list ' + '--long ' + '--status error', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -164,8 +146,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test list --volume cmd_output = self.openstack( - 'volume snapshot list ' + - '--volume ' + self.VOLLY, + 'volume snapshot list ' + '--volume ' + self.VOLLY, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -174,8 +155,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test list --name cmd_output = self.openstack( - 'volume snapshot list ' + - '--name ' + name1, + 'volume snapshot list ' + '--name ' + name1, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -187,11 +167,12 @@ class VolumeSnapshotTests(common.BaseVolumeTests): name = uuid.uuid4().hex new_name = name + "_" cmd_output = self.openstack( - 'volume snapshot create ' + - '--volume ' + self.VOLLY + - ' --description aaaa ' + - '--property Alpha=a ' + - name, + 'volume snapshot create ' + + '--volume ' + + self.VOLLY + + ' --description aaaa ' + + '--property Alpha=a ' + + name, parse_output=True, ) self.addCleanup(self.wait_for_delete, 'volume snapshot', new_name) @@ -216,19 +197,19 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test volume snapshot set raw_output = self.openstack( - 'volume snapshot set ' + - '--name ' + new_name + - ' --description bbbb ' + - '--property Alpha=c ' + - '--property Beta=b ' + - name, + 'volume snapshot set ' + + '--name ' + + new_name + + ' --description bbbb ' + + '--property Alpha=c ' + + '--property Beta=b ' + + name, ) self.assertOutput('', raw_output) # Show snapshot set result cmd_output = self.openstack( - 'volume snapshot show ' + - new_name, + 'volume snapshot show ' + new_name, parse_output=True, ) self.assertEqual( @@ -250,15 +231,12 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test volume snapshot unset raw_output = self.openstack( - 'volume snapshot unset ' + - '--property Alpha ' + - new_name, + 'volume snapshot unset ' + '--property Alpha ' + new_name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume snapshot show ' + - new_name, + 'volume snapshot show ' + new_name, parse_output=True, ) self.assertEqual( @@ -268,14 +246,11 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test volume snapshot set --no-property raw_output = self.openstack( - 'volume snapshot set ' + - '--no-property ' + - new_name, + 'volume snapshot set ' + '--no-property ' + new_name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume snapshot show ' + - new_name, + 'volume snapshot show ' + new_name, parse_output=True, ) self.assertNotIn( diff --git a/openstackclient/tests/functional/volume/v2/test_volume_type.py b/openstackclient/tests/functional/volume/v2/test_volume_type.py index 5cad9297..b9bbcfc3 100644 --- a/openstackclient/tests/functional/volume/v2/test_volume_type.py +++ b/openstackclient/tests/functional/volume/v2/test_volume_type.py @@ -17,13 +17,12 @@ from openstackclient.tests.functional.volume.v2 import common class VolumeTypeTests(common.BaseVolumeTests): - """Functional tests for volume type. """ + """Functional tests for volume type.""" def test_volume_type_create_list(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) self.addCleanup( @@ -51,14 +50,10 @@ class VolumeTypeTests(common.BaseVolumeTests): def test_volume_type_set_unset_properties(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'volume type delete ' + name - ) + self.addCleanup(self.openstack, 'volume type delete ' + name) self.assertEqual(name, cmd_output['name']) raw_output = self.openstack( @@ -71,9 +66,7 @@ class VolumeTypeTests(common.BaseVolumeTests): ) self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties']) - raw_output = self.openstack( - 'volume type unset --property a %s' % name - ) + raw_output = self.openstack('volume type unset --property a %s' % name) self.assertEqual("", raw_output) cmd_output = self.openstack( 'volume type show %s' % name, @@ -84,14 +77,10 @@ class VolumeTypeTests(common.BaseVolumeTests): def test_volume_type_set_unset_multiple_properties(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'volume type delete ' + name - ) + self.addCleanup(self.openstack, 'volume type delete ' + name) self.assertEqual(name, cmd_output['name']) raw_output = self.openstack( @@ -117,14 +106,10 @@ class VolumeTypeTests(common.BaseVolumeTests): def test_volume_type_set_unset_project(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'volume type delete ' + name - ) + self.addCleanup(self.openstack, 'volume type delete ' + name) self.assertEqual(name, cmd_output['name']) raw_output = self.openstack( @@ -161,14 +146,15 @@ class VolumeTypeTests(common.BaseVolumeTests): '--encryption-provider LuksEncryptor ' '--encryption-cipher aes-xts-plain64 ' '--encryption-key-size 128 ' - '--encryption-control-location front-end ' + - encryption_type, + '--encryption-control-location front-end ' + encryption_type, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test show encryption type @@ -176,10 +162,12 @@ class VolumeTypeTests(common.BaseVolumeTests): 'volume type show --encryption-type ' + encryption_type, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test list encryption type @@ -187,35 +175,39 @@ class VolumeTypeTests(common.BaseVolumeTests): 'volume type list --encryption-type', parse_output=True, ) - encryption_output = [t['Encryption'] for t in cmd_output - if t['Name'] == encryption_type][0] - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + encryption_output = [ + t['Encryption'] for t in cmd_output if t['Name'] == encryption_type + ][0] + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, encryption_output[attr]) # test set existing encryption type raw_output = self.openstack( 'volume type set ' '--encryption-key-size 256 ' - '--encryption-control-location back-end ' + - encryption_type) + '--encryption-control-location back-end ' + encryption_type + ) self.assertEqual('', raw_output) cmd_output = self.openstack( 'volume type show --encryption-type ' + encryption_type, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 256, - 'control_location': 'back-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 256, + 'control_location': 'back-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test set new encryption type cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) self.addCleanup( @@ -229,18 +221,20 @@ class VolumeTypeTests(common.BaseVolumeTests): '--encryption-provider LuksEncryptor ' '--encryption-cipher aes-xts-plain64 ' '--encryption-key-size 128 ' - '--encryption-control-location front-end ' + - name) + '--encryption-control-location front-end ' + name + ) self.assertEqual('', raw_output) cmd_output = self.openstack( 'volume type show --encryption-type ' + name, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test unset encryption type diff --git a/openstackclient/tests/functional/volume/v3/common.py b/openstackclient/tests/functional/volume/v3/common.py index 29f769b6..cbab3927 100644 --- a/openstackclient/tests/functional/volume/v3/common.py +++ b/openstackclient/tests/functional/volume/v3/common.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume import base class BaseVolumeTests(base.BaseVolumeTests): - """Base class for Volume functional tests. """ + """Base class for Volume functional tests.""" @classmethod def setUpClass(cls): diff --git a/openstackclient/tests/functional/volume/v3/test_qos.py b/openstackclient/tests/functional/volume/v3/test_qos.py index 51578e14..2a09e549 100644 --- a/openstackclient/tests/functional/volume/v3/test_qos.py +++ b/openstackclient/tests/functional/volume/v3/test_qos.py @@ -16,31 +16,23 @@ from openstackclient.tests.functional.volume.v3 import common class QosTests(common.BaseVolumeTests): - """Functional tests for volume qos. """ + """Functional tests for volume qos.""" def test_volume_qos_create_delete_list(self): """Test create, list, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - name1, + 'volume qos create ' + name1, parse_output=True, ) - self.assertEqual( - name1, - cmd_output['name'] - ) + self.assertEqual(name1, cmd_output['name']) name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - name2, + 'volume qos create ' + name2, parse_output=True, ) - self.assertEqual( - name2, - cmd_output['name'] - ) + self.assertEqual(name2, cmd_output['name']) # Test list cmd_output = self.openstack( @@ -60,126 +52,84 @@ class QosTests(common.BaseVolumeTests): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - '--consumer front-end ' - '--property Alpha=a ' + - name, + 'volume qos create ' + '--consumer front-end ' + '--property Alpha=a ' + name, parse_output=True, ) self.addCleanup(self.openstack, 'volume qos delete ' + name) - self.assertEqual( - name, - cmd_output['name'] - ) + self.assertEqual(name, cmd_output['name']) - self.assertEqual( - "front-end", - cmd_output['consumer'] - ) - self.assertEqual( - {'Alpha': 'a'}, - cmd_output['properties'] - ) + self.assertEqual("front-end", cmd_output['consumer']) + self.assertEqual({'Alpha': 'a'}, cmd_output['properties']) # Test volume qos set raw_output = self.openstack( - 'volume qos set ' + - '--property Alpha=c ' + - '--property Beta=b ' + - name, + 'volume qos set ' + + '--property Alpha=c ' + + '--property Beta=b ' + + name, ) self.assertOutput('', raw_output) # Test volume qos show cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) - self.assertEqual( - name, - cmd_output['name'] - ) - self.assertEqual( - {'Alpha': 'c', 'Beta': 'b'}, - cmd_output['properties'] - ) + self.assertEqual(name, cmd_output['name']) + self.assertEqual({'Alpha': 'c', 'Beta': 'b'}, cmd_output['properties']) # Test volume qos unset raw_output = self.openstack( - 'volume qos unset ' + - '--property Alpha ' + - name, + 'volume qos unset ' + '--property Alpha ' + name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) - self.assertEqual( - name, - cmd_output['name'] - ) - self.assertEqual( - {'Beta': 'b'}, - cmd_output['properties'] - ) + self.assertEqual(name, cmd_output['name']) + self.assertEqual({'Beta': 'b'}, cmd_output['properties']) def test_volume_qos_asso_disasso(self): """Tests associate and disassociate qos with volume type""" vol_type1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create ' + - vol_type1, + 'volume type create ' + vol_type1, parse_output=True, ) - self.assertEqual( - vol_type1, - cmd_output['name'] - ) + self.assertEqual(vol_type1, cmd_output['name']) self.addCleanup(self.openstack, 'volume type delete ' + vol_type1) vol_type2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create ' + - vol_type2, + 'volume type create ' + vol_type2, parse_output=True, ) - self.assertEqual( - vol_type2, - cmd_output['name'] - ) + self.assertEqual(vol_type2, cmd_output['name']) self.addCleanup(self.openstack, 'volume type delete ' + vol_type2) name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume qos create ' + - name, + 'volume qos create ' + name, parse_output=True, ) - self.assertEqual( - name, - cmd_output['name'] - ) + self.assertEqual(name, cmd_output['name']) self.addCleanup(self.openstack, 'volume qos delete ' + name) # Test associate raw_output = self.openstack( - 'volume qos associate ' + - name + ' ' + vol_type1 + 'volume qos associate ' + name + ' ' + vol_type1 ) self.assertOutput('', raw_output) raw_output = self.openstack( - 'volume qos associate ' + - name + ' ' + vol_type2 + 'volume qos associate ' + name + ' ' + vol_type2 ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) types = cmd_output["associations"] @@ -188,14 +138,15 @@ class QosTests(common.BaseVolumeTests): # Test disassociate raw_output = self.openstack( - 'volume qos disassociate ' + - '--volume-type ' + vol_type1 + - ' ' + name + 'volume qos disassociate ' + + '--volume-type ' + + vol_type1 + + ' ' + + name ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) types = cmd_output["associations"] @@ -204,13 +155,11 @@ class QosTests(common.BaseVolumeTests): # Test disassociate --all raw_output = self.openstack( - 'volume qos associate ' + - name + ' ' + vol_type1 + 'volume qos associate ' + name + ' ' + vol_type1 ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) types = cmd_output["associations"] @@ -218,13 +167,11 @@ class QosTests(common.BaseVolumeTests): self.assertIn(vol_type2, types) raw_output = self.openstack( - 'volume qos disassociate ' + - '--all ' + name + 'volume qos disassociate ' + '--all ' + name ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume qos show ' + - name, + 'volume qos show ' + name, parse_output=True, ) self.assertNotIn("associations", cmd_output.keys()) diff --git a/openstackclient/tests/functional/volume/v3/test_transfer_request.py b/openstackclient/tests/functional/volume/v3/test_transfer_request.py index 449fa08e..c9bdbc48 100644 --- a/openstackclient/tests/functional/volume/v3/test_transfer_request.py +++ b/openstackclient/tests/functional/volume/v3/test_transfer_request.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume.v3 import common class TransferRequestTests(common.BaseVolumeTests): - """Functional tests for transfer request. """ + """Functional tests for transfer request.""" API_VERSION = '3' @@ -26,26 +26,31 @@ class TransferRequestTests(common.BaseVolumeTests): # create a volume cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - volume_name, + 'volume create ' + '--size 1 ' + volume_name, parse_output=True, ) self.assertEqual(volume_name, cmd_output['name']) self.addCleanup( self.openstack, - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume delete ' + - volume_name + '--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 = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request create ' + - ' --name ' + xfer_name + ' ' + volume_name, + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request create ' + + ' --name ' + + xfer_name + + ' ' + + volume_name, parse_output=True, ) self.assertEqual(xfer_name, cmd_output['name']) @@ -56,9 +61,14 @@ class TransferRequestTests(common.BaseVolumeTests): # accept the volume transfer request cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request accept ' + - '--auth-key ' + auth_key + ' ' + xfer_id, + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request accept ' + + '--auth-key ' + + auth_key + + ' ' + + xfer_id, parse_output=True, ) self.assertEqual(xfer_name, cmd_output['name']) @@ -70,23 +80,29 @@ class TransferRequestTests(common.BaseVolumeTests): # create a volume cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + volume_name, + 'volume create ' + '--size 1 ' + volume_name, parse_output=True, ) self.assertEqual(volume_name, cmd_output['name']) self.addCleanup( self.openstack, - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume delete ' + - volume_name + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume delete ' + + volume_name, ) self.wait_for_status("volume", volume_name, "available") cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request create ' + - ' --name ' + xfer_name + ' ' + volume_name, + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request create ' + + ' --name ' + + xfer_name + + ' ' + + volume_name, parse_output=True, ) self.assertEqual(xfer_name, cmd_output['name']) @@ -96,16 +112,20 @@ class TransferRequestTests(common.BaseVolumeTests): self.wait_for_status("volume", volume_name, "awaiting-transfer") cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request list', + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request list', parse_output=True, ) self.assertIn(xfer_name, [req['Name'] for req in cmd_output]) cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request show ' + - xfer_id, + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request show ' + + xfer_id, parse_output=True, ) self.assertEqual(xfer_name, cmd_output['name']) @@ -116,8 +136,10 @@ class TransferRequestTests(common.BaseVolumeTests): # to become 'available' before attempting to delete # the volume. cmd_output = self.openstack( - '--os-volume-api-version ' + self.API_VERSION + ' ' + - 'volume transfer request delete ' + - xfer_id + '--os-volume-api-version ' + + self.API_VERSION + + ' ' + + 'volume transfer request delete ' + + xfer_id ) self.wait_for_status("volume", volume_name, "available") diff --git a/openstackclient/tests/functional/volume/v3/test_volume.py b/openstackclient/tests/functional/volume/v3/test_volume.py index 8a394e75..244fe91c 100644 --- a/openstackclient/tests/functional/volume/v3/test_volume.py +++ b/openstackclient/tests/functional/volume/v3/test_volume.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume.v3 import common class VolumeTests(common.BaseVolumeTests): - """Functional tests for volume. """ + """Functional tests for volume.""" def test_volume_delete(self): """Test create, delete multiple""" @@ -70,11 +70,7 @@ class VolumeTests(common.BaseVolumeTests): cmd_output["size"], ) self.wait_for_status("volume", name2, "available") - raw_output = self.openstack( - 'volume set ' + - '--state error ' + - name2 - ) + raw_output = self.openstack('volume set ' + '--state error ' + name2) self.assertOutput('', raw_output) # Test list --long @@ -103,11 +99,11 @@ class VolumeTests(common.BaseVolumeTests): name = uuid.uuid4().hex new_name = name + "_" cmd_output = self.openstack( - 'volume create ' + - '--size 1 ' + - '--description aaaa ' + - '--property Alpha=a ' + - name, + 'volume create ' + + '--size 1 ' + + '--description aaaa ' + + '--property Alpha=a ' + + name, parse_output=True, ) self.addCleanup(self.openstack, 'volume delete ' + new_name) @@ -135,17 +131,18 @@ class VolumeTests(common.BaseVolumeTests): # Test volume set raw_output = self.openstack( - 'volume set ' + - '--name ' + new_name + - ' --size 2 ' + - '--description bbbb ' + - '--no-property ' + - '--property Beta=b ' + - '--property Gamma=c ' + - '--image-property a=b ' + - '--image-property c=d ' + - '--bootable ' + - name, + 'volume set ' + + '--name ' + + new_name + + ' --size 2 ' + + '--description bbbb ' + + '--no-property ' + + '--property Beta=b ' + + '--property Gamma=c ' + + '--image-property a=b ' + + '--image-property c=d ' + + '--bootable ' + + name, ) self.assertOutput('', raw_output) self.wait_for_status("volume", new_name, "available") @@ -181,10 +178,10 @@ class VolumeTests(common.BaseVolumeTests): # Test volume unset raw_output = self.openstack( - 'volume unset ' + - '--property Beta ' + - '--image-property a ' + - new_name, + 'volume unset ' + + '--property Beta ' + + '--image-property a ' + + new_name, ) self.assertOutput('', raw_output) @@ -217,9 +214,10 @@ class VolumeTests(common.BaseVolumeTests): cmd_output["name"], ) cmd_output = self.openstack( - 'volume snapshot create ' + - snapshot_name + - ' --volume ' + volume_name, + 'volume snapshot create ' + + snapshot_name + + ' --volume ' + + volume_name, parse_output=True, ) self.wait_for_status("volume snapshot", snapshot_name, "available") @@ -227,9 +225,7 @@ class VolumeTests(common.BaseVolumeTests): name = uuid.uuid4().hex # Create volume from snapshot cmd_output = self.openstack( - 'volume create ' + - '--snapshot ' + snapshot_name + - ' ' + name, + 'volume create ' + '--snapshot ' + snapshot_name + ' ' + name, parse_output=True, ) self.addCleanup(self.openstack, 'volume delete ' + name) @@ -241,8 +237,7 @@ class VolumeTests(common.BaseVolumeTests): self.wait_for_status("volume", name, "available") # Delete snapshot - raw_output = self.openstack( - 'volume snapshot delete ' + snapshot_name) + raw_output = self.openstack('volume snapshot delete ' + snapshot_name) self.assertOutput('', raw_output) # Deleting snapshot may take time. If volume snapshot still exists when # a parent volume delete is requested, the volume deletion will fail. diff --git a/openstackclient/tests/functional/volume/v3/test_volume_snapshot.py b/openstackclient/tests/functional/volume/v3/test_volume_snapshot.py index 7b2d88d0..b9e86a93 100644 --- a/openstackclient/tests/functional/volume/v3/test_volume_snapshot.py +++ b/openstackclient/tests/functional/volume/v3/test_volume_snapshot.py @@ -16,7 +16,7 @@ from openstackclient.tests.functional.volume.v3 import common class VolumeSnapshotTests(common.BaseVolumeTests): - """Functional tests for volume snapshot. """ + """Functional tests for volume snapshot.""" VOLLY = uuid.uuid4().hex @@ -25,9 +25,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): super(VolumeSnapshotTests, cls).setUpClass() # create a volume for all tests to create snapshot cmd_output = cls.openstack( - 'volume create ' + - '--size 1 ' + - cls.VOLLY, + 'volume create ' + '--size 1 ' + cls.VOLLY, parse_output=True, ) cls.wait_for_status('volume', cls.VOLLY, 'available') @@ -37,8 +35,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): def tearDownClass(cls): try: cls.wait_for_status('volume', cls.VOLLY, 'available') - raw_output = cls.openstack( - 'volume delete --force ' + cls.VOLLY) + raw_output = cls.openstack('volume delete --force ' + cls.VOLLY) cls.assertOutput('', raw_output) finally: super(VolumeSnapshotTests, cls).tearDownClass() @@ -47,9 +44,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): """Test create, delete multiple""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name1 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY, parse_output=True, ) self.assertEqual( @@ -59,9 +54,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name2 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY, parse_output=True, ) self.assertEqual( @@ -73,7 +66,8 @@ class VolumeSnapshotTests(common.BaseVolumeTests): self.wait_for_status('volume snapshot', name2, 'available') del_output = self.openstack( - 'volume snapshot delete ' + name1 + ' ' + name2) + 'volume snapshot delete ' + name1 + ' ' + name2 + ) self.assertOutput('', del_output) self.wait_for_delete('volume snapshot', name1) self.wait_for_delete('volume snapshot', name2) @@ -82,9 +76,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): """Test create, list filter""" name1 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name1 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY, parse_output=True, ) self.addCleanup(self.wait_for_delete, 'volume snapshot', name1) @@ -105,9 +97,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): name2 = uuid.uuid4().hex cmd_output = self.openstack( - 'volume snapshot create ' + - name2 + - ' --volume ' + self.VOLLY, + 'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY, parse_output=True, ) self.addCleanup(self.wait_for_delete, 'volume snapshot', name2) @@ -126,17 +116,13 @@ class VolumeSnapshotTests(common.BaseVolumeTests): ) self.wait_for_status('volume snapshot', name2, 'available') raw_output = self.openstack( - 'volume snapshot set ' + - '--state error ' + - name2 + 'volume snapshot set ' + '--state error ' + name2 ) self.assertOutput('', raw_output) # Test list --long, --status cmd_output = self.openstack( - 'volume snapshot list ' + - '--long ' + - '--status error', + 'volume snapshot list ' + '--long ' + '--status error', parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -145,8 +131,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test list --volume cmd_output = self.openstack( - 'volume snapshot list ' + - '--volume ' + self.VOLLY, + 'volume snapshot list ' + '--volume ' + self.VOLLY, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -155,8 +140,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test list --name cmd_output = self.openstack( - 'volume snapshot list ' + - '--name ' + name1, + 'volume snapshot list ' + '--name ' + name1, parse_output=True, ) names = [x["Name"] for x in cmd_output] @@ -168,11 +152,12 @@ class VolumeSnapshotTests(common.BaseVolumeTests): name = uuid.uuid4().hex new_name = name + "_" cmd_output = self.openstack( - 'volume snapshot create ' + - '--volume ' + self.VOLLY + - ' --description aaaa ' + - '--property Alpha=a ' + - name, + 'volume snapshot create ' + + '--volume ' + + self.VOLLY + + ' --description aaaa ' + + '--property Alpha=a ' + + name, parse_output=True, ) self.addCleanup(self.wait_for_delete, 'volume snapshot', new_name) @@ -197,19 +182,19 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test volume snapshot set raw_output = self.openstack( - 'volume snapshot set ' + - '--name ' + new_name + - ' --description bbbb ' + - '--property Alpha=c ' + - '--property Beta=b ' + - name, + 'volume snapshot set ' + + '--name ' + + new_name + + ' --description bbbb ' + + '--property Alpha=c ' + + '--property Beta=b ' + + name, ) self.assertOutput('', raw_output) # Show snapshot set result cmd_output = self.openstack( - 'volume snapshot show ' + - new_name, + 'volume snapshot show ' + new_name, parse_output=True, ) self.assertEqual( @@ -231,15 +216,12 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test volume snapshot unset raw_output = self.openstack( - 'volume snapshot unset ' + - '--property Alpha ' + - new_name, + 'volume snapshot unset ' + '--property Alpha ' + new_name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume snapshot show ' + - new_name, + 'volume snapshot show ' + new_name, parse_output=True, ) self.assertEqual( @@ -249,14 +231,11 @@ class VolumeSnapshotTests(common.BaseVolumeTests): # Test volume snapshot set --no-property raw_output = self.openstack( - 'volume snapshot set ' + - '--no-property ' + - new_name, + 'volume snapshot set ' + '--no-property ' + new_name, ) self.assertOutput('', raw_output) cmd_output = self.openstack( - 'volume snapshot show ' + - new_name, + 'volume snapshot show ' + new_name, parse_output=True, ) self.assertNotIn( diff --git a/openstackclient/tests/functional/volume/v3/test_volume_type.py b/openstackclient/tests/functional/volume/v3/test_volume_type.py index 18e46c52..4edb3416 100644 --- a/openstackclient/tests/functional/volume/v3/test_volume_type.py +++ b/openstackclient/tests/functional/volume/v3/test_volume_type.py @@ -17,13 +17,12 @@ from openstackclient.tests.functional.volume.v3 import common class VolumeTypeTests(common.BaseVolumeTests): - """Functional tests for volume type. """ + """Functional tests for volume type.""" def test_volume_type_create_list(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) self.addCleanup( @@ -51,14 +50,10 @@ class VolumeTypeTests(common.BaseVolumeTests): def test_volume_type_set_unset_properties(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'volume type delete ' + name - ) + self.addCleanup(self.openstack, 'volume type delete ' + name) self.assertEqual(name, cmd_output['name']) raw_output = self.openstack( @@ -71,9 +66,7 @@ class VolumeTypeTests(common.BaseVolumeTests): ) self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties']) - raw_output = self.openstack( - 'volume type unset --property a %s' % name - ) + raw_output = self.openstack('volume type unset --property a %s' % name) self.assertEqual("", raw_output) cmd_output = self.openstack( 'volume type show %s' % name, @@ -84,14 +77,10 @@ class VolumeTypeTests(common.BaseVolumeTests): def test_volume_type_set_unset_multiple_properties(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'volume type delete ' + name - ) + self.addCleanup(self.openstack, 'volume type delete ' + name) self.assertEqual(name, cmd_output['name']) raw_output = self.openstack( @@ -117,14 +106,10 @@ class VolumeTypeTests(common.BaseVolumeTests): def test_volume_type_set_unset_project(self): name = uuid.uuid4().hex cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) - self.addCleanup( - self.openstack, - 'volume type delete ' + name - ) + self.addCleanup(self.openstack, 'volume type delete ' + name) self.assertEqual(name, cmd_output['name']) raw_output = self.openstack( @@ -161,14 +146,15 @@ class VolumeTypeTests(common.BaseVolumeTests): '--encryption-provider LuksEncryptor ' '--encryption-cipher aes-xts-plain64 ' '--encryption-key-size 128 ' - '--encryption-control-location front-end ' + - encryption_type, + '--encryption-control-location front-end ' + encryption_type, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test show encryption type @@ -176,10 +162,12 @@ class VolumeTypeTests(common.BaseVolumeTests): 'volume type show --encryption-type ' + encryption_type, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test list encryption type @@ -187,35 +175,39 @@ class VolumeTypeTests(common.BaseVolumeTests): 'volume type list --encryption-type', parse_output=True, ) - encryption_output = [t['Encryption'] for t in cmd_output - if t['Name'] == encryption_type][0] - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + encryption_output = [ + t['Encryption'] for t in cmd_output if t['Name'] == encryption_type + ][0] + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, encryption_output[attr]) # test set existing encryption type raw_output = self.openstack( 'volume type set ' '--encryption-key-size 256 ' - '--encryption-control-location back-end ' + - encryption_type) + '--encryption-control-location back-end ' + encryption_type + ) self.assertEqual('', raw_output) cmd_output = self.openstack( 'volume type show --encryption-type ' + encryption_type, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 256, - 'control_location': 'back-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 256, + 'control_location': 'back-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test set new encryption type cmd_output = self.openstack( - 'volume type create --private ' + - name, + 'volume type create --private ' + name, parse_output=True, ) self.addCleanup( @@ -229,18 +221,20 @@ class VolumeTypeTests(common.BaseVolumeTests): '--encryption-provider LuksEncryptor ' '--encryption-cipher aes-xts-plain64 ' '--encryption-key-size 128 ' - '--encryption-control-location front-end ' + - name) + '--encryption-control-location front-end ' + name + ) self.assertEqual('', raw_output) cmd_output = self.openstack( 'volume type show --encryption-type ' + name, parse_output=True, ) - expected = {'provider': 'LuksEncryptor', - 'cipher': 'aes-xts-plain64', - 'key_size': 128, - 'control_location': 'front-end'} + expected = { + 'provider': 'LuksEncryptor', + 'cipher': 'aes-xts-plain64', + 'key_size': 128, + 'control_location': 'front-end', + } for attr, value in expected.items(): self.assertEqual(value, cmd_output['encryption'][attr]) # test unset encryption type |