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>

6 files changed, 148 insertions, 232 deletions

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