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>

diff --git a/tests/topotests/isis-topo1/r3/r3_topology.json b/tests/topotests/isis-topo1/r3/r3_topology.json
index 5acaba46511bae7b16691d239ad4a59a81898a43..3df2827409a431442b9cf966abf86b4ceb994211 100644 (file)
--- 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 0152c7d3c496f4c2f9126f9e09c074767bab52e4..81149d334c376a4895bcc34b3ccb529cbf19d2aa 100644 (file)
--- 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 5a45d6f66220f401f2e7e1fb08727f8c27cf58e0..05ddd3cc70190f3ec2c1037231fe8a8b5bafa103 100644 (file)
--- 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"
         }
       ]
     },