From 784b49adba8946ea710da76e3e6cbbe4c9b47485 Mon Sep 17 00:00:00 2001 From: kentruss Date: Sun, 16 Jun 2024 11:07:03 -0400 Subject: [PATCH] updating p1b regex for RADSEC port consideration --- .../changelog_show_aaa_family_iosxe_20240616105529.rst | 6 ++++++ src/genie/libs/parser/iosxe/show_aaa.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelog/undistributed/changelog_show_aaa_family_iosxe_20240616105529.rst diff --git a/changelog/undistributed/changelog_show_aaa_family_iosxe_20240616105529.rst b/changelog/undistributed/changelog_show_aaa_family_iosxe_20240616105529.rst new file mode 100644 index 0000000000..87d5653fea --- /dev/null +++ b/changelog/undistributed/changelog_show_aaa_family_iosxe_20240616105529.rst @@ -0,0 +1,6 @@ +-------------------------------------------------------------------------------- + Fix +-------------------------------------------------------------------------------- +* IOSXE + * Modified ShowAAServers: + * Updated regex pattern p1b to allow for both RADSEC-port and RADSEC port as valid auth ports. diff --git a/src/genie/libs/parser/iosxe/show_aaa.py b/src/genie/libs/parser/iosxe/show_aaa.py index de641afc39..fc7e9a4027 100755 --- a/src/genie/libs/parser/iosxe/show_aaa.py +++ b/src/genie/libs/parser/iosxe/show_aaa.py @@ -197,8 +197,8 @@ def cli(self, output = None): # RADIUS: id 9, priority 1, host 11.15.24.174, auth-port 1812, acct-port 1813, hostname ISE-RAD p1a = re.compile(r'(^.*)\:\s+id\s+(?P\d+)\,\s+priority\s+(?P(\d+))\,\s+host\s+(?P(.*))\,\s+auth\-port\s+(?P(\d+))\,\s+acct\-port\s+(?P(\d+))\,\s*hostname\s*(?P(.*))$') - # RADIUS: id 9, priority 1, host 11.15.24.174, RADSEC-port 1812,hostname ISE-RAD - p1b = re.compile(r'(.*)\:\s+id\s+(?P\d+)\,\s+priority\s+(?P(\d+))\,\s+host\s+(?P(.*))\,\s*(RADSEC\-port\s*(?P(\d+)))\,\s*hostname\s+(?P(.*))$') + # RADIUS: id 9, priority 1, host 11.15.24.174, RADSEC[- ]port 1812,hostname ISE-RAD + p1b = re.compile(r'(.*)\:\s+id\s+(?P\d+)\,\s+priority\s+(?P(\d+))\,\s+host\s+(?P(.*))\,\s*(RADSEC[- ]port\s*(?P(\d+)))\,\s*hostname\s+(?P(.*))$') # RADIUS: id 9, priority 1, host 11.15.24.174, auth-port 1812, acct-port 1813 p1c = re.compile(r'(^.*)\:\s+id\s+(?P\d+)\,\s+priority\s+(?P(\d+))\,\s+host\s+(?P(.*))\,\s+auth\-port\s+(?P(\d+))\,\s+acct\-port\s+(?P(\d+))$')