From 4669bcc6280ba7d6776d6bdf6d6d1c34c87298e6 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Sat, 18 Apr 2020 11:58:59 -0500
Subject: [PATCH] Use unittest.mock instead of third party mock

Now that we no longer support py27, we can use the standard library
unittest.mock module instead of the third party mock lib.

Change-Id: I12e1a2a4a22116cabd09a3b808f871d98e4bd1f2
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
---
 lower-constraints.txt                                          | 1 -
 neutronclient/tests/unit/bgp/test_cli20_speaker.py             | 2 +-
 neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py       | 2 +-
 neutronclient/tests/unit/lb/test_cli20_healthmonitor.py        | 2 +-
 neutronclient/tests/unit/lb/test_cli20_pool.py                 | 2 +-
 neutronclient/tests/unit/lb/v2/test_cli20_loadbalancer.py      | 2 +-
 neutronclient/tests/unit/osc/v2/dynamic_routing/fakes.py       | 2 +-
 .../tests/unit/osc/v2/dynamic_routing/test_bgp_dragent.py      | 2 +-
 .../tests/unit/osc/v2/dynamic_routing/test_bgp_peer.py         | 2 +-
 .../tests/unit/osc/v2/dynamic_routing/test_bgp_speaker.py      | 2 +-
 neutronclient/tests/unit/osc/v2/fakes.py                       | 2 +-
 neutronclient/tests/unit/osc/v2/fwaas/fakes.py                 | 2 +-
 neutronclient/tests/unit/osc/v2/fwaas/test_firewallgroup.py    | 2 +-
 neutronclient/tests/unit/osc/v2/fwaas/test_firewallpolicy.py   | 2 +-
 neutronclient/tests/unit/osc/v2/fwaas/test_firewallrule.py     | 2 +-
 neutronclient/tests/unit/osc/v2/logging/fakes.py               | 3 +--
 neutronclient/tests/unit/osc/v2/logging/test_network_log.py    | 2 +-
 neutronclient/tests/unit/osc/v2/networking_bgpvpn/fakes.py     | 2 +-
 .../tests/unit/osc/v2/networking_bgpvpn/test_bgpvpn.py         | 2 +-
 .../unit/osc/v2/networking_bgpvpn/test_resource_association.py | 2 +-
 .../unit/osc/v2/networking_bgpvpn/test_router_association.py   | 2 +-
 neutronclient/tests/unit/osc/v2/sfc/fakes.py                   | 2 +-
 neutronclient/tests/unit/osc/v2/sfc/test_flow_classifier.py    | 2 +-
 neutronclient/tests/unit/osc/v2/sfc/test_port_chain.py         | 2 +-
 neutronclient/tests/unit/osc/v2/sfc/test_port_pair.py          | 2 +-
 neutronclient/tests/unit/osc/v2/sfc/test_port_pair_group.py    | 2 +-
 neutronclient/tests/unit/osc/v2/sfc/test_service_graph.py      | 2 +-
 .../unit/osc/v2/subnet_onboard/test_network_onboard_subnets.py | 2 +-
 neutronclient/tests/unit/osc/v2/trunk/fakes.py                 | 2 +-
 neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py    | 2 +-
 neutronclient/tests/unit/osc/v2/vpnaas/fakes.py                | 3 +--
 neutronclient/tests/unit/osc/v2/vpnaas/test_endpoint_group.py  | 2 +-
 neutronclient/tests/unit/osc/v2/vpnaas/test_ikepolicy.py       | 2 +-
 .../tests/unit/osc/v2/vpnaas/test_ipsec_site_connection.py     | 2 +-
 neutronclient/tests/unit/osc/v2/vpnaas/test_ipsecpolicy.py     | 2 +-
 neutronclient/tests/unit/osc/v2/vpnaas/test_vpnservice.py      | 2 +-
 neutronclient/tests/unit/test_cli20.py                         | 2 +-
 neutronclient/tests/unit/test_cli20_address_scope.py           | 2 +-
 neutronclient/tests/unit/test_cli20_agentschedulers.py         | 2 +-
 neutronclient/tests/unit/test_cli20_network.py                 | 2 +-
 neutronclient/tests/unit/test_cli20_port.py                    | 2 +-
 neutronclient/tests/unit/test_cli20_securitygroup.py           | 2 +-
 neutronclient/tests/unit/test_cli20_subnet.py                  | 2 +-
 neutronclient/tests/unit/test_cli20_subnetpool.py              | 2 +-
 neutronclient/tests/unit/test_cli20_tag.py                     | 2 +-
 neutronclient/tests/unit/test_client_extension.py              | 2 +-
 neutronclient/tests/unit/test_exceptions.py                    | 2 +-
 neutronclient/tests/unit/test_name_or_id.py                    | 3 ++-
 neutronclient/tests/unit/test_quota.py                         | 2 +-
 neutronclient/tests/unit/test_shell.py                         | 2 +-
 test-requirements.txt                                          | 1 -
 51 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 48b0056b0..8f576fed0 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -39,7 +39,6 @@ kombu==4.0.0
 linecache2==1.0.0
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
 monotonic==0.6
 mox3==0.20.0
 msgpack-python==0.4.0
