From a159934295df1c129ea6da3ee4f47de5c5c21e3f Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 18 Sep 2023 14:53:34 +0530
Subject: [PATCH 01/22] acls fixes

---
 .../network/ios/rm_templates/acls.py          | 57 +++++++++++--------
 plugins/modules/ios_command.py                |  2 +-
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/plugins/module_utils/network/ios/rm_templates/acls.py b/plugins/module_utils/network/ios/rm_templates/acls.py
index 164c93caf..bafc76dbd 100644
--- a/plugins/module_utils/network/ios/rm_templates/acls.py
+++ b/plugins/module_utils/network/ios/rm_templates/acls.py
@@ -149,7 +149,7 @@ def __init__(self, lines=None):
                 r"""^(ip|ipv6)
                     (\s(access-list))
                     (\s(standard|extended))
-                    (\s(?P<acl_name_r>\S+))?
+                    (\s(?P<acl_name_r>\S+))
                     $""",
                 re.VERBOSE,
             ),
@@ -159,13 +159,12 @@ def __init__(self, lines=None):
             "shared": True,
         },
         {
-            "name": "_mac_acls_name",  #
+            "name": "_mac_acls_name",  # mac acls to be removed
             "getval": re.compile(
-                r"""^(?P<acl_type>Standard|Extended|Reflexive)*
-                    \s*(?P<afi>MAC)*
-                    \s*access
-                    \s*list*
-                    \s*(?P<acl_name>.+)*
+                r"""^(?P<acl_type>Standard|Extended|Reflexive)
+                    (\s(?P<afi>MAC))
+                    (\s(access-list))
+                    (\s(?P<acl_name>.+))
                     $""",
                 re.VERBOSE,
             ),
@@ -204,8 +203,8 @@ def __init__(self, lines=None):
             "name": "remarks_type_linear",
             "getval": re.compile(
                 r"""^(access-list)
-                    (\s(?P<acl_name_linear>\S+))?
-                    (\sremark\s(?P<remarks>.+))?
+                    (\s(?P<acl_name_linear>\S+))
+                    (\sremark\s(?P<remarks>.+))
                     $""",
                 re.VERBOSE,
             ),
@@ -224,7 +223,7 @@ def __init__(self, lines=None):
             "getval": re.compile(
                 r"""\s*(?P<sequence>\d+)*
                         \s(?P<grant>deny|permit)?
-                        (\s+(?P<address>(?!ahp|eigrp|esp|gre|icmp|igmp|ipv6|ipinip|ip|nos|object-group|ospf|pcp|pim|sctp|tcp|udp)\S+|\S+,))?
+                        (\s+(?P<address>(?!ahp|any|eigrp|esp|gre|icmp|igmp|ipv6|ipinip|ip|nos|object-group|ospf|pcp|pim|sctp|tcp|udp)\S+|\S+,))?
                         (\s*(?P<any>any))?
                         (\swildcard\sbits\s(?P<wildcard>\S+))?
                         (\shost\s(?P<host>\S+))?
@@ -261,24 +260,32 @@ def __init__(self, lines=None):
                         (\s*(?P<grant>deny|permit))
                         (\sevaluate\s(?P<evaluate>\S+))?
                         (\s(?P<protocol_num>\d+))?
-                        (\s(?P<protocol>ahp|eigrp|esp|gre|icmp|igmp|ipv6|ipinip|ip|nos|ospf|pcp|pim|sctp|tcp|udp))?
+                        (\s(?P<protocol>ahp|eigrp|any|esp|gre|icmp|igmp|ipv6|ipinip|ip|nos|ospf|pcp|pim|sctp|tcp|udp))?
                         ((\s(?P<source_any>any))|
                         (\sobject-group\s(?P<source_obj_grp>\S+))|
                         (\shost\s(?P<source_host>\S+))|
                         (\s(?P<source_address>(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\s\S+)))?
-                        (\s(?P<source_port_protocol>(eq|gts|gt|lt|neq)\s(\S+|\d+)))?
+                        (\seq\s(?P<seq>(\S+|\d+)))?
+                        (\sgt\s(?P<sgt>(\S+|\d+)))?
+                        (\slt\s(?P<slt>(\S+|\d+)))?
+                        (\sneq\s(?P<sneq>(\S+|\d+)))?
                         (\srange\s(?P<srange_start>\d+)\s(?P<srange_end>\d+))?
                         (\s(?P<dest_any>any))?
                         (\sobject-group\s(?P<dest_obj_grp>\S+))?
                         (\shost\s(?P<dest_host>\S+))?
                         (\s(?P<dest_address>(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\s\S+))?
-                        (\s(?P<dest_port_protocol>(eq|gts|lt|neq)\s(\S+|\d+)))?
+                        (\seq\s(?P<deq>(\S+|\d+)))?
+                        (\sgt\s(?P<dgt>(\S+|\d+)))?
+                        (\slt\s(?P<dlt>(\S+|\d+)))?
+                        (\sneq\s(?P<dneq>(\S+|\d+)))?
                         (\srange\s(?P<drange_start>\d+)\s(?P<drange_end>\d+))?
                         (\s(?P<icmp_igmp_tcp_protocol>administratively-prohibited|alternate-address|conversion-error|dod-host-prohibited|dod-net-prohibited|echo-reply|echo|general-parameter-problem|host-isolated|host-precedence-unreachable|host-redirect|host-tos-redirect|host-tos-unreachable|host-unknown|host-unreachable|information-reply|information-request|mask-reply|mask-request|mobile-redirect|net-redirect|net-tos-redirect|net-tos-unreachable|net-unreachable|network-unknown|no-room-for-option|option-missing|packet-too-big|parameter-problem|port-unreachable|precedence-unreachable|protocol-unreachable|reassembly-timeout|redirect|router-advertisement|router-solicitation|source-quench|source-route-failed|time-exceeded|timestamp-reply|timestamp-request|traceroute|ttl-exceeded|unreachable|dvmrp|host-query|mtrace-resp|mtrace-route|pim|trace|v1host-report|v2host-report|v2leave-group|v3host-report|ack|established|fin|psh|rst|syn|urg))?
                         (\sdscp\s(?P<dscp>\S+))?
                         (\s(?P<enable_fragments>fragments))?
-                        (\s(?P<log_input>log-input\s\(tag\s=\s\S+\)|log-input))?
-                        (\s(?P<log>log\s\(tag\s=\s\S+\)|log))?
+                        (\slog-input\s\(tag\s=\s(?P<log_input>\S+\)|log-input))?
+                        (\s(?P<log_input_only>log-input))?
+                        (\slog\s\(tag\s=\s(?P<log>\S+\)|log))?
+                        (\s(?P<log_only>log))?
                         (\soption\s(?P<option>\S+|\d+))?
                         (\sprecedence\s(?P<precedence>\S+))?
                         (\stime-range\s(?P<time_range>\S+))?
@@ -312,8 +319,10 @@ def __init__(self, lines=None):
                                     "host": "{{ source_host }}",
                                     "object_group": "{{ source_obj_grp }}",
                                     "port_protocol": {
-                                        "{{ source_port_protocol.split(' ')[0] if source_port_protocol is defined else None }}": "{{\
-                                            source_port_protocol.split(' ')[1] if source_port_protocol is defined else None }}",
+                                        "eq": "{{ seq }}",
+                                        "gt": "{{ sgt }}",
+                                        "lt": "{{ slt }}",
+                                        "neq": "{{ neq }}",
                                         "range": {
                                             "start": "{{ srange_start if srange_start is defined else None }}",
                                             "end": "{{ srange_end if srange_end is defined else None }}",
@@ -326,8 +335,10 @@ def __init__(self, lines=None):
                                     "host": "{{ dest_host }}",
                                     "object_group": "{{ dest_obj_grp }}",
                                     "port_protocol": {
-                                        "{{ dest_port_protocol.split(' ')[0] if dest_port_protocol is defined else None }}": "{{\
-                                            dest_port_protocol.split(' ')[1] if dest_port_protocol is defined else None }}",
+                                        "eq": "{{ deq }}",
+                                        "gt": "{{ dgt }}",
+                                        "lt": "{{ dlt }}",
+                                        "neq": "{{ dneq }}",
                                         "range": {
                                             "start": "{{ drange_start if drange_start is defined else None }}",
                                             "end": "{{ drange_end if drange_end is defined else None }}",
@@ -337,12 +348,12 @@ def __init__(self, lines=None):
                                 "dscp": "{{ dscp }}",
                                 "enable_fragments": "{{ True if enable_fragments is defined else None }}",
                                 "log": {
-                                    "set": "{{ True if log is defined and 'tag' not in log else '' }}",
-                                    "user_cookie": "{{ log.split(' ')[-1].split(')')[0] if log is defined and 'tag' in log else '' }}",
+                                    "set": "{{ True if log_only is defined or log is defined }}",
+                                    "user_cookie": "{{ log.split(')')[0] if log is defined }}",
                                 },
                                 "log_input": {
-                                    "set": "{{ True if log_input is defined and 'tag' not in log_input else '' }}",
-                                    "user_cookie": "{{ log_input.split(' ')[-1].split(')')[0] if log_input is defined and 'tag' in log_input }}",
+                                    "set": "{{ True if log_input_only is defined or log_input is defined }}",
+                                    "user_cookie": "{{ log_input.split(')')[0] if log_input is defined }}",
                                 },
                                 "option": {
                                     "{{ option if option is defined else None }}": "{{ True if option is defined else None }}",
diff --git a/plugins/modules/ios_command.py b/plugins/modules/ios_command.py
index e73f8212f..bf37cd771 100644
--- a/plugins/modules/ios_command.py
+++ b/plugins/modules/ios_command.py
@@ -90,7 +90,7 @@
 EXAMPLES = r"""
 - name: Run show version on remote devices
   cisco.ios.ios_command:
-    commands: show version'
+    commands: show version
 
 # output-
 

From b59565db3ea9eba4b16507ca651c1c5fc9b4dc3e Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:24:58 +0000
Subject: [PATCH 02/22] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 docs/cisco.ios.ios_command_module.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/cisco.ios.ios_command_module.rst b/docs/cisco.ios.ios_command_module.rst
index 305641a9a..51437902e 100644
--- a/docs/cisco.ios.ios_command_module.rst
+++ b/docs/cisco.ios.ios_command_module.rst
@@ -141,7 +141,7 @@ Examples
 
     - name: Run show version on remote devices
       cisco.ios.ios_command:
-        commands: show version'
+        commands: show version
 
     # output-
 

From b1888c2e9916c5686a9cb272e67692f9a8ad04b2 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 18 Sep 2023 16:47:36 +0530
Subject: [PATCH 03/22] check tests

---
 plugins/module_utils/network/ios/rm_templates/acls.py | 2 +-
 tests/unit/modules/network/ios/test_ios_acls.py       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/module_utils/network/ios/rm_templates/acls.py b/plugins/module_utils/network/ios/rm_templates/acls.py
index bafc76dbd..86065e553 100644
--- a/plugins/module_utils/network/ios/rm_templates/acls.py
+++ b/plugins/module_utils/network/ios/rm_templates/acls.py
@@ -260,7 +260,7 @@ def __init__(self, lines=None):
                         (\s*(?P<grant>deny|permit))
                         (\sevaluate\s(?P<evaluate>\S+))?
                         (\s(?P<protocol_num>\d+))?
-                        (\s(?P<protocol>ahp|eigrp|any|esp|gre|icmp|igmp|ipv6|ipinip|ip|nos|ospf|pcp|pim|sctp|tcp|udp))?
+                        (\s(?P<protocol>ahp|eigrp|esp|gre|icmp|igmp|ipv6|ipinip|ip|nos|ospf|pcp|pim|sctp|tcp|udp))?
                         ((\s(?P<source_any>any))|
                         (\sobject-group\s(?P<source_obj_grp>\S+))|
                         (\shost\s(?P<source_host>\S+))|
diff --git a/tests/unit/modules/network/ios/test_ios_acls.py b/tests/unit/modules/network/ios/test_ios_acls.py
index d396f4fe6..b75de3517 100644
--- a/tests/unit/modules/network/ios/test_ios_acls.py
+++ b/tests/unit/modules/network/ios/test_ios_acls.py
@@ -303,7 +303,7 @@ def test_ios_acls_replaced_idempotent(self):
                                             "wildcard_bits": "0.0.0.255",
                                         },
                                         "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "log": {"user_cookie": "testLog"},
+                                        "log": {"set": True, "user_cookie": "testLog"},
                                     },
                                     {
                                         "sequence": 20,
@@ -468,7 +468,7 @@ def test_ios_acls_overridden_idempotent(self):
                                             "wildcard_bits": "0.0.0.255",
                                         },
                                         "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "log": {"user_cookie": "testLog"},
+                                        "log": {"set": True, "user_cookie": "testLog"},
                                     },
                                     {
                                         "sequence": 20,

From d73a5fc5677ed85dd1f838388e5673cd532fb3f5 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 18 Sep 2023 17:05:42 +0530
Subject: [PATCH 04/22] fix parsed

---
 plugins/module_utils/network/ios/rm_templates/acls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/module_utils/network/ios/rm_templates/acls.py b/plugins/module_utils/network/ios/rm_templates/acls.py
index 86065e553..ab6108bf9 100644
--- a/plugins/module_utils/network/ios/rm_templates/acls.py
+++ b/plugins/module_utils/network/ios/rm_templates/acls.py
@@ -163,7 +163,7 @@ def __init__(self, lines=None):
             "getval": re.compile(
                 r"""^(?P<acl_type>Standard|Extended|Reflexive)
                     (\s(?P<afi>MAC))
-                    (\s(access-list))
+                    (\saccess\slist)
                     (\s(?P<acl_name>.+))
                     $""",
                 re.VERBOSE,

From df188de72686ac60fae328cfa9cffeb0723b42d9 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 18 Sep 2023 17:56:21 +0530
Subject: [PATCH 05/22] fix action state bug

---
 .../network/ios/config/acls/acls.py           |   1 +
 .../network/ios/rm_templates/acls.py          |   2 +-
 .../unit/modules/network/ios/test_ios_acls.py | 260 +++++++++++++++++-
 3 files changed, 253 insertions(+), 10 deletions(-)

diff --git a/plugins/module_utils/network/ios/config/acls/acls.py b/plugins/module_utils/network/ios/config/acls/acls.py
index 9d29555cc..5303ff4d6 100644
--- a/plugins/module_utils/network/ios/config/acls/acls.py
+++ b/plugins/module_utils/network/ios/config/acls/acls.py
@@ -192,6 +192,7 @@ def sanitize_protocol_options(self, wace, hace):
                 list(wace.get("protocol_options"))[0] == hace.get("protocol")
             ):
                 hace.pop("protocol")
+                hace["protocol_options"] = wace.get("protocol_options")
         return hace
 
     def acl_name_cmd(self, name, afi, acl_type):
diff --git a/plugins/module_utils/network/ios/rm_templates/acls.py b/plugins/module_utils/network/ios/rm_templates/acls.py
index ab6108bf9..a67b53d0b 100644
--- a/plugins/module_utils/network/ios/rm_templates/acls.py
+++ b/plugins/module_utils/network/ios/rm_templates/acls.py
@@ -322,7 +322,7 @@ def __init__(self, lines=None):
                                         "eq": "{{ seq }}",
                                         "gt": "{{ sgt }}",
                                         "lt": "{{ slt }}",
-                                        "neq": "{{ neq }}",
+                                        "neq": "{{ sneq }}",
                                         "range": {
                                             "start": "{{ srange_start if srange_start is defined else None }}",
                                             "end": "{{ srange_end if srange_end is defined else None }}",
diff --git a/tests/unit/modules/network/ios/test_ios_acls.py b/tests/unit/modules/network/ios/test_ios_acls.py
index b75de3517..52ed5dafc 100644
--- a/tests/unit/modules/network/ios/test_ios_acls.py
+++ b/tests/unit/modules/network/ios/test_ios_acls.py
@@ -123,7 +123,7 @@ def test_ios_acls_merged(self):
                                     ),
                                     dict(
                                         grant="deny",
-                                        protocol_options=dict(tcp=dict(ack="true")),
+                                        protocol_options=dict(tcp=dict(ack="True")),
                                         sequence="200",
                                         source=dict(object_group="test_network_og"),
                                         destination=dict(object_group="test_network_og"),
@@ -234,7 +234,7 @@ def test_ios_acls_replaced(self):
                                 aces=[
                                     dict(
                                         grant="deny",
-                                        protocol_options=dict(tcp=dict(ack="true")),
+                                        protocol_options=dict(tcp=dict(ack="True")),
                                         source=dict(
                                             address="198.51.100.0",
                                             wildcard_bits="0.0.0.255",
@@ -401,7 +401,7 @@ def test_ios_acls_overridden(self):
                                 aces=[
                                     dict(
                                         grant="deny",
-                                        protocol_options=dict(tcp=dict(syn="true")),
+                                        protocol_options=dict(tcp=dict(syn="True")),
                                         source=dict(
                                             address="198.51.100.0",
                                             wildcard_bits="0.0.0.255",
@@ -570,7 +570,7 @@ def test_ios_acls_deleted_acl_based(self):
                                 aces=[
                                     dict(
                                         grant="deny",
-                                        protocol_options=dict(icmp=dict(echo="true")),
+                                        protocol_options=dict(icmp=dict(echo="True")),
                                         sequence="10",
                                         source=dict(address="192.0.2.0", wildcard_bits="0.0.0.255"),
                                         destination=dict(
@@ -592,11 +592,11 @@ def test_ios_acls_deleted_acl_based(self):
                                 aces=[
                                     dict(
                                         grant="deny",
-                                        protocol_options=dict(tcp=dict(ack="true")),
+                                        protocol_options=dict(tcp=dict(ack="True")),
                                         sequence="10",
-                                        source=dict(any="true", port_protocol=dict(eq="www")),
+                                        source=dict(any="True", port_protocol=dict(eq="www")),
                                         destination=dict(
-                                            any="true",
+                                            any="True",
                                             port_protocol=dict(eq="telnet"),
                                         ),
                                         dscp="af11",
@@ -628,7 +628,7 @@ def test_ios_acls_rendered(self):
                                         grant="deny",
                                         sequence="10",
                                         remarks=["check for remark", "remark for acl 110"],
-                                        protocol_options=dict(tcp=dict(syn="true")),
+                                        protocol_options=dict(tcp=dict(syn="True")),
                                         source=dict(address="192.0.2.0", wildcard_bits="0.0.0.255"),
                                         destination=dict(
                                             address="192.0.3.0",
@@ -808,7 +808,7 @@ def test_ios_acls_overridden_option(self):
                                 aces=[
                                     dict(
                                         grant="deny",
-                                        protocol_options=dict(tcp=dict(ack="true")),
+                                        protocol_options=dict(tcp=dict(ack="True")),
                                         source=dict(
                                             address="198.51.100.0",
                                             wildcard_bits="0.0.0.255",
@@ -1454,3 +1454,245 @@ def test_ios_acls_rendered_muiltioption(self):
         ]
         result = self.execute_module(changed=False)
         self.assertEqual(sorted(result["rendered"]), sorted(commands))
+
+    def test_ios_acls_overridden_bug(self):
+        self.execute_show_command.return_value = dedent(
+            """\
+            Extended IP access list NET-MGMT-VTY
+                10 permit tcp 10.58.77.248 0.0.0.7 any eq 22
+                20 permit tcp host 10.161.115.173 any eq 22
+                30 permit tcp host 10.161.115.182 any eq 22
+                40 permit tcp host 10.162.240.200 any eq 22
+                50 permit tcp host 10.182.30.9 any eq 22
+                60 permit tcp host 10.162.32.170 any eq 22
+                70 permit tcp host 10.162.32.171 any eq 22
+                80 permit tcp host 10.162.241.10 any eq 22
+                90 permit tcp host 10.58.8.22 any eq 22
+                100 permit tcp host 10.233.6.10 any eq 22
+                110 permit tcp host 10.233.6.11 any eq 22
+                120 permit tcp host 10.110.137.105 any eq 22
+                130 permit tcp host 10.182.70.13 any eq 22
+                140 permit tcp host 10.182.70.14 any eq 22
+                150 permit tcp host 10.182.70.19 any eq 22
+                160 deny ip any any log
+            Extended IP access list ntp-peer
+                10 permit ip host 10.162.14.21 any
+                20 permit ip host 10.162.14.22 any
+                30 permit ip host 10.162.14.23 any
+                40 permit ip host 10.162.14.24 any
+                50 permit ip host 10.162.15.21 any
+                60 permit ip host 10.162.15.22 any
+                70 permit ip host 10.16.8.21 any
+                80 permit ip host 10.16.8.22 any
+                90 deny ip any any log
+            """,
+        )
+
+        set_module_args(
+            dict(
+                config=[
+                    {
+                        "acls": [
+                            {
+                                "aces": [
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 10,
+                                        "source": {"host": "10.162.14.21"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 20,
+                                        "source": {"host": "10.162.14.22"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 30,
+                                        "source": {"host": "10.162.14.23"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 40,
+                                        "source": {"host": "10.162.14.24"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 50,
+                                        "source": {"host": "10.162.15.21"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 60,
+                                        "source": {"host": "10.162.15.22"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 70,
+                                        "source": {"host": "10.16.8.21"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 80,
+                                        "source": {"host": "10.16.8.22"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "deny",
+                                        "log": {"set": True},
+                                        "protocol": "ip",
+                                        "sequence": 90,
+                                        "source": {"any": True},
+                                    },
+                                ],
+                                "acl_type": "extended",
+                                "name": "ntp-peer",
+                            },
+                            {"aces": [], "acl_type": "extended", "name": "ntp-serve"},
+                            {
+                                "aces": [
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 10,
+                                        "source": {
+                                            "address": "10.58.77.248",
+                                            "wildcard_bits": "0.0.0.7",
+                                        },
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 20,
+                                        "source": {"host": "10.161.115.173"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 30,
+                                        "source": {"host": "10.161.115.182"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 40,
+                                        "source": {"host": "10.162.240.200"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 50,
+                                        "source": {"host": "10.182.30.9"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 60,
+                                        "source": {"host": "10.162.32.170"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 70,
+                                        "source": {"host": "10.162.32.171"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 80,
+                                        "source": {"host": "10.162.241.10"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 90,
+                                        "source": {"host": "10.58.8.22"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 100,
+                                        "source": {"host": "10.233.6.10"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 110,
+                                        "source": {"host": "10.233.6.11"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 120,
+                                        "source": {"host": "10.110.137.105"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 130,
+                                        "source": {"host": "10.182.70.13"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 140,
+                                        "source": {"host": "10.182.70.14"},
+                                    },
+                                    {
+                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
+                                        "grant": "permit",
+                                        "protocol": "tcp",
+                                        "sequence": 150,
+                                        "source": {"host": "10.182.70.19"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "deny",
+                                        "log": {"set": True},
+                                        "protocol": "ip",
+                                        "sequence": 160,
+                                        "source": {"any": True},
+                                    },
+                                ],
+                                "acl_type": "extended",
+                                "name": "NET-MGMT-VTY",
+                            },
+                        ],
+                        "afi": "ipv4",
+                    }
+                ],
+                state="overridden",
+            ),
+        )
+        result = self.execute_module(changed=False)
+        commands = []
+        self.assertEqual(sorted(result["commands"]), sorted(commands))

From 15d7ae42bbdaeef0e9d827417058a83aa5451615 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 12:27:29 +0000
Subject: [PATCH 06/22] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/unit/modules/network/ios/test_ios_acls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/modules/network/ios/test_ios_acls.py b/tests/unit/modules/network/ios/test_ios_acls.py
index 52ed5dafc..aa361dbd7 100644
--- a/tests/unit/modules/network/ios/test_ios_acls.py
+++ b/tests/unit/modules/network/ios/test_ios_acls.py
@@ -1688,7 +1688,7 @@ def test_ios_acls_overridden_bug(self):
                             },
                         ],
                         "afi": "ipv4",
-                    }
+                    },
                 ],
                 state="overridden",
             ),

From 3874a75127c022bef1d1558fbb08f3029afcddd7 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 18 Sep 2023 18:06:51 +0530
Subject: [PATCH 07/22] remove extra test

---
 .../unit/modules/network/ios/test_ios_acls.py | 242 ------------------
 1 file changed, 242 deletions(-)

diff --git a/tests/unit/modules/network/ios/test_ios_acls.py b/tests/unit/modules/network/ios/test_ios_acls.py
index aa361dbd7..66399a250 100644
--- a/tests/unit/modules/network/ios/test_ios_acls.py
+++ b/tests/unit/modules/network/ios/test_ios_acls.py
@@ -1454,245 +1454,3 @@ def test_ios_acls_rendered_muiltioption(self):
         ]
         result = self.execute_module(changed=False)
         self.assertEqual(sorted(result["rendered"]), sorted(commands))
-
-    def test_ios_acls_overridden_bug(self):
-        self.execute_show_command.return_value = dedent(
-            """\
-            Extended IP access list NET-MGMT-VTY
-                10 permit tcp 10.58.77.248 0.0.0.7 any eq 22
-                20 permit tcp host 10.161.115.173 any eq 22
-                30 permit tcp host 10.161.115.182 any eq 22
-                40 permit tcp host 10.162.240.200 any eq 22
-                50 permit tcp host 10.182.30.9 any eq 22
-                60 permit tcp host 10.162.32.170 any eq 22
-                70 permit tcp host 10.162.32.171 any eq 22
-                80 permit tcp host 10.162.241.10 any eq 22
-                90 permit tcp host 10.58.8.22 any eq 22
-                100 permit tcp host 10.233.6.10 any eq 22
-                110 permit tcp host 10.233.6.11 any eq 22
-                120 permit tcp host 10.110.137.105 any eq 22
-                130 permit tcp host 10.182.70.13 any eq 22
-                140 permit tcp host 10.182.70.14 any eq 22
-                150 permit tcp host 10.182.70.19 any eq 22
-                160 deny ip any any log
-            Extended IP access list ntp-peer
-                10 permit ip host 10.162.14.21 any
-                20 permit ip host 10.162.14.22 any
-                30 permit ip host 10.162.14.23 any
-                40 permit ip host 10.162.14.24 any
-                50 permit ip host 10.162.15.21 any
-                60 permit ip host 10.162.15.22 any
-                70 permit ip host 10.16.8.21 any
-                80 permit ip host 10.16.8.22 any
-                90 deny ip any any log
-            """,
-        )
-
-        set_module_args(
-            dict(
-                config=[
-                    {
-                        "acls": [
-                            {
-                                "aces": [
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "permit",
-                                        "protocol_options": {"ip": True},
-                                        "sequence": 10,
-                                        "source": {"host": "10.162.14.21"},
-                                    },
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "permit",
-                                        "protocol_options": {"ip": True},
-                                        "sequence": 20,
-                                        "source": {"host": "10.162.14.22"},
-                                    },
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "permit",
-                                        "protocol_options": {"ip": True},
-                                        "sequence": 30,
-                                        "source": {"host": "10.162.14.23"},
-                                    },
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "permit",
-                                        "protocol_options": {"ip": True},
-                                        "sequence": 40,
-                                        "source": {"host": "10.162.14.24"},
-                                    },
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "permit",
-                                        "protocol_options": {"ip": True},
-                                        "sequence": 50,
-                                        "source": {"host": "10.162.15.21"},
-                                    },
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "permit",
-                                        "protocol_options": {"ip": True},
-                                        "sequence": 60,
-                                        "source": {"host": "10.162.15.22"},
-                                    },
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "permit",
-                                        "protocol_options": {"ip": True},
-                                        "sequence": 70,
-                                        "source": {"host": "10.16.8.21"},
-                                    },
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "permit",
-                                        "protocol_options": {"ip": True},
-                                        "sequence": 80,
-                                        "source": {"host": "10.16.8.22"},
-                                    },
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "deny",
-                                        "log": {"set": True},
-                                        "protocol": "ip",
-                                        "sequence": 90,
-                                        "source": {"any": True},
-                                    },
-                                ],
-                                "acl_type": "extended",
-                                "name": "ntp-peer",
-                            },
-                            {"aces": [], "acl_type": "extended", "name": "ntp-serve"},
-                            {
-                                "aces": [
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 10,
-                                        "source": {
-                                            "address": "10.58.77.248",
-                                            "wildcard_bits": "0.0.0.7",
-                                        },
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 20,
-                                        "source": {"host": "10.161.115.173"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 30,
-                                        "source": {"host": "10.161.115.182"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 40,
-                                        "source": {"host": "10.162.240.200"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 50,
-                                        "source": {"host": "10.182.30.9"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 60,
-                                        "source": {"host": "10.162.32.170"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 70,
-                                        "source": {"host": "10.162.32.171"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 80,
-                                        "source": {"host": "10.162.241.10"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 90,
-                                        "source": {"host": "10.58.8.22"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 100,
-                                        "source": {"host": "10.233.6.10"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 110,
-                                        "source": {"host": "10.233.6.11"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 120,
-                                        "source": {"host": "10.110.137.105"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 130,
-                                        "source": {"host": "10.182.70.13"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 140,
-                                        "source": {"host": "10.182.70.14"},
-                                    },
-                                    {
-                                        "destination": {"any": True, "port_protocol": {"eq": "22"}},
-                                        "grant": "permit",
-                                        "protocol": "tcp",
-                                        "sequence": 150,
-                                        "source": {"host": "10.182.70.19"},
-                                    },
-                                    {
-                                        "destination": {"any": True},
-                                        "grant": "deny",
-                                        "log": {"set": True},
-                                        "protocol": "ip",
-                                        "sequence": 160,
-                                        "source": {"any": True},
-                                    },
-                                ],
-                                "acl_type": "extended",
-                                "name": "NET-MGMT-VTY",
-                            },
-                        ],
-                        "afi": "ipv4",
-                    },
-                ],
-                state="overridden",
-            ),
-        )
-        result = self.execute_module(changed=False)
-        commands = []
-        self.assertEqual(sorted(result["commands"]), sorted(commands))

From eba64a1eeae26c44c299ac15b4fd6140c5502ae3 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 18 Sep 2023 19:47:49 +0530
Subject: [PATCH 08/22] add tests

---
 .../unit/modules/network/ios/test_ios_acls.py | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/unit/modules/network/ios/test_ios_acls.py b/tests/unit/modules/network/ios/test_ios_acls.py
index 66399a250..5a3db48ed 100644
--- a/tests/unit/modules/network/ios/test_ios_acls.py
+++ b/tests/unit/modules/network/ios/test_ios_acls.py
@@ -282,6 +282,9 @@ def test_ios_acls_replaced_idempotent(self):
                 deny tcp any eq www any eq telnet ack dscp af11 sequence 10
             Extended IP access list test_pre
                 10 permit ip any any precedence internet
+            Extended IP access list test-idem
+                10 permit ip host 10.153.14.21 any
+                20 permit ip host 10.153.14.22 any
             """,
         )
         set_module_args(
@@ -371,6 +374,26 @@ def test_ios_acls_replaced_idempotent(self):
                             },
                         ],
                     },
+                    {
+                        "aces": [
+                            {
+                                "destination": {"any": True},
+                                "grant": "permit",
+                                "protocol_options": {"ip": True},
+                                "sequence": 10,
+                                "source": {"host": "10.153.14.21"},
+                            },
+                            {
+                                "destination": {"any": True},
+                                "grant": "permit",
+                                "protocol_options": {"ip": True},
+                                "sequence": 20,
+                                "source": {"host": "10.153.14.22"},
+                            },
+                        ],
+                        "acl_type": "extended",
+                        "name": "test-idem",
+                    },
                 ],
                 state="replaced",
             ),

From 93ee77eaa8be3c6000a7c56856376ab17a57b0f0 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 18 Sep 2023 19:53:32 +0530
Subject: [PATCH 09/22] fix ansible-lint

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 810680051..7e334f4e6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ on:  # yamllint disable-line rule:truthy
 
 jobs:
   ansible-lint:
-    uses: ansible-network/github_actions/.github/workflows/ansible-lint.yml@main
+    uses: ansible/ansible-lint@main
   changelog:
     uses: ansible-network/github_actions/.github/workflows/changelog.yml@main
     if: github.event_name != 'schedule'

From 914bf36e8473269509c28f88b0a2793c13523f09 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 18 Sep 2023 19:57:33 +0530
Subject: [PATCH 10/22] add a changelog

---
 changelogs/fragments/ios_acls_fix.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelogs/fragments/ios_acls_fix.yaml

diff --git a/changelogs/fragments/ios_acls_fix.yaml b/changelogs/fragments/ios_acls_fix.yaml
new file mode 100644
index 000000000..112c0347e
--- /dev/null
+++ b/changelogs/fragments/ios_acls_fix.yaml
@@ -0,0 +1,6 @@
+---
+doc_changes:
+  - "ios_command - Fix formatting of examples."
+bugfixes:
+  - "ios_acls - Fix standard acls rendering."
+  - "ios_acls - Fix protocol_options rendering corrects processing of overridden/ replaced state."

From 4e5251d254f849f7ad38064eef392cdac16289e1 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 18 Sep 2023 20:02:37 +0530
Subject: [PATCH 11/22] format test

---
 .../unit/modules/network/ios/test_ios_acls.py | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/unit/modules/network/ios/test_ios_acls.py b/tests/unit/modules/network/ios/test_ios_acls.py
index 5a3db48ed..2cd64f45f 100644
--- a/tests/unit/modules/network/ios/test_ios_acls.py
+++ b/tests/unit/modules/network/ios/test_ios_acls.py
@@ -336,6 +336,26 @@ def test_ios_acls_replaced_idempotent(self):
                                 ],
                             },
                             {"name": "test_acl", "acl_type": "standard"},
+                            {
+                                "aces": [
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 10,
+                                        "source": {"host": "10.153.14.21"},
+                                    },
+                                    {
+                                        "destination": {"any": True},
+                                        "grant": "permit",
+                                        "protocol_options": {"ip": True},
+                                        "sequence": 20,
+                                        "source": {"host": "10.153.14.22"},
+                                    },
+                                ],
+                                "acl_type": "extended",
+                                "name": "test-idem",
+                            },
                             {
                                 "name": "test_pre",
                                 "acl_type": "extended",
@@ -374,26 +394,6 @@ def test_ios_acls_replaced_idempotent(self):
                             },
                         ],
                     },
