Merge branch 'main' into new-ios_line

ansible-collections · Nov 30, 2023 · 532bfab · 532bfab
2 parents 5db2868 + 5159fac
commit 532bfab
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -24,6 +24,7 @@ Bugfixes
 --------
 
 - Updated the ios_ping ping module to support size param.
+- ios_acls - make sequence optional for rendering of standard acls.
 - ios_bgp_global - Explicitly add neighbor address to every parser.
 - ios_bgp_global - remote_as not mendatory for neighbors.
 - ios_vrf - added MDT related keys

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -1027,6 +1027,7 @@ releases:
     changes:
       bugfixes:
         - Updated the ios_ping ping module to support size param.
+        - ios_acls - make sequence optional for rendering of standard acls.
         - ios_bgp_global - Explicitly add neighbor address to every parser.
         - ios_bgp_global - remote_as not mendatory for neighbors.
         - ios_vrf - added MDT related keys
@@ -1046,6 +1047,7 @@ releases:
       - add_ios_vxlan_vtep.yaml
       - bgp_global_evpn_fix.yml
       - bgp_global_evpn_fix_2.yml
+      - fix_acls_old.yml
       - fix_ios_bgp_address_family.yaml
       - fix_ios_evpn_evi.yaml
       - fix_ios_vlan_config.yaml
@@ -1062,4 +1064,4 @@ releases:
       - description: Resource module to configure VXLAN VTEP interface.
         name: ios_vxlan_vtep
         namespace: ""
-    release_date: "2023-11-28"
+    release_date: "2023-11-29"
diff --git a/plugins/module_utils/network/ios/rm_templates/acls.py b/plugins/module_utils/network/ios/rm_templates/acls.py
@@ -73,7 +73,9 @@ def source_destination_common_config(config_data, command, attr):
                 command += " {protocol_number}".format(**aces["protocol_options"])
             else:
                 command += " {0}".format(list(aces["protocol_options"])[0])
-                proto_option = aces["protocol_options"].get(list(aces["protocol_options"])[0])
+                proto_option = aces["protocol_options"].get(
+                    list(aces["protocol_options"])[0],
+                )
         elif aces.get("protocol"):
             command += " {protocol}".format(**aces)
         if aces.get("source"):
@@ -182,9 +184,6 @@ def __init__(self, lines=None):
                     $""",
                 re.VERBOSE,
             ),
-            # "setval": "{{ sequence|string if sequence is defined else '' }}"
-            # "{{ (' ') if sequence is defined else '' }}"
-            # "remark {{ remarks }}",
             "setval": remarks_with_sequence,
             "result": {
                 "acls": {
@@ -237,7 +236,10 @@ def __init__(self, lines=None):
                     "{{ acl_name|d() }}": {
                         "name": "{{ acl_name }}",
                         "aces": [
-                            {"sequence": "{{ sequence }}", "remarks": ["{{ remarks }}"]},
+                            {
+                                "sequence": "{{ sequence }}",
+                                "remarks": ["{{ remarks }}"],
+                            },
                         ],
                     },
                 },
@@ -246,7 +248,7 @@ def __init__(self, lines=None):
         {
             "name": "aces_ipv4_standard",
             "getval": re.compile(
-                r"""(\s*(?P<sequence>\d+))
+                r"""(\s*(?P<sequence>\d+))?
                         (\s(?P<grant>deny|permit))
                         (\s+(?P<address>((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))?
                         (\s(?P<wildcard>((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))?