diff --git a/neutronclient/tests/unit/bgp/test_cli20_speaker.py b/neutronclient/tests/unit/bgp/test_cli20_speaker.py
index 72612dc6c..0d9cc60db 100644
--- a/neutronclient/tests/unit/bgp/test_cli20_speaker.py
+++ b/neutronclient/tests/unit/bgp/test_cli20_speaker.py
@@ -15,8 +15,8 @@
 #
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.common import exceptions
 from neutronclient.neutron.v2_0.bgp import speaker as bgp_speaker
diff --git a/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py b/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py
index 874ec7232..4cadfb2de 100644
--- a/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py
+++ b/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py
@@ -15,8 +15,8 @@
 #
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.neutron.v2_0.fw import firewallpolicy
 from neutronclient import shell
diff --git a/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py b/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py
index 7c4d15c09..61cb1b1a5 100644
--- a/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py
+++ b/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py
@@ -15,8 +15,8 @@
 #
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.neutron.v2_0.lb import healthmonitor
 from neutronclient.tests.unit import test_cli20
diff --git a/neutronclient/tests/unit/lb/test_cli20_pool.py b/neutronclient/tests/unit/lb/test_cli20_pool.py
index 1106aed92..79bf23df8 100644
--- a/neutronclient/tests/unit/lb/test_cli20_pool.py
+++ b/neutronclient/tests/unit/lb/test_cli20_pool.py
@@ -15,8 +15,8 @@
 #
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.neutron.v2_0.lb import pool
 from neutronclient.tests.unit import test_cli20
diff --git a/neutronclient/tests/unit/lb/v2/test_cli20_loadbalancer.py b/neutronclient/tests/unit/lb/v2/test_cli20_loadbalancer.py
index 6db07cc1a..3a6010cee 100644
--- a/neutronclient/tests/unit/lb/v2/test_cli20_loadbalancer.py
+++ b/neutronclient/tests/unit/lb/v2/test_cli20_loadbalancer.py
@@ -15,8 +15,8 @@
 #
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.neutron.v2_0.lb.v2 import loadbalancer as lb
 from neutronclient.tests.unit import test_cli20
diff --git a/neutronclient/tests/unit/osc/v2/dynamic_routing/fakes.py b/neutronclient/tests/unit/osc/v2/dynamic_routing/fakes.py
index d425cd67b..c496a3f66 100644
--- a/neutronclient/tests/unit/osc/v2/dynamic_routing/fakes.py
+++ b/neutronclient/tests/unit/osc/v2/dynamic_routing/fakes.py
@@ -11,9 +11,9 @@
 #    under the License.
 
 import copy
+from unittest import mock
 import uuid
 
-import mock
 
 from neutronclient.tests.unit.osc.v2 import fakes
 
diff --git a/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_dragent.py b/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_dragent.py
index 1ec7c41f0..7a94b323a 100644
--- a/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_dragent.py
+++ b/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_dragent.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-import mock
+from unittest import mock
 
 from neutronclient.osc.v2.dynamic_routing import bgp_dragent
 from neutronclient.tests.unit.osc.v2.dynamic_routing import fakes
