summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/topotests/isis-topo1/r3/r3_route6.json26
-rw-r--r--tests/topotests/isis-topo1/r3/zebra.conf4
-rw-r--r--tests/topotests/isis-topo1/r4/r4_route6.json18
-rw-r--r--tests/topotests/isis-topo1/r4/r4_topology.json10
-rw-r--r--tests/topotests/isis-topo1/r5/r5_route6.json16
-rw-r--r--tests/topotests/isis-topo1/r5/r5_route6_linux.json8
-rw-r--r--tests/topotests/isis-topo1/r5/zebra.conf4
7 files changed, 25 insertions, 61 deletions
diff --git a/tests/topotests/isis-topo1/r3/r3_route6.json b/tests/topotests/isis-topo1/r3/r3_route6.json
index 3b9605bd24..7bb2be0aef 100644
--- a/tests/topotests/isis-topo1/r3/r3_route6.json
+++ b/tests/topotests/isis-topo1/r3/r3_route6.json
@@ -1,27 +1,13 @@
{
"2001:db8:1:1::/64": [
{
- "distance": 115,
- "metric": 10,
- "nexthops": [
- {
- "active": true,
- "afi": "ipv6",
- "interfaceIndex": 2,
- "interfaceName": "r3-eth0"
- }
- ],
- "prefix": "2001:db8:1:1::/64",
- "protocol": "isis"
- },
- {
"nexthops": [
{
"active": true,
"directlyConnected": true,
"fib": true,
- "interfaceIndex": 3,
- "interfaceName": "r3-eth1"
+ "interfaceIndex": 2,
+ "interfaceName": "r3-eth0"
}
],
"prefix": "2001:db8:1:1::/64",
@@ -32,7 +18,7 @@
"2001:db8:1:2::/64": [
{
"distance": 115,
- "metric": 10,
+ "metric": 20,
"nexthops": [
{
"active": true,
@@ -54,8 +40,8 @@
"active": true,
"directlyConnected": true,
"fib": true,
- "interfaceIndex": 2,
- "interfaceName": "r3-eth0"
+ "interfaceIndex": 3,
+ "interfaceName": "r3-eth1"
}
],
"prefix": "2001:db8:2:1::/64",
@@ -66,7 +52,7 @@
"2001:db8:2:2::/64": [
{
"distance": 115,
- "metric": 20,
+ "metric": 10,
"nexthops": [
{
"active": true,
diff --git a/tests/topotests/isis-topo1/r3/zebra.conf b/tests/topotests/isis-topo1/r3/zebra.conf
index 051a5cf565..1e4c0d752e 100644
--- a/tests/topotests/isis-topo1/r3/zebra.conf
+++ b/tests/topotests/isis-topo1/r3/zebra.conf
@@ -1,11 +1,11 @@
hostname r3
interface r3-eth0
ip address 10.0.20.1/24
- ipv6 address 2001:db8:2:1::1/64
+ ipv6 address 2001:db8:1:1::1/64
!
interface r3-eth1
ip address 10.0.10.2/24
- ipv6 address 2001:db8:1:1::2/64
+ ipv6 address 2001:db8:2:1::2/64
!
interface lo
ip address 10.254.0.3/32
diff --git a/tests/topotests/isis-topo1/r4/r4_route6.json b/tests/topotests/isis-topo1/r4/r4_route6.json
index 8107b50753..8f52bcea2c 100644
--- a/tests/topotests/isis-topo1/r4/r4_route6.json
+++ b/tests/topotests/isis-topo1/r4/r4_route6.json
@@ -2,7 +2,7 @@
"2001:db8:1:1::/64": [
{
"distance": 115,
- "metric": 10,
+ "metric": 20,
"nexthops": [
{
"active": true,
@@ -19,20 +19,6 @@
],
"2001:db8:1:2::/64": [
{
- "distance": 115,
- "metric": 10,
- "nexthops": [
- {
- "active": true,
- "afi": "ipv6",
- "interfaceIndex": 3,
- "interfaceName": "r4-eth1"
- }
- ],
- "prefix": "2001:db8:1:2::/64",
- "protocol": "isis"
- },
- {
"nexthops": [
{
"active": true,
@@ -50,7 +36,7 @@
"2001:db8:2:1::/64": [
{
"distance": 115,
- "metric": 20,
+ "metric": 10,
"nexthops": [
{
"active": true,
diff --git a/tests/topotests/isis-topo1/r4/r4_topology.json b/tests/topotests/isis-topo1/r4/r4_topology.json
index ad857fee1b..0152c7d3c4 100644
--- a/tests/topotests/isis-topo1/r4/r4_topology.json
+++ b/tests/topotests/isis-topo1/r4/r4_topology.json
@@ -108,15 +108,7 @@
"next-hop": "10",
"parent": "r4-eth1",
"type": "IP6",
- "vertex": "2001:db8:1:1::/64"
- },
- {
- "interface": "r5",
- "metric": "internal",
- "next-hop": "10",
- "parent": "r4-eth1",
- "type": "IP6",
- "vertex": "2001:db8:1:2::/64"
+ "vertex": "2001:db8:2:1::/64"
},
{
"interface": "r5",
diff --git a/tests/topotests/isis-topo1/r5/r5_route6.json b/tests/topotests/isis-topo1/r5/r5_route6.json
index 860104f8d0..694d8c8814 100644
--- a/tests/topotests/isis-topo1/r5/r5_route6.json
+++ b/tests/topotests/isis-topo1/r5/r5_route6.json
@@ -1,5 +1,5 @@
{
- "2001:db8:1:1::/64": [
+ "2001:db8:2:1::/64": [
{
"nexthops": [
{
@@ -10,12 +10,12 @@
"interfaceName": "r5-eth0"
}
],
- "prefix": "2001:db8:1:1::/64",
+ "prefix": "2001:db8:2:1::/64",
"protocol": "connected",
"selected": true
}
],
- "2001:db8:1:2::/64": [
+ "2001:db8:2:2::/64": [
{
"nexthops": [
{
@@ -26,12 +26,12 @@
"interfaceName": "r5-eth1"
}
],
- "prefix": "2001:db8:1:2::/64",
+ "prefix": "2001:db8:2:2::/64",
"protocol": "connected",
"selected": true
}
],
- "2001:db8:2:1::/64": [
+ "2001:db8:1:1::/64": [
{
"distance": 115,
"metric": 10,
@@ -44,12 +44,12 @@
"interfaceName": "r5-eth0"
}
],
- "prefix": "2001:db8:2:1::/64",
+ "prefix": "2001:db8:1:1::/64",
"protocol": "isis",
"selected": true
}
],
- "2001:db8:2:2::/64": [
+ "2001:db8:1:2::/64": [
{
"distance": 115,
"metric": 10,
@@ -62,7 +62,7 @@
"interfaceName": "r5-eth1"
}
],
- "prefix": "2001:db8:2:2::/64",
+ "prefix": "2001:db8:1:2::/64",
"protocol": "isis",
"selected": true
}
diff --git a/tests/topotests/isis-topo1/r5/r5_route6_linux.json b/tests/topotests/isis-topo1/r5/r5_route6_linux.json
index ad8632e2d4..a7343b5330 100644
--- a/tests/topotests/isis-topo1/r5/r5_route6_linux.json
+++ b/tests/topotests/isis-topo1/r5/r5_route6_linux.json
@@ -1,15 +1,15 @@
{
"2001:db8:2:1::/64": {
"dev": "r5-eth0",
- "metric": "20",
+ "metric": "256",
"pref": "medium",
- "proto": "187"
+ "proto": "kernel"
},
"2001:db8:2:2::/64": {
"dev": "r5-eth1",
- "metric": "20",
+ "metric": "256",
"pref": "medium",
- "proto": "187"
+ "proto": "kernel"
},
"2001:db8:f::3": {
"dev": "r5-eth0",
diff --git a/tests/topotests/isis-topo1/r5/zebra.conf b/tests/topotests/isis-topo1/r5/zebra.conf
index aecfc49229..48fed69662 100644
--- a/tests/topotests/isis-topo1/r5/zebra.conf
+++ b/tests/topotests/isis-topo1/r5/zebra.conf
@@ -1,11 +1,11 @@
hostname r5
interface r5-eth0
ip address 10.0.10.1/24
- ipv6 address 2001:db8:1:1::4/64
+ ipv6 address 2001:db8:2:1::1/64
!
interface r5-eth1
ip address 10.0.11.1/24
- ipv6 address 2001:db8:1:2::4/64
+ ipv6 address 2001:db8:2:2::1/64
!
interface lo
ip address 10.254.0.5/32
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-02 20:41:19 +0000