proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 17:18:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

all-protocol-startup/isis: Fix check for "show isis interface" to allow different circuit ids than 1

Browse Source
This commit is contained in:
Martin Winter 2017-09-18 18:26:59 -07:00 committed by Donald Sharp
parent fcfbc7696b
commit 6ae351e837
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/topotests/all-protocol-startup/r1/show_isis_interface_detail.ref
View File

@ -1,5 +1,5 @@
Area test: Area test:
Interface: r1-eth5, State: Up, Active, Circuit Id: 0x1 Interface: r1-eth5, State: Up, Active, Circuit Id: 0xXX
Type: lan, Level: L1, SNPA: XXXX.XXXX.XXXX Type: lan, Level: L1, SNPA: XXXX.XXXX.XXXX
Level-1 Information: Level-1 Information:
Metric: 10, Active neighbors: 0 Metric: 10, Active neighbors: 0
@ -13,7 +13,7 @@ Area test:
IPv6 Prefixes: IPv6 Prefixes:
fc00:0:0:5::1/64 fc00:0:0:5::1/64
Interface: r1-eth6, State: Up, Active, Circuit Id: 0x1 Interface: r1-eth6, State: Up, Active, Circuit Id: 0xXX
Type: lan, Level: L2, SNPA: XXXX.XXXX.XXXX Type: lan, Level: L2, SNPA: XXXX.XXXX.XXXX
Level-2 Information: Level-2 Information:
Metric: 10, Active neighbors: 0 Metric: 10, Active neighbors: 0

2
tests/topotests/all-protocol-startup/test_all_protocol_startup.py
View File

@ -496,6 +496,8 @@ def test_isis_interfaces():
actual = re.sub(r"fe80::[0-9a-f:]+", "fe80::XXXX:XXXX:XXXX:XXXX", actual) actual = re.sub(r"fe80::[0-9a-f:]+", "fe80::XXXX:XXXX:XXXX:XXXX", actual)
# Mask out SNPA mac address portion. They are random... # Mask out SNPA mac address portion. They are random...
actual = re.sub(r"SNPA: [0-9a-f\.]+", "SNPA: XXXX.XXXX.XXXX", actual) actual = re.sub(r"SNPA: [0-9a-f\.]+", "SNPA: XXXX.XXXX.XXXX", actual)
# Mask out Circuit ID number
actual = re.sub(r"Circuit Id: 0x[0-9]+", "Circuit Id: 0xXX", actual)
# Fix newlines (make them all the same) # Fix newlines (make them all the same)
actual = ('\n'.join(actual.splitlines()) + '\n').splitlines(1) actual = ('\n'.join(actual.splitlines()) + '\n').splitlines(1)