diff --git a/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_peer.py b/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_peer.py
index ffe69f18d..506c86d93 100644
--- a/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_peer.py
+++ b/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_peer.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-import mock
+from unittest import mock
 
 from neutronclient.osc.v2.dynamic_routing import bgp_peer
 from neutronclient.tests.unit.osc.v2.dynamic_routing import fakes
diff --git a/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_speaker.py b/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_speaker.py
index dbecf057c..159746875 100644
--- a/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_speaker.py
+++ b/neutronclient/tests/unit/osc/v2/dynamic_routing/test_bgp_speaker.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-import mock
+from unittest import mock
 
 from neutronclient.osc.v2.dynamic_routing import bgp_speaker
 from neutronclient.tests.unit.osc.v2.dynamic_routing import fakes
diff --git a/neutronclient/tests/unit/osc/v2/fakes.py b/neutronclient/tests/unit/osc/v2/fakes.py
index afa81e72d..c7876b645 100644
--- a/neutronclient/tests/unit/osc/v2/fakes.py
+++ b/neutronclient/tests/unit/osc/v2/fakes.py
@@ -12,9 +12,9 @@
 #
 
 import argparse
+from unittest import mock
 
 from cliff import columns as cliff_columns
-import mock
 from osc_lib.tests import utils
 
 
diff --git a/neutronclient/tests/unit/osc/v2/fwaas/fakes.py b/neutronclient/tests/unit/osc/v2/fwaas/fakes.py
index 6475392c4..d0110989b 100644
--- a/neutronclient/tests/unit/osc/v2/fwaas/fakes.py
+++ b/neutronclient/tests/unit/osc/v2/fwaas/fakes.py
@@ -16,8 +16,8 @@
 
 import collections
 import copy
+from unittest import mock
 
-import mock
 from oslo_utils import uuidutils
 
 
diff --git a/neutronclient/tests/unit/osc/v2/fwaas/test_firewallgroup.py b/neutronclient/tests/unit/osc/v2/fwaas/test_firewallgroup.py
index cc54d406b..41bfecb2d 100644
--- a/neutronclient/tests/unit/osc/v2/fwaas/test_firewallgroup.py
+++ b/neutronclient/tests/unit/osc/v2/fwaas/test_firewallgroup.py
@@ -16,8 +16,8 @@
 
 import copy
 import re
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib.tests import utils
 
diff --git a/neutronclient/tests/unit/osc/v2/fwaas/test_firewallpolicy.py b/neutronclient/tests/unit/osc/v2/fwaas/test_firewallpolicy.py
index 316eec887..7eba77483 100644
--- a/neutronclient/tests/unit/osc/v2/fwaas/test_firewallpolicy.py
+++ b/neutronclient/tests/unit/osc/v2/fwaas/test_firewallpolicy.py
@@ -16,8 +16,8 @@
 
 import copy
 import re
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib.tests import utils
 
diff --git a/neutronclient/tests/unit/osc/v2/fwaas/test_firewallrule.py b/neutronclient/tests/unit/osc/v2/fwaas/test_firewallrule.py
index a8b25c304..dac94cb74 100644
--- a/neutronclient/tests/unit/osc/v2/fwaas/test_firewallrule.py
+++ b/neutronclient/tests/unit/osc/v2/fwaas/test_firewallrule.py
@@ -16,8 +16,8 @@
 
 import copy
 import re
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib.tests import utils
 import testtools
diff --git a/neutronclient/tests/unit/osc/v2/logging/fakes.py b/neutronclient/tests/unit/osc/v2/logging/fakes.py
index 856838fee..a20e3712e 100644
--- a/neutronclient/tests/unit/osc/v2/logging/fakes.py
+++ b/neutronclient/tests/unit/osc/v2/logging/fakes.py
@@ -16,10 +16,9 @@
 
 import collections
 import copy
+from unittest import mock
 import uuid
 
-import mock
-
 
 class FakeLogging(object):
 
diff --git a/neutronclient/tests/unit/osc/v2/logging/test_network_log.py b/neutronclient/tests/unit/osc/v2/logging/test_network_log.py
index d36453542..c2e0390ae 100644
--- a/neutronclient/tests/unit/osc/v2/logging/test_network_log.py
+++ b/neutronclient/tests/unit/osc/v2/logging/test_network_log.py
@@ -15,8 +15,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib.tests import utils
 import testtools
