Use unittest.mock instead of mock

The mock third party library was needed for mock support in py2
runtimes. Since we now only support py38 and later, we can use the
standard lib unittest.mock module instead.

Change-Id: I009b6e65424ba3b662949baa1226fbf0ff14af80

neutron_fwaas/tests/functional/services/logapi/agents/drivers/iptables/test_log.py

@@ -13,9 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import time
 
-import mock
 from neutron.agent.l3 import l3_agent_extension_api as l3_ext_api
 from neutron.agent.linux import utils as linux_utils
 from neutron.tests.functional.agent.l3 import framework

neutron_fwaas/tests/unit/cmd/upgrade_checks/test_checks.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_config import cfg
 from oslo_upgradecheck.upgradecheck import Code
 

neutron_fwaas/tests/unit/db/firewall/v2/test_firewall_db_v2.py

@@ -13,7 +13,8 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 import webob.exc
 

neutron_fwaas/tests/unit/privileged/netfilter_log/test_libnetfilter_log.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import socket
+from unittest import mock
 
 import cffi
-import mock
 from neutron.tests import base
 from oslo_utils import importutils
 import testtools

neutron_fwaas/tests/unit/privileged/test_netlink_lib.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from neutron_lib import constants

neutron_fwaas/tests/unit/privileged/test_utils.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from neutron_fwaas.privileged import utils

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/drivers/linux/l2/noop/test_noop_driver.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron import manager
 from neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.l2.\

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/drivers/linux/l2/openvswitch_firewall/test_firewall.py

@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron_lib import constants
 from neutron_lib.plugins.ml2 import ovs_constants as ovs_consts
 import testtools

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/drivers/linux/l2/openvswitch_firewall/test_rules.py

@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron_lib import constants
 
 from neutron.tests import base

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/drivers/linux/test_iptables_fwaas_v2.py

@@ -15,7 +15,8 @@
 
 import copy
 
-import mock
+from unittest import mock
+
 from neutron.tests import base
 from neutron.tests.unit.api.v2 import test_base as test_api_v2
 

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/drivers/linux/test_legacy_conntrack.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from neutron.tests import base

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/drivers/linux/test_netlink_conntrack.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux \
     import netlink_conntrack

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/l2/fake_data.py

@@ -16,7 +16,8 @@
 
 import copy
 
-import mock
+from unittest import mock
+
 from neutron_lib import constants as nl_consts
 from oslo_utils import uuidutils
 

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/l2/test_fwaas_v2.py

@@ -14,7 +14,8 @@
 
 import copy
 
-import mock
+from unittest import mock
+
 from neutron_lib import constants as nl_consts
 from neutron_lib import context
 from neutron_lib.exceptions import firewall_v2 as f_exc

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/l3reference/test_firewall_l3_agent_v2.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron.agent.l3 import l3_agent_extension_api as l3_agent_api
 from neutron.agent.l3 import router_info
 from neutron.agent.linux import ip_lib

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/test_agents.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron.conf import common as common_conf
 from neutron import extensions as neutron_extensions

neutron_fwaas/tests/unit/services/firewall/service_drivers/agents/test_firewall_agent_api.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron_fwaas.services.firewall.service_drivers.agents.drivers \
     import fwaas_base

neutron_fwaas/tests/unit/services/firewall/service_drivers/test_driver_api.py

@@ -15,7 +15,8 @@
 
 import copy
 
-import mock
+from unittest import mock
+
 from neutron_lib.callbacks import events
 from neutron_lib import context
 

neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin_v2.py

@@ -15,7 +15,7 @@
 
 import contextlib
 
-import mock
+from unittest import mock
 import webob.exc
 
 from neutron.api import extensions as api_ext

neutron_fwaas/tests/unit/services/logapi/agents/drivers/iptables/test_log.py

@@ -15,7 +15,8 @@
 
 from collections import defaultdict
 
-import mock
+from unittest import mock
+
 from neutron.tests.unit.api.v2 import test_base
 from neutron_lib.services.logapi import constants as log_const
 

neutron_fwaas/tests/unit/services/logapi/agents/l3/test_fwg_log.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron.api.rpc.callbacks.consumer import registry
 from neutron.api.rpc.callbacks import resources

neutron_fwaas/tests/unit/services/logapi/base.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron.api.rpc.callbacks.consumer import registry as cons_registry
 from neutron.api.rpc.callbacks.producer import registry as prod_registry

neutron_fwaas/tests/unit/services/logapi/common/test_fwg_callback.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron.objects import ports as port_objects
 from neutron.services.logapi.drivers import base as log_driver_base
 from neutron.services.logapi.drivers import manager as driver_mgr

neutron_fwaas/tests/unit/services/logapi/common/test_log_db_api.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron.objects.logapi import logging_resource as log_object
 from neutron.objects import ports as port_objects
 from neutron.services.logapi.rpc import server as server_rpc

neutron_fwaas/tests/unit/services/logapi/common/test_port_callback.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron.objects import ports as port_objects
 from neutron.services.logapi.drivers import base as log_driver_base
 from neutron.services.logapi.drivers import manager as driver_mgr

neutron_fwaas/tests/unit/services/logapi/rpc/test_log_server.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from neutron.services.logapi.rpc import server as server_rpc
 from neutron.tests import base

neutron_fwaas/tests/unit/services/logapi/test_fwg_validate.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from neutron.objects import ports
 from neutron.services.logapi.common import exceptions as log_exc
 from neutron.services.logapi.common import validators

test-requirements.txt

@@ -5,7 +5,6 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 flake8-import-order==0.12 # LGPLv3
-mock>=2.0.0 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 requests-mock>=1.2.0 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0