From f338000c73c12844cbe543151ccf8fdfc6d7aa83 Mon Sep 17 00:00:00 2001 From: jiceatscion <139873336+jiceatscion@users.noreply.github.com> Date: Thu, 7 Dec 2023 16:56:07 +0100 Subject: [PATCH] testing: rename "router_newbenchmark" to "router_benchmark" (#4455) Since, the original "router_benchmark" has been deleted the "new" prefix is no longer necessary. --- .../{router_newbenchmark => router_benchmark}/BUILD.bazel | 4 ++-- .../brload/BUILD.bazel | 4 ++-- .../{router_newbenchmark => router_benchmark}/brload/main.go | 2 +- .../cases/BUILD.bazel | 5 ++--- .../cases/br_transit.go | 2 +- .../{router_newbenchmark => router_benchmark}/cases/in.go | 2 +- .../cases/in_transit.go | 2 +- .../{router_newbenchmark => router_benchmark}/cases/out.go | 2 +- .../cases/out_transit.go | 2 +- .../{router_newbenchmark => router_benchmark}/cases/topo.go | 2 +- .../{router_newbenchmark => router_benchmark}/conf/br.toml | 0 .../conf/keys/master0.key | 0 .../conf/keys/master1.key | 0 .../conf/prometheus.yml | 0 .../conf/topology.json | 0 acceptance/{router_newbenchmark => router_benchmark}/test.py | 2 +- 16 files changed, 14 insertions(+), 15 deletions(-) rename acceptance/{router_newbenchmark => router_benchmark}/BUILD.bazel (78%) rename acceptance/{router_newbenchmark => router_benchmark}/brload/BUILD.bazel (90%) rename acceptance/{router_newbenchmark => router_benchmark}/brload/main.go (99%) rename acceptance/{router_newbenchmark => router_benchmark}/cases/BUILD.bazel (85%) rename acceptance/{router_newbenchmark => router_benchmark}/cases/br_transit.go (98%) rename acceptance/{router_newbenchmark => router_benchmark}/cases/in.go (98%) rename acceptance/{router_newbenchmark => router_benchmark}/cases/in_transit.go (98%) rename acceptance/{router_newbenchmark => router_benchmark}/cases/out.go (98%) rename acceptance/{router_newbenchmark => router_benchmark}/cases/out_transit.go (98%) rename acceptance/{router_newbenchmark => router_benchmark}/cases/topo.go (99%) rename acceptance/{router_newbenchmark => router_benchmark}/conf/br.toml (100%) rename acceptance/{router_newbenchmark => router_benchmark}/conf/keys/master0.key (100%) rename acceptance/{router_newbenchmark => router_benchmark}/conf/keys/master1.key (100%) rename acceptance/{router_newbenchmark => router_benchmark}/conf/prometheus.yml (100%) rename acceptance/{router_newbenchmark => router_benchmark}/conf/topology.json (100%) rename acceptance/{router_newbenchmark => router_benchmark}/test.py (99%) diff --git a/acceptance/router_newbenchmark/BUILD.bazel b/acceptance/router_benchmark/BUILD.bazel similarity index 78% rename from acceptance/router_newbenchmark/BUILD.bazel rename to acceptance/router_benchmark/BUILD.bazel index 1a93da0376..67e95e56a0 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/brload/BUILD.bazel b/acceptance/router_benchmark/brload/BUILD.bazel similarity index 90% rename from acceptance/router_newbenchmark/brload/BUILD.bazel rename to acceptance/router_benchmark/brload/BUILD.bazel index e475b8b68a..c408b5e0d5 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/brload/main.go b/acceptance/router_benchmark/brload/main.go similarity index 99% rename from acceptance/router_newbenchmark/brload/main.go rename to acceptance/router_benchmark/brload/main.go index 40e50cfbf6..c741a9fa1e 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/cases/BUILD.bazel b/acceptance/router_benchmark/cases/BUILD.bazel similarity index 85% rename from acceptance/router_newbenchmark/cases/BUILD.bazel rename to acceptance/router_benchmark/cases/BUILD.bazel index d7e13f435b..98c50124b0 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/cases/br_transit.go b/acceptance/router_benchmark/cases/br_transit.go similarity index 98% rename from acceptance/router_newbenchmark/cases/br_transit.go rename to acceptance/router_benchmark/cases/br_transit.go index 789856ad61..3cc09857b3 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/cases/in.go b/acceptance/router_benchmark/cases/in.go similarity index 98% rename from acceptance/router_newbenchmark/cases/in.go rename to acceptance/router_benchmark/cases/in.go index bf760a2fb0..bbbc49fae8 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/cases/in_transit.go b/acceptance/router_benchmark/cases/in_transit.go similarity index 98% rename from acceptance/router_newbenchmark/cases/in_transit.go rename to acceptance/router_benchmark/cases/in_transit.go index de51f87d7a..d919b53c01 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/cases/out.go b/acceptance/router_benchmark/cases/out.go similarity index 98% rename from acceptance/router_newbenchmark/cases/out.go rename to acceptance/router_benchmark/cases/out.go index 0f36ca5267..d2553e3931 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/cases/out_transit.go b/acceptance/router_benchmark/cases/out_transit.go similarity index 98% rename from acceptance/router_newbenchmark/cases/out_transit.go rename to acceptance/router_benchmark/cases/out_transit.go index 5322ce4950..8de366c5f8 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/cases/topo.go b/acceptance/router_benchmark/cases/topo.go similarity index 99% rename from acceptance/router_newbenchmark/cases/topo.go rename to acceptance/router_benchmark/cases/topo.go index b49bced0bd..af3abc43d2 100644 --- a/acceptance/router_newbenchmark/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_newbenchmark/conf/br.toml b/acceptance/router_benchmark/conf/br.toml similarity index 100% rename from acceptance/router_newbenchmark/conf/br.toml rename to acceptance/router_benchmark/conf/br.toml diff --git a/acceptance/router_newbenchmark/conf/keys/master0.key b/acceptance/router_benchmark/conf/keys/master0.key similarity index 100% rename from acceptance/router_newbenchmark/conf/keys/master0.key rename to acceptance/router_benchmark/conf/keys/master0.key diff --git a/acceptance/router_newbenchmark/conf/keys/master1.key b/acceptance/router_benchmark/conf/keys/master1.key similarity index 100% rename from acceptance/router_newbenchmark/conf/keys/master1.key rename to acceptance/router_benchmark/conf/keys/master1.key diff --git a/acceptance/router_newbenchmark/conf/prometheus.yml b/acceptance/router_benchmark/conf/prometheus.yml similarity index 100% rename from acceptance/router_newbenchmark/conf/prometheus.yml rename to acceptance/router_benchmark/conf/prometheus.yml diff --git a/acceptance/router_newbenchmark/conf/topology.json b/acceptance/router_benchmark/conf/topology.json similarity index 100% rename from acceptance/router_newbenchmark/conf/topology.json rename to acceptance/router_benchmark/conf/topology.json diff --git a/acceptance/router_newbenchmark/test.py b/acceptance/router_benchmark/test.py similarity index 99% rename from acceptance/router_newbenchmark/test.py rename to acceptance/router_benchmark/test.py index b9d5b24411..f72d66e4ee 100644 --- a/acceptance/router_newbenchmark/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")