Fix W504 errors

Also a few related errors based on some earlier investigation
may have been pulled in along the lines of E305.

Story: #2001985
Change-Id: Ifb2d3b481202fbd8cbb472e02de0f14f4d0809fd

14 files changed, 65 insertions, 65 deletions

diff --git a/ironic/tests/unit/api/test_root.py b/ironic/tests/unit/api/test_root.py
index ba9af12a5..3ca47fae4 100644
--- a/ironic/tests/unit/api/test_root.py
+++ b/ironic/tests/unit/api/test_root.py
@@ -51,8 +51,8 @@ class TestV1Root(base.BaseApiTest):
         # Check if all known resources are present and there are no extra ones.
         not_resources = ('id', 'links', 'media_types')
         actual_resources = tuple(set(data) - set(not_resources))
-        expected_resources = (['chassis', 'drivers', 'nodes', 'ports'] +
-                              additional_expected_resources)
+        expected_resources = (['chassis', 'drivers', 'nodes', 'ports']
+                              + additional_expected_resources)
         self.assertEqual(sorted(expected_resources), sorted(actual_resources))
         self.assertIn({'type': 'application/vnd.openstack.ironic.v1+json',
                        'base': 'application/json'}, data['media_types'])
diff --git a/ironic/tests/unit/common/test_driver_factory.py b/ironic/tests/unit/common/test_driver_factory.py
index 1e0ebc9c5..291216697 100644
--- a/ironic/tests/unit/common/test_driver_factory.py
+++ b/ironic/tests/unit/common/test_driver_factory.py
@@ -119,8 +119,8 @@ class DriverLoadTestCase(db_base.DbTestCase):
     @mock.patch.object(driver_factory.LOG, 'warning', autospec=True)
     def test_build_driver_for_task_incorrect(self, mock_warn, mock_attach):
         # Cannot set these node interfaces for classic driver
