Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Mar 27, 2024
1 parent 9d23577 commit ddd53d9
Show file tree
Hide file tree
Showing 36 changed files with 182 additions and 211 deletions.
3 changes: 2 additions & 1 deletion tests/unit/mock/path.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@


mock_unfrackpath_noop = MagicMock(
spec_set=unfrackpath, side_effect=lambda x, *args, **kwargs: x
spec_set=unfrackpath,
side_effect=lambda x, *args, **kwargs: x,
)
7 changes: 2 additions & 5 deletions tests/unit/modules/network/ios/test_ios_acl_interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@


__metaclass__ = type
from unittest.mock import patch
from textwrap import dedent
from unittest.mock import patch

from ansible_collections.cisco.ios.plugins.modules import ios_acl_interfaces

from ansible_collections.cisco.ios.tests.unit.modules.utils import set_module_args

from .ios_module import TestIosModule
Expand All @@ -27,9 +26,7 @@ def setUp(self):
"ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
"get_resource_connection",
)
self.get_resource_connection_facts = (
self.mock_get_resource_connection_facts.start()
)
self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()

self.mock_execute_show_command = patch(
"ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.acl_interfaces.acl_interfaces."
Expand Down
11 changes: 3 additions & 8 deletions tests/unit/modules/network/ios/test_ios_acls.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@


__metaclass__ = type
from unittest.mock import patch
from textwrap import dedent
from unittest.mock import patch

from ansible_collections.cisco.ios.plugins.modules import ios_acls

from ansible_collections.cisco.ios.tests.unit.modules.utils import set_module_args

from .ios_module import TestIosModule
Expand All @@ -27,9 +26,7 @@ def setUp(self):
"ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
"get_resource_connection",
)
self.get_resource_connection_facts = (
self.mock_get_resource_connection_facts.start()
)
self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()

self.mock_execute_show_command = patch(
"ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.acls.acls."
Expand All @@ -40,9 +37,7 @@ def setUp(self):
"ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.acls.acls."
"AclsFacts.get_acl_names",
)
self.execute_show_command_name = (
self.mock_execute_show_command_name_specific.start()
)
self.execute_show_command_name = self.mock_execute_show_command_name_specific.start()

def tearDown(self):
super(TestIosAclsModule, self).tearDown()
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/modules/network/ios/test_ios_banner.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

__metaclass__ = type
from unittest.mock import patch
from ansible_collections.cisco.ios.plugins.modules import ios_banner

from ansible_collections.cisco.ios.plugins.modules import ios_banner
from ansible_collections.cisco.ios.tests.unit.modules.utils import set_module_args

from .ios_module import TestIosModule, load_fixture
Expand Down
34 changes: 17 additions & 17 deletions tests/unit/modules/network/ios/test_ios_bgp_address_family.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@


__metaclass__ = type
from unittest.mock import patch
from textwrap import dedent
from unittest.mock import patch

from ansible_collections.cisco.ios.plugins.modules import ios_bgp_address_family

from ansible_collections.cisco.ios.tests.unit.modules.utils import set_module_args

from .ios_module import TestIosModule
Expand All @@ -27,9 +26,7 @@ def setUp(self):
"ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
"get_resource_connection",
)
self.get_resource_connection_facts = (
self.mock_get_resource_connection_facts.start()
)
self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()

self.mock_execute_show_command = patch(
"ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.bgp_address_family.bgp_address_family."
Expand Down Expand Up @@ -122,10 +119,10 @@ def test_ios_bgp_address_family_merged(self):
neighbor_address="198.51.100.1",
remote_as="65.11",
route_maps=[
dict(name="test-route-out", out="true")
dict(name="test-route-out", out="true"),
],
prefix_lists=[
dict(name="AS65100-PREFIX-OUT", out="true")
dict(name="AS65100-PREFIX-OUT", out="true"),
],
),
],
Expand All @@ -135,7 +132,7 @@ def test_ios_bgp_address_family_merged(self):
bgp=dict(aggregate_timer=20, dmzlink_bw=True, scan_time=10),
default_metric=10,
networks=[
dict(address="192.0.1.1", route_map="test_route")
dict(address="192.0.1.1", route_map="test_route"),
],
),
],
Expand Down Expand Up @@ -336,13 +333,13 @@ def test_ios_bgp_address_family_merged_idempotent(self):
"neighbor_address": "198.51.100.1",
"nexthop_self": {"all": True},
"prefix_lists": [
{"name": "AS65100-PREFIX-OUT", "out": True}
{"name": "AS65100-PREFIX-OUT", "out": True},
],
"remote_as": 10,
"route_maps": [{"name": "test-out", "out": True}],
"route_server_client": True,
"slow_peer_options": {
"detection": {"threshold": 150}
"detection": {"threshold": 150},
},
},
],
Expand Down Expand Up @@ -442,7 +439,7 @@ def test_ios_bgp_address_family_replaced(self):
activate=True,
remote_as=200,
route_maps=[
dict(name="test-replaced-route", out=True)
dict(name="test-replaced-route", out=True),
],
),
],
Expand Down Expand Up @@ -552,14 +549,15 @@ def test_ios_bgp_address_family_replaced_idempotent(self):
cost_community=dict(
id=100,
poi=dict(
igp_cost=True, transitive=True
igp_cost=True,
transitive=True,
),
),
),
),
nexthop_self=dict(all=True),
prefix_lists=[
dict(name="AS65100-PREFIX-OUT", out="true")
dict(name="AS65100-PREFIX-OUT", out="true"),
],
slow_peer=[dict(detection=dict(threshold=150))],
remote_as=10,
Expand Down Expand Up @@ -731,14 +729,15 @@ def test_ios_bgp_address_family_overridden_idempotent(self):
cost_community=dict(
id=100,
poi=dict(
igp_cost=True, transitive=True
igp_cost=True,
transitive=True,
),
),
),
),
nexthop_self=dict(all=True),
prefix_lists=[
dict(name="AS65100-PREFIX-OUT", out="true")
dict(name="AS65100-PREFIX-OUT", out="true"),
],
slow_peer=[dict(detection=dict(threshold=150))],
remote_as=10,
Expand Down Expand Up @@ -963,7 +962,8 @@ def test_ios_bgp_address_family_rendered(self):
cost_community=dict(
id=100,
poi=dict(
igp_cost=True, transitive=True
igp_cost=True,
transitive=True,
),
),
),
Expand Down Expand Up @@ -1209,7 +1209,7 @@ def test_ios_bgp_address_family_parsed(self):
},
"route_server_client": True,
"prefix_lists": [
{"name": "AS65100-PREFIX-OUT", "out": True}
{"name": "AS65100-PREFIX-OUT", "out": True},
],
"slow_peer_options": {"detection": {"threshold": 150}},
"route_maps": [{"name": "test-out", "out": True}],
Expand Down
11 changes: 3 additions & 8 deletions tests/unit/modules/network/ios/test_ios_bgp_global.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@