diff --git a/neutronclient/tests/unit/osc/v2/networking_bgpvpn/fakes.py b/neutronclient/tests/unit/osc/v2/networking_bgpvpn/fakes.py
index b3a538f5a..a0b2cb892 100644
--- a/neutronclient/tests/unit/osc/v2/networking_bgpvpn/fakes.py
+++ b/neutronclient/tests/unit/osc/v2/networking_bgpvpn/fakes.py
@@ -15,8 +15,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib.utils import columns as column_util
 
 from neutronclient.osc import utils as nc_osc_utils
diff --git a/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_bgpvpn.py b/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_bgpvpn.py
index 14b6bb1a5..16fb164ae 100644
--- a/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_bgpvpn.py
+++ b/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_bgpvpn.py
@@ -16,8 +16,8 @@
 
 import copy
 import operator
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib import utils as osc_utils
 from osc_lib.utils import columns as column_util
diff --git a/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_resource_association.py b/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_resource_association.py
index 926001742..f8aa95f47 100644
--- a/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_resource_association.py
+++ b/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_resource_association.py
@@ -16,8 +16,8 @@
 
 import copy
 import operator
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib import utils as osc_utils
 from osc_lib.utils import columns as column_util
diff --git a/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_router_association.py b/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_router_association.py
index fb17bdb67..f48424c48 100644
--- a/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_router_association.py
+++ b/neutronclient/tests/unit/osc/v2/networking_bgpvpn/test_router_association.py
@@ -16,8 +16,8 @@
 
 import copy
 import operator
+from unittest import mock
 
-import mock
 from osc_lib.tests.utils import ParserException
 from osc_lib import utils as osc_utils
 from osc_lib.utils import columns as column_util
diff --git a/neutronclient/tests/unit/osc/v2/sfc/fakes.py b/neutronclient/tests/unit/osc/v2/sfc/fakes.py
index 97861207f..ba07107fd 100755
--- a/neutronclient/tests/unit/osc/v2/sfc/fakes.py
+++ b/neutronclient/tests/unit/osc/v2/sfc/fakes.py
@@ -15,8 +15,8 @@
 
 import argparse
 import copy
+from unittest import mock
 
-import mock
 
 from osc_lib.tests import utils
 from oslo_utils import uuidutils
diff --git a/neutronclient/tests/unit/osc/v2/sfc/test_flow_classifier.py b/neutronclient/tests/unit/osc/v2/sfc/test_flow_classifier.py
index e4672d377..379f72767 100755
--- a/neutronclient/tests/unit/osc/v2/sfc/test_flow_classifier.py
+++ b/neutronclient/tests/unit/osc/v2/sfc/test_flow_classifier.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutronclient.osc.v2.sfc import sfc_flow_classifier
 from neutronclient.tests.unit.osc.v2.sfc import fakes
diff --git a/neutronclient/tests/unit/osc/v2/sfc/test_port_chain.py b/neutronclient/tests/unit/osc/v2/sfc/test_port_chain.py
index fbf60303d..da6455230 100755
--- a/neutronclient/tests/unit/osc/v2/sfc/test_port_chain.py
+++ b/neutronclient/tests/unit/osc/v2/sfc/test_port_chain.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib import exceptions
 
diff --git a/neutronclient/tests/unit/osc/v2/sfc/test_port_pair.py b/neutronclient/tests/unit/osc/v2/sfc/test_port_pair.py
index c56781881..8246e35d9 100755
--- a/neutronclient/tests/unit/osc/v2/sfc/test_port_pair.py
+++ b/neutronclient/tests/unit/osc/v2/sfc/test_port_pair.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutronclient.osc.v2.sfc import sfc_port_pair
 from neutronclient.tests.unit.osc.v2.sfc import fakes
diff --git a/neutronclient/tests/unit/osc/v2/sfc/test_port_pair_group.py b/neutronclient/tests/unit/osc/v2/sfc/test_port_pair_group.py
index 48cee1ed9..6db21a284 100755
--- a/neutronclient/tests/unit/osc/v2/sfc/test_port_pair_group.py
+++ b/neutronclient/tests/unit/osc/v2/sfc/test_port_pair_group.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutronclient.osc.v2.sfc import sfc_port_pair_group
 from neutronclient.tests.unit.osc.v2.sfc import fakes
