Fixes ipv6 remark parsing in older device (#1159)

* Fixes ipv6 remark parsing in older device

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add changelog

* adding sorted

* Fix lldp interface issue

* fix overridden state lldp interfaces

* Fix lldp interfaces

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Rohit Thakur <rohitthakur2590@outlook.com>

Author: 3 people

changelogs/fragments/fix_acls_remark.yaml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - ios_acls - Fixed issue where cisco.ios.ios_acls module failed to process IPv6 ACL remarks, causing unsupported parameter errors.

plugins/module_utils/network/ios/facts/acls/acls.py

@@ -235,7 +235,7 @@ def collect_remarks(aces):
 
             for each in temp_v6:
                 if each.get("aces"):
-                    # each["aces"] = collect_remarks(each.get("aces"))
+                    each["aces"] = collect_remarks(each.get("aces"))
                     process_protocol_options(each)
 
         objs = []

tests/integration/targets/ios_lldp_interfaces/tests/cli/_populate_config.yaml

@@ -1,11 +1,27 @@
 ---
-- name: Populate configuration
-  vars:
+- name: Configure GigabitEthernet1
+  cisco.ios.ios_config:
     lines:
-      "interface GigabitEthernet 1\nlldp receive\nlldp transmit\ninterface GigabitEthernet 2\nlldp receive\nlldp transmit\ninterface GigabitEthernet 3\n\
-      lldp receive\nlldp transmit\n"
-  ansible.netcommon.cli_config:
-    config: "{{ lines }}"
+      - lldp receive
+      - lldp transmit
+    parents:
+      - interface GigabitEthernet1
+
+- name: Configure GigabitEthernet2
+  cisco.ios.ios_config:
+    lines:
+      - lldp receive
+      - lldp transmit
+    parents:
+      - interface GigabitEthernet2
+
+- name: Configure GigabitEthernet3
+  cisco.ios.ios_config:
+    lines:
+      - lldp receive
+      - lldp transmit
+    parents:
+      - interface GigabitEthernet3
 
 - name: Negate GigabitEthernet 4 lldp receive and transmit if merged
   vars:

tests/integration/targets/ios_lldp_interfaces/tests/cli/gathered.yaml

@@ -5,6 +5,8 @@
 - ansible.builtin.include_tasks: _enable_lldp.yaml
 - ansible.builtin.include_tasks: _remove_config.yaml
 - ansible.builtin.include_tasks: _populate_config.yaml
+  vars:
+    isMerged: true
 
 - block:
     - name: Gather the provided configuration with the existing running configuration

tests/integration/targets/ios_lldp_interfaces/tests/cli/overridden.yaml

@@ -7,6 +7,8 @@
 - ansible.builtin.include_tasks: _remove_config.yaml
 
 - ansible.builtin.include_tasks: _populate_config.yaml
+  vars:
+    isMerged: true
 
 - block:
     - name: Override device configuration of all lldp_interfaces with provided configuration

tests/integration/targets/ios_lldp_interfaces/tests/cli/replaced.yaml

@@ -7,6 +7,8 @@
 - ansible.builtin.include_tasks: _remove_config.yaml
 
 - ansible.builtin.include_tasks: _populate_config.yaml
+  vars:
+    isMerged: true
 
 - block:
     - name: Replaces device configuration of listed lldp_interfaces with provided configuration

tests/integration/test_integration.py

@@ -21,6 +21,7 @@ def run(ansible_project, environment):
         "debug",
         "--lf",
         str(ansible_project.log_file),
+        "-vvv",
     ]
     process = subprocess.run(
         args=args,

tests/unit/modules/network/ios/test_ios_acls.py

@@ -2303,3 +2303,55 @@ def test_ios_acls_overridden_remarks_complex(self):
             "no ip access-list extended test_acl",
         ]
         self.assertEqual(sorted(result["commands"]), sorted(commands))
+
+    def test_ios_merged_general(self):
+        self.execute_show_command.return_value = dedent(
+            """\
+            ipv6 access-list extended std_acl_name_test_1
+                10 remark std_acl_name_test_1
+                20 permit 220 any any
+            """,
+        )
+        self.execute_show_command_name.return_value = dedent("")
+        set_module_args(
+            dict(
+                config=[
+                    {
+                        "afi": "ipv6",
+                        "acls": [
+                            {
+                                "name": "std_acl_name_test_1",
+                                "acl_type": "extended",
+                                "aces": [
+                                    {
+                                        "remarks": [
+                                            "Test_ipv4_ipv6_acl",
+                                        ],
+                                    },
+                                    {
+                                        "destination": {
+                                            "any": True,
+                                        },
+                                        "grant": "permit",
+                                        "protocol": 220,
+                                        "sequence": 40,
+                                        "source": {
+                                            "any": True,
+                                        },
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                ],
+                state="merged",
+            ),
+        )
+
+        result = self.execute_module(changed=True)
+        commands = [
+            "ipv6 access-list std_acl_name_test_1",
+            "permit 220 any any sequence 40",
+            "remark Test_ipv4_ipv6_acl",
+        ]
+        self.assertEqual(sorted(result["commands"]), sorted(commands))