Merge branch 'main' into cdp_changes

Author: KB-perByte

changelogs/fragments/parser_fix.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - cisco.nxos.nxos_hsrp_interfaces - Fix parsers for preempt and priority

plugins/module_utils/network/nxos/rm_templates/hsrp_interfaces.py

@@ -225,12 +225,14 @@ def __init__(self, lines=None, module=None):
             "name": "preempt",
             "getval": re.compile(
                 r"""
-                \s*hsrp\s(?P<grp_no>\d+)
-                \s*preempt\sdelay
-                (\sminimum\s(?P<minimum>\d+))
-                (\sreload\s(?P<reload>\d+))
-                (\ssync\s(?P<sync>\d+))
-                $""", re.VERBOSE,
+                ^\s*hsrp\s(?P<grp_no>\d+)
+                \s*preempt
+                (\sdelay
+                    (\sminimum\s(?P<minimum>\d+))?
+                    (\sreload\s(?P<reload>\d+))?
+                    (\ssync\s(?P<sync>\d+))?
+                )?
+                \s*$""", re.VERBOSE,
             ),
             "setval": "preempt delay minimum {{ preempt.minimum|string }}"
             "{{ (' reload ' + preempt.reload|string) if preempt.reload is defined else '' }}"
@@ -253,8 +255,7 @@ def __init__(self, lines=None, module=None):
                 r"""
                 \s*hsrp\s(?P<grp_no>\d+)
                 \s*priority\s(?P<priority>\d+)
-                (\sforwarding-threshold\slower\s(?P<lower>\d+))
-                (\supper\s(?P<upper>\d+))
+                (\sforwarding-threshold\slower\s(?P<lower>\d+)\supper\s(?P<upper>\d+))?
                 $""", re.VERBOSE,
             ),
             "setval": "priority {{ priority.level|string }}"

tests/unit/modules/network/nxos/test_nxos_hsrp_interfaces.py

@@ -598,3 +598,46 @@ def test_nxos_hsrp_interfaces_deprecated_bfd(self):
             "no hsrp version 2",
         ]
         self.assertEqual(set(result["commands"]), set(commands))
+
+    def test_nxos_hsrp_interfaces_gathered(self):
+        self.get_config.return_value = dedent(
+            """\
+            interface Vlan1
+             hsrp 10 preempt delay minimum 10 reload 100 sync 5
+             hsrp 10 priority 100 forwarding-threshold lower 12 upper 22
+             hsrp 10 timers msec 456 33
+            interface Vlan2
+             hsrp 11 preempt delay minimum 10 sync 5
+             hsrp 11 priority 100
+             hsrp 11 timers 456 33
+            """,
+        )
+        set_module_args(
+            dict(
+                state="gathered",
+            ),
+        )
+        result = self.execute_module(changed=False)
+        gathered = [
+            {
+                "name": "Vlan1",
+                "standby_options": [
+                    {
+                        "preempt": {"minimum": 10, "reload": 100, "sync": 5},
+                        "priority": {"level": 100, "lower": 12, "upper": 22},
+                        "timer": {"hello_interval": 456, "hold_time": 33, "msec": True},
+                    },
+                ],
+            },
+            {
+                "name": "Vlan2",
+                "standby_options": [
+                    {
+                        "preempt": {"minimum": 10, "sync": 5},
+                        "priority": {"level": 100},
+                        "timer": {"hello_interval": 456, "hold_time": 33},
+                    },
+                ],
+            },
+        ]
+        self.assertEqual(result["gathered"], gathered)