treewide: introduce osbase package and move things around
All except localregistry moved from metropolis/pkg to osbase,
localregistry moved to metropolis/test as its only used there anyway.
Change-Id: If1a4bf377364bef0ac23169e1b90379c71b06d72
Reviewed-on: https://review.monogon.dev/c/monogon/+/3079
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/metropolis/test/launch/cli/launch-cluster/BUILD.bazel b/metropolis/test/launch/cli/launch-cluster/BUILD.bazel
index 688228e..9e48795 100644
--- a/metropolis/test/launch/cli/launch-cluster/BUILD.bazel
+++ b/metropolis/test/launch/cli/launch-cluster/BUILD.bazel
@@ -8,7 +8,7 @@
visibility = ["//visibility:private"],
deps = [
"//metropolis/cli/metroctl/core",
- "//metropolis/test/launch/cluster",
+ "//metropolis/test/launch",
],
)
diff --git a/metropolis/test/launch/cli/launch-cluster/main.go b/metropolis/test/launch/cli/launch-cluster/main.go
index c9b9dec..1529396 100644
--- a/metropolis/test/launch/cli/launch-cluster/main.go
+++ b/metropolis/test/launch/cli/launch-cluster/main.go
@@ -23,12 +23,12 @@
"os/signal"
metroctl "source.monogon.dev/metropolis/cli/metroctl/core"
- "source.monogon.dev/metropolis/test/launch/cluster"
+ mlaunch "source.monogon.dev/metropolis/test/launch"
)
func main() {
ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
- cl, err := cluster.LaunchCluster(ctx, cluster.ClusterOptions{
+ cl, err := mlaunch.LaunchCluster(ctx, mlaunch.ClusterOptions{
NumNodes: 3,
NodeLogsToFiles: true,
})
@@ -36,7 +36,7 @@
log.Fatalf("LaunchCluster: %v", err)
}
- mpath, err := cluster.MetroctlRunfilePath()
+ mpath, err := mlaunch.MetroctlRunfilePath()
if err != nil {
log.Fatalf("MetroctlRunfilePath: %v", err)
}
diff --git a/metropolis/test/launch/cli/launch/BUILD.bazel b/metropolis/test/launch/cli/launch/BUILD.bazel
index 49df994..f0edefc 100644
--- a/metropolis/test/launch/cli/launch/BUILD.bazel
+++ b/metropolis/test/launch/cli/launch/BUILD.bazel
@@ -9,7 +9,7 @@
deps = [
"//metropolis/proto/api",
"//metropolis/test/launch",
- "//metropolis/test/launch/cluster",
+ "//osbase/test/launch",
],
)
diff --git a/metropolis/test/launch/cli/launch/main.go b/metropolis/test/launch/cli/launch/main.go
index 2ae3a0c..71c7aa2 100644
--- a/metropolis/test/launch/cli/launch/main.go
+++ b/metropolis/test/launch/cli/launch/main.go
@@ -24,8 +24,9 @@
"path/filepath"
apb "source.monogon.dev/metropolis/proto/api"
- "source.monogon.dev/metropolis/test/launch"
- "source.monogon.dev/metropolis/test/launch/cluster"
+
+ mlaunch "source.monogon.dev/metropolis/test/launch"
+ "source.monogon.dev/osbase/test/launch"
)
func main() {
@@ -45,22 +46,22 @@
defer os.RemoveAll(sd)
var ports []uint16
- for _, p := range cluster.NodePorts {
+ for _, p := range mlaunch.NodePorts {
ports = append(ports, uint16(p))
}
ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
doneC := make(chan error)
- tpmf, err := cluster.NewTPMFactory(filepath.Join(ld, "tpm"))
+ tpmf, err := mlaunch.NewTPMFactory(filepath.Join(ld, "tpm"))
if err != nil {
log.Fatalf("NewTPMFactory: %v", err)
}
- err = cluster.LaunchNode(ctx, ld, sd, tpmf, &cluster.NodeOptions{
+ err = mlaunch.LaunchNode(ctx, ld, sd, tpmf, &mlaunch.NodeOptions{
Name: "test-node",
Ports: launch.IdentityPortMap(ports),
SerialPort: os.Stdout,
NodeParameters: &apb.NodeParameters{
Cluster: &apb.NodeParameters_ClusterBootstrap_{
- ClusterBootstrap: cluster.InsecureClusterBootstrap,
+ ClusterBootstrap: mlaunch.InsecureClusterBootstrap,
},
},
}, doneC)