-                    {
-                        "aces": [
-                            {
-                                "destination": {"any": True},
-                                "grant": "permit",
-                                "protocol_options": {"ip": True},
-                                "sequence": 10,
-                                "source": {"host": "10.153.14.21"},
-                            },
-                            {
-                                "destination": {"any": True},
-                                "grant": "permit",
-                                "protocol_options": {"ip": True},
-                                "sequence": 20,
-                                "source": {"host": "10.153.14.22"},
-                            },
-                        ],
-                        "acl_type": "extended",
-                        "name": "test-idem",
-                    },
                 ],
                 state="replaced",
             ),

From f4987efd6bced3d60b6e057677cb0f08a37e47ab Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Wed, 20 Sep 2023 11:25:48 +0530
Subject: [PATCH 12/22] fix lint

---
 .ansible-lint               |  5 +++++
 .github/workflows/lint.yml  | 11 +++++++++++
 .github/workflows/tests.yml |  4 ----
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 .ansible-lint
 create mode 100644 .github/workflows/lint.yml

diff --git a/.ansible-lint b/.ansible-lint
new file mode 100644
index 000000000..ee5ded359
--- /dev/null
+++ b/.ansible-lint
@@ -0,0 +1,5 @@
+---
+profile: production
+
+exclude_paths:
+  - changelogs/changelog.yaml
\ No newline at end of file
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000..78739c355
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,11 @@
+name: ansible-lint
+on:
+  pull_request:
+    branches: ["main", "stable", "release/v*"]
+jobs:
+  build:
+    name: Ansible Lint # Naming the build is important to use it as a status check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run ansible-lint
+        uses: ansible/ansible-lint@main # or version tag instead of 'main'
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7e334f4e6..0fb4cc0cf 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,8 +14,6 @@ on:  # yamllint disable-line rule:truthy
 
 
 jobs:
