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/metropolis/node/core/localstorage/BUILD.bazel b/metropolis/node/core/localstorage/BUILD.bazel
index 4249297..29e7696 100644
--- a/metropolis/node/core/localstorage/BUILD.bazel
+++ b/metropolis/node/core/localstorage/BUILD.bazel
@@ -18,7 +18,7 @@
"//metropolis/proto/api",
"//metropolis/proto/common",
"//metropolis/proto/private",
- "//net/proto",
+ "//osbase/net/proto",
"//osbase/tpm",
"@org_golang_google_protobuf//proto",
"@org_golang_x_sys//unix",
diff --git a/metropolis/node/core/localstorage/storage_esp.go b/metropolis/node/core/localstorage/storage_esp.go
index 8fc71d0..fd6913a 100644
--- a/metropolis/node/core/localstorage/storage_esp.go
+++ b/metropolis/node/core/localstorage/storage_esp.go
@@ -27,7 +27,7 @@
apb "source.monogon.dev/metropolis/proto/api"
cpb "source.monogon.dev/metropolis/proto/common"
ppb "source.monogon.dev/metropolis/proto/private"
- npb "source.monogon.dev/net/proto"
+ npb "source.monogon.dev/osbase/net/proto"
"source.monogon.dev/osbase/tpm"
)
diff --git a/metropolis/node/core/network/BUILD.bazel b/metropolis/node/core/network/BUILD.bazel
index 614e0dc..8ef2e6c 100644
--- a/metropolis/node/core/network/BUILD.bazel
+++ b/metropolis/node/core/network/BUILD.bazel
@@ -14,11 +14,11 @@
"//go/algorithm/toposort",
"//metropolis/node/core/network/dhcp4c",
"//metropolis/node/core/network/dhcp4c/callback",
- "//net/proto",
"//osbase/event/memory",
"//osbase/logtree",
"//osbase/net/dns",
"//osbase/net/dns/forward",
+ "//osbase/net/proto",
"//osbase/supervisor",
"//osbase/sysctl",
"@com_github_google_nftables//:nftables",
diff --git a/metropolis/node/core/network/main.go b/metropolis/node/core/network/main.go
index 06b443a..e51ed11 100644
--- a/metropolis/node/core/network/main.go
+++ b/metropolis/node/core/network/main.go
@@ -36,7 +36,7 @@
"source.monogon.dev/osbase/supervisor"
"source.monogon.dev/osbase/sysctl"
- netpb "source.monogon.dev/net/proto"
+ netpb "source.monogon.dev/osbase/net/proto"
)
// Service is the network service for this node. It maintains all
diff --git a/metropolis/node/core/network/static.go b/metropolis/node/core/network/static.go
index 5afefdf..86c45f6 100644
--- a/metropolis/node/core/network/static.go
+++ b/metropolis/node/core/network/static.go
@@ -22,7 +22,7 @@
"source.monogon.dev/osbase/supervisor"
"source.monogon.dev/osbase/sysctl"
- netpb "source.monogon.dev/net/proto"
+ netpb "source.monogon.dev/osbase/net/proto"
)
var vlanProtoMap = map[netpb.VLAN_Protocol]netlink.VlanProtocol{
diff --git a/metropolis/proto/api/BUILD.bazel b/metropolis/proto/api/BUILD.bazel
index 82aa60b..f90885a 100644
--- a/metropolis/proto/api/BUILD.bazel
+++ b/metropolis/proto/api/BUILD.bazel
@@ -14,8 +14,8 @@
deps = [
"//metropolis/proto/common:common_proto",
"//metropolis/proto/ext:ext_proto",
- "//net/proto:net_proto_proto",
"//osbase/logtree/proto:proto_proto",
+ "//osbase/net/proto:net_proto_proto",
"@protobuf//:duration_proto",
],
)
@@ -29,8 +29,8 @@
deps = [
"//metropolis/proto/common",
"//metropolis/proto/ext",
- "//net/proto",
"//osbase/logtree/proto",
+ "//osbase/net/proto",
],
)
diff --git a/metropolis/proto/api/configuration.proto b/metropolis/proto/api/configuration.proto
index ba8a7f3..e7fc38c 100644
--- a/metropolis/proto/api/configuration.proto
+++ b/metropolis/proto/api/configuration.proto
@@ -19,7 +19,7 @@
option go_package = "source.monogon.dev/metropolis/proto/api";
import "metropolis/proto/common/common.proto";
-import "net/proto/net.proto";
+import "osbase/net/proto/net.proto";
// NodeParameters is the data with which a Node is set booted. It contains the
// configuration required for a node to either bootstrap a new cluster, or
@@ -81,5 +81,5 @@
// Optional network configuration when autoconfiguration is not possible or
// desirable. If unset, autoconfiguration (ie. DHCP) is used.
- net.proto.Net network_config = 4;
+ osbase.net.proto.Net network_config = 4;
}