From f2f5c986011afce545b033abc9df5d0fdc85a301 Mon Sep 17 00:00:00 2001 From: Jafar Al-Gharaibeh Date: Sun, 20 Feb 2022 14:12:43 -0600 Subject: [PATCH] tests: rename topotest ospf_topo1_vrf to ospf_netns_vrf Signed-off-by: Jafar Al-Gharaibeh --- .../{ospf_topo1_vrf => ospf_netns_vrf}/__init__.py | 0 .../r1/ospfd.conf | 0 .../r1/ospfroute.txt | 0 .../r1/ospfroute_down.txt | 0 .../r1/zebra.conf | 0 .../r1/zebraroute.txt | 0 .../r1/zebraroutedown.txt | 0 .../r2/ospfd.conf | 0 .../r2/ospfroute.txt | 0 .../r2/ospfroute_down.txt | 0 .../r2/zebra.conf | 0 .../r2/zebraroute.txt | 0 .../r2/zebraroutedown.txt | 0 .../r3/ospfd.conf | 0 .../r3/ospfroute.txt | 0 .../r3/ospfroute_down.txt | 0 .../r3/zebra.conf | 0 .../r3/zebraroute.txt | 0 .../r3/zebraroutedown.txt | 0 .../test_ospf_netns_vrf.dot} | 0 .../test_ospf_netns_vrf.jpg} | Bin .../test_ospf_netns_vrf.py} | 4 ++-- 22 files changed, 2 insertions(+), 2 deletions(-) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/__init__.py (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r1/ospfd.conf (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r1/ospfroute.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r1/ospfroute_down.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r1/zebra.conf (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r1/zebraroute.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r1/zebraroutedown.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r2/ospfd.conf (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r2/ospfroute.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r2/ospfroute_down.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r2/zebra.conf (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r2/zebraroute.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r2/zebraroutedown.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r3/ospfd.conf (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r3/ospfroute.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r3/ospfroute_down.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r3/zebra.conf (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r3/zebraroute.txt (100%) rename tests/topotests/{ospf_topo1_vrf => ospf_netns_vrf}/r3/zebraroutedown.txt (100%) rename tests/topotests/{ospf_topo1_vrf/test_ospf_topo1-vrf.dot => ospf_netns_vrf/test_ospf_netns_vrf.dot} (100%) rename tests/topotests/{ospf_topo1_vrf/test_ospf_topo1_vrf.jpg => ospf_netns_vrf/test_ospf_netns_vrf.jpg} (100%) rename tests/topotests/{ospf_topo1_vrf/test_ospf_topo1_vrf.py => ospf_netns_vrf/test_ospf_netns_vrf.py} (99%) diff --git a/tests/topotests/ospf_topo1_vrf/__init__.py b/tests/topotests/ospf_netns_vrf/__init__.py similarity index 100% rename from tests/topotests/ospf_topo1_vrf/__init__.py rename to tests/topotests/ospf_netns_vrf/__init__.py diff --git a/tests/topotests/ospf_topo1_vrf/r1/ospfd.conf b/tests/topotests/ospf_netns_vrf/r1/ospfd.conf similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r1/ospfd.conf rename to tests/topotests/ospf_netns_vrf/r1/ospfd.conf diff --git a/tests/topotests/ospf_topo1_vrf/r1/ospfroute.txt b/tests/topotests/ospf_netns_vrf/r1/ospfroute.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r1/ospfroute.txt rename to tests/topotests/ospf_netns_vrf/r1/ospfroute.txt diff --git a/tests/topotests/ospf_topo1_vrf/r1/ospfroute_down.txt b/tests/topotests/ospf_netns_vrf/r1/ospfroute_down.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r1/ospfroute_down.txt rename to tests/topotests/ospf_netns_vrf/r1/ospfroute_down.txt diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebra.conf b/tests/topotests/ospf_netns_vrf/r1/zebra.conf similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r1/zebra.conf rename to tests/topotests/ospf_netns_vrf/r1/zebra.conf diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r1/zebraroute.txt rename to tests/topotests/ospf_netns_vrf/r1/zebraroute.txt diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r1/zebraroutedown.txt rename to tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt diff --git a/tests/topotests/ospf_topo1_vrf/r2/ospfd.conf b/tests/topotests/ospf_netns_vrf/r2/ospfd.conf similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r2/ospfd.conf rename to tests/topotests/ospf_netns_vrf/r2/ospfd.conf diff --git a/tests/topotests/ospf_topo1_vrf/r2/ospfroute.txt b/tests/topotests/ospf_netns_vrf/r2/ospfroute.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r2/ospfroute.txt rename to tests/topotests/ospf_netns_vrf/r2/ospfroute.txt diff --git a/tests/topotests/ospf_topo1_vrf/r2/ospfroute_down.txt b/tests/topotests/ospf_netns_vrf/r2/ospfroute_down.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r2/ospfroute_down.txt rename to tests/topotests/ospf_netns_vrf/r2/ospfroute_down.txt diff --git a/tests/topotests/ospf_topo1_vrf/r2/zebra.conf b/tests/topotests/ospf_netns_vrf/r2/zebra.conf similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r2/zebra.conf rename to tests/topotests/ospf_netns_vrf/r2/zebra.conf diff --git a/tests/topotests/ospf_topo1_vrf/r2/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r2/zebraroute.txt rename to tests/topotests/ospf_netns_vrf/r2/zebraroute.txt diff --git a/tests/topotests/ospf_topo1_vrf/r2/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r2/zebraroutedown.txt rename to tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt diff --git a/tests/topotests/ospf_topo1_vrf/r3/ospfd.conf b/tests/topotests/ospf_netns_vrf/r3/ospfd.conf similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r3/ospfd.conf rename to tests/topotests/ospf_netns_vrf/r3/ospfd.conf diff --git a/tests/topotests/ospf_topo1_vrf/r3/ospfroute.txt b/tests/topotests/ospf_netns_vrf/r3/ospfroute.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r3/ospfroute.txt rename to tests/topotests/ospf_netns_vrf/r3/ospfroute.txt diff --git a/tests/topotests/ospf_topo1_vrf/r3/ospfroute_down.txt b/tests/topotests/ospf_netns_vrf/r3/ospfroute_down.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r3/ospfroute_down.txt rename to tests/topotests/ospf_netns_vrf/r3/ospfroute_down.txt diff --git a/tests/topotests/ospf_topo1_vrf/r3/zebra.conf b/tests/topotests/ospf_netns_vrf/r3/zebra.conf similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r3/zebra.conf rename to tests/topotests/ospf_netns_vrf/r3/zebra.conf diff --git a/tests/topotests/ospf_topo1_vrf/r3/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r3/zebraroute.txt rename to tests/topotests/ospf_netns_vrf/r3/zebraroute.txt diff --git a/tests/topotests/ospf_topo1_vrf/r3/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt similarity index 100% rename from tests/topotests/ospf_topo1_vrf/r3/zebraroutedown.txt rename to tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt diff --git a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1-vrf.dot b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.dot similarity index 100% rename from tests/topotests/ospf_topo1_vrf/test_ospf_topo1-vrf.dot rename to tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.dot diff --git a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.jpg b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.jpg similarity index 100% rename from tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.jpg rename to tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.jpg diff --git a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py similarity index 99% rename from tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py rename to tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py index 44de61d82a..621d8079dc 100644 --- a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py +++ b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -# test_ospf_topo1.py +# test_ospf_netns_vrf.py # Part of NetDEF Topology Tests # # Copyright (c) 2017 by @@ -23,7 +23,7 @@ # """ -test_ospf_topo1.py: Test the FRR OSPF routing daemon. +test_ospf_netns_vrf.py: Test OSPF with Network Namespace VRFs. """ import os -- 2.39.5