From f1cd01d3d7610d8e22dcadf09cdca4748d0313c9 Mon Sep 17 00:00:00 2001 From: Allen Robel Date: Wed, 3 Dec 2025 11:05:06 -1000 Subject: [PATCH 1/4] MaintenanceModeInfo: linting No functional changes in this commit. Run black and isort. --- plugins/module_utils/common/maintenance_mode_info.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/module_utils/common/maintenance_mode_info.py b/plugins/module_utils/common/maintenance_mode_info.py index ded423897..73915ebb0 100644 --- a/plugins/module_utils/common/maintenance_mode_info.py +++ b/plugins/module_utils/common/maintenance_mode_info.py @@ -23,11 +23,11 @@ import inspect import logging +from ..fabric.fabric_details_v2 import FabricDetailsByName from .conversion import ConversionUtils from .exceptions import ControllerResponseError from .properties import Properties from .switch_details import SwitchDetails -from ..fabric.fabric_details_v2 import FabricDetailsByName @Properties.add_rest_send @@ -327,9 +327,7 @@ def _get(self, item): msg += "the controller." raise ValueError(msg) - return self.conversion.make_boolean( - self.conversion.make_none(self._info[self.filter].get(item)) - ) + return self.conversion.make_boolean(self.conversion.make_none(self._info[self.filter].get(item))) @property def filter(self): From 1fc4fb5701094a0742dbd7a7344642f732cb47d6 Mon Sep 17 00:00:00 2001 From: Allen Robel Date: Wed, 3 Dec 2025 11:06:55 -1000 Subject: [PATCH 2/4] MaintenanceMode: linting No functional changes in this commit. Run black and isort linters against MaintenanceMode. --- plugins/module_utils/common/maintenance_mode.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/plugins/module_utils/common/maintenance_mode.py b/plugins/module_utils/common/maintenance_mode.py index 00f4dce5f..27aee90cd 100644 --- a/plugins/module_utils/common/maintenance_mode.py +++ b/plugins/module_utils/common/maintenance_mode.py @@ -23,9 +23,7 @@ import inspect import logging -from .api.v1.lan_fabric.rest.control.fabrics.fabrics import ( - EpFabricConfigDeploy, EpMaintenanceModeDeploy, EpMaintenanceModeDisable, - EpMaintenanceModeEnable) +from .api.v1.lan_fabric.rest.control.fabrics.fabrics import EpFabricConfigDeploy, EpMaintenanceModeDeploy, EpMaintenanceModeDisable, EpMaintenanceModeEnable from .conversion import ConversionUtils from .exceptions import ControllerResponseError from .properties import Properties @@ -417,12 +415,8 @@ def change_system_mode(self) -> None: self.results.action = "change_sytem_mode" self.results.check_mode = self.check_mode self.results.state = self.state - self.results.response_current = copy.deepcopy( - self.rest_send.response_current - ) - self.results.result_current = copy.deepcopy( - self.rest_send.result_current - ) + self.results.response_current = copy.deepcopy(self.rest_send.response_current) + self.results.result_current = copy.deepcopy(self.rest_send.result_current) self.results.register_task_result() except (TypeError, ValueError) as error: raise ValueError(error) from error @@ -588,9 +582,7 @@ def deploy_switches(self) -> None: self.results.action = action self.results.check_mode = self.check_mode self.results.state = self.state - self.results.response_current = copy.deepcopy( - self.rest_send.response_current - ) + self.results.response_current = copy.deepcopy(self.rest_send.response_current) self.results.result_current = copy.deepcopy(self.rest_send.result_current) self.results.register_task_result() From bf1f2e173fd8f1bb876e9a8c9afce6974288e80c Mon Sep 17 00:00:00 2001 From: Allen Robel Date: Wed, 3 Dec 2025 11:08:41 -1000 Subject: [PATCH 3/4] dcnm_maintenance_mode.py: linting No functional changes in this commit. Run black and isort linters against dcnm_maintenance_mode.py. --- plugins/modules/dcnm_maintenance_mode.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/plugins/modules/dcnm_maintenance_mode.py b/plugins/modules/dcnm_maintenance_mode.py index f281904e0..c2265ab54 100644 --- a/plugins/modules/dcnm_maintenance_mode.py +++ b/plugins/modules/dcnm_maintenance_mode.py @@ -149,6 +149,7 @@ import logging from ansible.module_utils.basic import AnsibleModule + from ..module_utils.common.log_v2 import Log from ..module_utils.common.maintenance_mode import MaintenanceMode from ..module_utils.common.maintenance_mode_info import MaintenanceModeInfo @@ -917,9 +918,7 @@ def get_have(self): instance = MaintenanceModeInfo(self.params) instance.rest_send = self.rest_send instance.results = self.results - instance.config = [ - item["ip_address"] for item in self.config.get("switches", {}) - ] + instance.config = [item["ip_address"] for item in self.config.get("switches", {})] instance.refresh() except (TypeError, ValueError) as error: msg = f"{self.class_name}.{method_name}: " @@ -1212,9 +1211,7 @@ def get_have(self): try: self.maintenance_mode_info.rest_send = self.rest_send self.maintenance_mode_info.results = self.results - self.maintenance_mode_info.config = [ - item["ip_address"] for item in self.config.get("switches", {}) - ] + self.maintenance_mode_info.config = [item["ip_address"] for item in self.config.get("switches", {})] self.maintenance_mode_info.refresh() except (TypeError, ValueError) as error: msg = f"{self.class_name}.{method_name}: " @@ -1292,9 +1289,7 @@ def main(): "type": "str", } - ansible_module = AnsibleModule( - argument_spec=argument_spec, supports_check_mode=True - ) + ansible_module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True) params = copy.deepcopy(ansible_module.params) params["check_mode"] = ansible_module.check_mode From 2f9bcd4b9051ca8a2a12ee96381c556ff9c28608 Mon Sep 17 00:00:00 2001 From: Allen Robel Date: Wed, 3 Dec 2025 11:10:56 -1000 Subject: [PATCH 4/4] UT: test_dcnm_maintenance_mode: linting No functional changes in this commit. Run black and isort linters against unit test files for dcnm_maintenance_mode. --- .../test_dcnm_maintenance_mode_common.py | 9 ++--- .../test_dcnm_maintenance_mode_merged.py | 34 ++++++++----------- .../test_dcnm_maintenance_mode_params_spec.py | 6 ++-- .../test_dcnm_maintenance_mode_query.py | 29 ++++++++-------- .../test_dcnm_maintenance_mode_want.py | 12 +++---- .../dcnm/dcnm_maintenance_mode/utils.py | 15 +++----- 6 files changed, 43 insertions(+), 62 deletions(-) diff --git a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_common.py b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_common.py index 734cc5826..b3e38491f 100644 --- a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_common.py +++ b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_common.py @@ -29,12 +29,9 @@ import inspect import pytest -from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import \ - Common -from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import \ - ResponseGenerator -from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.utils import ( - common_fixture, configs_common, does_not_raise, params) +from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import Common +from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import ResponseGenerator +from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.utils import common_fixture, configs_common, does_not_raise, params def test_dcnm_maintenance_mode_common_00000(common) -> None: diff --git a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_merged.py b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_merged.py index c4b43a40c..0fd42581c 100644 --- a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_merged.py +++ b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_merged.py @@ -30,22 +30,22 @@ import inspect import pytest -from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import \ - ResponseHandler -from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import \ - RestSend -from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import \ - Sender -from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import \ - Merged -from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import \ - ResponseGenerator +from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import ResponseHandler +from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import RestSend +from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import Sender +from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import Merged +from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import ResponseGenerator from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.utils import ( - MockAnsibleModule, configs_merged, does_not_raise, params, - responses_ep_all_switches, responses_ep_fabrics, + MockAnsibleModule, + configs_merged, + does_not_raise, + params, + responses_ep_all_switches, + responses_ep_fabrics, responses_ep_maintenance_mode_deploy, responses_ep_maintenance_mode_disable, - responses_ep_maintenance_mode_enable) + responses_ep_maintenance_mode_enable, +) def test_dcnm_maintenance_mode_merged_00000() -> None: @@ -606,9 +606,7 @@ def responses(): instance.rest_send = rest_send instance.config = params_test.get("config") match = r"Merged\.fabric_deployment_disabled:\s+" - match += ( - r"The hosting fabric is in 'Deployment Disable' state for the switch with\s+" - ) + match += r"The hosting fabric is in 'Deployment Disable' state for the switch with\s+" match += r"ip_address 192\.168\.1\.2,\s+" match += r"serial_number FD2222222GA\.\s+" match += r"Review the 'Deployment Enable / Deployment Disable' setting on the controller at:\s+" @@ -902,9 +900,7 @@ def commit(self): match += r"Error detail:\s+" match += r"MockMaintenanceModeInfo\.refresh: Mocked ValueError\." with pytest.raises(ValueError, match=match): - monkeypatch.setattr( - instance, "maintenance_mode", MockMaintenanceMode(params_test) - ) + monkeypatch.setattr(instance, "maintenance_mode", MockMaintenanceMode(params_test)) instance.commit() assert len(instance.results.diff) == 2 diff --git a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_params_spec.py b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_params_spec.py index 9b80c1456..e244eb49a 100644 --- a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_params_spec.py +++ b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_params_spec.py @@ -32,10 +32,8 @@ import copy import pytest -from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import \ - ParamsSpec -from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.utils import ( - does_not_raise, params) +from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import ParamsSpec +from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.utils import does_not_raise, params def test_dcnm_maintenance_mode_params_spec_00000() -> None: diff --git a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_query.py b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_query.py index 934912b82..065c3101a 100644 --- a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_query.py +++ b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_query.py @@ -30,19 +30,19 @@ import inspect import pytest -from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import \ - ResponseHandler -from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import \ - RestSend -from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import \ - Sender -from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import \ - Query -from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import \ - ResponseGenerator +from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import ResponseHandler +from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send_v2 import RestSend +from ansible_collections.cisco.dcnm.plugins.module_utils.common.sender_file import Sender +from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import Query +from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import ResponseGenerator from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.utils import ( - MockAnsibleModule, configs_query, does_not_raise, params_query, - responses_ep_all_switches, responses_ep_fabrics) + MockAnsibleModule, + configs_query, + does_not_raise, + params_query, + responses_ep_all_switches, + responses_ep_fabrics, +) def test_dcnm_maintenance_mode_query_00000() -> None: @@ -350,6 +350,7 @@ class MockMaintenanceModeInfo: # pylint: disable=too-few-public-methods """ Mocked MaintenanceModeInfo class. """ + def __init__(self, *args): pass @@ -367,7 +368,5 @@ def refresh(self): match += r"Error detail: MockMaintenanceModeInfo\.refresh:\s+" match += r"Mocked ValueError\." with pytest.raises(ValueError, match=match): - monkeypatch.setattr( - instance, "maintenance_mode_info", MockMaintenanceModeInfo() - ) + monkeypatch.setattr(instance, "maintenance_mode_info", MockMaintenanceModeInfo()) instance.commit() diff --git a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_want.py b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_want.py index 31d79f753..d9a79b926 100644 --- a/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_want.py +++ b/tests/unit/modules/dcnm/dcnm_maintenance_mode/test_dcnm_maintenance_mode_want.py @@ -30,14 +30,10 @@ import inspect import pytest -from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import ( - ParamsSpec, Want) -from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import \ - ResponseGenerator -from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.test_params_validate_v2 import \ - ParamsValidate -from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.utils import ( - configs_want, does_not_raise, params) +from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import ParamsSpec, Want +from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.common_utils import ResponseGenerator +from ansible_collections.cisco.dcnm.tests.unit.module_utils.common.test_params_validate_v2 import ParamsValidate +from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.utils import configs_want, does_not_raise, params def test_dcnm_maintenance_mode_want_00000() -> None: diff --git a/tests/unit/modules/dcnm/dcnm_maintenance_mode/utils.py b/tests/unit/modules/dcnm/dcnm_maintenance_mode/utils.py index 93245efd8..829316ab3 100644 --- a/tests/unit/modules/dcnm/dcnm_maintenance_mode/utils.py +++ b/tests/unit/modules/dcnm/dcnm_maintenance_mode/utils.py @@ -20,16 +20,11 @@ from contextlib import contextmanager import pytest -from ansible_collections.ansible.netcommon.tests.unit.modules.utils import \ - AnsibleFailJson -from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import \ - ResponseHandler -from ansible_collections.cisco.dcnm.plugins.module_utils.fabric.fabric_details_v2 import \ - FabricDetailsByName as FabricDetailsByNameV2 -from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import \ - Common -from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.fixture import \ - load_fixture +from ansible_collections.ansible.netcommon.tests.unit.modules.utils import AnsibleFailJson +from ansible_collections.cisco.dcnm.plugins.module_utils.common.response_handler import ResponseHandler +from ansible_collections.cisco.dcnm.plugins.module_utils.fabric.fabric_details_v2 import FabricDetailsByName as FabricDetailsByNameV2 +from ansible_collections.cisco.dcnm.plugins.modules.dcnm_maintenance_mode import Common +from ansible_collections.cisco.dcnm.tests.unit.modules.dcnm.dcnm_maintenance_mode.fixture import load_fixture params_query = { "state": "query",