testing: rename "router_newbenchmark" to "router_benchmark" (scionproto#4455)

jiceathome · juagargi · commit bb483d9f090e · 2024-03-08T18:56:55.000+01:00
Since, the original "router_benchmark" has been deleted the "new" prefix is
no longer necessary.
diff --git a/acceptance/router_benchmark/BUILD.bazel b/acceptance/router_benchmark/BUILD.bazel
@@ -7,14 +7,14 @@ exports_files([
 
 args = [
     "--executable",
-    "brload:$(location //acceptance/router_newbenchmark/brload:brload)",
+    "brload:$(location //acceptance/router_benchmark/brload:brload)",
     "--container-loader=posix-router:latest#$(location //docker:posix_router)",
 ]
 
 data = [
     ":conf",
     "//docker:posix_router",
-    "//acceptance/router_newbenchmark/brload:brload",
+    "//acceptance/router_benchmark/brload:brload",
 ]
 
 raw_test(
diff --git a/acceptance/router_benchmark/brload/BUILD.bazel b/acceptance/router_benchmark/brload/BUILD.bazel
@@ -4,10 +4,10 @@ load("//:scion.bzl", "scion_go_binary")
 go_library(
     name = "go_default_library",
     srcs = ["main.go"],
-    importpath = "github.com/scionproto/scion/acceptance/router_newbenchmark/brload",
+    importpath = "github.com/scionproto/scion/acceptance/router_benchmark/brload",
     visibility = ["//visibility:private"],
     deps = [
-        "//acceptance/router_newbenchmark/cases:go_default_library",
+        "//acceptance/router_benchmark/cases:go_default_library",
         "//pkg/log:go_default_library",
         "//pkg/private/serrors:go_default_library",
         "//pkg/scrypto:go_default_library",
diff --git a/acceptance/router_benchmark/brload/main.go b/acceptance/router_benchmark/brload/main.go
@@ -30,7 +30,7 @@ import (
 	"github.com/google/gopacket/layers"
 	"github.com/spf13/cobra"
 
-	"github.com/scionproto/scion/acceptance/router_newbenchmark/cases"
+	"github.com/scionproto/scion/acceptance/router_benchmark/cases"
 	"github.com/scionproto/scion/pkg/log"
 	"github.com/scionproto/scion/pkg/private/serrors"
 	"github.com/scionproto/scion/pkg/scrypto"
diff --git a/acceptance/router_benchmark/cases/BUILD.bazel b/acceptance/router_benchmark/cases/BUILD.bazel
@@ -10,10 +10,9 @@ go_library(
         "out_transit.go",
         "topo.go",
     ],
-    importpath = "github.com/scionproto/scion/acceptance/router_newbenchmark/cases",
+    importpath = "github.com/scionproto/scion/acceptance/router_benchmark/cases",
     visibility = [
-        "//acceptance/router_newbenchmark:__pkg__",
-        "//acceptance/router_newbenchmark:__subpackages__",
+        "//acceptance/router_benchmark:__subpackages__",
     ],
     deps = [
         "//pkg/addr:go_default_library",
diff --git a/acceptance/router_benchmark/cases/br_transit.go b/acceptance/router_benchmark/cases/br_transit.go
@@ -26,7 +26,7 @@ import (
 	"github.com/scionproto/scion/pkg/slayers/path/scion"
 )
 
-// Topology (see accept/router_newbenchmark/conf/topology.json)
+// Topology (see accept/router_benchmark/conf/topology.json)
 //    AS2 (br2) ---+== (br1a) AS1 (br1b) ---- (br4) AS4
 //                 |
 //    AS3 (br3) ---+
diff --git a/acceptance/router_benchmark/cases/in.go b/acceptance/router_benchmark/cases/in.go
@@ -26,7 +26,7 @@ import (
 	"github.com/scionproto/scion/pkg/slayers/path/scion"
 )
 
-// Topology (see accept/router_newbenchmark/conf/topology.json)
+// Topology (see accept/router_benchmark/conf/topology.json)
 //    AS2 (br2) ---+== (br1a) AS1 (br1b) ---- (br4) AS4
 //                 |
 //    AS3 (br3) ---+
diff --git a/acceptance/router_benchmark/cases/in_transit.go b/acceptance/router_benchmark/cases/in_transit.go
@@ -26,7 +26,7 @@ import (
 	"github.com/scionproto/scion/pkg/slayers/path/scion"
 )
 
-// Topology (see accept/router_newbenchmark/conf/topology.json)
+// Topology (see accept/router_benchmark/conf/topology.json)
 //    AS2 (br2) ---+== (br1a) AS1 (br1b) ---- (br4) AS4
 //                 |
 //    AS3 (br3) ---+
diff --git a/acceptance/router_benchmark/cases/out.go b/acceptance/router_benchmark/cases/out.go
@@ -26,7 +26,7 @@ import (
 	"github.com/scionproto/scion/pkg/slayers/path/scion"
 )
 
-// Topology (see accept/router_newbenchmark/conf/topology.json)
+// Topology (see accept/router_benchmark/conf/topology.json)
 //    AS2 (br2) ---+== (br1a) AS1 (br1b) ---- (br4) AS4
 //                 |
 //    AS3 (br3) ---+
diff --git a/acceptance/router_benchmark/cases/out_transit.go b/acceptance/router_benchmark/cases/out_transit.go
@@ -26,7 +26,7 @@ import (
 	"github.com/scionproto/scion/pkg/slayers/path/scion"
 )
 
-// Topology (see accept/router_newbenchmark/conf/topology.json)
+// Topology (see accept/router_benchmark/conf/topology.json)
 //    AS2 (br2) ---+== (br1a) AS1 (br1b) ---- (br4) AS4
 //                 |
 //    AS3 (br3) ---+
diff --git a/acceptance/router_benchmark/cases/topo.go b/acceptance/router_benchmark/cases/topo.go
@@ -28,7 +28,7 @@ import (
 	"github.com/scionproto/scion/pkg/scrypto"
 )
 
-// Topology (see accept/router_newbenchmark/conf/topology.json)
+// Topology (see accept/router_benchmark/conf/topology.json)
 //    AS2 (br2) ---+== (br1a) AS1 (br1b) ---- (br4) AS4
 //                 |
 //    AS3 (br3) ---+
diff --git a/acceptance/router_benchmark/conf/br.toml b/acceptance/router_benchmark/conf/br.toml
diff --git a/acceptance/router_benchmark/conf/keys/master0.key b/acceptance/router_benchmark/conf/keys/master0.key
diff --git a/acceptance/router_benchmark/conf/keys/master1.key b/acceptance/router_benchmark/conf/keys/master1.key
diff --git a/acceptance/router_benchmark/conf/prometheus.yml b/acceptance/router_benchmark/conf/prometheus.yml
diff --git a/acceptance/router_benchmark/conf/topology.json b/acceptance/router_benchmark/conf/topology.json
diff --git a/acceptance/router_benchmark/test.py b/acceptance/router_benchmark/test.py
@@ -149,7 +149,7 @@ def setup_prepare(self):
         super().setup_prepare()
 
         # get the config where the router can find it.
-        shutil.copytree("acceptance/router_newbenchmark/conf/", self.artifacts / "conf")
+        shutil.copytree("acceptance/router_benchmark/conf/", self.artifacts / "conf")
 
         # We need a custom network so can create veth interfaces of our own chosing.
         docker("network", "create",  "-d", "bridge", "benchmark")

Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@ exports_files([`
`7`	`7`
`8`	`8`	`args = [`
`9`	`9`	`"--executable",`
`10`		`- "brload:$(location //acceptance/router_newbenchmark/brload:brload)",`
	`10`	`+ "brload:$(location //acceptance/router_benchmark/brload:brload)",`
`11`	`11`	`"--container-loader=posix-router:latest#$(location //docker:posix_router)",`
`12`	`12`	`]`
`13`	`13`
`14`	`14`	`data = [`
`15`	`15`	`":conf",`
`16`	`16`	`"//docker:posix_router",`
`17`		`- "//acceptance/router_newbenchmark/brload:brload",`
	`17`	`+ "//acceptance/router_benchmark/brload:brload",`
`18`	`18`	`]`
`19`	`19`
`20`	`20`	`raw_test(`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"github.com/scionproto/scion/pkg/slayers/path/scion"`
`27`	`27`	`)`
`28`	`28`
`29`		`-// Topology (see accept/router_newbenchmark/conf/topology.json)`
	`29`	`+// Topology (see accept/router_benchmark/conf/topology.json)`
`30`	`30`	`// AS2 (br2) ---+== (br1a) AS1 (br1b) ---- (br4) AS4`
`31`	`31`	`// \|`
`32`	`32`	`// AS3 (br3) ---+`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"github.com/scionproto/scion/pkg/scrypto"`
`29`	`29`	`)`
`30`	`30`
`31`		`-// Topology (see accept/router_newbenchmark/conf/topology.json)`
	`31`	`+// Topology (see accept/router_benchmark/conf/topology.json)`
`32`	`32`	`// AS2 (br2) ---+== (br1a) AS1 (br1b) ---- (br4) AS4`
`33`	`33`	`// \|`
`34`	`34`	`// AS3 (br3) ---+`