treewide: move //net to //osbase/net
The net package contains the utility to dump a network configuration in
proto format. It should be in osbase.
Change-Id: I4d25d9c7d600f4a04b9b79bd1ba98286bf9daec3
Reviewed-on: https://review.monogon.dev/c/monogon/+/3313
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/cloud/agent/BUILD.bazel b/cloud/agent/BUILD.bazel
index dd54619..2574ad4 100644
--- a/cloud/agent/BUILD.bazel
+++ b/cloud/agent/BUILD.bazel
@@ -18,12 +18,12 @@
"//cloud/bmaas/server/api",
"//metropolis/node/core/devmgr",
"//metropolis/node/core/network",
- "//net/proto",
"//osbase/blockdev",
"//osbase/bootparam",
"//osbase/build/mkimage/osimage",
"//osbase/efivarfs",
"//osbase/logtree",
+ "//osbase/net/proto",
"//osbase/nvme",
"//osbase/pki",
"//osbase/scsi",
diff --git a/cloud/agent/api/BUILD.bazel b/cloud/agent/api/BUILD.bazel
index 77dfa4b..ba31094 100644
--- a/cloud/agent/api/BUILD.bazel
+++ b/cloud/agent/api/BUILD.bazel
@@ -10,7 +10,7 @@
"takeover.proto",
],
visibility = ["//visibility:public"],
- deps = ["//net/proto:net_proto_proto"],
+ deps = ["//osbase/net/proto:net_proto_proto"],
)
go_proto_library(
@@ -18,7 +18,7 @@
importpath = "source.monogon.dev/cloud/agent/api",
proto = ":api_proto",
visibility = ["//visibility:public"],
- deps = ["//net/proto"],
+ deps = ["//osbase/net/proto"],
)
go_library(
diff --git a/cloud/agent/api/agent.proto b/cloud/agent/api/agent.proto
index fda4e64..c2ac0f7 100644
--- a/cloud/agent/api/agent.proto
+++ b/cloud/agent/api/agent.proto
@@ -1,6 +1,6 @@
syntax = "proto3";
package cloud.agent.api;
-import "net/proto/net.proto";
+import "osbase/net/proto/net.proto";
import "cloud/agent/api/takeover.proto";
option go_package = "source.monogon.dev/cloud/agent/api";
@@ -14,5 +14,5 @@
bytes private_key = 2;
// A network configuration in case automatic configuration does not work or is
// not desired. If left unset, automatic configuration is used.
- net.proto.Net network_config = 3;
+ osbase.net.proto.Net network_config = 3;
}
\ No newline at end of file
diff --git a/cloud/agent/install.go b/cloud/agent/install.go
index 2eaeeb3..7752517 100644
--- a/cloud/agent/install.go
+++ b/cloud/agent/install.go
@@ -14,11 +14,11 @@
"google.golang.org/protobuf/proto"
bpb "source.monogon.dev/cloud/bmaas/server/api"
- npb "source.monogon.dev/net/proto"
"source.monogon.dev/osbase/blockdev"
"source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/efivarfs"
"source.monogon.dev/osbase/logtree"
+ npb "source.monogon.dev/osbase/net/proto"
)
//go:embed metropolis/node/core/abloader/abloader_bin.efi
diff --git a/cloud/agent/takeover/BUILD.bazel b/cloud/agent/takeover/BUILD.bazel
index 914fc9a..2a32e01 100644
--- a/cloud/agent/takeover/BUILD.bazel
+++ b/cloud/agent/takeover/BUILD.bazel
@@ -16,10 +16,10 @@
visibility = ["//visibility:private"],
deps = [
"//cloud/agent/api",
- "//net/dump",
- "//net/proto",
"//osbase/bootparam",
"//osbase/kexec",
+ "//osbase/net/dump",
+ "//osbase/net/proto",
"@com_github_cavaliergopher_cpio//:cpio",
"@com_github_klauspost_compress//zstd",
"@org_golang_google_protobuf//proto",
diff --git a/cloud/agent/takeover/takeover.go b/cloud/agent/takeover/takeover.go
index ffc3a6e..bf7760c 100644
--- a/cloud/agent/takeover/takeover.go
+++ b/cloud/agent/takeover/takeover.go
@@ -32,10 +32,10 @@
"google.golang.org/protobuf/proto"
"source.monogon.dev/cloud/agent/api"
- netdump "source.monogon.dev/net/dump"
- netapi "source.monogon.dev/net/proto"
"source.monogon.dev/osbase/bootparam"
"source.monogon.dev/osbase/kexec"
+ netdump "source.monogon.dev/osbase/net/dump"
+ netapi "source.monogon.dev/osbase/net/proto"
)
//go:embed third_party/linux/bzImage