diff options
Diffstat (limited to 'ironic')
128 files changed, 179 insertions, 133 deletions
diff --git a/ironic/tests/unit/api/base.py b/ironic/tests/unit/api/base.py index 5d4ab99b8..180f363e6 100644 --- a/ironic/tests/unit/api/base.py +++ b/ironic/tests/unit/api/base.py @@ -20,9 +20,9 @@ # ceilometer/tests/api/__init__.py). This should be oslo'ified: # https://bugs.launchpad.net/ironic/+bug/1255115. +from unittest import mock from urllib import parse as urlparse -import mock from oslo_config import cfg import pecan import pecan.testing diff --git a/ironic/tests/unit/api/test_acl.py b/ironic/tests/unit/api/test_acl.py index c358f5a15..9ebabfac0 100644 --- a/ironic/tests/unit/api/test_acl.py +++ b/ironic/tests/unit/api/test_acl.py @@ -17,8 +17,8 @@ are blocked or allowed to be processed. """ from http import client as http_client +from unittest import mock -import mock from oslo_config import cfg from ironic.tests.unit.api import base diff --git a/ironic/tests/unit/api/test_audit.py b/ironic/tests/unit/api/test_audit.py index c621013d3..34ecaf18f 100644 --- a/ironic/tests/unit/api/test_audit.py +++ b/ironic/tests/unit/api/test_audit.py @@ -13,8 +13,9 @@ Tests to assert that audit middleware works as expected. """ +from unittest import mock + from keystonemiddleware import audit -import mock from oslo_config import cfg from ironic.common import exception diff --git a/ironic/tests/unit/api/test_healthcheck.py b/ironic/tests/unit/api/test_healthcheck.py index 364ba8cf8..907bc9f4a 100644 --- a/ironic/tests/unit/api/test_healthcheck.py +++ b/ironic/tests/unit/api/test_healthcheck.py @@ -13,7 +13,8 @@ Tests to assert that audit middleware works as expected. """ -import mock +from unittest import mock + from oslo_config import cfg from oslo_middleware import healthcheck diff --git a/ironic/tests/unit/api/test_hooks.py b/ironic/tests/unit/api/test_hooks.py index 095d08a36..5f974d161 100644 --- a/ironic/tests/unit/api/test_hooks.py +++ b/ironic/tests/unit/api/test_hooks.py @@ -16,8 +16,8 @@ from http import client as http_client import json +from unittest import mock -import mock from oslo_config import cfg import oslo_messaging as messaging diff --git a/ironic/tests/unit/api/test_ospmiddleware.py b/ironic/tests/unit/api/test_ospmiddleware.py index 48638aff7..856ba8380 100644 --- a/ironic/tests/unit/api/test_ospmiddleware.py +++ b/ironic/tests/unit/api/test_ospmiddleware.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_config import cfg from osprofiler import web diff --git a/ironic/tests/unit/cmd/test_conductor.py b/ironic/tests/unit/cmd/test_conductor.py index 8de4ebb40..ef0f8b085 100644 --- a/ironic/tests/unit/cmd/test_conductor.py +++ b/ironic/tests/unit/cmd/test_conductor.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_config import cfg from ironic.cmd import conductor diff --git a/ironic/tests/unit/cmd/test_dbsync.py b/ironic/tests/unit/cmd/test_dbsync.py index f1f9e05b9..530b576e8 100644 --- a/ironic/tests/unit/cmd/test_dbsync.py +++ b/ironic/tests/unit/cmd/test_dbsync.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from ironic.cmd import dbsync from ironic.common import context diff --git a/ironic/tests/unit/cmd/test_status.py b/ironic/tests/unit/cmd/test_status.py index aa4a5258b..f776e2d51 100644 --- a/ironic/tests/unit/cmd/test_status.py +++ b/ironic/tests/unit/cmd/test_status.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_upgradecheck.upgradecheck import Code from ironic.cmd import dbsync diff --git a/ironic/tests/unit/common/test_cinder.py b/ironic/tests/unit/common/test_cinder.py index db5a96fbb..5768cf20b 100644 --- a/ironic/tests/unit/common/test_cinder.py +++ b/ironic/tests/unit/common/test_cinder.py @@ -14,10 +14,10 @@ import datetime from http import client as http_client import json +from unittest import mock from cinderclient import exceptions as cinder_exceptions import cinderclient.v3 as cinderclient -import mock from oslo_utils import uuidutils from ironic.common import cinder diff --git a/ironic/tests/unit/common/test_context.py b/ironic/tests/unit/common/test_context.py index eb035deb6..b04613076 100644 --- a/ironic/tests/unit/common/test_context.py +++ b/ironic/tests/unit/common/test_context.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_context import context as oslo_context from ironic.common import context @@ -49,7 +50,7 @@ class RequestContextTestCase(tests_base.TestCase): {'project_name': 'demo', 'is_public_api': True, 'domain_id': 'meow'}) self.assertEqual('demo', test_context.project_name) - self.assertEqual('meow', test_context.user_domain) + self.assertEqual('meow', test_context.user_domain_id) self.assertTrue(test_context.is_public_api) def test_to_policy_values(self): diff --git a/ironic/tests/unit/common/test_driver_factory.py b/ironic/tests/unit/common/test_driver_factory.py index fdf14e9fd..682622eec 100644 --- a/ironic/tests/unit/common/test_driver_factory.py +++ b/ironic/tests/unit/common/test_driver_factory.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from stevedore import named diff --git a/ironic/tests/unit/common/test_glance_service.py b/ironic/tests/unit/common/test_glance_service.py index 02e4914bc..c8532d1b8 100644 --- a/ironic/tests/unit/common/test_glance_service.py +++ b/ironic/tests/unit/common/test_glance_service.py @@ -17,11 +17,11 @@ import datetime import importlib import time +from unittest import mock from glanceclient import client as glance_client from glanceclient import exc as glance_exc from keystoneauth1 import loading as kaloading -import mock from oslo_config import cfg from oslo_utils import uuidutils import retrying diff --git a/ironic/tests/unit/common/test_image_service.py b/ironic/tests/unit/common/test_image_service.py index bc0d391b6..d59c1a4bc 100644 --- a/ironic/tests/unit/common/test_image_service.py +++ b/ironic/tests/unit/common/test_image_service.py @@ -16,8 +16,8 @@ from http import client as http_client import io import os import shutil +from unittest import mock -import mock from oslo_utils import uuidutils import requests import sendfile diff --git a/ironic/tests/unit/common/test_images.py b/ironic/tests/unit/common/test_images.py index 9aa711f87..437bb41ef 100644 --- a/ironic/tests/unit/common/test_images.py +++ b/ironic/tests/unit/common/test_images.py @@ -19,10 +19,10 @@ import builtins import io import os import shutil +from unittest import mock from ironic_lib import disk_utils from ironic_lib import utils as ironic_utils -import mock from oslo_concurrency import processutils from oslo_config import cfg diff --git a/ironic/tests/unit/common/test_json_rpc.py b/ironic/tests/unit/common/test_json_rpc.py index 7924ffb86..0f5020bdd 100644 --- a/ironic/tests/unit/common/test_json_rpc.py +++ b/ironic/tests/unit/common/test_json_rpc.py @@ -10,8 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import fixtures -import mock import oslo_messaging import webob diff --git a/ironic/tests/unit/common/test_keystone.py b/ironic/tests/unit/common/test_keystone.py index 596b6a7fe..ffc08a7f7 100644 --- a/ironic/tests/unit/common/test_keystone.py +++ b/ironic/tests/unit/common/test_keystone.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from keystoneauth1 import loading as kaloading -import mock from oslo_config import cfg from oslo_config import fixture diff --git a/ironic/tests/unit/common/test_network.py b/ironic/tests/unit/common/test_network.py index e6ffcd08c..69b17b01b 100644 --- a/ironic/tests/unit/common/test_network.py +++ b/ironic/tests/unit/common/test_network.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from ironic.common import exception diff --git a/ironic/tests/unit/common/test_neutron.py b/ironic/tests/unit/common/test_neutron.py index 81d8c99be..02c989331 100644 --- a/ironic/tests/unit/common/test_neutron.py +++ b/ironic/tests/unit/common/test_neutron.py @@ -12,9 +12,9 @@ import copy import time +from unittest import mock from keystoneauth1 import loading as kaloading -import mock from neutronclient.common import exceptions as neutron_client_exc from neutronclient.v2_0 import client from oslo_utils import uuidutils diff --git a/ironic/tests/unit/common/test_nova.py b/ironic/tests/unit/common/test_nova.py index 1d63b4fb5..7a3c300c8 100644 --- a/ironic/tests/unit/common/test_nova.py +++ b/ironic/tests/unit/common/test_nova.py @@ -10,13 +10,12 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock import ddt from keystoneauth1 import exceptions as kaexception -import mock import requests - from ironic.common import context from ironic.common import keystone from ironic.common import nova diff --git a/ironic/tests/unit/common/test_policy.py b/ironic/tests/unit/common/test_policy.py index 046706554..67e3ea4d2 100644 --- a/ironic/tests/unit/common/test_policy.py +++ b/ironic/tests/unit/common/test_policy.py @@ -16,8 +16,8 @@ # under the License. import sys +from unittest import mock -import mock from oslo_config import cfg from oslo_policy import policy as oslo_policy diff --git a/ironic/tests/unit/common/test_pxe_utils.py b/ironic/tests/unit/common/test_pxe_utils.py index 6950bfe8a..9fcbb477a 100644 --- a/ironic/tests/unit/common/test_pxe_utils.py +++ b/ironic/tests/unit/common/test_pxe_utils.py @@ -16,9 +16,9 @@ import os import tempfile +from unittest import mock from ironic_lib import utils as ironic_utils -import mock from oslo_config import cfg from oslo_utils import fileutils from oslo_utils import uuidutils diff --git a/ironic/tests/unit/common/test_release_mappings.py b/ironic/tests/unit/common/test_release_mappings.py index db3f18f85..2231d0be5 100644 --- a/ironic/tests/unit/common/test_release_mappings.py +++ b/ironic/tests/unit/common/test_release_mappings.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_utils import versionutils from ironic.api.controllers.v1 import versions as api_versions diff --git a/ironic/tests/unit/common/test_rpc.py b/ironic/tests/unit/common/test_rpc.py index 6cb25098d..1cf8fa787 100644 --- a/ironic/tests/unit/common/test_rpc.py +++ b/ironic/tests/unit/common/test_rpc.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_config import cfg import oslo_messaging as messaging diff --git a/ironic/tests/unit/common/test_rpc_service.py b/ironic/tests/unit/common/test_rpc_service.py index 755df4f81..ec440324c 100644 --- a/ironic/tests/unit/common/test_rpc_service.py +++ b/ironic/tests/unit/common/test_rpc_service.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_config import cfg import oslo_messaging from oslo_service import service as base_service diff --git a/ironic/tests/unit/common/test_swift.py b/ironic/tests/unit/common/test_swift.py index cb53d16ba..44103ea69 100644 --- a/ironic/tests/unit/common/test_swift.py +++ b/ironic/tests/unit/common/test_swift.py @@ -15,8 +15,8 @@ import builtins from http import client as http_client import io +from unittest import mock -import mock from oslo_config import cfg from swiftclient import client as swift_client from swiftclient import exceptions as swift_exception diff --git a/ironic/tests/unit/common/test_utils.py b/ironic/tests/unit/common/test_utils.py index 0a652435d..df60b88ca 100644 --- a/ironic/tests/unit/common/test_utils.py +++ b/ironic/tests/unit/common/test_utils.py @@ -19,9 +19,9 @@ import os import os.path import shutil import tempfile +from unittest import mock import jinja2 -import mock from oslo_concurrency import processutils from oslo_config import cfg from oslo_utils import netutils diff --git a/ironic/tests/unit/common/test_wsgi_service.py b/ironic/tests/unit/common/test_wsgi_service.py index a489c869b..5af26bf37 100644 --- a/ironic/tests/unit/common/test_wsgi_service.py +++ b/ironic/tests/unit/common/test_wsgi_service.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_concurrency import processutils from oslo_config import cfg diff --git a/ironic/tests/unit/conductor/mgr_utils.py b/ironic/tests/unit/conductor/mgr_utils.py index 44e492462..e5bc43bcb 100644 --- a/ironic/tests/unit/conductor/mgr_utils.py +++ b/ironic/tests/unit/conductor/mgr_utils.py @@ -17,8 +17,9 @@ """Test utils for Ironic Managers.""" +from unittest import mock + from futurist import periodics -import mock from oslo_utils import strutils from oslo_utils import uuidutils diff --git a/ironic/tests/unit/conductor/test_allocations.py b/ironic/tests/unit/conductor/test_allocations.py index 18b6025bf..91046b72f 100644 --- a/ironic/tests/unit/conductor/test_allocations.py +++ b/ironic/tests/unit/conductor/test_allocations.py @@ -12,7 +12,8 @@ """Unit tests for functionality related to allocations.""" -import mock +from unittest import mock + import oslo_messaging as messaging from oslo_utils import uuidutils diff --git a/ironic/tests/unit/conductor/test_base_manager.py b/ironic/tests/unit/conductor/test_base_manager.py index 49cacbff5..f36e3d91a 100644 --- a/ironic/tests/unit/conductor/test_base_manager.py +++ b/ironic/tests/unit/conductor/test_base_manager.py @@ -13,13 +13,13 @@ """Test class for Ironic BaseConductorManager.""" import collections +from unittest import mock import uuid import eventlet import futurist from futurist import periodics from ironic_lib import mdns -import mock from oslo_config import cfg from oslo_db import exception as db_exception from oslo_utils import uuidutils diff --git a/ironic/tests/unit/conductor/test_cleaning.py b/ironic/tests/unit/conductor/test_cleaning.py index f48fee047..d504fb940 100644 --- a/ironic/tests/unit/conductor/test_cleaning.py +++ b/ironic/tests/unit/conductor/test_cleaning.py @@ -12,7 +12,8 @@ """Tests for cleaning bits.""" -import mock +from unittest import mock + from oslo_config import cfg from oslo_utils import uuidutils diff --git a/ironic/tests/unit/conductor/test_deployments.py b/ironic/tests/unit/conductor/test_deployments.py index bbac17652..985cdcebc 100644 --- a/ironic/tests/unit/conductor/test_deployments.py +++ b/ironic/tests/unit/conductor/test_deployments.py @@ -13,7 +13,8 @@ """Tests for deployment aspects of the conductor.""" -import mock +from unittest import mock + from oslo_config import cfg from oslo_db import exception as db_exception from oslo_utils import uuidutils diff --git a/ironic/tests/unit/conductor/test_manager.py b/ironic/tests/unit/conductor/test_manager.py index 708cf452c..897119eab 100644 --- a/ironic/tests/unit/conductor/test_manager.py +++ b/ironic/tests/unit/conductor/test_manager.py @@ -22,10 +22,10 @@ from collections import namedtuple import datetime import queue import re +from unittest import mock import eventlet from futurist import waiters -import mock from oslo_config import cfg import oslo_messaging as messaging from oslo_utils import uuidutils diff --git a/ironic/tests/unit/conductor/test_notification_utils.py b/ironic/tests/unit/conductor/test_notification_utils.py index 8ef8780d3..cc8fe5320 100644 --- a/ironic/tests/unit/conductor/test_notification_utils.py +++ b/ironic/tests/unit/conductor/test_notification_utils.py @@ -15,7 +15,8 @@ """Test class for ironic-conductor notification utilities.""" -import mock +from unittest import mock + from oslo_versionedobjects.exception import VersionedObjectsException from ironic.common import exception diff --git a/ironic/tests/unit/conductor/test_rpcapi.py b/ironic/tests/unit/conductor/test_rpcapi.py index a4d327398..31f9811f4 100644 --- a/ironic/tests/unit/conductor/test_rpcapi.py +++ b/ironic/tests/unit/conductor/test_rpcapi.py @@ -19,8 +19,8 @@ Unit Tests for :py:class:`ironic.conductor.rpcapi.ConductorAPI`. """ import copy +from unittest import mock -import mock from oslo_config import cfg import oslo_messaging as messaging from oslo_messaging import _utils as messaging_utils diff --git a/ironic/tests/unit/conductor/test_steps.py b/ironic/tests/unit/conductor/test_steps.py index cc7c8af47..afdaaa5a9 100644 --- a/ironic/tests/unit/conductor/test_steps.py +++ b/ironic/tests/unit/conductor/test_steps.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_config import cfg from oslo_utils import uuidutils diff --git a/ironic/tests/unit/conductor/test_task_manager.py b/ironic/tests/unit/conductor/test_task_manager.py index 1cb61441f..d0c547f40 100644 --- a/ironic/tests/unit/conductor/test_task_manager.py +++ b/ironic/tests/unit/conductor/test_task_manager.py @@ -17,8 +17,9 @@ """Tests for :class:`ironic.conductor.task_manager`.""" +from unittest import mock + import futurist -import mock from oslo_utils import uuidutils from ironic.common import driver_factory diff --git a/ironic/tests/unit/conductor/test_utils.py b/ironic/tests/unit/conductor/test_utils.py index 2ec5649c6..e72935e54 100644 --- a/ironic/tests/unit/conductor/test_utils.py +++ b/ironic/tests/unit/conductor/test_utils.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. import time +from unittest import mock -import mock from oslo_config import cfg from oslo_utils import timeutils from oslo_utils import uuidutils diff --git a/ironic/tests/unit/db/sqlalchemy/test_migrations.py b/ironic/tests/unit/db/sqlalchemy/test_migrations.py index 7aed87626..f4b4708fc 100644 --- a/ironic/tests/unit/db/sqlalchemy/test_migrations.py +++ b/ironic/tests/unit/db/sqlalchemy/test_migrations.py @@ -36,10 +36,10 @@ For postgres on Ubuntu this can be done with the following commands: import collections import contextlib +from unittest import mock from alembic import script import fixtures -import mock from oslo_db import exception as db_exc from oslo_db.sqlalchemy import enginefacade from oslo_db.sqlalchemy import test_fixtures diff --git a/ironic/tests/unit/db/test_api.py b/ironic/tests/unit/db/test_api.py index ed640e9cd..f855e9c91 100644 --- a/ironic/tests/unit/db/test_api.py +++ b/ironic/tests/unit/db/test_api.py @@ -11,8 +11,8 @@ # under the License. import random +from unittest import mock -import mock from oslo_db.sqlalchemy import utils as db_utils from oslo_utils import uuidutils from testtools import matchers diff --git a/ironic/tests/unit/db/test_conductor.py b/ironic/tests/unit/db/test_conductor.py index 1ae38de88..bb7832b99 100644 --- a/ironic/tests/unit/db/test_conductor.py +++ b/ironic/tests/unit/db/test_conductor.py @@ -16,8 +16,8 @@ """Tests for manipulating Conductors via the DB API""" import datetime +from unittest import mock -import mock import oslo_db from oslo_db import exception as db_exc from oslo_db import sqlalchemy diff --git a/ironic/tests/unit/db/test_nodes.py b/ironic/tests/unit/db/test_nodes.py index 88200bf99..79b0529fa 100644 --- a/ironic/tests/unit/db/test_nodes.py +++ b/ironic/tests/unit/db/test_nodes.py @@ -16,8 +16,8 @@ """Tests for manipulating Nodes via the DB API""" import datetime +from unittest import mock -import mock from oslo_utils import timeutils from oslo_utils import uuidutils diff --git a/ironic/tests/unit/dhcp/test_factory.py b/ironic/tests/unit/dhcp/test_factory.py index bda6bed0e..008efefce 100644 --- a/ironic/tests/unit/dhcp/test_factory.py +++ b/ironic/tests/unit/dhcp/test_factory.py @@ -14,8 +14,8 @@ # under the License. import inspect +from unittest import mock -import mock import stevedore from ironic.common import dhcp_factory diff --git a/ironic/tests/unit/dhcp/test_neutron.py b/ironic/tests/unit/dhcp/test_neutron.py index 391b1cf74..e4091c58b 100644 --- a/ironic/tests/unit/dhcp/test_neutron.py +++ b/ironic/tests/unit/dhcp/test_neutron.py @@ -14,7 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from neutronclient.common import exceptions as neutron_client_exc from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/ansible/test_deploy.py b/ironic/tests/unit/drivers/modules/ansible/test_deploy.py index 95741d02e..5e302d0d5 100644 --- a/ironic/tests/unit/drivers/modules/ansible/test_deploy.py +++ b/ironic/tests/unit/drivers/modules/ansible/test_deploy.py @@ -11,9 +11,9 @@ # limitations under the License. import json +from unittest import mock from ironic_lib import utils as irlib_utils -import mock from oslo_concurrency import processutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/drac/test_bios.py b/ironic/tests/unit/drivers/modules/drac/test_bios.py index 2c59f9f52..6fdca0684 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_bios.py +++ b/ironic/tests/unit/drivers/modules/drac/test_bios.py @@ -19,8 +19,9 @@ Test class for DRAC BIOS configuration specific methods """ +from unittest import mock + from dracclient import exceptions as drac_exceptions -import mock from ironic.common import exception from ironic.common import states diff --git a/ironic/tests/unit/drivers/modules/drac/test_boot.py b/ironic/tests/unit/drivers/modules/drac/test_boot.py index ec8ae4fe6..d73ef69d7 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_boot.py +++ b/ironic/tests/unit/drivers/modules/drac/test_boot.py @@ -18,7 +18,8 @@ Test class for DRAC boot interface """ -import mock +from unittest import mock + from oslo_utils import importutils from ironic.common import boot_devices diff --git a/ironic/tests/unit/drivers/modules/drac/test_common.py b/ironic/tests/unit/drivers/modules/drac/test_common.py index 6863ed564..cc1baee28 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_common.py +++ b/ironic/tests/unit/drivers/modules/drac/test_common.py @@ -15,8 +15,9 @@ Test class for common methods used by DRAC modules. """ +from unittest import mock + import dracclient.client -import mock from ironic.common import exception from ironic.drivers.modules.drac import common as drac_common diff --git a/ironic/tests/unit/drivers/modules/drac/test_inspect.py b/ironic/tests/unit/drivers/modules/drac/test_inspect.py index e76b351f2..628f3c855 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_inspect.py +++ b/ironic/tests/unit/drivers/modules/drac/test_inspect.py @@ -15,8 +15,9 @@ Test class for DRAC inspection interface """ +from unittest import mock + from dracclient import exceptions as drac_exceptions -import mock from ironic.common import exception from ironic.common import states diff --git a/ironic/tests/unit/drivers/modules/drac/test_job.py b/ironic/tests/unit/drivers/modules/drac/test_job.py index 5a68c8d5e..a0ea526cb 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_job.py +++ b/ironic/tests/unit/drivers/modules/drac/test_job.py @@ -15,8 +15,9 @@ Test class for DRAC job specific methods """ +from unittest import mock + from dracclient import exceptions as drac_exceptions -import mock from ironic.common import exception from ironic.conductor import task_manager diff --git a/ironic/tests/unit/drivers/modules/drac/test_management.py b/ironic/tests/unit/drivers/modules/drac/test_management.py index 74f2ea372..29b7e445b 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_management.py +++ b/ironic/tests/unit/drivers/modules/drac/test_management.py @@ -20,7 +20,8 @@ Test class for DRAC management interface """ -import mock +from unittest import mock + from oslo_utils import importutils import ironic.common.boot_devices diff --git a/ironic/tests/unit/drivers/modules/drac/test_periodic_task.py b/ironic/tests/unit/drivers/modules/drac/test_periodic_task.py index a4392f269..47defd1a9 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_periodic_task.py +++ b/ironic/tests/unit/drivers/modules/drac/test_periodic_task.py @@ -15,7 +15,7 @@ Test class for DRAC periodic tasks """ -import mock +from unittest import mock from ironic.conductor import task_manager from ironic.conductor import utils as manager_utils diff --git a/ironic/tests/unit/drivers/modules/drac/test_power.py b/ironic/tests/unit/drivers/modules/drac/test_power.py index 4c442ba6f..f56930e21 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_power.py +++ b/ironic/tests/unit/drivers/modules/drac/test_power.py @@ -15,9 +15,10 @@ Test class for DRAC power interface """ +from unittest import mock + from dracclient import constants as drac_constants from dracclient import exceptions as drac_exceptions -import mock from ironic.common import exception from ironic.common import states diff --git a/ironic/tests/unit/drivers/modules/drac/test_raid.py b/ironic/tests/unit/drivers/modules/drac/test_raid.py index 1cb50f129..5a9a26e9b 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_raid.py +++ b/ironic/tests/unit/drivers/modules/drac/test_raid.py @@ -15,9 +15,10 @@ Test class for DRAC RAID interface """ +from unittest import mock + from dracclient import constants from dracclient import exceptions as drac_exceptions -import mock from ironic.common import exception from ironic.common import states diff --git a/ironic/tests/unit/drivers/modules/ibmc/base.py b/ironic/tests/unit/drivers/modules/ibmc/base.py index cb337207e..158f510bb 100644 --- a/ironic/tests/unit/drivers/modules/ibmc/base.py +++ b/ironic/tests/unit/drivers/modules/ibmc/base.py @@ -12,7 +12,7 @@ # under the License. """Test base class for iBMC Driver.""" -import mock +from unittest import mock from ironic.drivers.modules.ibmc import utils from ironic.tests.unit.db import base as db_base diff --git a/ironic/tests/unit/drivers/modules/ibmc/test_management.py b/ironic/tests/unit/drivers/modules/ibmc/test_management.py index d45a23304..b4fe14040 100644 --- a/ironic/tests/unit/drivers/modules/ibmc/test_management.py +++ b/ironic/tests/unit/drivers/modules/ibmc/test_management.py @@ -13,8 +13,8 @@ """Test class for iBMC Management interface.""" import itertools +from unittest import mock -import mock from oslo_utils import importutils from ironic.common import boot_devices diff --git a/ironic/tests/unit/drivers/modules/ibmc/test_power.py b/ironic/tests/unit/drivers/modules/ibmc/test_power.py index d7d68a704..681853a94 100644 --- a/ironic/tests/unit/drivers/modules/ibmc/test_power.py +++ b/ironic/tests/unit/drivers/modules/ibmc/test_power.py @@ -12,7 +12,8 @@ # under the License. """Test class for iBMC Power interface.""" -import mock +from unittest import mock + from oslo_utils import importutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/ibmc/test_utils.py b/ironic/tests/unit/drivers/modules/ibmc/test_utils.py index 87df0e6e0..40f0fd2c3 100644 --- a/ironic/tests/unit/drivers/modules/ibmc/test_utils.py +++ b/ironic/tests/unit/drivers/modules/ibmc/test_utils.py @@ -14,8 +14,8 @@ import copy import os +from unittest import mock -import mock from oslo_utils import importutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/ibmc/test_vendor.py b/ironic/tests/unit/drivers/modules/ibmc/test_vendor.py index f4e6e99d3..ef693e765 100644 --- a/ironic/tests/unit/drivers/modules/ibmc/test_vendor.py +++ b/ironic/tests/unit/drivers/modules/ibmc/test_vendor.py @@ -12,7 +12,8 @@ # under the License. """Test class for iBMC vendor interface.""" -import mock +from unittest import mock + from oslo_utils import importutils from ironic.conductor import task_manager diff --git a/ironic/tests/unit/drivers/modules/ilo/test_bios.py b/ironic/tests/unit/drivers/modules/ilo/test_bios.py index f3c69a752..b65df2f88 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_bios.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_bios.py @@ -15,7 +15,8 @@ """Test class for IloPower module.""" -import mock +from unittest import mock + from oslo_config import cfg from oslo_utils import importutils diff --git a/ironic/tests/unit/drivers/modules/ilo/test_boot.py b/ironic/tests/unit/drivers/modules/ilo/test_boot.py index 056467ad2..f348dd52a 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_boot.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_boot.py @@ -17,9 +17,9 @@ import io import tempfile +from unittest import mock from ironic_lib import utils as ironic_utils -import mock from oslo_config import cfg from ironic.common import boot_devices diff --git a/ironic/tests/unit/drivers/modules/ilo/test_common.py b/ironic/tests/unit/drivers/modules/ilo/test_common.py index 466f35a0c..f06e21af3 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_common.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_common.py @@ -21,9 +21,9 @@ import io import os import shutil import tempfile +from unittest import mock from ironic_lib import utils as ironic_utils -import mock from oslo_config import cfg from oslo_utils import importutils from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/ilo/test_console.py b/ironic/tests/unit/drivers/modules/ilo/test_console.py index 2db07c0b2..082a39e78 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_console.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_console.py @@ -15,7 +15,7 @@ """Test class for common methods used by iLO modules.""" -import mock +from unittest import mock from ironic.common import exception from ironic.conductor import task_manager diff --git a/ironic/tests/unit/drivers/modules/ilo/test_firmware_processor.py b/ironic/tests/unit/drivers/modules/ilo/test_firmware_processor.py index 89aa96f9f..2182e2b9a 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_firmware_processor.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_firmware_processor.py @@ -16,9 +16,10 @@ import builtins import io +from unittest import mock from urllib import parse as urlparse -import mock + from oslo_utils import importutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/ilo/test_inspect.py b/ironic/tests/unit/drivers/modules/ilo/test_inspect.py index deb3f2e2d..a10c34bd9 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_inspect.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_inspect.py @@ -15,7 +15,7 @@ """Test class for Management Interface used by iLO modules.""" -import mock +from unittest import mock from ironic.common import exception from ironic.common import states diff --git a/ironic/tests/unit/drivers/modules/ilo/test_management.py b/ironic/tests/unit/drivers/modules/ilo/test_management.py index fd59abbce..396df5ebe 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_management.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_management.py @@ -14,7 +14,8 @@ """Test class for Management Interface used by iLO modules.""" -import mock +from unittest import mock + from oslo_utils import importutils from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/ilo/test_power.py b/ironic/tests/unit/drivers/modules/ilo/test_power.py index 3fe38da97..ded22bd6c 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_power.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_power.py @@ -15,7 +15,8 @@ """Test class for IloPower module.""" -import mock +from unittest import mock + from oslo_config import cfg from oslo_utils import importutils from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/ilo/test_raid.py b/ironic/tests/unit/drivers/modules/ilo/test_raid.py index 7e89c2160..6485b5d1e 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_raid.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_raid.py @@ -14,7 +14,8 @@ """Test class for Raid Interface used by iLO5.""" -import mock +from unittest import mock + from oslo_utils import importutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/ilo/test_vendor.py b/ironic/tests/unit/drivers/modules/ilo/test_vendor.py index 2a9ebc61f..05a735d21 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_vendor.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_vendor.py @@ -15,7 +15,7 @@ """Test class for vendor methods used by iLO modules.""" -import mock +from unittest import mock from ironic.common import exception from ironic.common import states diff --git a/ironic/tests/unit/drivers/modules/intel_ipmi/test_management.py b/ironic/tests/unit/drivers/modules/intel_ipmi/test_management.py index 589906777..c42bfa9ec 100644 --- a/ironic/tests/unit/drivers/modules/intel_ipmi/test_management.py +++ b/ironic/tests/unit/drivers/modules/intel_ipmi/test_management.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from ironic.common import exception from ironic.conductor import task_manager diff --git a/ironic/tests/unit/drivers/modules/irmc/test_bios.py b/ironic/tests/unit/drivers/modules/irmc/test_bios.py index 9876317f8..093bcdea4 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_bios.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_bios.py @@ -16,7 +16,7 @@ Test class for IRMC BIOS configuration """ -import mock +from unittest import mock from ironic.common import exception from ironic.conductor import task_manager diff --git a/ironic/tests/unit/drivers/modules/irmc/test_boot.py b/ironic/tests/unit/drivers/modules/irmc/test_boot.py index fd83b8cc8..389cdc6c5 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_boot.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_boot.py @@ -20,9 +20,9 @@ import io import os import shutil import tempfile +from unittest import mock from ironic_lib import utils as ironic_utils -import mock from oslo_config import cfg from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/irmc/test_common.py b/ironic/tests/unit/drivers/modules/irmc/test_common.py index 11c0da446..3f0c3d94a 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_common.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_common.py @@ -16,7 +16,8 @@ Test class for common methods used by iRMC modules. """ -import mock +from unittest import mock + from oslo_config import cfg from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/irmc/test_inspect.py b/ironic/tests/unit/drivers/modules/irmc/test_inspect.py index b0bd206a3..0a6eeb399 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_inspect.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_inspect.py @@ -16,7 +16,7 @@ Test class for iRMC Inspection Driver """ -import mock +from unittest import mock from ironic.common import exception from ironic.common import states diff --git a/ironic/tests/unit/drivers/modules/irmc/test_management.py b/ironic/tests/unit/drivers/modules/irmc/test_management.py index e1c3fcc42..c4b152ae9 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_management.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_management.py @@ -17,10 +17,9 @@ Test class for iRMC Management Driver """ import os +from unittest import mock import xml.etree.ElementTree as ET -import mock - from ironic.common import boot_devices from ironic.common import exception from ironic.common import states diff --git a/ironic/tests/unit/drivers/modules/irmc/test_periodic_task.py b/ironic/tests/unit/drivers/modules/irmc/test_periodic_task.py index 15575523c..52230259d 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_periodic_task.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_periodic_task.py @@ -16,7 +16,8 @@ Test class for iRMC periodic tasks """ -import mock +from unittest import mock + from oslo_utils import uuidutils from ironic.conductor import task_manager diff --git a/ironic/tests/unit/drivers/modules/irmc/test_power.py b/ironic/tests/unit/drivers/modules/irmc/test_power.py index dfc112c8c..db335e941 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_power.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_power.py @@ -16,7 +16,7 @@ Test class for iRMC Power Driver """ -import mock +from unittest import mock from ironic.common import exception from ironic.common import states diff --git a/ironic/tests/unit/drivers/modules/irmc/test_raid.py b/ironic/tests/unit/drivers/modules/irmc/test_raid.py index 8dc2421ed..7698c256a 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_raid.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_raid.py @@ -16,7 +16,7 @@ Test class for IRMC RAID configuration """ -import mock +from unittest import mock from ironic.common import exception from ironic.conductor import task_manager diff --git a/ironic/tests/unit/drivers/modules/network/test_common.py b/ironic/tests/unit/drivers/modules/network/test_common.py index eedd907f6..d2d4b6bb3 100644 --- a/ironic/tests/unit/drivers/modules/network/test_common.py +++ b/ironic/tests/unit/drivers/modules/network/test_common.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_config import cfg from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/network/test_flat.py b/ironic/tests/unit/drivers/modules/network/test_flat.py index 186827166..81f2f7e4a 100644 --- a/ironic/tests/unit/drivers/modules/network/test_flat.py +++ b/ironic/tests/unit/drivers/modules/network/test_flat.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from neutronclient.common import exceptions as neutron_exceptions from oslo_config import cfg from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/network/test_neutron.py b/ironic/tests/unit/drivers/modules/network/test_neutron.py index 2d083a740..21767f75c 100644 --- a/ironic/tests/unit/drivers/modules/network/test_neutron.py +++ b/ironic/tests/unit/drivers/modules/network/test_neutron.py @@ -11,8 +11,8 @@ # under the License. import copy +from unittest import mock -import mock from neutronclient.common import exceptions as neutron_exceptions from oslo_config import cfg from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/redfish/test_bios.py b/ironic/tests/unit/drivers/modules/redfish/test_bios.py index 0dc770c7c..4f964461d 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_bios.py +++ b/ironic/tests/unit/drivers/modules/redfish/test_bios.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_utils import importutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/redfish/test_boot.py b/ironic/tests/unit/drivers/modules/redfish/test_boot.py index 5558996ca..e21734951 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_boot.py +++ b/ironic/tests/unit/drivers/modules/redfish/test_boot.py @@ -14,8 +14,8 @@ # under the License. import os +from unittest import mock -import mock from oslo_utils import importutils from ironic.common import boot_devices diff --git a/ironic/tests/unit/drivers/modules/redfish/test_inspect.py b/ironic/tests/unit/drivers/modules/redfish/test_inspect.py index 776a68bae..251d5bd91 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_inspect.py +++ b/ironic/tests/unit/drivers/modules/redfish/test_inspect.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_utils import importutils from oslo_utils import units diff --git a/ironic/tests/unit/drivers/modules/redfish/test_management.py b/ironic/tests/unit/drivers/modules/redfish/test_management.py index c8a37951a..2336a64e3 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_management.py +++ b/ironic/tests/unit/drivers/modules/redfish/test_management.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_utils import importutils from ironic.common import boot_devices diff --git a/ironic/tests/unit/drivers/modules/redfish/test_power.py b/ironic/tests/unit/drivers/modules/redfish/test_power.py index 09068df24..932d44af8 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_power.py +++ b/ironic/tests/unit/drivers/modules/redfish/test_power.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_utils import importutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/redfish/test_utils.py b/ironic/tests/unit/drivers/modules/redfish/test_utils.py index 7107a8ab2..794982bba 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_utils.py +++ b/ironic/tests/unit/drivers/modules/redfish/test_utils.py @@ -16,8 +16,8 @@ import collections import copy import os +from unittest import mock -import mock from oslo_config import cfg from oslo_utils import importutils import requests diff --git a/ironic/tests/unit/drivers/modules/storage/test_cinder.py b/ironic/tests/unit/drivers/modules/storage/test_cinder.py index 02f2a56f2..6ec9c317f 100644 --- a/ironic/tests/unit/drivers/modules/storage/test_cinder.py +++ b/ironic/tests/unit/drivers/modules/storage/test_cinder.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from ironic.common import cinder as cinder_common diff --git a/ironic/tests/unit/drivers/modules/storage/test_external.py b/ironic/tests/unit/drivers/modules/storage/test_external.py index 50b478d31..30b60bec4 100644 --- a/ironic/tests/unit/drivers/modules/storage/test_external.py +++ b/ironic/tests/unit/drivers/modules/storage/test_external.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from ironic.common import exception from ironic.conductor import task_manager diff --git a/ironic/tests/unit/drivers/modules/test_agent.py b/ironic/tests/unit/drivers/modules/test_agent.py index 590a22e08..7d6406c8a 100644 --- a/ironic/tests/unit/drivers/modules/test_agent.py +++ b/ironic/tests/unit/drivers/modules/test_agent.py @@ -13,8 +13,8 @@ # limitations under the License. import types +from unittest import mock -import mock from oslo_config import cfg from ironic.common import dhcp_factory diff --git a/ironic/tests/unit/drivers/modules/test_agent_base.py b/ironic/tests/unit/drivers/modules/test_agent_base.py index 4f7ce9a1f..e260415d0 100644 --- a/ironic/tests/unit/drivers/modules/test_agent_base.py +++ b/ironic/tests/unit/drivers/modules/test_agent_base.py @@ -15,8 +15,8 @@ import time import types +from unittest import mock -import mock from oslo_config import cfg from testtools import matchers diff --git a/ironic/tests/unit/drivers/modules/test_agent_client.py b/ironic/tests/unit/drivers/modules/test_agent_client.py index 1bea74188..4fdf20a88 100644 --- a/ironic/tests/unit/drivers/modules/test_agent_client.py +++ b/ironic/tests/unit/drivers/modules/test_agent_client.py @@ -14,8 +14,8 @@ from http import client as http_client import json +from unittest import mock -import mock import requests import retrying diff --git a/ironic/tests/unit/drivers/modules/test_boot_mode_utils.py b/ironic/tests/unit/drivers/modules/test_boot_mode_utils.py index 11b5b5f7b..b4a39b0eb 100644 --- a/ironic/tests/unit/drivers/modules/test_boot_mode_utils.py +++ b/ironic/tests/unit/drivers/modules/test_boot_mode_utils.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from ironic.common import boot_modes from ironic.drivers.modules import boot_mode_utils diff --git a/ironic/tests/unit/drivers/modules/test_console_utils.py b/ironic/tests/unit/drivers/modules/test_console_utils.py index a3cd142ad..94e8a260d 100644 --- a/ironic/tests/unit/drivers/modules/test_console_utils.py +++ b/ironic/tests/unit/drivers/modules/test_console_utils.py @@ -26,9 +26,9 @@ import string import subprocess import tempfile import time +from unittest import mock from ironic_lib import utils as ironic_utils -import mock from oslo_config import cfg from oslo_service import loopingcall from oslo_utils import netutils diff --git a/ironic/tests/unit/drivers/modules/test_deploy_utils.py b/ironic/tests/unit/drivers/modules/test_deploy_utils.py index a39b33a35..4845da65f 100644 --- a/ironic/tests/unit/drivers/modules/test_deploy_utils.py +++ b/ironic/tests/unit/drivers/modules/test_deploy_utils.py @@ -16,9 +16,9 @@ import os import tempfile +from unittest import mock import fixtures -import mock from oslo_config import cfg from oslo_utils import fileutils from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/test_image_cache.py b/ironic/tests/unit/drivers/modules/test_image_cache.py index bd57332fb..b70960ec1 100644 --- a/ironic/tests/unit/drivers/modules/test_image_cache.py +++ b/ironic/tests/unit/drivers/modules/test_image_cache.py @@ -20,9 +20,9 @@ import datetime import os import tempfile import time +from unittest import mock import uuid -import mock from oslo_utils import uuidutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/test_inspect_utils.py b/ironic/tests/unit/drivers/modules/test_inspect_utils.py index c43e996ba..8b44dde5a 100644 --- a/ironic/tests/unit/drivers/modules/test_inspect_utils.py +++ b/ironic/tests/unit/drivers/modules/test_inspect_utils.py @@ -14,7 +14,8 @@ # under the License. -import mock +from unittest import mock + from oslo_utils import importutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/test_inspector.py b/ironic/tests/unit/drivers/modules/test_inspector.py index 857fd5765..c1f179ff7 100644 --- a/ironic/tests/unit/drivers/modules/test_inspector.py +++ b/ironic/tests/unit/drivers/modules/test_inspector.py @@ -10,8 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import eventlet -import mock import openstack from ironic.common import context diff --git a/ironic/tests/unit/drivers/modules/test_ipmitool.py b/ironic/tests/unit/drivers/modules/test_ipmitool.py index 6f7b2c513..1b232f5d1 100644 --- a/ironic/tests/unit/drivers/modules/test_ipmitool.py +++ b/ironic/tests/unit/drivers/modules/test_ipmitool.py @@ -28,10 +28,10 @@ import subprocess import tempfile import time import types +from unittest import mock import fixtures from ironic_lib import utils as ironic_utils -import mock from oslo_concurrency import processutils from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/test_ipxe.py b/ironic/tests/unit/drivers/modules/test_ipxe.py index cbec1bb0d..9479072cb 100644 --- a/ironic/tests/unit/drivers/modules/test_ipxe.py +++ b/ironic/tests/unit/drivers/modules/test_ipxe.py @@ -16,8 +16,8 @@ """Test class for iPXE driver.""" import os +from unittest import mock -import mock from oslo_config import cfg from oslo_serialization import jsonutils as json from oslo_utils import uuidutils diff --git a/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py b/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py index e723b3518..d980ef8ca 100644 --- a/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py +++ b/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py @@ -19,10 +19,10 @@ import os import tempfile import time import types +from unittest import mock from ironic_lib import disk_utils from ironic_lib import utils as ironic_utils -import mock from oslo_concurrency import processutils from oslo_config import cfg from oslo_utils import fileutils diff --git a/ironic/tests/unit/drivers/modules/test_noop.py b/ironic/tests/unit/drivers/modules/test_noop.py index f1db0bdf7..692b5aa04 100644 --- a/ironic/tests/unit/drivers/modules/test_noop.py +++ b/ironic/tests/unit/drivers/modules/test_noop.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import stevedore from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/test_noop_mgmt.py b/ironic/tests/unit/drivers/modules/test_noop_mgmt.py index c34b05fe3..78731e40e 100644 --- a/ironic/tests/unit/drivers/modules/test_noop_mgmt.py +++ b/ironic/tests/unit/drivers/modules/test_noop_mgmt.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from ironic.common import boot_devices from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/test_pxe.py b/ironic/tests/unit/drivers/modules/test_pxe.py index ed4fa2b63..e6d1aaacb 100644 --- a/ironic/tests/unit/drivers/modules/test_pxe.py +++ b/ironic/tests/unit/drivers/modules/test_pxe.py @@ -17,8 +17,8 @@ import os import tempfile +from unittest import mock -import mock from oslo_config import cfg from oslo_serialization import jsonutils as json from oslo_utils import timeutils diff --git a/ironic/tests/unit/drivers/modules/test_snmp.py b/ironic/tests/unit/drivers/modules/test_snmp.py index 5563cfe91..3272934d1 100644 --- a/ironic/tests/unit/drivers/modules/test_snmp.py +++ b/ironic/tests/unit/drivers/modules/test_snmp.py @@ -17,8 +17,8 @@ """Test class for SNMP power driver module.""" import time +from unittest import mock -import mock from oslo_config import cfg from pysnmp import error as snmp_error from pysnmp import hlapi as pysnmp diff --git a/ironic/tests/unit/drivers/modules/xclarity/test_common.py b/ironic/tests/unit/drivers/modules/xclarity/test_common.py index a7253bf8d..b4667534d 100644 --- a/ironic/tests/unit/drivers/modules/xclarity/test_common.py +++ b/ironic/tests/unit/drivers/modules/xclarity/test_common.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_utils import importutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/modules/xclarity/test_management.py b/ironic/tests/unit/drivers/modules/xclarity/test_management.py index d66da9b8f..883bcd5bc 100644 --- a/ironic/tests/unit/drivers/modules/xclarity/test_management.py +++ b/ironic/tests/unit/drivers/modules/xclarity/test_management.py @@ -15,8 +15,8 @@ import importlib import sys +from unittest import mock -import mock from oslo_utils import importutils from ironic.common import boot_devices diff --git a/ironic/tests/unit/drivers/modules/xclarity/test_power.py b/ironic/tests/unit/drivers/modules/xclarity/test_power.py index 86f1e3318..af4b85155 100644 --- a/ironic/tests/unit/drivers/modules/xclarity/test_power.py +++ b/ironic/tests/unit/drivers/modules/xclarity/test_power.py @@ -15,8 +15,8 @@ import importlib import sys +from unittest import mock -import mock from oslo_utils import importutils from ironic.common import exception diff --git a/ironic/tests/unit/drivers/test_base.py b/ironic/tests/unit/drivers/test_base.py index 19fca2067..d1e33b9b1 100644 --- a/ironic/tests/unit/drivers/test_base.py +++ b/ironic/tests/unit/drivers/test_base.py @@ -14,8 +14,7 @@ # under the License. import json - -import mock +from unittest import mock from ironic.common import components from ironic.common import exception diff --git a/ironic/tests/unit/drivers/test_generic.py b/ironic/tests/unit/drivers/test_generic.py index c8475aad6..6a1d07863 100644 --- a/ironic/tests/unit/drivers/test_generic.py +++ b/ironic/tests/unit/drivers/test_generic.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from ironic.common import driver_factory from ironic.common import exception diff --git a/ironic/tests/unit/drivers/test_snmp.py b/ironic/tests/unit/drivers/test_snmp.py index e2b941e48..10692383c 100644 --- a/ironic/tests/unit/drivers/test_snmp.py +++ b/ironic/tests/unit/drivers/test_snmp.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from ironic.conductor import task_manager from ironic.drivers.modules import fake diff --git a/ironic/tests/unit/drivers/test_utils.py b/ironic/tests/unit/drivers/test_utils.py index b09915704..28251601e 100644 --- a/ironic/tests/unit/drivers/test_utils.py +++ b/ironic/tests/unit/drivers/test_utils.py @@ -15,8 +15,8 @@ import datetime import os +from unittest import mock -import mock from oslo_config import cfg from oslo_utils import timeutils diff --git a/ironic/tests/unit/drivers/third_party_driver_mocks.py b/ironic/tests/unit/drivers/third_party_driver_mocks.py index 4dcd45e51..583db1b9e 100644 --- a/ironic/tests/unit/drivers/third_party_driver_mocks.py +++ b/ironic/tests/unit/drivers/third_party_driver_mocks.py @@ -31,8 +31,8 @@ Current list of mocked libraries: import importlib import sys +from unittest import mock -import mock from oslo_utils import importutils from ironic.drivers.modules import ipmitool diff --git a/ironic/tests/unit/objects/test_allocation.py b/ironic/tests/unit/objects/test_allocation.py index 33fffddb5..84ec56b81 100644 --- a/ironic/tests/unit/objects/test_allocation.py +++ b/ironic/tests/unit/objects/test_allocation.py @@ -11,8 +11,8 @@ # under the License. import datetime +from unittest import mock -import mock from testtools import matchers from ironic.common import exception diff --git a/ironic/tests/unit/objects/test_bios.py b/ironic/tests/unit/objects/test_bios.py index 0d31ae4ec..57538fbbf 100644 --- a/ironic/tests/unit/objects/test_bios.py +++ b/ironic/tests/unit/objects/test_bios.py @@ -11,8 +11,7 @@ # under the License. import types - -import mock +from unittest import mock from ironic.common import context from ironic.db import api as dbapi diff --git a/ironic/tests/unit/objects/test_chassis.py b/ironic/tests/unit/objects/test_chassis.py index 1e3b26d31..aaa64b71d 100644 --- a/ironic/tests/unit/objects/test_chassis.py +++ b/ironic/tests/unit/objects/test_chassis.py @@ -14,8 +14,8 @@ # under the License. import datetime +from unittest import mock -import mock from oslo_utils import uuidutils from testtools import matchers diff --git a/ironic/tests/unit/objects/test_conductor.py b/ironic/tests/unit/objects/test_conductor.py index 109a89edf..42010da0c 100644 --- a/ironic/tests/unit/objects/test_conductor.py +++ b/ironic/tests/unit/objects/test_conductor.py @@ -16,8 +16,8 @@ import datetime import types +from unittest import mock -import mock from oslo_utils import timeutils from ironic.common import exception diff --git a/ironic/tests/unit/objects/test_deploy_template.py b/ironic/tests/unit/objects/test_deploy_template.py index 7a871ef4b..11863bcda 100644 --- a/ironic/tests/unit/objects/test_deploy_template.py +++ b/ironic/tests/unit/objects/test_deploy_template.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from ironic.common import context from ironic.db import api as dbapi diff --git a/ironic/tests/unit/objects/test_node.py b/ironic/tests/unit/objects/test_node.py index b027cff10..a72dc6ea5 100644 --- a/ironic/tests/unit/objects/test_node.py +++ b/ironic/tests/unit/objects/test_node.py @@ -14,8 +14,8 @@ # under the License. import datetime +from unittest import mock -import mock from oslo_serialization import jsonutils from oslo_utils import uuidutils from testtools import matchers diff --git a/ironic/tests/unit/objects/test_notification.py b/ironic/tests/unit/objects/test_notification.py index e6e40ba82..82c2a8dd9 100644 --- a/ironic/tests/unit/objects/test_notification.py +++ b/ironic/tests/unit/objects/test_notification.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from ironic.common import exception from ironic.objects import base diff --git a/ironic/tests/unit/objects/test_objects.py b/ironic/tests/unit/objects/test_objects.py index 621b7f939..3e2b9a8d4 100644 --- a/ironic/tests/unit/objects/test_objects.py +++ b/ironic/tests/unit/objects/test_objects.py @@ -15,9 +15,9 @@ import contextlib import datetime import types +from unittest import mock import iso8601 -import mock from oslo_utils import timeutils from oslo_versionedobjects import base as object_base from oslo_versionedobjects import exception as object_exception diff --git a/ironic/tests/unit/objects/test_port.py b/ironic/tests/unit/objects/test_port.py index 32df1e52a..5a88ecc1b 100644 --- a/ironic/tests/unit/objects/test_port.py +++ b/ironic/tests/unit/objects/test_port.py @@ -15,8 +15,8 @@ import datetime import types +from unittest import mock -import mock from oslo_config import cfg from testtools import matchers diff --git a/ironic/tests/unit/objects/test_portgroup.py b/ironic/tests/unit/objects/test_portgroup.py index d69ac13e0..29bab20d0 100644 --- a/ironic/tests/unit/objects/test_portgroup.py +++ b/ironic/tests/unit/objects/test_portgroup.py @@ -11,8 +11,8 @@ # under the License. import datetime +from unittest import mock -import mock from testtools import matchers from ironic.common import exception diff --git a/ironic/tests/unit/objects/test_trait.py b/ironic/tests/unit/objects/test_trait.py index b64248af6..ba18f6ace 100644 --- a/ironic/tests/unit/objects/test_trait.py +++ b/ironic/tests/unit/objects/test_trait.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from ironic.common import context from ironic.db import api as dbapi diff --git a/ironic/tests/unit/objects/test_volume_connector.py b/ironic/tests/unit/objects/test_volume_connector.py index fad9b4a06..7030f4766 100644 --- a/ironic/tests/unit/objects/test_volume_connector.py +++ b/ironic/tests/unit/objects/test_volume_connector.py @@ -14,8 +14,8 @@ import datetime import types +from unittest import mock -import mock from testtools.matchers import HasLength from ironic.common import exception diff --git a/ironic/tests/unit/objects/test_volume_target.py b/ironic/tests/unit/objects/test_volume_target.py index 2734d7d35..3882a368c 100644 --- a/ironic/tests/unit/objects/test_volume_target.py +++ b/ironic/tests/unit/objects/test_volume_target.py @@ -14,8 +14,8 @@ import datetime import types +from unittest import mock -import mock from testtools.matchers import HasLength from ironic.common import exception diff --git a/ironic/tests/unit/test_base.py b/ironic/tests/unit/test_base.py index 338983516..28eeb6992 100644 --- a/ironic/tests/unit/test_base.py +++ b/ironic/tests/unit/test_base.py @@ -12,9 +12,9 @@ # limitations under the License. import subprocess +from unittest import mock from ironic_lib import utils -import mock from oslo_concurrency import processutils from ironic.tests import base |