diff --git a/neutronclient/tests/unit/osc/v2/sfc/test_service_graph.py b/neutronclient/tests/unit/osc/v2/sfc/test_service_graph.py
index da12aa570..a05ed2c72 100644
--- a/neutronclient/tests/unit/osc/v2/sfc/test_service_graph.py
+++ b/neutronclient/tests/unit/osc/v2/sfc/test_service_graph.py
@@ -11,8 +11,8 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+from unittest import mock
 
-import mock
 from osc_lib import exceptions
 from osc_lib.tests import utils as tests_utils
 
diff --git a/neutronclient/tests/unit/osc/v2/subnet_onboard/test_network_onboard_subnets.py b/neutronclient/tests/unit/osc/v2/subnet_onboard/test_network_onboard_subnets.py
index efd3d1d11..c2ca14044 100644
--- a/neutronclient/tests/unit/osc/v2/subnet_onboard/test_network_onboard_subnets.py
+++ b/neutronclient/tests/unit/osc/v2/subnet_onboard/test_network_onboard_subnets.py
@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-import mock
+from unittest import mock
 
 from neutronclient.osc.v2.subnet_onboard import subnet_onboard
 from neutronclient.tests.unit.osc.v2 import fakes as test_fakes
diff --git a/neutronclient/tests/unit/osc/v2/trunk/fakes.py b/neutronclient/tests/unit/osc/v2/trunk/fakes.py
index f7da0dd77..a52aa3097 100644
--- a/neutronclient/tests/unit/osc/v2/trunk/fakes.py
+++ b/neutronclient/tests/unit/osc/v2/trunk/fakes.py
@@ -11,8 +11,8 @@
 #   under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from oslo_utils import uuidutils
 
 
diff --git a/neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py b/neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py
index 8e9e73c49..dd6799870 100644
--- a/neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py
+++ b/neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py
@@ -15,8 +15,8 @@
 
 import argparse
 import copy
+from unittest import mock
 
-import mock
 from mock import call
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
diff --git a/neutronclient/tests/unit/osc/v2/vpnaas/fakes.py b/neutronclient/tests/unit/osc/v2/vpnaas/fakes.py
index 7ee7c5d5e..dfad250b3 100644
--- a/neutronclient/tests/unit/osc/v2/vpnaas/fakes.py
+++ b/neutronclient/tests/unit/osc/v2/vpnaas/fakes.py
@@ -16,10 +16,9 @@
 
 import collections
 import copy
+from unittest import mock
 import uuid
 
-import mock
-
 
 class FakeVPNaaS(object):
 
diff --git a/neutronclient/tests/unit/osc/v2/vpnaas/test_endpoint_group.py b/neutronclient/tests/unit/osc/v2/vpnaas/test_endpoint_group.py
index cc597e701..9c5dbcce5 100644
--- a/neutronclient/tests/unit/osc/v2/vpnaas/test_endpoint_group.py
+++ b/neutronclient/tests/unit/osc/v2/vpnaas/test_endpoint_group.py
@@ -15,8 +15,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib.tests import utils as tests_utils
 
 from neutronclient.osc import utils as osc_utils
diff --git a/neutronclient/tests/unit/osc/v2/vpnaas/test_ikepolicy.py b/neutronclient/tests/unit/osc/v2/vpnaas/test_ikepolicy.py
index 24663d6a2..0d2673a99 100644
--- a/neutronclient/tests/unit/osc/v2/vpnaas/test_ikepolicy.py
+++ b/neutronclient/tests/unit/osc/v2/vpnaas/test_ikepolicy.py
@@ -15,8 +15,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib.tests import utils as tests_utils
 
 from neutronclient.osc import utils as osc_utils
diff --git a/neutronclient/tests/unit/osc/v2/vpnaas/test_ipsec_site_connection.py b/neutronclient/tests/unit/osc/v2/vpnaas/test_ipsec_site_connection.py
index 4d04b641c..96313b459 100644
--- a/neutronclient/tests/unit/osc/v2/vpnaas/test_ipsec_site_connection.py
+++ b/neutronclient/tests/unit/osc/v2/vpnaas/test_ipsec_site_connection.py
@@ -15,8 +15,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib.cli import format_columns
 from osc_lib.tests import utils as tests_utils
 
