Merge "Add I202 to flake ignore list"

ironic/drivers/cisco_ucs.py

@@ -15,10 +15,8 @@ Hardware types for Cisco UCS Servers
 """
 
 from ironic.drivers import ipmi
-
 from ironic.drivers.modules.cimc import management as cimc_mgmt
 from ironic.drivers.modules.cimc import power as cimc_power
-
 from ironic.drivers.modules.ucs import management as ucs_mgmt
 from ironic.drivers.modules.ucs import power as ucs_power
 

ironic/drivers/modules/irmc/common.py

@@ -15,10 +15,9 @@
 """
 Common functionalities shared between different iRMC modules.
 """
-import six
-
 from oslo_log import log as logging
 from oslo_utils import importutils
+import six
 
 from ironic.common import exception
 from ironic.common.i18n import _

ironic/drivers/modules/oneview/inspect.py

@@ -20,12 +20,11 @@ from oslo_utils import importutils
 from ironic.common import exception
 from ironic.common import states
 from ironic.conductor import task_manager
+from ironic.conf import CONF
 from ironic.drivers.modules import inspector
 from ironic.drivers.modules.oneview import common
 from ironic.drivers.modules.oneview import deploy_utils
 
-from ironic.conf import CONF
-
 METRICS = metrics_utils.get_metrics_logger(__name__)
 
 oneview_exception = importutils.try_import('oneview_client.exceptions')

ironic/drivers/modules/storage/cinder.py

@@ -12,12 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import retrying
-
 from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import excutils
 from oslo_utils import strutils
+import retrying
 
 from ironic.common import cinder
 from ironic.common import exception

ironic/tests/unit/api/test_ospmiddleware.py

@@ -11,7 +11,6 @@
 #    under the License.
 
 import mock
-
 from oslo_config import cfg
 from osprofiler import web
 

ironic/tests/unit/db/test_node_tags.py

@@ -13,7 +13,6 @@
 """Tests for manipulating NodeTags via the DB API"""
 
 from ironic.common import exception
-
 from ironic.tests.unit.db import base
 from ironic.tests.unit.db import utils as db_utils
 

ironic/tests/unit/dhcp/test_neutron.py

@@ -15,7 +15,6 @@
 #    under the License.
 
 import mock
-
 from neutronclient.common import exceptions as neutron_client_exc
 from oslo_utils import uuidutils
 

ironic/tests/unit/drivers/modules/cimc/test_common.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import mock
-
 from oslo_config import cfg
 from oslo_utils import importutils
 from oslo_utils import uuidutils

ironic/tests/unit/drivers/modules/cimc/test_management.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import mock
-
 from oslo_utils import importutils
 from six.moves import http_client
 

ironic/tests/unit/drivers/modules/cimc/test_power.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import mock
-
 from oslo_config import cfg
 from oslo_utils import importutils
 

ironic/tests/unit/drivers/modules/irmc/test_boot.py

@@ -45,7 +45,6 @@ from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.drivers import third_party_driver_mock_specs \
     as mock_specs
 from ironic.tests.unit.objects import utils as obj_utils
-
 if six.PY3:
     import io
     file = io.BytesIO

ironic/tests/unit/drivers/modules/irmc/test_common.py

@@ -17,7 +17,6 @@ Test class for common methods used by iRMC modules.
 """
 
 import mock
-
 from oslo_config import cfg
 
 from ironic.common import exception

ironic/tests/unit/drivers/modules/irmc/test_power.py

@@ -17,7 +17,6 @@ Test class for iRMC Power Driver
 """
 
 import mock
-
 from oslo_utils import uuidutils
 
 from ironic.common import exception

ironic/tests/unit/drivers/modules/oneview/test_deploy_utils.py

@@ -14,7 +14,6 @@
 #    under the License.
 
 import mock
-
 from oslo_utils import importutils
 
 from ironic.common import driver_factory

ironic/tests/unit/drivers/test_cisco.py

@@ -12,19 +12,17 @@
 
 from ironic.conductor import task_manager
 from ironic.drivers.modules import agent
+from ironic.drivers.modules.cimc import management as cimc_mgmt
+from ironic.drivers.modules.cimc import power as cimc_power
 from ironic.drivers.modules import ipmitool
 from ironic.drivers.modules import iscsi_deploy
 from ironic.drivers.modules import noop
 from ironic.drivers.modules import pxe
 from ironic.drivers.modules.storage import noop as noop_storage
-from ironic.tests.unit.db import base as db_base
-from ironic.tests.unit.objects import utils as obj_utils
-
-from ironic.drivers.modules.cimc import management as cimc_mgmt
-from ironic.drivers.modules.cimc import power as cimc_power
-
 from ironic.drivers.modules.ucs import management as ucs_mgmt
 from ironic.drivers.modules.ucs import power as ucs_power
+from ironic.tests.unit.db import base as db_base
+from ironic.tests.unit.objects import utils as obj_utils
 
 
 class CiscoUCSStandaloneHardwareTestCase(db_base.DbTestCase):

ironic/tests/unit/drivers/test_drac.py

@@ -15,7 +15,6 @@
 import inspect
 
 import mock
-
 from oslo_utils import importutils
 
 from ironic.common import exception

ironic_tempest_plugin/manager.py

@@ -23,7 +23,6 @@ import subprocess
 
 from oslo_log import log
 from oslo_utils import netutils
-
 from tempest.common import compute
 from tempest.common.utils.linux import remote_client
 from tempest.common.utils import net_utils

ironic_tempest_plugin/tests/api/admin/test_nodes.py

@@ -11,7 +11,6 @@
 #    under the License.
 
 import six
-
 from tempest import config
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators

tox.ini

@@ -98,7 +98,9 @@ setenv = PYTHONHASHSEED=0
 commands = {posargs}
 
 [flake8]
-ignore = E129
+# TODO(vdrok): Remove I202 from ignore list when we split out
+# the tempest plugin
+ignore = E129,I202
 exclude =  .venv,.git,.tox,dist,doc,*lib/python*,*egg,build
 import-order-style = pep8
 application-import-names = ironic