Skip to content

Releasing v25.1 #926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Releasing v25.1 #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ TRUSTED_HOST = pyats-pypi.cisco.com

# Development pkg requirements
RELATED_PKGS = genie.libs.parser
DEPENDENCIES = xmltodict requests "netaddr<1.0.0"
DEPENDENCIES = xmltodict requests netaddr

ifeq ($(MAKECMDGOALS), devnet)
BUILD_CMD += --devnet
Expand Down Expand Up @@ -237,7 +237,7 @@ json:
@echo "--------------------------------------------------------------------"
@echo "Generating Parser json file"
@echo ""
@$(PYTHON) -W ignore::SyntaxWarning -c "from genie.json.make_json import make_genieparser; make_genieparser()"
@$(PYTHON) -c "from genie.json.make_json import make_genieparser; make_genieparser()"
@echo ""
@echo "Done."
@echo ""
Expand Down
308 changes: 308 additions & 0 deletions changelog/2025/january.rst
View file
Open in desktop

Large diffs are not rendered by default.

96,402 changes: 0 additions & 96,402 deletions sdk_generator/outputs/github_parser.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/genie/libs/parser/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'''

# metadata
__version__ = '24.11'
__version__ = '25.1'
__author__ = 'Cisco Systems Inc.'
__contact__ = ['[email protected]', '[email protected]']
__copyright__ = 'Copyright (c) 2018, Cisco Systems Inc.'
Expand Down
4 changes: 2 additions & 2 deletions src/genie/libs/parser/asa/show_arp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ def cli(self, output=None):
# outside 10.10.1.1 aa11.bbff.ee55 alias
# outside 10.10.1.1/1 aa11.bbff.ee55 -
p1 = re.compile(r'^(?P<name>\S+) +(?P<ip>\d+.\d+.\d+.\d+)'
'(\/(?P<prefix_length>[0-9]+))? +(?P<link_layer_address>\S+.\S+.\S+) '
'+(?P<age>\S+)$')
r'(\/(?P<prefix_length>[0-9]+))? +(?P<link_layer_address>\S+.\S+.\S+) '
r'+(?P<age>\S+)$')

for line in out.splitlines():
line = line.strip()
Expand Down
6 changes: 3 additions & 3 deletions src/genie/libs/parser/asa/show_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def cli(self, output=None):
# *admin default Vlan1000,Vlan1001, Routed disk0:/pod-context/admin.cfg
p1 = re.compile(
r'^(?P<context_name>\S+)\s+(?P<class>\S+)\s+(?P<interface>\S+)\s+'
'(?P<mode>(?!Contexts:)\S+)\s+(?P<url>\S+)$')
r'(?P<mode>(?!Contexts:)\S+)\s+(?P<url>\S+)$')

# Vlan1030,Vlan1031,
# Vlan1082,Vlan1083...
Expand Down Expand Up @@ -174,8 +174,8 @@ def cli(self, output=None):
# Vlan993, Vlan994, Vlan995, Vlan996, Vlan997, Vlan998, Vlan999
p5 = re.compile(
r'^(?P<interfaces>(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)'
'?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+)'
'?\s*)$')
r'?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+,)?\s*(\S+)'
r'?\s*)$')

# Class: default, Flags: 0x00000111, ID: 1
p6 = re.compile(
Expand Down
22 changes: 11 additions & 11 deletions src/genie/libs/parser/asa/show_failover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ def cli(self, output=None):
# Failover LAN Interface: folink GigabitEthernet0/1 (up)
p3 = re.compile(
r'^Failover +LAN +Interface:\s(?P<name>[A-Za-z0-9\-\_]+)\s+'
'(?P<interface>(Lo\S*|Fa\S*|Gi\S*|Ten\S*|\S*(SL|VL)\S*|Se\S*|VoIP\S*|Configured))'
'( +\((?P<status>[A-Za-z0-0_\-\s]+)\))?$'
r'(?P<interface>(Lo\S*|Fa\S*|Gi\S*|Ten\S*|\S*(SL|VL)\S*|Se\S*|VoIP\S*|Configured))'
r'( +\((?P<status>[A-Za-z0-0_\-\s]+)\))?$'
)

# Reconnect timeout 0:00:00
Expand All @@ -152,14 +152,14 @@ def cli(self, output=None):
# Unit Poll frequency 300 milliseconds, holdtime 999 milliseconds
p5 = re.compile(
r'^Unit +Poll +frequency\s+(?P<poll>\d+)\s+(?P<poll_unit>seconds|milliseconds),'
' +holdtime\s+(?P<holdtime>\d+)\s+(?P<holdtime_unit>seconds|milliseconds)$'
r' +holdtime\s+(?P<holdtime>\d+)\s+(?P<holdtime_unit>seconds|milliseconds)$'
)

# Interface Poll frequency 800 milliseconds, holdtime 5 seconds
# Interface Poll frequency 5 seconds, holdtime 25 seconds
p6 = re.compile(
r'^Interface +Poll +frequency\s+(?P<poll>\d+)\s+(?P<poll_unit>seconds|milliseconds),'
' +holdtime\s+(?P<holdtime>\d+)\s+(?P<holdtime_unit>seconds|milliseconds)$'
r' +holdtime\s+(?P<holdtime>\d+)\s+(?P<holdtime_unit>seconds|milliseconds)$'
)

# Interface Policy 1
Expand All @@ -173,13 +173,13 @@ def cli(self, output=None):
# Version: Ours 9.14(1), Mate 9.14(1)
p9 = re.compile(
r'^Version: +Ours\s+(?P<ours>[A-Za-z0-9\.\(\)]+),'
' +Mate\s+(?P<mate>[A-Za-z0-9\.\(\)]+)$'
r' +Mate\s+(?P<mate>[A-Za-z0-9\.\(\)]+)$'
)

# Serial Number: Ours 9AW2PSRETDT, Mate 9ASGGBEE416
p10 = re.compile(
r'^Serial +Number: +Ours\s+(?P<ours>[A-Za-z0-9]+),'
' +Mate\s+(?P<mate>[A-Za-z0-9]+)$'
r' +Mate\s+(?P<mate>[A-Za-z0-9]+)$'
)

# Last Failover at: 20:37:30 UTC Apr 11 2021
Expand All @@ -200,16 +200,16 @@ def cli(self, output=None):
# Interface outside (0.0.0.0/fe80::ecd:e9ff:fe5c:5301): Normal (Not-Monitored)
p14 = re.compile(
r'^Interface\s+(?P<interface>\w+)\s+\((?P<ipv4>[0-9\.]+)'
'(\/(?P<ipv6>[A-Za-z0-9:]+))?\):\s+(?P<state>\w+)\s+'
'\((?P<monitored_state>[A-Za-z0-9\-_]+)\)$'
r'(\/(?P<ipv6>[A-Za-z0-9:]+))?\):\s+(?P<state>\w+)\s+'
r'\((?P<monitored_state>[A-Za-z0-9\-_]+)\)$'
)

# slot 0: ASAv hw/sw rev (/9.14(1)) status (Up Sys)
# slot 1: IPS5515 hw/sw rev (N/A/7.1(4)E4) status (Up/Up)
# slot 0: ASA5515 hw/sw rev (1.0/9.2(2)4) status (Up Sys)
p15 = re.compile(
r'^slot\s+(?P<slot>\d+):\s+(?P<model>[A-Za-z0-9\-_]+) +hw\/sw +rev\s+'
'\((?P<version>\S+)\) +status\s+\((?P<status>[A-Za-z0-9_\-\s\/]+)\)$'
r'\((?P<version>\S+)\) +status\s+\((?P<status>[A-Za-z0-9_\-\s\/]+)\)$'
)

# Recv Q: 0 0 0
Expand All @@ -223,8 +223,8 @@ def cli(self, output=None):
p17_1 = re.compile(r'^Stateful +Failover +Logical +Update +Statistics$')
p17_2 = re.compile(
r'^Link\s+:\s+(?P<name>[A-Za-z0-9]+)\s+'
'(?P<interface>(Lo\S*|Fa\S*|Gi\S*|Ten\S*|\S*(SL|VL)\S*|Se\S*|VoIP\S*|Configured))'
'( +\((?P<status>[A-Za-z0-0_\-\s]+)\))?$'
r'(?P<interface>(Lo\S*|Fa\S*|Gi\S*|Ten\S*|\S*(SL|VL)\S*|Se\S*|VoIP\S*|Configured))'
r'( +\((?P<status>[A-Za-z0-0_\-\s]+)\))?$'
)

parsed_dict = {}
Expand Down
26 changes: 13 additions & 13 deletions src/genie/libs/parser/asa/show_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@ def cli(self, output=None):
# Interface GigabitEthernet0/5 "", is administratively down, line protocol is up
# Interface "nlp_int_tap", is up, line protocol is up
p1 = re.compile(r'^Interface +((?P<interface>\S+) +)?"(?P<name>\S*)", +is +'
'(?P<link_status>[\w\s]+), +line +protocol +is +(?P<line_protocol>\w+)$')
r'(?P<link_status>[\w\s]+), +line +protocol +is +(?P<line_protocol>\w+)$')

# MAC address aa11.bbff.ee55, MTU 1500
p2 = re.compile(r'^MAC address +(?P<mac_address>[\w\.]+), +MTU +(?P<mtu>\d+)$')

# IP address 10.10.10.1, subnet mask 255.255.255.0
p3 = re.compile(r'^IP +address +(?P<ip>[a-z0-9\.]+)'
'(\/(?P<prefix_length>[0-9]+))?, +subnet +mask '
'+(?P<subnet>[\w\.]+)$')
r'(\/(?P<prefix_length>[0-9]+))?, +subnet +mask '
r'+(?P<subnet>[\w\.]+)$')

# Available but not configured via nameif
p4 = re.compile(r'^(?P<interface_state>Available) +but +'
'(?P<config_status>not +configured) +via +(?P<config_issue>\S*)$')
r'(?P<config_status>not +configured) +via +(?P<config_issue>\S*)$')

for line in output.splitlines():
line = line.strip()
Expand Down Expand Up @@ -328,27 +328,27 @@ def cli(self, output=None):

# Interface Vlan300 "admin-out", is up, line protocol is up
p1 = re.compile(r'^Interface +(?P<interface>\S+) +"(?P<name>\S*)", +is +'
'(?P<link_status>[\w\s]+), +line +protocol +is +(?P<line_protocol>\w+)$')
r'(?P<link_status>[\w\s]+), +line +protocol +is +(?P<line_protocol>\w+)$')

# MAC address aa11.bbff.ee55, MTU 1500
p2 = re.compile(r'^MAC address +(?P<mac_address>[\w\.]+), +MTU +(?P<mtu>\d+)$')

# IP address 10.10.10.1, subnet mask 255.255.255.0
p3 = re.compile(r'^IP +address +(?P<ip>[a-z0-9\.]+)'
'(\/(?P<prefix_length>[0-9]+))?, +subnet +mask '
'+(?P<subnet>[\w\.]+)$')
r'(\/(?P<prefix_length>[0-9]+))?, +subnet +mask '
r'+(?P<subnet>[\w\.]+)$')

# Available but not configured via nameif
p4 = re.compile(r'^(?P<interface_state>Available) +but +'
'(?P<config_status>not +configured) +via +(?P<config_issue>\S*)$')
r'(?P<config_status>not +configured) +via +(?P<config_issue>\S*)$')

# 889007666 packets input, 785740327549 bytes
p5 = re.compile(r'^(?P<packets_input>\d+) +packets +input, '
'+(?P<bytes_input>[\d]+) +bytes$')
r'+(?P<bytes_input>[\d]+) +bytes$')

# 621453837 packets output, 428046938178 bytes
p6 = re.compile(r'^(?P<packets_output>\d+) +packets +output, '
'+(?P<bytes_output>[\d]+) +bytes$')
r'+(?P<bytes_output>[\d]+) +bytes$')

# 2988535 packets dropped
p7 = re.compile(r'^(?P<packets_dropped>\d+) +packets +dropped$')
Expand All @@ -359,7 +359,7 @@ def cli(self, output=None):
# Interface config status is active
# Interface config status is not active
p9 = re.compile(r'^Interface +config +status +is '
'+(?P<interface_config_status>[\S\s]+)$')
r'+(?P<interface_config_status>[\S\s]+)$')

# Interface state is active
# Interface state is not active
Expand All @@ -368,12 +368,12 @@ def cli(self, output=None):
# Interface vlan config status is active
# Interface vlan config status is not active
p11 = re.compile(r'^Interface +vlan +config +status +is '
'+(?P<interface_vlan_config_status>[\S\s]+)$')
r'+(?P<interface_vlan_config_status>[\S\s]+)$')

# Interface vlan state is UP
# Interface vlan state is DOWN (down in system space)
p12 = re.compile(r'^Interface +vlan +state +is +'
'(?P<interface_vlan_state>\w+)+([\S\s]+)?$')
r'(?P<interface_vlan_state>\w+)+([\S\s]+)?$')

for line in out.splitlines():
line = line.strip()
Expand Down
8 changes: 4 additions & 4 deletions src/genie/libs/parser/asa/show_route.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from genie.metaparser import MetaParser
from genie.metaparser.util.schemaengine import Any, Optional, Or
from netaddr import IPAddress
from netaddr import IPAddress, INET_ATON


# =============================================
Expand Down Expand Up @@ -187,15 +187,15 @@ def cli(self, output=None):
# D 10.0.0.0 255.255.255.0 [90/30720] via 192.168.1.1, 0:19:52, inside
p8 = re.compile(
r'^(?P<code>\S+)\s(?P<network>\S+)\s(?P<subnet>\S+)\s\[(?P<route_preference>[\d\/]+)\]'
'\svia\s+(?P<next_hop>\S+),\s(?P<date>\S+),\s+(?P<context_name>\S+)')
r'\svia\s+(?P<next_hop>\S+),\s(?P<date>\S+),\s+(?P<context_name>\S+)')

# B 10.122.3.0 255.255.255.0 [20/0]
p9 = re.compile(r'(?P<code>\S+)\s(?P<network>\S+)\s(?P<subnet>\S+)\s\[(?P<route_preference>[\d\/]+)\]')

# [170/345856] via 10.9.193.99, 2w1d, esavpn [170/345856] via 10.9.193.98, 2w1d, esavpn
p10 = re.compile(
r'\[(?P<route_preference>[\d\/]+)\]\svia\s+(?P<next_hop>\S+),\s(?P<date>\S+),'
'\s(?P<context_name>\S+)')
r'\s(?P<context_name>\S+)')

# D EX 10.121.67.0 255.255.255.0
p11 = re.compile(r'^(?:\S+)\s(?P<code>\S+)\s(?P<network>\S+)\s(?P<subnet>\S+)')
Expand Down Expand Up @@ -272,7 +272,7 @@ def cli(self, output=None):
else:
continue

prefix_length = str(IPAddress(groups['subnet']).netmask_bits())
prefix_length = str(IPAddress(groups['subnet'], flags=INET_ATON).netmask_bits())
combined_ip = groups['network'] + '/' + prefix_length
dict_route = target_dict.setdefault(combined_ip, {})

Expand Down
8 changes: 4 additions & 4 deletions src/genie/libs/parser/asa/show_traffic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,22 @@ def cli(self, output=None):

# 1 minute input rate 9452 pkts/sec, 661142 bytes/sec
p5 = re.compile(r'^1 minute input rate\s+(?P<packets_input_1_minute>\d+)\s+pkts\/sec,\s+'
'(?P<bytes_input_1_minute>\d+)\s+bytes\/sec$')
r'(?P<bytes_input_1_minute>\d+)\s+bytes\/sec$')

# 1 minute output rate 206 pkts/sec, 41887 bytes/sec
p6 = re.compile(r'^1 minute output rate\s+(?P<packets_output_1_minute>\d+)\s+pkts\/sec,\s+'
'(?P<bytes_output_1_minute>\d+)\s+bytes\/sec$')
r'(?P<bytes_output_1_minute>\d+)\s+bytes\/sec$')

# 1 minute drop rate, 0 pkts/sec
p7 = re.compile(r'^1 minute drop rate,\s+(?P<packets_drop_rate_1_minute>\d+)\s+pkts\/sec$')

# 5 minute input rate 11309 pkts/sec, 790978 bytes/sec
p8 = re.compile(r'^5 minute input rate\s+(?P<packets_input_5_minute>\d+)\s+pkts\/sec,\s+'
'(?P<bytes_input_5_minute>\d+)\s+bytes\/sec$')
r'(?P<bytes_input_5_minute>\d+)\s+bytes\/sec$')

# 5 minute output rate 0 pkts/sec, 0 bytes/sec
p9 = re.compile(r'^5 minute output rate\s+(?P<packets_output_5_minute>\d+)\s+pkts\/sec,\s+'
'(?P<bytes_output_5_minute>\d+)\s+bytes\/sec$')
r'(?P<bytes_output_5_minute>\d+)\s+bytes\/sec$')

# 5 minute drop rate, 0 pkts/sec
p10 = re.compile(r'^5 minute drop rate,\s+(?P<packets_drop_rate_5_minute>\d+)\s+pkts\/sec$')
Expand Down
4 changes: 2 additions & 2 deletions src/genie/libs/parser/cheetah/show_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,10 @@ def cli(self, ifnum, output=None):
p1_4 = re.compile(r'^(?P<attributes>[\w\s]+)?\s+MTU:(?P<mtu>\d+)\s+Metric:(?P<metric>\d+)$')

# RX packets:26749820 errors:0 dropped:0 overruns:0 frame:0
p1_5 = re.compile('^RX packets:(?P<packets>\d+) errors:(?P<error>\d+) dropped:(?P<drop>\d+) overruns:(?P<overrun>\d+) frame:(?P<frame>\d+)$')
p1_5 = re.compile(r'^RX packets:(?P<packets>\d+) errors:(?P<error>\d+) dropped:(?P<drop>\d+) overruns:(?P<overrun>\d+) frame:(?P<frame>\d+)$')

# TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
p1_6 = re.compile('^TX packets:(?P<packets>\d+) errors:(?P<error>\d+) dropped:(?P<drop>\d+) overruns:(?P<overrun>\d+) carrier:(?P<carrier>\d+)$')
p1_6 = re.compile(r'^TX packets:(?P<packets>\d+) errors:(?P<error>\d+) dropped:(?P<drop>\d+) overruns:(?P<overrun>\d+) carrier:(?P<carrier>\d+)$')

# collisions:0 txqueuelen:1000
p1_7 = re.compile(r'^collisions:(?P<collisions>\d+) txqueuelen:(?P<txqueuelen>\d+)$')
Expand Down
20 changes: 10 additions & 10 deletions src/genie/libs/parser/ios/cat6k/show_platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,11 +848,11 @@ def cli(self, output=None):

# NAME: "HundredGigE1/0/48", DESCR: "QSFP 100GE SR"
p1 = re.compile(r'^NAME: +\"(?P<name>.*)\",'
' +DESCR: +\"(?P<descr>.*)\"$')
r' +DESCR: +\"(?P<descr>.*)\"$')

# PID: QSFP-100G-SR4-S , VID: V03 , SN: AVF2243S10A
p2 = re.compile(r'^PID: +(?P<pid>\S+)? *, +VID:(?: +(?P<vid>(\S+)))? *,'
' +SN:(?: +(?P<sn>(\S+)))?$')
r' +SN:(?: +(?P<sn>(\S+)))?$')

for line in out.splitlines():
line = line.strip()
Expand Down Expand Up @@ -975,31 +975,31 @@ def cli(self, output=None):
# 1 2 Catalyst 6000 supervisor 2 (Active) WS-X6K-S2U-MSFC2 SAD0628035C
# 2 0 Supervisor-Other unknown unknown
r1 = re.compile(r'(?P<mod>\d)\s+(?P<ports>\d+)\s+(?P<card_type>.+'
'(S|s)upervisor.+)\s+(?P<model>\S+)\s+'
'(?P<serial_number>\S+)')
r'(S|s)upervisor.+)\s+(?P<model>\S+)\s+'
r'(?P<serial_number>\S+)')

# 6 1 1 port 10-Gigabit Ethernet Module WS-X6502-10GE SAD062003CM
# 3 16 Pure SFM-mode 16 port 1000mb GBIC WS-X6816-GBIC SAL061218K3
r2 = re.compile(r'(?P<mod>\d)\s+(?P<ports>\d+)\s+(?P<card_type>.+\d+\s+'
'port.+)\s{2,}(?P<model>\S+)\s+(?P<serial_number>\S+)')
r'port.+)\s{2,}(?P<model>\S+)\s+(?P<serial_number>\S+)')

# 5 0 Switching Fabric Module-136 (Active) WS-X6500-SFM2 SAD061701YC
r3 = re.compile('(?P<mod>\d)\s+(?P<ports>\d+)\s+(?P<card_type>.+)\s{2,}'
'(?P<model>\S+)\s+(?P<serial_number>\S+)')
r3 = re.compile(r'(?P<mod>\d)\s+(?P<ports>\d+)\s+(?P<card_type>.+)\s{2,}'
r'(?P<model>\S+)\s+(?P<serial_number>\S+)')

# 1 0001.64ff.1958 to 0001.64ff.1959 3.9 6.1(3) 7.5(0.6)HUB9 Ok
# 3 0005.74ff.1b9d to 0005.74ff.1bac 1.3 12.1(5r)E1 12.1(13)E3, Ok
# 1 0001.64ff.1958 to 0001.64ff.1959 3.9 6.1(3) 7.5(0.6)HUB9 Ok
r4 = re.compile(r'(?P<mod>\d+)\s+(?P<mac_from>\S+)\s+to\s+(?P<mac_to>\S+)'
'\s+(?P<hw>\S+)\s+(?P<fw>\S+)\s+(?P<sw>[\d\.\(\)\w]+)\,'
'*\s+(?P<status>(Ok|Unknown))')
r'\s+(?P<hw>\S+)\s+(?P<fw>\S+)\s+(?P<sw>[\d\.\(\)\w]+)\,'
r'*\s+(?P<status>(Ok|Unknown))')

# 1 Policy Feature Card 2 WS-F6K-PFC2 SAD062802AV 3.2 Ok
# 1 Cat6k MSFC 2 daughterboard WS-F6K-MSFC2 SAD062803TX 2.5 Ok
# 6 Distributed Forwarding Card WS-F6K-DFC SAL06261R0A 2.3 Ok
# 6 10GBASE-LR Serial 1310nm lo WS-G6488 SAD062201BN 1.1 Ok
r5 = re.compile(r'(?P<mod>\d+)\s+(?P<sub_mod>.+)\s+(?P<model>\S+)\s+'
'(?P<serial>\S+)\s+(?P<hw>\S+)\s+(?P<status>(Ok|Unknown))')
r'(?P<serial>\S+)\s+(?P<hw>\S+)\s+(?P<status>(Ok|Unknown))')

# 1 Pass
r6 = re.compile(r'(?P<mod>\d+) +(?P<online_diag_status>\S+)$')
Expand Down
2 changes: 1 addition & 1 deletion src/genie/libs/parser/ios/show_bgp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class ShowBgpAllSummary(ShowBgpAllSummary_iosxe):
class ShowBgpAllClusterIds(ShowBgpAllClusterIds_iosxe):
"""
Parser for show bgp all cluster-ids
Executing 'show vrf detail | inc \(VRF' to collect vrf names.
Note: this parser executes 'show vrf detail | inc \\(VRF' to collect vrf names.
"""
pass

Expand Down
4 changes: 2 additions & 2 deletions src/genie/libs/parser/ios/show_key_chain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def cli(self, output=None):
# accept lifetime (10:10:10 UTC Jan 1 2002) - (06:01:00 UTC Jan 1 2010)
p3 = re.compile(
r'^accept\s+lifetime\s+\((?P<start>[A-Za-z0-9:\s\+\-_]+)\)\s+\-\s+'
'\((?P<end>[A-Za-z0-9:\s\+\-_]+)\)'
r'\((?P<end>[A-Za-z0-9:\s\+\-_]+)\)'
r'(\s+\[(?P<is_valid>[A-Za-z0-9\s\-_]+)\])?$'
)

Expand All @@ -70,7 +70,7 @@ def cli(self, output=None):
# send lifetime (always valid) - (always valid) [valid now]
p4 = re.compile(
r'^send\s+lifetime\s+\((?P<start>[A-Za-z0-9:\s\+\-_]+)\)\s+\-\s+'
'\((?P<end>[A-Za-z0-9:\s\+\-_]+)\)'
r'\((?P<end>[A-Za-z0-9:\s\+\-_]+)\)'
r'(\s+\[(?P<is_valid>[A-Za-z0-9\s\-_]+)\])?$'
)

Expand Down
12 changes: 6 additions & 6 deletions src/genie/libs/parser/ios/show_ntp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,18 @@ def cli(self, output=None):
# ~10.4.1.1 .INIT. 16 - 1024 0 0.000 0.000 15937.
# +~10.16.2.2 127.127.1.1 8 137 64 1 15.917 556.786 7938.0
p1 = re.compile(r'^(?P<mode_code>[x\*\#\+\- ])?(?P<configured>[\~])? *(?P<remote>[\w\.\:]+) +'
'(?P<refid>[\w\.]+) +(?P<stratum>\d+) +'
'(?P<receive_time>[\d\-]+) +(?P<poll>\d+) +'
'(?P<reach>\d+) +(?P<delay>[\d\.]+) +'
'(?P<offset>[\d\.\-]+) +(?P<disp>[\d\.\-]+)$')
r'(?P<refid>[\w\.]+) +(?P<stratum>\d+) +'
r'(?P<receive_time>[\d\-]+) +(?P<poll>\d+) +'
r'(?P<reach>\d+) +(?P<delay>[\d\.]+) +'
r'(?P<offset>[\d\.\-]+) +(?P<disp>[\d\.\-]+)$')

# * sys.peer, # selected, + candidate, - outlyer, x falseticker, ~ configured
p2 = re.compile(r'^\* sys.peer, +\# selected, +\+ candidate, +- outlyer, '
'+x falseticker, +~ configured$')
r'+x falseticker, +~ configured$')

# * master (synced), # master (unsynced), + selected, - candidate, ~ configured
p3 = re.compile(r'^\* master +\(synced\), +\# master \(unsynced\), +\+ '
'selected, +\- candidate, +~ configured$')
r'selected, +\- candidate, +~ configured$')

for line in out.splitlines():
line = line.strip()
Expand Down
Loading
Loading