Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
----------------------
Fix
----------------------
* nxos
* Modified ShowIsis, ShowIsisAdjacency, ShowIsisHostname, ShowIsisHostnameDetail, ShowIsisInterface
* Adjust area address regex to account for addresses that are hex or None
* Adjust schemas to account for valid VRF configurations that do not have all information
15 changes: 8 additions & 7 deletions src/genie/libs/parser/nxos/show_isis.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class ShowIsisSchema(MetaParser):
'resolution_of_l3_to_l2': str,
'sr_ipv4': str,
'sr_ipv6': str,
'supported_interfaces': list,
Optional('supported_interfaces'): list,
'topology': {
Any(): {
'address_family': {
Expand Down Expand Up @@ -169,7 +169,8 @@ def cli(self, vrf='', output=None):

# Area address(es) :
# 49.0001
p17 = re.compile(r'^(?P<area>[\d\.]+)$')
# 49.fe51
p17 = re.compile(r'^\s*(?P<area>([a-fA-F0-9.]+\.[a-fA-F0-9.]+)|None)$')

# Process is up and running
p18 = re.compile(r'^Process +is +(?P<process>[\S\s]+)$')
Expand Down Expand Up @@ -520,7 +521,7 @@ class ShowIsisInterfaceSchema(MetaParser):
Any(): { # process_id
'vrf': {
Any(): {
'interfaces': {
Optional('interfaces'): {
Any(): {
'name': str,
'status': str,
Expand Down Expand Up @@ -549,7 +550,7 @@ class ShowIsisInterfaceSchema(MetaParser):
Optional('passive'): str,
Optional('mtu'): int,
Optional('lsp_interval_ms'): int,
'levels': {
Optional('levels'): {
Any(): { # 1, 2
Optional('metric'): str,
Optional('designated_is'): str,
Expand Down Expand Up @@ -1060,7 +1061,7 @@ class ShowIsisAdjacencySchema(MetaParser):
Any(): {
'vrf': {
Any(): {
'interfaces': {
Optional('interfaces'): {
Any(): {
'adjacencies': {
Any(): {
Expand Down Expand Up @@ -1163,7 +1164,7 @@ class ShowIsisHostnameSchema(MetaParser):
Any(): {
'vrf': {
Any(): {
'hostname_db': {
Optional('hostname_db'): {
'hostname': {
Any(): {
'hostname': str,
Expand Down Expand Up @@ -1257,7 +1258,7 @@ class ShowIsisHostnameDetailSchema(MetaParser):
Any(): {
'vrf': {
Any(): {
'hostname_db': {
Optional('hostname_db'): {
'hostname': {
Any(): {
'hostname': str,
Expand Down

Large diffs are not rendered by default.

Loading