From d6e7552457b1ab2f494e2f9ea960792e36d5caba Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <imelofer@redhat.com>
Date: Tue, 7 Apr 2020 10:33:11 +0200
Subject: [PATCH] Switch to unittest mock

Python3 have a standard library for mock in the unittest module,
let's drop the mock requirement and switch tests to unittest mock.

Change-Id: I4f1b3e25c8adbc24cdda51c73da3b66967f7ef23
---
 ironic/tests/unit/api/base.py                                | 2 +-
 ironic/tests/unit/api/test_acl.py                            | 2 +-
 ironic/tests/unit/api/test_audit.py                          | 3 ++-
 ironic/tests/unit/api/test_healthcheck.py                    | 3 ++-
 ironic/tests/unit/api/test_hooks.py                          | 2 +-
 ironic/tests/unit/api/test_ospmiddleware.py                  | 3 ++-
 ironic/tests/unit/cmd/test_conductor.py                      | 3 ++-
 ironic/tests/unit/cmd/test_dbsync.py                         | 2 +-
 ironic/tests/unit/cmd/test_status.py                         | 3 ++-
 ironic/tests/unit/common/test_cinder.py                      | 2 +-
 ironic/tests/unit/common/test_context.py                     | 5 +++--
 ironic/tests/unit/common/test_driver_factory.py              | 3 ++-
 ironic/tests/unit/common/test_glance_service.py              | 2 +-
 ironic/tests/unit/common/test_image_service.py               | 2 +-
 ironic/tests/unit/common/test_images.py                      | 2 +-
 ironic/tests/unit/common/test_json_rpc.py                    | 3 ++-
 ironic/tests/unit/common/test_keystone.py                    | 3 ++-
 ironic/tests/unit/common/test_network.py                     | 3 ++-
 ironic/tests/unit/common/test_neutron.py                     | 2 +-
 ironic/tests/unit/common/test_nova.py                        | 3 +--
 ironic/tests/unit/common/test_policy.py                      | 2 +-
 ironic/tests/unit/common/test_pxe_utils.py                   | 2 +-
 ironic/tests/unit/common/test_release_mappings.py            | 3 ++-
 ironic/tests/unit/common/test_rpc.py                         | 3 ++-
 ironic/tests/unit/common/test_rpc_service.py                 | 3 ++-
 ironic/tests/unit/common/test_swift.py                       | 2 +-
 ironic/tests/unit/common/test_utils.py                       | 2 +-
 ironic/tests/unit/common/test_wsgi_service.py                | 3 ++-
 ironic/tests/unit/conductor/mgr_utils.py                     | 3 ++-
 ironic/tests/unit/conductor/test_allocations.py              | 3 ++-
 ironic/tests/unit/conductor/test_base_manager.py             | 2 +-
 ironic/tests/unit/conductor/test_cleaning.py                 | 3 ++-
 ironic/tests/unit/conductor/test_deployments.py              | 3 ++-
 ironic/tests/unit/conductor/test_manager.py                  | 2 +-
 ironic/tests/unit/conductor/test_notification_utils.py       | 3 ++-
 ironic/tests/unit/conductor/test_rpcapi.py                   | 2 +-
 ironic/tests/unit/conductor/test_steps.py                    | 3 ++-
 ironic/tests/unit/conductor/test_task_manager.py             | 3 ++-
 ironic/tests/unit/conductor/test_utils.py                    | 2 +-
 ironic/tests/unit/db/sqlalchemy/test_migrations.py           | 2 +-
 ironic/tests/unit/db/test_api.py                             | 2 +-
 ironic/tests/unit/db/test_conductor.py                       | 2 +-
 ironic/tests/unit/db/test_nodes.py                           | 2 +-
 ironic/tests/unit/dhcp/test_factory.py                       | 2 +-
 ironic/tests/unit/dhcp/test_neutron.py                       | 3 ++-
 ironic/tests/unit/drivers/modules/ansible/test_deploy.py     | 2 +-
 ironic/tests/unit/drivers/modules/drac/test_bios.py          | 3 ++-
 ironic/tests/unit/drivers/modules/drac/test_boot.py          | 3 ++-
 ironic/tests/unit/drivers/modules/drac/test_common.py        | 3 ++-
 ironic/tests/unit/drivers/modules/drac/test_inspect.py       | 3 ++-
 ironic/tests/unit/drivers/modules/drac/test_job.py           | 3 ++-
 ironic/tests/unit/drivers/modules/drac/test_management.py    | 3 ++-
 ironic/tests/unit/drivers/modules/drac/test_periodic_task.py | 2 +-
 ironic/tests/unit/drivers/modules/drac/test_power.py         | 3 ++-
 ironic/tests/unit/drivers/modules/drac/test_raid.py          | 3 ++-
 ironic/tests/unit/drivers/modules/ibmc/base.py               | 2 +-
 ironic/tests/unit/drivers/modules/ibmc/test_management.py    | 2 +-
 ironic/tests/unit/drivers/modules/ibmc/test_power.py         | 3 ++-
 ironic/tests/unit/drivers/modules/ibmc/test_utils.py         | 2 +-
 ironic/tests/unit/drivers/modules/ibmc/test_vendor.py        | 3 ++-
 ironic/tests/unit/drivers/modules/ilo/test_bios.py           | 3 ++-
 ironic/tests/unit/drivers/modules/ilo/test_boot.py           | 2 +-
 ironic/tests/unit/drivers/modules/ilo/test_common.py         | 2 +-
 ironic/tests/unit/drivers/modules/ilo/test_console.py        | 2 +-
 .../unit/drivers/modules/ilo/test_firmware_processor.py      | 3 ++-
 ironic/tests/unit/drivers/modules/ilo/test_inspect.py        | 2 +-
 ironic/tests/unit/drivers/modules/ilo/test_management.py     | 3 ++-
 ironic/tests/unit/drivers/modules/ilo/test_power.py          | 3 ++-
 ironic/tests/unit/drivers/modules/ilo/test_raid.py           | 3 ++-
 ironic/tests/unit/drivers/modules/ilo/test_vendor.py         | 2 +-
 .../tests/unit/drivers/modules/intel_ipmi/test_management.py | 2 +-
 ironic/tests/unit/drivers/modules/irmc/test_bios.py          | 2 +-
 ironic/tests/unit/drivers/modules/irmc/test_boot.py          | 2 +-
 ironic/tests/unit/drivers/modules/irmc/test_common.py        | 3 ++-
 ironic/tests/unit/drivers/modules/irmc/test_inspect.py       | 2 +-
 ironic/tests/unit/drivers/modules/irmc/test_management.py    | 3 +--
 ironic/tests/unit/drivers/modules/irmc/test_periodic_task.py | 3 ++-
 ironic/tests/unit/drivers/modules/irmc/test_power.py         | 2 +-
 ironic/tests/unit/drivers/modules/irmc/test_raid.py          | 2 +-
 ironic/tests/unit/drivers/modules/network/test_common.py     | 3 ++-
 ironic/tests/unit/drivers/modules/network/test_flat.py       | 3 ++-
 ironic/tests/unit/drivers/modules/network/test_neutron.py    | 2 +-
 ironic/tests/unit/drivers/modules/redfish/test_bios.py       | 3 ++-
 ironic/tests/unit/drivers/modules/redfish/test_boot.py       | 2 +-
 ironic/tests/unit/drivers/modules/redfish/test_inspect.py    | 3 ++-
 ironic/tests/unit/drivers/modules/redfish/test_management.py | 3 ++-
 ironic/tests/unit/drivers/modules/redfish/test_power.py      | 3 ++-
 ironic/tests/unit/drivers/modules/redfish/test_utils.py      | 2 +-
 ironic/tests/unit/drivers/modules/storage/test_cinder.py     | 3 ++-
 ironic/tests/unit/drivers/modules/storage/test_external.py   | 2 +-
 ironic/tests/unit/drivers/modules/test_agent.py              | 2 +-
 ironic/tests/unit/drivers/modules/test_agent_base.py         | 2 +-
 ironic/tests/unit/drivers/modules/test_agent_client.py       | 2 +-
 ironic/tests/unit/drivers/modules/test_boot_mode_utils.py    | 2 +-
 ironic/tests/unit/drivers/modules/test_console_utils.py      | 2 +-
 ironic/tests/unit/drivers/modules/test_deploy_utils.py       | 2 +-
 ironic/tests/unit/drivers/modules/test_image_cache.py        | 2 +-
 ironic/tests/unit/drivers/modules/test_inspect_utils.py      | 3 ++-
 ironic/tests/unit/drivers/modules/test_inspector.py          | 3 ++-
 ironic/tests/unit/drivers/modules/test_ipmitool.py           | 2 +-
 ironic/tests/unit/drivers/modules/test_ipxe.py               | 2 +-
 ironic/tests/unit/drivers/modules/test_iscsi_deploy.py       | 2 +-
 ironic/tests/unit/drivers/modules/test_noop.py               | 3 ++-
 ironic/tests/unit/drivers/modules/test_noop_mgmt.py          | 2 +-
 ironic/tests/unit/drivers/modules/test_pxe.py                | 2 +-
 ironic/tests/unit/drivers/modules/test_snmp.py               | 2 +-
 ironic/tests/unit/drivers/modules/xclarity/test_common.py    | 3 ++-
 .../tests/unit/drivers/modules/xclarity/test_management.py   | 2 +-
 ironic/tests/unit/drivers/modules/xclarity/test_power.py     | 2 +-
 ironic/tests/unit/drivers/test_base.py                       | 3 +--
 ironic/tests/unit/drivers/test_generic.py                    | 2 +-
 ironic/tests/unit/drivers/test_snmp.py                       | 2 +-
 ironic/tests/unit/drivers/test_utils.py                      | 2 +-
 ironic/tests/unit/drivers/third_party_driver_mocks.py        | 2 +-
 ironic/tests/unit/objects/test_allocation.py                 | 2 +-
 ironic/tests/unit/objects/test_bios.py                       | 3 +--
 ironic/tests/unit/objects/test_chassis.py                    | 2 +-
 ironic/tests/unit/objects/test_conductor.py                  | 2 +-
 ironic/tests/unit/objects/test_deploy_template.py            | 2 +-
 ironic/tests/unit/objects/test_node.py                       | 2 +-
 ironic/tests/unit/objects/test_notification.py               | 2 +-
 ironic/tests/unit/objects/test_objects.py                    | 2 +-
 ironic/tests/unit/objects/test_port.py                       | 2 +-
 ironic/tests/unit/objects/test_portgroup.py                  | 2 +-
 ironic/tests/unit/objects/test_trait.py                      | 2 +-
 ironic/tests/unit/objects/test_volume_connector.py           | 2 +-
 ironic/tests/unit/objects/test_volume_target.py              | 2 +-
 ironic/tests/unit/test_base.py                               | 2 +-
 lower-constraints.txt                                        | 1 -
 test-requirements.txt                                        | 1 -
 130 files changed, 179 insertions(+), 135 deletions(-)