-  ansible-lint:
-    uses: ansible/ansible-lint@main
   changelog:
     uses: ansible-network/github_actions/.github/workflows/changelog.yml@main
     if: github.event_name != 'schedule'
@@ -32,7 +30,6 @@ jobs:
   all_green:
     if: ${{ always() && (github.event_name != 'schedule') }}
     needs:
-      - ansible-lint
       - changelog
       - sanity
       - unit-galaxy
@@ -42,7 +39,6 @@ jobs:
       - run: >-
           python -c "assert 'failure' not in
           set([
-          '${{ needs.ansible-lint.result }}',
           '${{ needs.changelog.result }}',
           '${{ needs.sanity.result }}',
           '${{ needs.unit-galaxy.result }}',

From 039211303a80c9dddb38e0fa0089a1ae833d9b91 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Wed, 20 Sep 2023 11:30:33 +0530
Subject: [PATCH 13/22] lint fix lint

---
 .github/workflows/lint.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 78739c355..bab01bf12 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,11 +1,12 @@
+---
 name: ansible-lint
 on:
   pull_request:
     branches: ["main", "stable", "release/v*"]
 jobs:
   build:
-    name: Ansible Lint # Naming the build is important to use it as a status check
+    name: Ansible Lint  # Naming the build is important to use it as a status check
     runs-on: ubuntu-latest
     steps:
       - name: Run ansible-lint
-        uses: ansible/ansible-lint@main # or version tag instead of 'main'
\ No newline at end of file
+        uses: ansible/ansible-lint@main  # or version tag instead of 'main'

From 767bc9bfc2001e7bf566378f5c19aae6f1feea7c Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 06:01:04 +0000
Subject: [PATCH 14/22] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .ansible-lint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ansible-lint b/.ansible-lint
index ee5ded359..8d9bb70b8 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -2,4 +2,4 @@
 profile: production
 
 exclude_paths:
-  - changelogs/changelog.yaml
\ No newline at end of file
+  - changelogs/changelog.yaml

From 44639974674fcddcf6481648f67ec0e85079d4fa Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Wed, 20 Sep 2023 11:49:52 +0530
Subject: [PATCH 15/22] lgtm

---
 .github/workflows/lint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index bab01bf12..6890c6a8d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,8 +1,8 @@
 ---
 name: ansible-lint
-on:
+on:  # yamllint disable-line rule:truthy
   pull_request:
-    branches: ["main", "stable", "release/v*"]
+    branches: ["main"]
 jobs:
   build:
     name: Ansible Lint  # Naming the build is important to use it as a status check

From 534ae9e4ae7808ab590caf7d8bfcb4d7b3aaf5ab Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Wed, 20 Sep 2023 12:28:12 +0530
Subject: [PATCH 16/22] remove comments

---
 .github/workflows/lint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6890c6a8d..853e4b69c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,8 +5,8 @@ on:  # yamllint disable-line rule:truthy
     branches: ["main"]
 jobs:
   build:
-    name: Ansible Lint  # Naming the build is important to use it as a status check
+    name: Ansible Lint
     runs-on: ubuntu-latest
     steps:
       - name: Run ansible-lint
-        uses: ansible/ansible-lint@main  # or version tag instead of 'main'
+        uses: ansible/ansible-lint@main

From 021c764b68da25981328682515cb868a45e1a3ca Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Wed, 20 Sep 2023 15:09:15 +0530
Subject: [PATCH 17/22] fix range as port_protocol issue

---
 plugins/module_utils/network/ios/config/acls/acls.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/module_utils/network/ios/config/acls/acls.py b/plugins/module_utils/network/ios/config/acls/acls.py
index 5303ff4d6..c40157c28 100644
--- a/plugins/module_utils/network/ios/config/acls/acls.py
+++ b/plugins/module_utils/network/ios/config/acls/acls.py
@@ -227,9 +227,15 @@ def list_to_dict(self, param):
                         if acl.get("aces"):
                             temp_rem = []  # remarks if defined in an ace
                             for ace in acl.get("aces"):  # each ace turned to dict
-                                if ace.get("destination") and ace.get("destination", {}).get(
-                                    "port_protocol",
-                                    {},
+                                if (
+                                    ace.get("destination")
+                                    and ace.get("destination", {}).get(
+                                        "port_protocol",
+                                        {},
+                                    )
+                                    and not ace.get("destination", {})
+                                    .get("port_protocol", {})
+                                    .get("range")
                                 ):
                                     for k, v in (
                                         ace.get("destination", {}).get("port_protocol", {}).items()

From d7bc3b937227f59627fbcc41df5b4c7858a71ca4 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Wed, 20 Sep 2023 16:27:33 +0530
Subject: [PATCH 18/22] bump ansible version

---
 meta/runtime.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/runtime.yml b/meta/runtime.yml
index 55584b22f..1f2a5efca 100644
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -206,4 +206,4 @@ plugin_routing:
       redirect: cisco.ios.ios_vlans
     vrf:
       redirect: cisco.ios.ios_vrf
-requires_ansible: ">=2.9.10"
+requires_ansible: ">=2.13.12"

From 90e0fafc74cc49cd90f43372515060e399cc494b Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 10:58:01 +0000
Subject: [PATCH 19/22] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 18c333bd9..9e5cc373c 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ This collection has been tested against Cisco IOS XE Version 17.3 on CML.
 <!--start requires_ansible-->
 ## Ansible version compatibility
 
-This collection has been tested against following Ansible versions: **>=2.9.10**.
+This collection has been tested against following Ansible versions: **>=2.13.12**.
 
 For collections that support Ansible 2.9, please ensure you update your `network_os` to use the
 fully qualified collection name (for example, `cisco.ios.ios`).

From 05ca08315ec227ef6b6f1a12319ffd1ebab70300 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Wed, 20 Sep 2023 16:35:59 +0530
Subject: [PATCH 20/22] the requires_ansible version

---
 meta/runtime.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/runtime.yml b/meta/runtime.yml
index 1f2a5efca..14d31cd1c 100644
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -206,4 +206,4 @@ plugin_routing:
       redirect: cisco.ios.ios_vlans
     vrf:
       redirect: cisco.ios.ios_vrf
-requires_ansible: ">=2.13.12"
+requires_ansible: ">=2.13.11"

From fcb82f843cf431f3c89aad1e6e36730d98c9a881 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 11:07:27 +0000
Subject: [PATCH 21/22] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9e5cc373c..ac061831b 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ This collection has been tested against Cisco IOS XE Version 17.3 on CML.
 <!--start requires_ansible-->
 ## Ansible version compatibility
 
-This collection has been tested against following Ansible versions: **>=2.13.12**.
+This collection has been tested against following Ansible versions: **>=2.13.11**.
 
 For collections that support Ansible 2.9, please ensure you update your `network_os` to use the
 fully qualified collection name (for example, `cisco.ios.ios`).

From 1552c4779967a4fb509db79e2bb2189a0df334d1 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Fri, 22 Sep 2023 13:06:41 +0530
Subject: [PATCH 22/22] fix sanity

---
 tests/sanity/ignore-2.17.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tests/sanity/ignore-2.17.txt

diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt
new file mode 100644
index 000000000..d7ff17ca8
--- /dev/null
+++ b/tests/sanity/ignore-2.17.txt
@@ -0,0 +1 @@
+plugins/action/ios.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`