diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_dhcp_network_rebalance_randomized.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_dhcp_network_rebalance_randomized.py index bb3548db..7b4f0b84 100644 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_dhcp_network_rebalance_randomized.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_dhcp_network_rebalance_randomized.py @@ -1,10 +1,10 @@ # -# Copyright (c) 2015-2016 Wind River Systems, Inc. +# Copyright (c) 2015-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # -import mock import random +from unittest import mock from nfv_vim.network_rebalance._dhcp_rebalance import _add_network_to_dhcp_agent_callback_body # noqa: H501 from nfv_vim.network_rebalance._dhcp_rebalance import _DHCPRebalance diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_fw_update_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_fw_update_strategy.py index 8dfee8fb..38401a42 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_fw_update_strategy.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_fw_update_strategy.py @@ -1,10 +1,10 @@ # -# Copyright (c) 2020 Wind River Systems, Inc. +# Copyright (c) 2020-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # -import mock +from unittest import mock import uuid from nfv_vim import nfvi diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_instance_director.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_instance_director.py index 90d4649d..e4e2c49a 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_instance_director.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_instance_director.py @@ -1,9 +1,9 @@ # -# Copyright (c) 2015-2016 Wind River Systems, Inc. +# Copyright (c) 2015-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # -import mock +from unittest import mock import uuid from nfv_vim import nfvi diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_kube_rootca_update_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_kube_rootca_update_strategy.py index 759e8dd9..394fd0f7 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_kube_rootca_update_strategy.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_kube_rootca_update_strategy.py @@ -1,9 +1,9 @@ # -# Copyright (c) 2020-2021 Wind River Systems, Inc. +# Copyright (c) 2020-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # -import mock +from unittest import mock import uuid from nfv_common import strategy as common_strategy diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_kube_upgrade_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_kube_upgrade_strategy.py index 314f1a33..edddd03a 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_kube_upgrade_strategy.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_kube_upgrade_strategy.py @@ -1,9 +1,9 @@ # -# Copyright (c) 2020-2021 Wind River Systems, Inc. +# Copyright (c) 2020-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # -import mock +from unittest import mock import uuid from nfv_common import strategy as common_strategy diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_network_rebalance.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_network_rebalance.py index d8522aee..637eec97 100644 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_network_rebalance.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_network_rebalance.py @@ -1,10 +1,10 @@ # -# Copyright (c) 2015-2016 Wind River Systems, Inc. +# Copyright (c) 2015-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # -import mock import random +from unittest import mock from nfv_vim.network_rebalance._network_rebalance import _L3Rebalance from nfv_vim.network_rebalance._network_rebalance import _reschedule_down_agent diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_network_rebalance_randomized.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_network_rebalance_randomized.py index 1ca78af8..9534fc25 100644 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_network_rebalance_randomized.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_network_rebalance_randomized.py @@ -1,10 +1,10 @@ # -# Copyright (c) 2015-2016 Wind River Systems, Inc. +# Copyright (c) 2015-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # -import mock import random +from unittest import mock from nfv_vim.network_rebalance._network_rebalance import _add_router_to_agent_callback_body # noqa: H501 from nfv_vim.network_rebalance._network_rebalance import _get_agent_routers_callback_body # noqa: H501 diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_nfv_client.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_nfv_client.py index 7bbb9321..214ddba7 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_nfv_client.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_nfv_client.py @@ -1,11 +1,11 @@ # -# Copyright +# Copyright (c) 2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # import copy -import mock import os +from unittest import mock from nfv_client import shell diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_plugin_kubernetes_client.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_plugin_kubernetes_client.py index 30aaa161..4cd73053 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_plugin_kubernetes_client.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_plugin_kubernetes_client.py @@ -1,4 +1,6 @@ # +# Copyright (c) 2023 Wind River Systems, Inc. +# # SPDX-License-Identifier: Apache-2.0 # # Copyright (C) 2019 Intel Corporation @@ -6,7 +8,7 @@ import kubernetes from kubernetes.client.rest import ApiException -import mock +from unittest import mock from nfv_plugins.nfvi_plugins.clients import kubernetes_client diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py index 7aec4391..d4895b54 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py @@ -1,9 +1,9 @@ # -# Copyright (c) 2016-2020 Wind River Systems, Inc. +# Copyright (c) 2016-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # -import mock +from unittest import mock import uuid from nfv_common import strategy as common_strategy diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py index aedf7e8f..2472e088 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py @@ -1,10 +1,10 @@ # -# Copyright (c) 2016-2020 Wind River Systems, Inc. +# Copyright (c) 2016-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # -import mock import testtools +from unittest import mock import uuid from nfv_common import strategy as common_strategy diff --git a/nfv/test-requirements.txt b/nfv/test-requirements.txt index 19e9129d..ccba0db9 100644 --- a/nfv/test-requirements.txt +++ b/nfv/test-requirements.txt @@ -5,6 +5,5 @@ hacking>=1.1.0,<=2.0.0 # Apache-2.0 bandit coverage>=3.6 fixtures>=3.0.0 # Apache-2.0/BSD -mock>=2.0.0 # BSD pylint testtools>=2.2.0 # MIT diff --git a/nfv/tox.ini b/nfv/tox.ini index 4fe80acc..c3dde994 100644 --- a/nfv/tox.ini +++ b/nfv/tox.ini @@ -128,7 +128,6 @@ commands = bandit --ini tox.ini -f txt -r {[nfv]nfv_base_dir} deps = {[nfv]deps} coverage fixtures - mock stestr testtools setenv = PYTHONDONTWRITEBYTECODE=True @@ -141,7 +140,6 @@ commands = cp -v {[nfv]nfv_base_dir}/nfv-tests/nfv_unit_tests/test_data/nfv_vim_ deps = {[nfv]deps} coverage fixtures - mock stestr testtools setenv = diff --git a/nova-api-proxy/test-requirements.txt b/nova-api-proxy/test-requirements.txt index a254a8c0..82e87bec 100644 --- a/nova-api-proxy/test-requirements.txt +++ b/nova-api-proxy/test-requirements.txt @@ -5,5 +5,4 @@ hacking>=1.1.0,<=2.0.0 # Apache-2.0 bandit<1.6.0;python_version>="3.0" coverage>=3.6 fixtures>=3.0.0 # Apache-2.0/BSD -mock>=2.0.0 # BSD pylint