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

isis-topo1: fix IPv6 changes and remove metric

Browse Source 
IPv6 metric for FRR version <3.X is different than for newer versions,
so to avoid extra code logic lets just ignore these checks.

The IPv6 changes weren't detected earlier because of the json_cmp list
fix.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2018-07-26 22:13:44 -03:00 committed by Donald Sharp
parent ae6be66b8c
commit 62accdecd8
5 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/topotests/isis-topo1/r1/r1_topology.json
View File

@ -76,7 +76,6 @@
}, },
{ {
"interface": "r3", "interface": "r3",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r1-eth0", "parent": "r1-eth0",
"type": "IP6", "type": "IP6",
@ -84,7 +83,6 @@
}, },
{ {
"interface": "r3", "interface": "r3",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r1-eth0", "parent": "r1-eth0",
"type": "IP6", "type": "IP6",

2
tests/topotests/isis-topo1/r2/r2_topology.json
View File

@ -76,7 +76,6 @@
}, },
{ {
"interface": "r4", "interface": "r4",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r2-eth0", "parent": "r2-eth0",
"type": "IP6", "type": "IP6",
@ -84,7 +83,6 @@
}, },
{ {
"interface": "r4", "interface": "r4",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r2-eth0", "parent": "r2-eth0",
"type": "IP6", "type": "IP6",

21
tests/topotests/isis-topo1/r3/r3_topology.json
View File

@ -75,7 +75,7 @@
"metric": "internal", "metric": "internal",
"parent": "0", "parent": "0",
"type": "IP6", "type": "IP6",
"vertex": "2001:db8:1:1::/64" "vertex": "2001:db8:2:1::/64"
}, },
{ {
"interface": "r3-eth1", "interface": "r3-eth1",
@ -87,15 +87,13 @@
}, },
{ {
"interface": "r5", "interface": "r5",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r3-eth1", "parent": "r3-eth1",
"type": "IP6", "type": "IP6",
"vertex": "2001:db8:1:2::/64" "vertex": "2001:db8:2:2::/64"
}, },
{ {
"interface": "r5", "interface": "r5",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r3-eth1", "parent": "r3-eth1",
"type": "IP6", "type": "IP6",
@ -110,15 +108,13 @@
}, },
{ {
"interface": "r5", "interface": "r5",
"metric": "internal",
"next-hop": "20", "next-hop": "20",
"parent": "r3-eth1", "parent": "r3-eth1",
"type": "IP6", "type": "IP6",
"vertex": "2001:db8:2:2::/64" "vertex": "2001:db8:1:2::/64"
}, },
{ {
"interface": "r5", "interface": "r5",
"metric": "internal",
"next-hop": "20", "next-hop": "20",
"parent": "r3-eth1", "parent": "r3-eth1",
"type": "IP6", "type": "IP6",
@ -170,7 +166,7 @@
"metric": "internal", "metric": "internal",
"parent": "0", "parent": "0",
"type": "IP6", "type": "IP6",
"vertex": "2001:db8:2:1::/64" "vertex": "2001:db8:1:1::/64"
}, },
{ {
"interface": "r3-eth0", "interface": "r3-eth0",
@ -182,15 +178,6 @@
}, },
{ {
"interface": "r1", "interface": "r1",
"metric": "internal",
"next-hop": "10",
"parent": "r3-eth0",
"type": "IP6",
"vertex": "2001:db8:1:1::/64"
},
{
"interface": "r1",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r3-eth0", "parent": "r3-eth0",
"type": "IP6", "type": "IP6",

7
tests/topotests/isis-topo1/r4/r4_topology.json
View File

@ -87,7 +87,6 @@
}, },
{ {
"interface": "r5", "interface": "r5",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r4-eth1", "parent": "r4-eth1",
"type": "IP6", "type": "IP6",
@ -95,7 +94,6 @@
}, },
{ {
"interface": "r5", "interface": "r5",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r4-eth1", "parent": "r4-eth1",
"type": "IP6", "type": "IP6",
@ -110,15 +108,13 @@
}, },
{ {
"interface": "r5", "interface": "r5",
"metric": "internal",
"next-hop": "20", "next-hop": "20",
"parent": "r4-eth1", "parent": "r4-eth1",
"type": "IP6", "type": "IP6",
"vertex": "2001:db8:2:1::/64" "vertex": "2001:db8:1:1::/64"
}, },
{ {
"interface": "r5", "interface": "r5",
"metric": "internal",
"next-hop": "20", "next-hop": "20",
"parent": "r4-eth1", "parent": "r4-eth1",
"type": "IP6", "type": "IP6",
@ -182,7 +178,6 @@
}, },
{ {
"interface": "r2", "interface": "r2",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r4-eth0", "parent": "r4-eth0",
"type": "IP6", "type": "IP6",

12
tests/topotests/isis-topo1/r5/r5_topology.json
View File

@ -90,13 +90,13 @@
"metric": "internal", "metric": "internal",
"parent": "0", "parent": "0",
"type": "IP6", "type": "IP6",
"vertex": "2001:db8:1:1::/64" "vertex": "2001:db8:2:1::/64"
}, },
{ {
"metric": "internal", "metric": "internal",
"parent": "0", "parent": "0",
"type": "IP6", "type": "IP6",
"vertex": "2001:db8:1:2::/64" "vertex": "2001:db8:2:2::/64"
}, },
{ {
"interface": "r5-eth0", "interface": "r5-eth0",
@ -116,15 +116,13 @@
}, },
{ {
"interface": "r3", "interface": "r3",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r5-eth0", "parent": "r5-eth0",
"type": "IP6", "type": "IP6",
"vertex": "2001:db8:2:1::/64" "vertex": "2001:db8:1:1::/64"
}, },
{ {
"interface": "r3", "interface": "r3",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r5-eth0", "parent": "r5-eth0",
"type": "IP6", "type": "IP6",
@ -132,15 +130,13 @@
}, },
{ {
"interface": "r4", "interface": "r4",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r5-eth1", "parent": "r5-eth1",
"type": "IP6", "type": "IP6",
"vertex": "2001:db8:2:2::/64" "vertex": "2001:db8:1:2::/64"
}, },
{ {
"interface": "r4", "interface": "r4",
"metric": "internal",
"next-hop": "10", "next-hop": "10",
"parent": "r5-eth1", "parent": "r5-eth1",
"type": "IP6", "type": "IP6",