tests: Unify directory naming for topotests

Change every `-` to `_` in directory names. This is to avoid mixing _ and -.

Just for consistency and directory sorting properly.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

4 files changed, 0 insertions, 76 deletions

diff --git a/tests/topotests/nhrp-topo/r1/nhrp4_cache.json b/tests/topotests/nhrp-topo/r1/nhrp4_cache.json
deleted file mode 100644
index 6426a939b..000000000
--- a/tests/topotests/nhrp-topo/r1/nhrp4_cache.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "attr":{
-    "entriesCount":2
-  },
-  "table":[
-    {
-      "interface":"r1-gre0",
-      "type":"nhs",
-      "protocol":"10.255.255.2",
-      "nbma":"10.2.1.2",
-      "claimed_nbma":"10.2.1.2",
-      "used":false,
-      "timeout":true,
-      "auth":false,
-      "identity":""
-    },
-    {
-      "interface":"r1-gre0",
-      "type":"local",
-      "protocol":"10.255.255.1",
-      "nbma":"10.1.1.1",
-      "claimed_nbma":"10.1.1.1",
-      "used":false,
-      "timeout":false,
-      "auth":false,
-      "identity":"-"
-    }
-  ]
-}
diff --git a/tests/topotests/nhrp-topo/r1/nhrp_route4.json b/tests/topotests/nhrp-topo/r1/nhrp_route4.json
deleted file mode 100644
index 68b5a6ece..000000000
--- a/tests/topotests/nhrp-topo/r1/nhrp_route4.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "10.255.255.2\/32":[
-    {
-      "prefix":"10.255.255.2\/32",
-      "protocol":"nhrp",
-      "vrfId":0,
-      "vrfName":"default",
-      "selected":true,
-      "destSelected":true,
-      "distance":10,
-      "metric":0,
-      "installed":true,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
-      "nexthops":[
-        {
-          "fib":true,
-          "directlyConnected":true,
-          "interfaceName":"r1-gre0",
-          "active":true
-        }
-      ]
-    }
-  ]
-}
diff --git a/tests/topotests/nhrp-topo/r1/nhrpd.conf b/tests/topotests/nhrp-topo/r1/nhrpd.conf
deleted file mode 100644
index 04114bdbe..000000000
--- a/tests/topotests/nhrp-topo/r1/nhrpd.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-log stdout debugging
-debug nhrp all
-interface r1-gre0
- ip nhrp holdtime 500
- ip nhrp shortcut
- ip nhrp network-id 42
- ip nhrp nhs dynamic nbma 10.2.1.2
- ip nhrp registration no-unique
- tunnel source r1-eth0
-exit
diff --git a/tests/topotests/nhrp-topo/r1/zebra.conf b/tests/topotests/nhrp-topo/r1/zebra.conf
deleted file mode 100644
index b45670fcb..000000000
--- a/tests/topotests/nhrp-topo/r1/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-interface r1-eth0
- ip address 10.1.1.1/24
-!
-ip route 10.2.1.0/24 10.1.1.3
-interface r1-gre0
- ip address 10.255.255.1/32
- no link-detect
- ipv6 nd suppress-ra
-exit
-interface r1-eth1
- ip address 192.168.1.1/24
-!