From 62accdecd82dc590e608461c4c2dfddaac10332a Mon Sep 17 00:00:00 2001
From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Thu, 26 Jul 2018 22:13:44 -0300
Subject: [PATCH] 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>
---
 .../topotests/isis-topo1/r1/r1_topology.json  |  2 --
 .../topotests/isis-topo1/r2/r2_topology.json  |  2 --
 .../topotests/isis-topo1/r3/r3_topology.json  | 21 ++++---------------
 .../topotests/isis-topo1/r4/r4_topology.json  |  7 +------
 .../topotests/isis-topo1/r5/r5_topology.json  | 12 ++++-------
 5 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/tests/topotests/isis-topo1/r1/r1_topology.json b/tests/topotests/isis-topo1/r1/r1_topology.json
index 027f95607f..6d2bbb80c9 100644
--- 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 5349aeb118..396c618caa 100644
--- 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 3df2827409..5ab58c41a6 100644
--- 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 81149d334c..ae74a60948 100644
--- 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 05ddd3cc70..0224661411 100644
--- 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",
-- 
2.39.5