From bdcc5df5c34a361be334100ab2108ab4c8e7870c Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 8 May 2023 08:06:30 -0400 Subject: [PATCH] tests: ospf_metric_propagation should not look for a specific vrfId There is no guarantee that the vrfId is going to be the same across tests, as that the vrfId is chosen based upon the ifindex of the vrf device. As such we should not be looking for the vrfId, but the correct vrf name. Signed-off-by: Donald Sharp --- tests/topotests/ospf_metric_propagation/r1/show_ip_route-1.json | 1 - tests/topotests/ospf_metric_propagation/r1/show_ip_route-2.json | 1 - tests/topotests/ospf_metric_propagation/r1/show_ip_route-3.json | 1 - tests/topotests/ospf_metric_propagation/r1/show_ip_route-4.json | 1 - tests/topotests/ospf_metric_propagation/r1/show_ip_route-5.json | 1 - tests/topotests/ospf_metric_propagation/r1/show_ip_route-6.json | 1 - 6 files changed, 6 deletions(-) diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-1.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-1.json index 673e81d287..4f1ced81fb 100644 --- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-1.json +++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-1.json @@ -4,7 +4,6 @@ "prefix":"10.0.94.0/24", "prefixLen":24, "protocol":"bgp", - "vrfId":9, "vrfName":"green", "selected":true, "destSelected":true, diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-2.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-2.json index 9d12aeed3a..882d3ca4f0 100644 --- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-2.json +++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-2.json @@ -4,7 +4,6 @@ "prefix":"10.0.94.0/24", "prefixLen":24, "protocol":"bgp", - "vrfId":9, "vrfName":"green", "selected":true, "destSelected":true, diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-3.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-3.json index e3a7206729..cd528459ab 100644 --- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-3.json +++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-3.json @@ -4,7 +4,6 @@ "prefix":"10.0.94.0/24", "prefixLen":24, "protocol":"bgp", - "vrfId":9, "vrfName":"green", "selected":true, "destSelected":true, diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-4.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-4.json index fe1845134c..133f37549e 100644 --- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-4.json +++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-4.json @@ -4,7 +4,6 @@ "prefix":"10.0.94.0/24", "prefixLen":24, "protocol":"bgp", - "vrfId":9, "vrfName":"green", "selected":true, "destSelected":true, diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-5.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-5.json index a02d437e69..5d80509021 100644 --- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-5.json +++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-5.json @@ -4,7 +4,6 @@ "prefix":"10.0.94.0/24", "prefixLen":24, "protocol":"bgp", - "vrfId":9, "vrfName":"green", "selected":true, "destSelected":true, diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-6.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-6.json index 1f25796a37..1b59707b98 100644 --- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-6.json +++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-6.json @@ -4,7 +4,6 @@ "prefix":"10.0.94.0/24", "prefixLen":24, "protocol":"bgp", - "vrfId":9, "vrfName":"green", "selected":true, "destSelected":true, -- 2.39.5