diff --git a/neutronclient/tests/unit/osc/v2/vpnaas/test_ipsecpolicy.py b/neutronclient/tests/unit/osc/v2/vpnaas/test_ipsecpolicy.py
index 8e56cf3f9..0df98e3f3 100644
--- a/neutronclient/tests/unit/osc/v2/vpnaas/test_ipsecpolicy.py
+++ b/neutronclient/tests/unit/osc/v2/vpnaas/test_ipsecpolicy.py
@@ -15,8 +15,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib.tests import utils as tests_utils
 
 from neutronclient.osc import utils as osc_utils
diff --git a/neutronclient/tests/unit/osc/v2/vpnaas/test_vpnservice.py b/neutronclient/tests/unit/osc/v2/vpnaas/test_vpnservice.py
index a9c208e7c..7630eb8e0 100644
--- a/neutronclient/tests/unit/osc/v2/vpnaas/test_vpnservice.py
+++ b/neutronclient/tests/unit/osc/v2/vpnaas/test_vpnservice.py
@@ -15,9 +15,9 @@
 #
 
 import copy
+from unittest import mock
 import uuid
 
-import mock
 
 from neutronclient.osc import utils as osc_utils
 from neutronclient.osc.v2.vpnaas import vpnservice
diff --git a/neutronclient/tests/unit/test_cli20.py b/neutronclient/tests/unit/test_cli20.py
index 73104b54c..c2143e168 100644
--- a/neutronclient/tests/unit/test_cli20.py
+++ b/neutronclient/tests/unit/test_cli20.py
@@ -18,9 +18,9 @@ import contextlib
 from io import StringIO
 import itertools
 import sys
+from unittest import mock
 import urllib.parse as urlparse
 
-import mock
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
 from oslotest import base
diff --git a/neutronclient/tests/unit/test_cli20_address_scope.py b/neutronclient/tests/unit/test_cli20_address_scope.py
index f58185fd0..902f7e653 100644
--- a/neutronclient/tests/unit/test_cli20_address_scope.py
+++ b/neutronclient/tests/unit/test_cli20_address_scope.py
@@ -15,8 +15,8 @@
 #
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.common import exceptions
 from neutronclient.neutron.v2_0 import address_scope
diff --git a/neutronclient/tests/unit/test_cli20_agentschedulers.py b/neutronclient/tests/unit/test_cli20_agentschedulers.py
index ddb8dce7d..817909d38 100644
--- a/neutronclient/tests/unit/test_cli20_agentschedulers.py
+++ b/neutronclient/tests/unit/test_cli20_agentschedulers.py
@@ -15,8 +15,8 @@
 #
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.neutron.v2_0 import agentscheduler
 from neutronclient.neutron.v2_0 import network
diff --git a/neutronclient/tests/unit/test_cli20_network.py b/neutronclient/tests/unit/test_cli20_network.py
index 2f7a46896..b1f69acc8 100644
--- a/neutronclient/tests/unit/test_cli20_network.py
+++ b/neutronclient/tests/unit/test_cli20_network.py
@@ -15,8 +15,8 @@
 
 import itertools
 import sys
+from unittest import mock
 
-import mock
 from oslo_serialization import jsonutils
 
 from neutronclient.common import exceptions
diff --git a/neutronclient/tests/unit/test_cli20_port.py b/neutronclient/tests/unit/test_cli20_port.py
index f6fc61783..e1ab411e5 100644
--- a/neutronclient/tests/unit/test_cli20_port.py
+++ b/neutronclient/tests/unit/test_cli20_port.py
@@ -16,8 +16,8 @@
 
 import itertools
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.neutron.v2_0 import port
 from neutronclient import shell
diff --git a/neutronclient/tests/unit/test_cli20_securitygroup.py b/neutronclient/tests/unit/test_cli20_securitygroup.py
index 010f7dcae..f5ed8ad1e 100644
--- a/neutronclient/tests/unit/test_cli20_securitygroup.py
+++ b/neutronclient/tests/unit/test_cli20_securitygroup.py
@@ -15,9 +15,9 @@
 #    under the License.
 
 import sys
