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>

8 files changed, 237 insertions, 351 deletions

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