diff --git a/changelogs/fragments/snmp_parse_fix.yml b/changelogs/fragments/snmp_parse_fix.yml new file mode 100644 index 000000000..fb2672474 --- /dev/null +++ b/changelogs/fragments/snmp_parse_fix.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - snmp_server - Fix configuration command for snmp-server host. diff --git a/plugins/module_utils/network/ios/rm_templates/snmp_server.py b/plugins/module_utils/network/ios/rm_templates/snmp_server.py index 6f0c04c69..777d4fbd9 100644 --- a/plugins/module_utils/network/ios/rm_templates/snmp_server.py +++ b/plugins/module_utils/network/ios/rm_templates/snmp_server.py @@ -322,9 +322,9 @@ def __init__(self, lines=None, module=None): ^snmp-server\shost (\s(?P\S+))? (\s(?Pinforms))? + (\svrf\s(?P\S+))? (\sversion\s(?P1|3|2c))? (\s(?Pauth|noauth|priv))? - (\svrf\s(?P\S+))? (\s(?P\S+))? (\s+(?P.+$))? """, re.VERBOSE, diff --git a/tests/unit/modules/network/ios/test_ios_snmp_server.py b/tests/unit/modules/network/ios/test_ios_snmp_server.py index 9674c894d..1c60a6628 100644 --- a/tests/unit/modules/network/ios/test_ios_snmp_server.py +++ b/tests/unit/modules/network/ios/test_ios_snmp_server.py @@ -1681,9 +1681,10 @@ def test_ios_snmp_server_parsed(self): def test_ios_snmp_server_gathered(self): self.execute_show_command.return_value = dedent( """\ - snmp-server host 172.16.2.99 checktrap isis hsrp - snmp-server host 172.16.2.1 version 3 priv newtera rsrb pim rsvp slb pki - snmp-server host 172.16.2.1 version 3 noauth replace-User! slb pki + snmp-server host 172.16.2.99 checktrap isis hsrp + snmp-server host 172.16.2.1 version 3 priv newtera rsrb pim rsvp slb pki + snmp-server host 172.16.2.1 version 3 noauth replace-User! slb pki + snmp-server host 172.16.2.1 vrf vrf1 version 3 priv newtera1 rsrb pim """, ) self.execute_show_command_user.return_value = dedent( @@ -1753,6 +1754,14 @@ def test_ios_snmp_server_gathered(self): "community_string": "checktrap", "traps": ["isis", "hsrp"], }, + { + "host": "172.16.2.99", + "vrf": "vrf1", + "version": "3", + "version_option": "priv", + "community_string": "newtera1", + "traps": ["rsrb", "pim"], + }, ], "users": [ {