proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-26 04:23:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4295 from donaldsharp/topotest_if

Browse Source 
topotests: ifindex values are not guaranteed to be the same
This commit is contained in:
Renato Westphal 2019-05-10 08:42:07 -03:00 committed by GitHub
commit e777abf3a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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_ip_ospf_interface.ref
View File

@ -1,5 +1,5 @@
r1-eth0 is up r1-eth0 is up
ifindex 2, MTU 1500 bytes, BW XX Mbit <UP,BROADCAST,RUNNING,MULTICAST> ifindex X, MTU 1500 bytes, BW XX Mbit <UP,BROADCAST,RUNNING,MULTICAST>
Internet Address 192.168.0.1/24, Broadcast 192.168.0.255, Area 0.0.0.0 Internet Address 192.168.0.1/24, Broadcast 192.168.0.255, Area 0.0.0.0
MTU mismatch detection: enabled MTU mismatch detection: enabled
Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10 Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10
@ -10,7 +10,7 @@ r1-eth0 is up
Hello due in XX.XXXs Hello due in XX.XXXs
Neighbor Count is 0, Adjacent neighbor count is 0 Neighbor Count is 0, Adjacent neighbor count is 0
r1-eth3 is up r1-eth3 is up
ifindex 5, MTU 1500 bytes, BW XX Mbit <UP,BROADCAST,RUNNING,MULTICAST> ifindex X, MTU 1500 bytes, BW XX Mbit <UP,BROADCAST,RUNNING,MULTICAST>
Internet Address 192.168.3.1/26, Broadcast 192.168.3.63, Area 0.0.0.0 Internet Address 192.168.3.1/26, Broadcast 192.168.3.63, Area 0.0.0.0
MTU mismatch detection: enabled MTU mismatch detection: enabled
Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10 Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10

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

@ -480,6 +480,8 @@ def test_ospfv2_interfaces():
actual = net['r%s' % i].cmd('vtysh -c "show ip ospf interface" 2> /dev/null').rstrip() actual = net['r%s' % i].cmd('vtysh -c "show ip ospf interface" 2> /dev/null').rstrip()
# Mask out Bandwidth portion. They may change.. # Mask out Bandwidth portion. They may change..
actual = re.sub(r"BW [0-9]+ Mbit", "BW XX Mbit", actual) actual = re.sub(r"BW [0-9]+ Mbit", "BW XX Mbit", actual)
actual = re.sub(r"ifindex [0-9]", "ifindex X", actual)
# Drop time in next due # Drop time in next due
actual = re.sub(r"Hello due in [0-9\.]+s", "Hello due in XX.XXXs", actual) actual = re.sub(r"Hello due in [0-9\.]+s", "Hello due in XX.XXXs", actual)
# Fix 'MTU mismatch detection: enabled' vs 'MTU mismatch detection:enabled' - accept both # Fix 'MTU mismatch detection: enabled' vs 'MTU mismatch detection:enabled' - accept both