diff --git a/ironic/tests/unit/api/base.py b/ironic/tests/unit/api/base.py
index 5d4ab99b88..180f363e6a 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 c358f5a15b..9ebabfac07 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 c621013d3d..34ecaf18f4 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 364ba8cf87..907bc9f4af 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 095d08a36b..5f974d161f 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 48638aff76..856ba83808 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 8de4ebb405..ef0f8b0859 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 f1f9e05b93..530b576e89 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 aa4a5258bb..f776e2d513 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 db5a96fbb3..5768cf20bb 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 eb035deb6b..b04613076e 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 fdf14e9fd5..682622eecd 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 02e4914bc1..c8532d1b84 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 bc0d391b68..d59c1a4bc8 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 9aa711f877..437bb41ef0 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 7924ffb86f..0f5020bddc 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 596b6a7fe2..ffc08a7f7d 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 e6ffcd08c8..69b17b01b4 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 81d8c99be3..02c9893312 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 1d63b4fb5d..7a3c300c87 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 046706554c..67e3ea4d26 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 6950bfe8a5..9fcbb477a6 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 db3f18f857..2231d0be57 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 6cb25098da..1cf8fa7871 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 755df4f81c..ec440324c7 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 cb53d16ba4..44103ea699 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 0a652435de..df60b88ca9 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 a489c869b6..5af26bf37f 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 44e492462e..e5bc43bcbb 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 18b6025bf8..91046b72f5 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 49cacbff5b..f36e3d91a0 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 f48fee0477..d504fb940d 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 bbac176528..985cdcebc4 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 708cf452c2..897119eabb 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 8ef8780d31..cc8fe53200 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 a4d3273982..31f9811f40 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 cc7c8af474..afdaaa5a99 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 1cb61441ff..d0c547f406 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 2ec5649c6e..e72935e543 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 7aed87626b..f4b4708fc9 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 ed640e9cdb..f855e9c91b 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 1ae38de88b..bb7832b99b 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 88200bf99f..79b0529fac 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 bda6bed0ec..008efefced 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 391b1cf74c..e4091c58be 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 95741d02e4..5e302d0d5f 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 2c59f9f521..6fdca0684d 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 ec8ae4fe68..d73ef69d7e 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 6863ed564c..cc1baee284 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 e76b351f28..628f3c855d 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 5a68c8d5e3..a0ea526cbc 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 74f2ea3728..29b7e445bd 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 a4392f2696..47defd1a9f 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 4c442ba6f8..f56930e21c 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 1cb50f1294..5a9a26e9b5 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 cb337207e5..158f510bba 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 d45a233047..b4fe140406 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 d7d68a704b..681853a945 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 87df0e6e03..40f0fd2c31 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 f4e6e99d39..ef693e765f 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 f3c69a7527..b65df2f88b 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 056467ad2c..f348dd52a7 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 466f35a0c3..f06e21af3d 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 2db07c0b2c..082a39e786 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 89aa96f9f4..2182e2b9a6 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 deb3f2e2df..a10c34bd9d 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 fd59abbceb..396df5ebee 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 3fe38da978..ded22bd6c1 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 7e89c2160f..6485b5d1e9 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 2a9ebc61f8..05a735d213 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 589906777d..c42bfa9ecb 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 9876317f85..093bcdea47 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 fd83b8cc85..389cdc6c5b 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 11c0da4463..3f0c3d94a9 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 b0bd206a37..0a6eeb399b 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 e1c3fcc42b..c4b152ae9f 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 15575523cd..52230259df 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 dfc112c8c1..db335e941b 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 8dc2421eda..7698c256ae 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 eedd907f67..d2d4b6bb3d 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 186827166d..81f2f7e4a7 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 2d083a740d..21767f75c9 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 0dc770c7c1..4f964461d1 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 5558996ca7..e217349515 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 776a68bae3..251d5bd917 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 c8a37951a9..2336a64e35 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 09068df24b..932d44af89 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 7107a8ab23..794982bba6 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 02f2a56f2b..6ec9c317fd 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 50b478d316..30b60bec4b 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 590a22e08e..7d6406c8a1 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 4f7ce9a1fe..e260415d03 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 1bea741880..4fdf20a888 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 11b5b5f7bb..b4a39b0eb3 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 a3cd142ade..94e8a260d6 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 a39b33a351..4845da65ff 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 bd57332fb2..b70960ec13 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 c43e996bae..8b44dde5a9 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 857fd57653..c1f179ff7d 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 6f7b2c5138..1b232f5d1b 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 cbec1bb0d7..9479072cb8 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 e723b3518e..d980ef8caf 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 f1db0bdf76..692b5aa04d 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 c34b05fe33..78731e40e6 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 ed4fa2b63f..e6d1aaacb4 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 5563cfe916..3272934d18 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 a7253bf8dc..b4667534d8 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 d66da9b8fd..883bcd5bca 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 86f1e3318f..af4b851559 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 19fca2067b..d1e33b9b1c 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 c8475aad68..6a1d078635 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 e2b941e488..10692383cd 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 b09915704f..28251601e0 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 4dcd45e513..583db1b9ee 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 33fffddb5f..84ec56b818 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 0d31ae4ec7..57538fbbf8 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 1e3b26d315..aaa64b71d2 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 109a89edfe..42010da0cd 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 7a871ef4bb..11863bcdaf 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 b027cff108..a72dc6ea54 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 e6e40ba820..82c2a8dd92 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 621b7f9398..3e2b9a8d4e 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 32df1e52a1..5a88ecc1bd 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 d69ac13e07..29bab20d04 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 b64248af63..ba18f6ace4 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 fad9b4a069..7030f4766d 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 2734d7d35a..3882a368c1 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 3389835160..28eeb69922 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
diff --git a/lower-constraints.txt b/lower-constraints.txt
index bac7eabafa..51cafb54c9 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -18,7 +18,6 @@ jsonpatch==1.16
 jsonschema==2.6.0
 keystoneauth1==3.18.0
 keystonemiddleware==4.17.0
-mock==3.0.0
 openstackdocstheme==1.31.2
 openstacksdk==0.37.0
 os-api-ref==1.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 497bcdc99f..8e0eab73a3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 doc8>=0.6.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=3.0.0 # BSD
 Babel!=2.4.0,>=2.3.4 # BSD
 PyMySQL>=0.7.6 # MIT License
 iso8601>=0.1.11 # MIT