isis-topo1: fix IPv6 changes and remove metric

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>

diff --git a/tests/topotests/isis-topo1/r1/r1_topology.json b/tests/topotests/isis-topo1/r1/r1_topology.json
index 027f95607fbf61decbbaa87da169ad13f2a423b6..6d2bbb80c9fb8ce81bc7a94f43bf6c3d871b1e90 100644 (file)
--- a/tests/topotests/isis-topo1/r1/r1_topology.json
+++ b/tests/topotests/isis-topo1/r1/r1_topology.json
@@ -76,7 +76,6 @@
         },
         {
           "interface": "r3",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r1-eth0",
           "type": "IP6",
@@ -84,7 +83,6 @@
         },
         {
           "interface": "r3",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r1-eth0",
           "type": "IP6",

diff --git a/tests/topotests/isis-topo1/r2/r2_topology.json b/tests/topotests/isis-topo1/r2/r2_topology.json
index 5349aeb1187a4f7f7f77cffa28dfefcdb6a3d482..396c618caa07c4449dc7065154ed04061bf247dd 100644 (file)
--- a/tests/topotests/isis-topo1/r2/r2_topology.json
+++ b/tests/topotests/isis-topo1/r2/r2_topology.json
@@ -76,7 +76,6 @@
         },
         {
           "interface": "r4",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r2-eth0",
           "type": "IP6",
@@ -84,7 +83,6 @@
         },
         {
           "interface": "r4",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r2-eth0",
           "type": "IP6",

diff --git a/tests/topotests/isis-topo1/r3/r3_topology.json b/tests/topotests/isis-topo1/r3/r3_topology.json
index 3df2827409a431442b9cf966abf86b4ceb994211..5ab58c41a63624e5adadddef67b07644da321464 100644 (file)
--- a/tests/topotests/isis-topo1/r3/r3_topology.json
+++ b/tests/topotests/isis-topo1/r3/r3_topology.json
@@ -75,7 +75,7 @@
           "metric": "internal",
           "parent": "0",
           "type": "IP6",
-          "vertex": "2001:db8:1:1::/64"
+          "vertex": "2001:db8:2:1::/64"
         },
         {
           "interface": "r3-eth1",
@@ -87,15 +87,13 @@
         },
         {
           "interface": "r5",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r3-eth1",
           "type": "IP6",
-          "vertex": "2001:db8:1:2::/64"
+          "vertex": "2001:db8:2:2::/64"
         },
         {
           "interface": "r5",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r3-eth1",
           "type": "IP6",
@@ -110,15 +108,13 @@
         },
         {
           "interface": "r5",
-          "metric": "internal",
           "next-hop": "20",
           "parent": "r3-eth1",
           "type": "IP6",
-          "vertex": "2001:db8:2:2::/64"
+          "vertex": "2001:db8:1:2::/64"
         },
         {
           "interface": "r5",
-          "metric": "internal",
           "next-hop": "20",
           "parent": "r3-eth1",
           "type": "IP6",
@@ -170,7 +166,7 @@
           "metric": "internal",
           "parent": "0",
           "type": "IP6",
-          "vertex": "2001:db8:2:1::/64"
+          "vertex": "2001:db8:1:1::/64"
         },
         {
           "interface": "r3-eth0",
@@ -182,15 +178,6 @@
         },
         {
           "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",
           "parent": "r3-eth0",
           "type": "IP6",

diff --git a/tests/topotests/isis-topo1/r4/r4_topology.json b/tests/topotests/isis-topo1/r4/r4_topology.json
index 81149d334c376a4895bcc34b3ccb529cbf19d2aa..ae74a609489a9d523ba3545540625ed23befbfd1 100644 (file)
--- a/tests/topotests/isis-topo1/r4/r4_topology.json
+++ b/tests/topotests/isis-topo1/r4/r4_topology.json
@@ -87,7 +87,6 @@
         },
         {
           "interface": "r5",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r4-eth1",
           "type": "IP6",
@@ -95,7 +94,6 @@
         },
         {
           "interface": "r5",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r4-eth1",
           "type": "IP6",
@@ -110,15 +108,13 @@
         },
         {
           "interface": "r5",
-          "metric": "internal",
           "next-hop": "20",
           "parent": "r4-eth1",
           "type": "IP6",
-          "vertex": "2001:db8:2:1::/64"
+          "vertex": "2001:db8:1:1::/64"
         },
         {
           "interface": "r5",
-          "metric": "internal",
           "next-hop": "20",
           "parent": "r4-eth1",
           "type": "IP6",
@@ -182,7 +178,6 @@
         },
         {
           "interface": "r2",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r4-eth0",
           "type": "IP6",

diff --git a/tests/topotests/isis-topo1/r5/r5_topology.json b/tests/topotests/isis-topo1/r5/r5_topology.json
index 05ddd3cc70190f3ec2c1037231fe8a8b5bafa103..0224661411b434bd71f484e5e9690dfe9bd4e851 100644 (file)
--- a/tests/topotests/isis-topo1/r5/r5_topology.json
+++ b/tests/topotests/isis-topo1/r5/r5_topology.json
@@ -90,13 +90,13 @@
           "metric": "internal",
           "parent": "0",
           "type": "IP6",
-          "vertex": "2001:db8:1:1::/64"
+          "vertex": "2001:db8:2:1::/64"
         },
         {
           "metric": "internal",
           "parent": "0",
           "type": "IP6",
-          "vertex": "2001:db8:1:2::/64"
+          "vertex": "2001:db8:2:2::/64"
         },
         {
           "interface": "r5-eth0",
@@ -116,15 +116,13 @@
         },
         {
           "interface": "r3",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r5-eth0",
           "type": "IP6",
-          "vertex": "2001:db8:2:1::/64"
+          "vertex": "2001:db8:1:1::/64"
         },
         {
           "interface": "r3",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r5-eth0",
           "type": "IP6",
@@ -132,15 +130,13 @@
         },
         {
           "interface": "r4",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r5-eth1",
           "type": "IP6",
-          "vertex": "2001:db8:2:2::/64"
+          "vertex": "2001:db8:1:2::/64"
         },
         {
           "interface": "r4",
-          "metric": "internal",
           "next-hop": "10",
           "parent": "r5-eth1",
           "type": "IP6",