diff --git a/changelog/undistributed/changelog_asa_show_failover_202404110935.rst b/changelog/undistributed/changelog_asa_show_failover_202404110935.rst new file mode 100644 index 0000000000..a5a7a3328a --- /dev/null +++ b/changelog/undistributed/changelog_asa_show_failover_202404110935.rst @@ -0,0 +1,8 @@ +-------------------------------------------------------------------------------- + Fix +-------------------------------------------------------------------------------- +* ASA + * Modified ShowFailoverSchema: + * Updated regex to handle Ethernet type interface names + * Modified ShowVersionSchema: + * Updated regex to '/' in Processor type \ No newline at end of file diff --git a/src/genie/libs/parser/asa/show_failover.py b/src/genie/libs/parser/asa/show_failover.py index 8329ad7fb8..d4d6525a68 100644 --- a/src/genie/libs/parser/asa/show_failover.py +++ b/src/genie/libs/parser/asa/show_failover.py @@ -141,7 +141,7 @@ def cli(self, output=None): # Failover LAN Interface: folink GigabitEthernet0/1 (up) p3 = re.compile( r'^Failover +LAN +Interface:\s(?P[A-Za-z0-9\-\_]+)\s+' - '(?P(Lo\S*|Fa\S*|Gi\S*|Ten\S*|\S*(SL|VL)\S*|Se\S*|VoIP\S*|Configured))' + '(?P(Lo\S*|Fa\S*|Eth\S*|Gi\S*|Ten\S*|\S*(SL|VL)\S*|Se\S*|VoIP\S*|Configured))' '( +\((?P[A-Za-z0-0_\-\s]+)\))?$' ) @@ -223,7 +223,7 @@ def cli(self, output=None): p17_1 = re.compile(r'^Stateful +Failover +Logical +Update +Statistics$') p17_2 = re.compile( r'^Link\s+:\s+(?P[A-Za-z0-9]+)\s+' - '(?P(Lo\S*|Fa\S*|Gi\S*|Ten\S*|\S*(SL|VL)\S*|Se\S*|VoIP\S*|Configured))' + '(?P(Lo\S*|Fa\S*|Eth\S*|Gi\S*|Ten\S*|\S*(SL|VL)\S*|Se\S*|VoIP\S*|Configured))' '( +\((?P[A-Za-z0-0_\-\s]+)\))?$' ) diff --git a/src/genie/libs/parser/asa/show_version.py b/src/genie/libs/parser/asa/show_version.py index e819685e72..345253774c 100644 --- a/src/genie/libs/parser/asa/show_version.py +++ b/src/genie/libs/parser/asa/show_version.py @@ -124,7 +124,7 @@ def cli(self, output=None): # Hardware: FPR9K-SM-24, 230696 MB RAM, CPU Xeon E5 series 2200 MHz, 2 CPUs (48 cores) # Hardware: ASA5555, 16384 MB RAM, CPU Lynnfield 2800 MHz, 1 CPU (8 cores) p7 = re.compile(r'^Hardware:\s+(?P\S+),\s+(?P[\w\s]+) RAM,' - r'\s+CPU (?P[\s\w]+),? ?(?P\d+)?\s?(\w+|)? ?\(?(?P\d+)?( cores\))?$') + r'\s+CPU (?P[\s\w\/]+),? ?(?P\d+)?\s?(\w+|)? ?\(?(?P\d+)?( cores\))?$') # SSP Slot Number: 1 p7_1 = re.compile(r'^SSP Slot Number: (?P\d+)$')