+from unittest import mock
 import urllib.parse as urlparse
 
-import mock
 from oslo_utils import uuidutils
 
 from neutronclient.common import exceptions
diff --git a/neutronclient/tests/unit/test_cli20_subnet.py b/neutronclient/tests/unit/test_cli20_subnet.py
index ab37cbdd7..97c2faff0 100644
--- a/neutronclient/tests/unit/test_cli20_subnet.py
+++ b/neutronclient/tests/unit/test_cli20_subnet.py
@@ -15,8 +15,8 @@
 #
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.common import exceptions
 from neutronclient.neutron import v2_0 as neutronV20
diff --git a/neutronclient/tests/unit/test_cli20_subnetpool.py b/neutronclient/tests/unit/test_cli20_subnetpool.py
index 89a89b244..fb201683a 100644
--- a/neutronclient/tests/unit/test_cli20_subnetpool.py
+++ b/neutronclient/tests/unit/test_cli20_subnetpool.py
@@ -15,8 +15,8 @@
 #
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.common import exceptions
 from neutronclient.neutron.v2_0 import subnetpool
diff --git a/neutronclient/tests/unit/test_cli20_tag.py b/neutronclient/tests/unit/test_cli20_tag.py
index bb3c451e9..2e23c9dc5 100644
--- a/neutronclient/tests/unit/test_cli20_tag.py
+++ b/neutronclient/tests/unit/test_cli20_tag.py
@@ -11,8 +11,8 @@
 #    under the License.
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.common import exceptions
 from neutronclient.neutron.v2_0 import network
diff --git a/neutronclient/tests/unit/test_client_extension.py b/neutronclient/tests/unit/test_client_extension.py
index 7e443a01e..7137ae7b3 100644
--- a/neutronclient/tests/unit/test_client_extension.py
+++ b/neutronclient/tests/unit/test_client_extension.py
@@ -16,8 +16,8 @@
 
 import inspect
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.common import extension
 from neutronclient.neutron.v2_0.contrib import _fox_sockets as fox_sockets
diff --git a/neutronclient/tests/unit/test_exceptions.py b/neutronclient/tests/unit/test_exceptions.py
index 50b2bdbbe..6e063244c 100644
--- a/neutronclient/tests/unit/test_exceptions.py
+++ b/neutronclient/tests/unit/test_exceptions.py
@@ -13,8 +13,8 @@
 #    under the License.
 
 import sys
+from unittest import mock
 
-import mock
 from oslo_utils import encodeutils
 import testtools
 
diff --git a/neutronclient/tests/unit/test_name_or_id.py b/neutronclient/tests/unit/test_name_or_id.py
index ee94b24b1..a6a7b9246 100644
--- a/neutronclient/tests/unit/test_name_or_id.py
+++ b/neutronclient/tests/unit/test_name_or_id.py
@@ -14,7 +14,8 @@
 #    under the License.
 #
 
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 import testtools
 
diff --git a/neutronclient/tests/unit/test_quota.py b/neutronclient/tests/unit/test_quota.py
index 6192bbb9a..4529287b0 100644
--- a/neutronclient/tests/unit/test_quota.py
+++ b/neutronclient/tests/unit/test_quota.py
@@ -15,8 +15,8 @@
 #    under the License.
 
 import sys
+from unittest import mock
 
-import mock
 
 from neutronclient.common import exceptions
 from neutronclient.neutron.v2_0 import quota as test_quota
diff --git a/neutronclient/tests/unit/test_shell.py b/neutronclient/tests/unit/test_shell.py
index 86250a139..9dc2faac8 100644
--- a/neutronclient/tests/unit/test_shell.py
+++ b/neutronclient/tests/unit/test_shell.py
@@ -19,10 +19,10 @@ import logging
 import os
 import re
 import sys
+from unittest import mock
 
 import fixtures
 from keystoneauth1 import session
-import mock
 import testtools
 from testtools import matchers
 
diff --git a/test-requirements.txt b/test-requirements.txt
index a0d76ed70..ae1f2e55d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,6 @@ bandit!=1.6.0,>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 flake8-import-order==0.12 # LGPLv3
-mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 osprofiler>=2.3.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0