From ae6be66b8c62ee2ef4b32d823a1f205e0c0e4279 Mon Sep 17 00:00:00 2001
From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Thu, 26 Jul 2018 19:07:44 -0300
Subject: [PATCH] isis-topo1: remove pseudo_TE-IS entries from check

The pseudo_TE-IS entries vary and depend on the way the topology
converges, so lets not rely on that.

The IS-IS routers in the middle TE-IS entries vary the parent
interface, so we also removed that entry to avoid json_cmp comparison
failures.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
---
 .../topotests/isis-topo1/r3/r3_topology.json  | 18 -------
 .../topotests/isis-topo1/r4/r4_topology.json  | 50 -------------------
 .../topotests/isis-topo1/r5/r5_topology.json  | 16 ------
 3 files changed, 84 deletions(-)

diff --git a/tests/topotests/isis-topo1/r3/r3_topology.json b/tests/topotests/isis-topo1/r3/r3_topology.json
index 5acaba4651..3df2827409 100644
--- a/tests/topotests/isis-topo1/r3/r3_topology.json
+++ b/tests/topotests/isis-topo1/r3/r3_topology.json
@@ -47,15 +47,6 @@
           "interface": "r3-eth1",
           "metric": "20",
           "next-hop": "r5",
-          "parent": "r5(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r5"
-        },
-        {
-          "interface": "r3-eth1",
-          "metric": "20",
-          "next-hop": "r5",
-          "parent": "r5(2)",
           "type": "TE-IS",
           "vertex": "r4"
         },
@@ -114,15 +105,6 @@
           "interface": "r3-eth1",
           "metric": "20",
           "next-hop": "r5",
-          "parent": "r5(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r5"
-        },
-        {
-          "interface": "r3-eth1",
-          "metric": "20",
-          "next-hop": "r5",
-          "parent": "r5(2)",
           "type": "TE-IS",
           "vertex": "r4"
         },
diff --git a/tests/topotests/isis-topo1/r4/r4_topology.json b/tests/topotests/isis-topo1/r4/r4_topology.json
index 0152c7d3c4..81149d334c 100644
--- a/tests/topotests/isis-topo1/r4/r4_topology.json
+++ b/tests/topotests/isis-topo1/r4/r4_topology.json
@@ -47,23 +47,6 @@
           "interface": "r4-eth1",
           "metric": "20",
           "next-hop": "r5",
-          "parent": "r5(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r3"
-        },
-        {
-          "interface": "r4-eth1",
-          "metric": "20",
-          "next-hop": "r5",
-          "parent": "r5(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r5"
-        },
-        {
-          "interface": "r4-eth1",
-          "metric": "20",
-          "next-hop": "r5",
-          "parent": "r3(2)",
           "type": "TE-IS",
           "vertex": "r3"
         },
@@ -122,23 +105,6 @@
           "interface": "r4-eth1",
           "metric": "20",
           "next-hop": "r5",
-          "parent": "r5(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r3"
-        },
-        {
-          "interface": "r4-eth1",
-          "metric": "20",
-          "next-hop": "r5",
-          "parent": "r5(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r5"
-        },
-        {
-          "interface": "r4-eth1",
-          "metric": "20",
-          "next-hop": "r5",
-          "parent": "r3(2)",
           "type": "TE-IS",
           "vertex": "r3"
         },
@@ -194,14 +160,6 @@
           "parent": "r4-eth0",
           "type": "IP",
           "vertex": "10.254.0.2/32"
-        },
-        {
-          "interface": "r4-eth0",
-          "metric": "20",
-          "next-hop": "r2",
-          "parent": "r2(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r2"
         }
       ],
       "ipv6": [
@@ -229,14 +187,6 @@
           "parent": "r4-eth0",
           "type": "IP6",
           "vertex": "2001:db8:f::2/128"
-        },
-        {
-          "interface": "r4-eth0",
-          "metric": "20",
-          "next-hop": "r2",
-          "parent": "r2(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r2"
         }
       ]
     }
diff --git a/tests/topotests/isis-topo1/r5/r5_topology.json b/tests/topotests/isis-topo1/r5/r5_topology.json
index 5a45d6f662..05ddd3cc70 100644
--- a/tests/topotests/isis-topo1/r5/r5_topology.json
+++ b/tests/topotests/isis-topo1/r5/r5_topology.json
@@ -80,14 +80,6 @@
           "parent": "r5-eth1",
           "type": "IP",
           "vertex": "10.254.0.4/32"
-        },
-        {
-          "interface": "r5-eth0",
-          "metric": "20",
-          "next-hop": "r3",
-          "parent": "r3(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r3"
         }
       ],
       "ipv6": [
@@ -153,14 +145,6 @@
           "parent": "r5-eth1",
           "type": "IP6",
           "vertex": "2001:db8:f::4/128"
-        },
-        {
-          "interface": "r5-eth0",
-          "metric": "20",
-          "next-hop": "r3",
-          "parent": "r3(4)",
-          "type": "pseudo_TE-IS",
-          "vertex": "r3"
         }
       ]
     },