__metaclass__ = type
from unittest.mock import patch
from textwrap import dedent
from unittest.mock import patch

from ansible_collections.cisco.ios.plugins.modules import ios_bgp_global
from ansible_collections.cisco.ios.tests.unit.modules.utils import (
AnsibleFailJson,
set_module_args,
)
from ansible_collections.cisco.ios.tests.unit.modules.utils import AnsibleFailJson, set_module_args

from .ios_module import TestIosModule

Expand All @@ -29,9 +26,7 @@ def setUp(self):
"ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
"get_resource_connection",
)
self.get_resource_connection_facts = (
self.mock_get_resource_connection_facts.start()
)
self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()

self.mock_execute_show_command = patch(
"ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.bgp_global.bgp_global."
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/modules/network/ios/test_ios_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@


__metaclass__ = type
from unittest.mock import patch
import json

from unittest.mock import patch

from ansible_collections.cisco.ios.plugins.modules import ios_command
from ansible_collections.cisco.ios.tests.unit.modules.utils import set_module_args

Expand Down
19 changes: 12 additions & 7 deletions tests/unit/modules/network/ios/test_ios_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

__metaclass__ = type
from unittest.mock import MagicMock, patch

from ansible_collections.cisco.ios.plugins.cliconf.ios import Cliconf
from ansible_collections.cisco.ios.plugins.modules import ios_config

from ansible_collections.cisco.ios.tests.unit.modules.utils import set_module_args

from .ios_module import TestIosModule, load_fixture
Expand Down Expand Up @@ -124,7 +124,8 @@ def test_ios_config_lines_wo_parents(self):
set_module_args(dict(lines=lines))
self.conn.get_diff = MagicMock(
return_value=self.cliconf_obj.get_diff(
"\n".join(lines), self.running_config
"\n".join(lines),
self.running_config,
),
)
commands = ["hostname foo"]
Expand All @@ -140,7 +141,8 @@ def test_ios_config_lines_w_parents(self):

self.conn.get_diff = MagicMock(
return_value=self.cliconf_obj.get_diff(
candidate_config, self.running_config
candidate_config,
self.running_config,
),
)

Expand All @@ -152,7 +154,8 @@ def test_ios_config_before(self):
set_module_args(dict(lines=lines, before=["test1", "test2"]))
self.conn.get_diff = MagicMock(
return_value=self.cliconf_obj.get_diff(
"\n".join(lines), self.running_config
"\n".join(lines),
self.running_config,
),
)
commands = ["test1", "test2", "hostname foo"]
Expand All @@ -163,7 +166,8 @@ def test_ios_config_after(self):
set_module_args(dict(lines=lines, after=["test1", "test2"]))
self.conn.get_diff = MagicMock(
return_value=self.cliconf_obj.get_diff(
"\n".join(lines), self.running_config
"\n".join(lines),
self.running_config,
),
)
commands = ["hostname foo", "test1", "test2"]
Expand All @@ -172,11 +176,12 @@ def test_ios_config_after(self):
def test_ios_config_before_after_no_change(self):
lines = ["hostname router"]
set_module_args(
dict(lines=lines, before=["test1", "test2"], after=["test3", "test4"])
dict(lines=lines, before=["test1", "test2"], after=["test3", "test4"]),
)
self.conn.get_diff = MagicMock(
return_value=self.cliconf_obj.get_diff(
"\n".join(lines), self.running_config
"\n".join(lines),
self.running_config,
),
)
self.execute_module()
Expand Down
6 changes: 2 additions & 4 deletions tests/unit/modules/network/ios/test_ios_evpn_global.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@


__metaclass__ = type
from unittest.mock import patch
from textwrap import dedent
from unittest.mock import patch

from ansible_collections.cisco.ios.plugins.modules import ios_evpn_global
from ansible_collections.cisco.ios.tests.unit.modules.utils import set_module_args
Expand All @@ -26,9 +26,7 @@ def setUp(self):
"ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
"get_resource_connection",
)
self.get_resource_connection_facts = (
self.mock_get_resource_connection_facts.start()
)
self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()

self.mock_execute_show_command = patch(
"ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.evpn_global.evpn_global."
Expand Down
Loading

0 comments on commit ddd53d9

Please sign in to comment.