-        no_set_interfaces = (drivers_base.ALL_INTERFACES -
-                             set(['network', 'storage']))
+        no_set_interfaces = (drivers_base.ALL_INTERFACES
+                             - set(['network', 'storage']))
         for iface in no_set_interfaces:
             iface_name = '%s_interface' % iface
             node_kwargs = {'uuid': uuidutils.generate_uuid(),
@@ -305,8 +305,8 @@ class CheckAndUpdateNodeInterfacesTestCase(db_base.DbTestCase):
 
     def test_create_node_classic_driver_not_allowed_interfaces_set(self):
         # Cannot set these node interfaces for classic driver
-        no_set_interfaces = (drivers_base.ALL_INTERFACES -
-                             set(['network', 'storage']))
+        no_set_interfaces = (drivers_base.ALL_INTERFACES
+                             - set(['network', 'storage']))
         for iface in no_set_interfaces:
             iface_name = '%s_interface' % iface
             node_kwargs = {'uuid': uuidutils.generate_uuid(),
@@ -319,8 +319,8 @@ class CheckAndUpdateNodeInterfacesTestCase(db_base.DbTestCase):
                 driver_factory.check_and_update_node_interfaces, node)
 
     def test_create_node_classic_driver_no_interfaces_set(self):
-        no_set_interfaces = (drivers_base.ALL_INTERFACES -
-                             set(['network', 'storage']))
+        no_set_interfaces = (drivers_base.ALL_INTERFACES
+                             - set(['network', 'storage']))
         node_kwargs = {'uuid': uuidutils.generate_uuid()}
         node = obj_utils.get_test_node(self.context, driver='fake',
                                        **node_kwargs)
@@ -368,8 +368,8 @@ class CheckAndUpdateNodeInterfacesTestCase(db_base.DbTestCase):
 
     def test_update_node_set_classic_driver_and_not_allowed_interfaces(self):
         """Update driver to classic and interfaces specified"""
-        not_allowed_interfaces = (drivers_base.ALL_INTERFACES -
-                                  set(['network', 'storage']))
+        not_allowed_interfaces = (drivers_base.ALL_INTERFACES
+                                  - set(['network', 'storage']))
         self.config(enabled_drivers=['fake', 'fake_agent'])
         for iface in not_allowed_interfaces:
             iface_name = '%s_interface' % iface
@@ -400,8 +400,8 @@ class CheckAndUpdateNodeInterfacesTestCase(db_base.DbTestCase):
 
     def test_update_node_set_classic_driver_unset_interfaces(self):
         """Update driver to classic and set interfaces to None"""
-        no_set_interfaces = (drivers_base.ALL_INTERFACES -
-                             set(['network', 'storage']))
+        no_set_interfaces = (drivers_base.ALL_INTERFACES
+                             - set(['network', 'storage']))
         self.config(enabled_drivers=['fake', 'fake_agent'])
         for iface in no_set_interfaces:
             iface_name = '%s_interface' % iface
@@ -416,8 +416,8 @@ class CheckAndUpdateNodeInterfacesTestCase(db_base.DbTestCase):
 
     def test_update_node_classic_driver_unset_interfaces(self):
         """Update interfaces to None for node with classic driver"""
-        no_set_interfaces = (drivers_base.ALL_INTERFACES -
-                             set(['network', 'storage']))
+        no_set_interfaces = (drivers_base.ALL_INTERFACES
+                             - set(['network', 'storage']))
         self.config(enabled_drivers=['fake', 'fake_agent'])
         for iface in no_set_interfaces:
             iface_name = '%s_interface' % iface
@@ -431,8 +431,8 @@ class CheckAndUpdateNodeInterfacesTestCase(db_base.DbTestCase):
     def test_update_node_set_classic_driver_no_interfaces(self):
         """Update driver to classic no interfaces specified"""
         self._set_config_interface_options_hardware_type()
-        no_set_interfaces = (drivers_base.ALL_INTERFACES -
-                             set(['network', 'storage']))
+        no_set_interfaces = (drivers_base.ALL_INTERFACES
+                             - set(['network', 'storage']))
         for iface in no_set_interfaces:
             iface_name = '%s_interface' % iface
             node_kwargs = {'uuid': uuidutils.generate_uuid()}
@@ -618,8 +618,8 @@ class TestFakeHardware(hardware_type.AbstractHardwareType):
         return [fake.FakeVendorB, fake.FakeVendorA]
 
 
-OPTIONAL_INTERFACES = (set(drivers_base.BareDriver().standard_interfaces) -
-                       {'management', 'boot'}) | {'vendor'}
+OPTIONAL_INTERFACES = (set(drivers_base.BareDriver().standard_interfaces)
+                       - {'management', 'boot'}) | {'vendor'}
 
 
 class HardwareTypeLoadTestCase(db_base.DbTestCase):
diff --git a/ironic/tests/unit/common/test_glance_service.py b/ironic/tests/unit/common/test_glance_service.py
index f2afe72ea..72937b365 100644
--- a/ironic/tests/unit/common/test_glance_service.py
+++ b/ironic/tests/unit/common/test_glance_service.py
@@ -700,8 +700,8 @@ class TestGlanceSwiftTempURL(base.TestCase):
         temp_url = self.service.swift_temp_url(image_info=self.fake_image)
 
         self.assertEqual(
-            (urlparse.urljoin(CONF.glance.swift_endpoint_url, 'swift') +
-             tempurl_mock.return_value),
+            (urlparse.urljoin(CONF.glance.swift_endpoint_url, 'swift')
+             + tempurl_mock.return_value),
             temp_url)
         tempurl_mock.assert_called_with(
             path=path,
@@ -865,8 +865,8 @@ class TestSwiftTempUrlCache(base.TestCase):
         temp_url = self.glance_service.swift_temp_url(
             image_info=fake_image)
 
-        self.assertEqual(CONF.glance.swift_endpoint_url +
-                         tempurl_mock.return_value,
+        self.assertEqual(CONF.glance.swift_endpoint_url
+                         + tempurl_mock.return_value,
                          temp_url)
         cleanup_mock.assert_called_once_with()
         tempurl_mock.assert_called_with(
@@ -921,8 +921,8 @@ class TestSwiftTempUrlCache(base.TestCase):
         query = '?temp_url_sig=hmacsig&temp_url_expires=%s'
         self.glance_service._cache[fake_image['id']] = (
             glance_v2.TempUrlCacheElement(
-                url=(CONF.glance.swift_endpoint_url + path +
-                     query % old_exp_time),
+                url=(CONF.glance.swift_endpoint_url + path
+                     + query % old_exp_time),
                 url_expires_at=old_exp_time)
         )
 
@@ -935,8 +935,8 @@ class TestSwiftTempUrlCache(base.TestCase):
         fresh_temp_url = self.glance_service.swift_temp_url(
             image_info=fake_image)
 
-        self.assertEqual(CONF.glance.swift_endpoint_url +
-                         tempurl_mock.return_value,
+        self.assertEqual(CONF.glance.swift_endpoint_url
+                         + tempurl_mock.return_value,
                          fresh_temp_url)
         tempurl_mock.assert_called_with(
             path=path,
@@ -994,8 +994,8 @@ class TestSwiftTempUrlCache(base.TestCase):
             image_id=fake_image['id']
         )
 
-        self.assertEqual(CONF.glance.swift_endpoint_url +
-                         tempurl_mock.return_value,
+        self.assertEqual(CONF.glance.swift_endpoint_url
+                         + tempurl_mock.return_value,
                          temp_url)
         tempurl_mock.assert_called_with(
             path=path,
diff --git a/ironic/tests/unit/common/test_utils.py b/ironic/tests/unit/common/test_utils.py
index 6add5cd2c..79198dd00 100644
--- a/ironic/tests/unit/common/test_utils.py
+++ b/ironic/tests/unit/common/test_utils.py
@@ -316,8 +316,8 @@ class GenericUtilsTestCase(base.TestCase):
         valid_no_proxy = [
             ('a' * 63 + '.' + '0' * 63 + '.c.' + 'd' * 61 + '.' + 'e' * 61),
             ('A' * 63 + '.' + '0' * 63 + '.C.' + 'D' * 61 + '.' + 'E' * 61),
-            ('.' + 'a' * 62 + '.' + '0' * 62 + '.c.' + 'd' * 61 + '.' +
-             'e' * 61),
+            ('.' + 'a' * 62 + '.' + '0' * 62 + '.c.' + 'd' * 61 + '.'
+             + 'e' * 61),
             ',,example.com:3128,',
             '192.168.1.1',  # IP should be valid
         ]
@@ -336,14 +336,14 @@ class GenericUtilsTestCase(base.TestCase):
 
         # Invalid values for 'no_proxy'
         invalid_no_proxy = [
-            ('A' * 64 + '.' + '0' * 63 + '.C.' + 'D' * 61 + '.' +
-             'E' * 61),  # too long (> 253)
+            ('A' * 64 + '.' + '0' * 63 + '.C.' + 'D' * 61 + '.'
+             + 'E' * 61),  # too long (> 253)
             ('a' * 100),
             'a..com',
-            ('.' + 'a' * 63 + '.' + '0' * 62 + '.c.' + 'd' * 61 + '.' +
-             'e' * 61),  # too long (> 251 after deleting .)
-            ('*.' + 'a' * 60 + '.' + '0' * 60 + '.c.' + 'd' * 61 + '.' +
-             'e' * 61),  # starts with *.
+            ('.' + 'a' * 63 + '.' + '0' * 62 + '.c.' + 'd' * 61 + '.'
+             + 'e' * 61),  # too long (> 251 after deleting .)
+            ('*.' + 'a' * 60 + '.' + '0' * 60 + '.c.' + 'd' * 61 + '.'
+             + 'e' * 61),  # starts with *.
             'c.-a.com',
             'c.a-.com',
         ]
diff --git a/ironic/tests/unit/db/sqlalchemy/test_migrations.py b/ironic/tests/unit/db/sqlalchemy/test_migrations.py
index e7c6be4a0..b231c5d1e 100644
--- a/ironic/tests/unit/db/sqlalchemy/test_migrations.py
+++ b/ironic/tests/unit/db/sqlalchemy/test_migrations.py
@@ -244,8 +244,8 @@ class MigrationCheckersMixin(object):
         data_conductor = {'hostname': 'test_host'}
         conductors.insert().execute(data_conductor)
         conductor = conductors.select(
-            conductors.c.hostname ==
-            data_conductor['hostname']).execute().first()
+            conductors.c.hostname
+            == data_conductor['hostname']).execute().first()
 
         data_node = {'uuid': uuidutils.generate_uuid(),
                      'conductor_affinity': conductor['id']}
diff --git a/ironic/tests/unit/drivers/modules/ansible/test_deploy.py b/ironic/tests/unit/drivers/modules/ansible/test_deploy.py
index e1774f5a4..a2a533258 100644
--- a/ironic/tests/unit/drivers/modules/ansible/test_deploy.py
+++ b/ironic/tests/unit/drivers/modules/ansible/test_deploy.py
@@ -504,8 +504,8 @@ class TestAnsibleDeploy(AnsibleDeployTestCaseBase):
 
     def test_get_properties(self):
         self.assertEqual(
-            set(list(ansible_deploy.COMMON_PROPERTIES) +
-                ['deploy_forces_oob_reboot']),
+            set(list(ansible_deploy.COMMON_PROPERTIES)
+                + ['deploy_forces_oob_reboot']),
             set(self.driver.get_properties()))
 
     @mock.patch.object(deploy_utils, 'check_for_missing_params',
diff --git a/ironic/tests/unit/drivers/modules/drac/test_raid.py b/ironic/tests/unit/drivers/modules/drac/test_raid.py
index 28eff4b79..eedafd811 100644
--- a/ironic/tests/unit/drivers/modules/drac/test_raid.py
+++ b/ironic/tests/unit/drivers/modules/drac/test_raid.py
@@ -903,8 +903,8 @@ class DracRaidInterfaceTestCase(db_base.DbTestCase):
                 'Disk.Bay.5:Enclosure.Internal.0-1:RAID.Integrated.1-1'],
             'is_root_volume': True
         }
-        self.logical_disks = ([self.root_logical_disk] +
-                              self.nonroot_logical_disks)
+        self.logical_disks = ([self.root_logical_disk]
+                              + self.nonroot_logical_disks)
         self.target_raid_configuration = {'logical_disks': self.logical_disks}
         self.node.target_raid_config = self.target_raid_configuration
         self.node.save()
diff --git a/ironic/tests/unit/drivers/modules/irmc/test_boot.py b/ironic/tests/unit/drivers/modules/irmc/test_boot.py
index 9eaf8b859..5962e852e 100644
--- a/ironic/tests/unit/drivers/modules/irmc/test_boot.py
+++ b/ironic/tests/unit/drivers/modules/irmc/test_boot.py
@@ -494,10 +494,10 @@ class IRMCDeployPrivateMethodsTestCase(db_base.DbTestCase):
                 task.context, 'image-uuid', ['kernel_id', 'ramdisk_id'])
             create_boot_iso_mock.assert_called_once_with(
                 task.context,
-                '/remote_image_share_root/' +
+                '/remote_image_share_root/'
                 "boot-%s.iso" % self.node.uuid,
                 'kernel_uuid', 'ramdisk_uuid',
-                'file:///remote_image_share_root/' +
+                'file:///remote_image_share_root/'
                 "deploy-%s.iso" % self.node.uuid,
                 'root-uuid', 'kernel-params', 'uefi')
             task.node.refresh()
@@ -746,7 +746,7 @@ class IRMCDeployPrivateMethodsTestCase(db_base.DbTestCase):
                                   task.node,
                                   'iso_filename')
             get_irmc_client_mock.assert_called_once_with(task.node)
-            self.assertEqual("iRMC Inserting virtual cdrom failed. " +
+            self.assertEqual("iRMC Inserting virtual cdrom failed. "
                              "Reason: fake error", str(e))
 
     @mock.patch.object(irmc_common, 'get_irmc_client', spec_set=True,
@@ -772,7 +772,7 @@ class IRMCDeployPrivateMethodsTestCase(db_base.DbTestCase):
             e = self.assertRaises(exception.IRMCOperationError,
                                   irmc_boot._detach_virtual_cd,
                                   task.node)
-            self.assertEqual("iRMC Ejecting virtual cdrom failed. " +
+            self.assertEqual("iRMC Ejecting virtual cdrom failed. "
                              "Reason: fake error", str(e))
 
     @mock.patch.object(irmc_common, 'get_irmc_client', spec_set=True,
@@ -825,7 +825,7 @@ class IRMCDeployPrivateMethodsTestCase(db_base.DbTestCase):
                                   task.node,
                                   'iso_filename')
             get_irmc_client_mock.assert_called_once_with(task.node)
-            self.assertEqual("iRMC Inserting virtual floppy failed. " +
+            self.assertEqual("iRMC Inserting virtual floppy failed. "
                              "Reason: fake error", str(e))
 
     @mock.patch.object(irmc_common, 'get_irmc_client', spec_set=True,
diff --git a/ironic/tests/unit/drivers/modules/irmc/test_management.py b/ironic/tests/unit/drivers/modules/irmc/test_management.py
index 3a63adc5a..6ff5a9969 100644
--- a/ironic/tests/unit/drivers/modules/irmc/test_management.py
+++ b/ironic/tests/unit/drivers/modules/irmc/test_management.py
@@ -471,7 +471,7 @@ class IRMCManagementTestCase(db_base.DbTestCase):
             e = self.assertRaises(exception.FailedToGetSensorData,
                                   self.driver.management.get_sensors_data,
                                   task)
-        self.assertEqual("Failed to get sensor data for node 1be26c0b-" +
+        self.assertEqual("Failed to get sensor data for node 1be26c0b-"
                          "03f2-4d2e-ae87-c02d7f33c123. Error: Fake Error",
                          str(e))
 
diff --git a/ironic/tests/unit/drivers/modules/oneview/test_common.py b/ironic/tests/unit/drivers/modules/oneview/test_common.py
index 625d8b20e..849ae00a9 100644
--- a/ironic/tests/unit/drivers/modules/oneview/test_common.py
+++ b/ironic/tests/unit/drivers/modules/oneview/test_common.py
@@ -80,7 +80,7 @@ class OneViewCommonTestCase(db_base.DbTestCase):
         mock_oneview.assert_called_once_with(credentials)
 
     def test_get_ilo_access(self):
-        url = ("hplocons://addr=1.2.3.4&sessionkey" +
+        url = ("hplocons://addr=1.2.3.4&sessionkey"
                "=a79659e3b3b7c8209c901ac3509a6719")
         remote_console = {'remoteConsoleUrl': url}
         host_ip, token = common._get_ilo_access(remote_console)
diff --git a/ironic/tests/unit/drivers/modules/test_pxe.py b/ironic/tests/unit/drivers/modules/test_pxe.py
index 38f8ac8db..2c75709db 100644
--- a/ironic/tests/unit/drivers/modules/test_pxe.py
+++ b/ironic/tests/unit/drivers/modules/test_pxe.py
@@ -224,8 +224,8 @@ class PXEPrivateMethodsTestCase(db_base.DbTestCase):
                                          ramdisk_label))
         }
 
-        if (whle_dsk_img or
-            deploy_utils.get_boot_option(self.node) == 'local'):
+        if (whle_dsk_img
+            or deploy_utils.get_boot_option(self.node) == 'local'):
                 ramdisk = 'no_ramdisk'
                 kernel = 'no_kernel'
         else:
@@ -385,8 +385,8 @@ class PXEPrivateMethodsTestCase(db_base.DbTestCase):
 
         kernel = os.path.join(http_url, self.node.uuid, 'kernel')
         ramdisk = os.path.join(http_url, self.node.uuid, 'ramdisk')
-        if (whle_dsk_img or
-            deploy_utils.get_boot_option(self.node) == 'local'):
+        if (whle_dsk_img
+            or deploy_utils.get_boot_option(self.node) == 'local'):
                 ramdisk = 'no_ramdisk'
                 kernel = 'no_kernel'
         else:
diff --git a/ironic/tests/unit/drivers/modules/test_snmp.py b/ironic/tests/unit/drivers/modules/test_snmp.py
index 349268a40..1d5bc9db2 100644
--- a/ironic/tests/unit/drivers/modules/test_snmp.py
+++ b/ironic/tests/unit/drivers/modules/test_snmp.py
@@ -741,8 +741,8 @@ class SNMPDeviceDriverTestCase(db_base.DbTestCase):
         mock_client = mock_get_client.return_value
         driver = snmp._get_driver(self.node)
         attempts = CONF.snmp.power_timeout // driver.retry_interval
-        mock_client.get.side_effect = ([driver.value_power_off] +
-                                       [42] * attempts)
+        mock_client.get.side_effect = ([driver.value_power_off]
+                                       + [42] * attempts)
         pstate = driver.power_reset()
         calls = [mock.call(driver._snmp_oid(), driver.value_power_off),
                  mock.call(driver._snmp_oid(), driver.value_power_on)]
@@ -773,8 +773,8 @@ class SNMPDeviceDriverTestCase(db_base.DbTestCase):
         mock_client = mock_get_client.return_value
         driver = snmp._get_driver(self.node)
         attempts = CONF.snmp.power_timeout // driver.retry_interval
-        mock_client.get.side_effect = ([driver.value_power_off] *
-                                       (1 + attempts))
+        mock_client.get.side_effect = ([driver.value_power_off]
+                                       * (1 + attempts))
         pstate = driver.power_reset()
         calls = [mock.call(driver._snmp_oid(), driver.value_power_off),
                  mock.call(driver._snmp_oid(), driver.value_power_on)]
diff --git a/ironic/tests/unit/drivers/test_utils.py b/ironic/tests/unit/drivers/test_utils.py
index cb07c547b..9f695a5d0 100644
--- a/ironic/tests/unit/drivers/test_utils.py
+++ b/ironic/tests/unit/drivers/test_utils.py
@@ -227,16 +227,16 @@ class UtilsTestCase(db_base.DbTestCase):
             driver_utils.capabilities_to_dict,
             capabilities_already_dict
         )
-        self.assertEqual("Value of 'capabilities' must be string. Got " +
-                         str(dict), str(exc))
+        self.assertEqual("Value of 'capabilities' must be string. Got "
+                         + str(dict), str(exc))
 
         exc = self.assertRaises(
             exception.InvalidParameterValue,
             driver_utils.capabilities_to_dict,
             capabilities_something_else
         )
-        self.assertEqual("Value of 'capabilities' must be string. Got " +
-                         str(int), str(exc))
+        self.assertEqual("Value of 'capabilities' must be string. Got "
+                         + str(int), str(exc))
 
     def test_normalize_mac_string(self):
         mac_raw = "0A:1B-2C-3D:4F"
@@ -268,8 +268,8 @@ class UtilsRamdiskLogsTestCase(tests_base.TestCase):
         node2 = obj_utils.get_test_node(
             self.context, instance_uuid=instance_uuid)
         name = driver_utils.get_ramdisk_logs_file_name(node2)
-        expected_name = ('1be26c0b-03f2-4d2e-ae87-c02d7f33c123_' +
-                         instance_uuid + '_2000-01-01-00-00-00.tar.gz')
+        expected_name = ('1be26c0b-03f2-4d2e-ae87-c02d7f33c123_'
+                         + instance_uuid + '_2000-01-01-00-00-00.tar.gz')
         self.assertEqual(expected_name, name)
 
     @mock.patch.object(driver_utils, 'store_ramdisk_logs', autospec=True)
diff --git a/ironic/tests/unit/objects/utils.py b/ironic/tests/unit/objects/utils.py
index d8ef0c4e1..77acd2dd9 100644
--- a/ironic/tests/unit/objects/utils.py
+++ b/ironic/tests/unit/objects/utils.py
@@ -250,8 +250,8 @@ def get_payloads_with_schemas(from_module):
             # First class is this payload class, parent class is the 2nd
             # one in the tuple
             parent = base_classes[1]
-            if (not hasattr(parent, 'SCHEMA') or
-                parent.SCHEMA != payload.SCHEMA):
+            if (not hasattr(parent, 'SCHEMA')
+                or parent.SCHEMA != payload.SCHEMA):
                 payloads.append(payload)
 
     return payloads