diff --git a/dc/README.md b/dc/README.md new file mode 100644 index 00000000..6ee4c21c --- /dev/null +++ b/dc/README.md @@ -0,0 +1,4 @@ +hscloud/dc +========== + +Software and systems related to DC operations and provisioning. diff --git a/go/svc/arista-proxy/BUILD.bazel b/dc/arista-proxy/BUILD.bazel similarity index 83% rename from go/svc/arista-proxy/BUILD.bazel rename to dc/arista-proxy/BUILD.bazel index 56996077..fb7ec6af 100644 --- a/go/svc/arista-proxy/BUILD.bazel +++ b/dc/arista-proxy/BUILD.bazel @@ -6,11 +6,11 @@ go_library( "main.go", "service.go", ], - importpath = "code.hackerspace.pl/hscloud/go/svc/arista-proxy", + importpath = "code.hackerspace.pl/hscloud/dc/arista-proxy", visibility = ["//visibility:private"], deps = [ + "//dc/arista-proxy/proto:go_default_library", "//go/mirko:go_default_library", - "//go/svc/arista-proxy/proto:go_default_library", "@com_github_golang_glog//:go_default_library", "@com_github_ybbus_jsonrpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", diff --git a/go/svc/arista-proxy/README.md b/dc/arista-proxy/README.md similarity index 100% rename from go/svc/arista-proxy/README.md rename to dc/arista-proxy/README.md diff --git a/go/svc/arista-proxy/main.go b/dc/arista-proxy/main.go similarity index 95% rename from go/svc/arista-proxy/main.go rename to dc/arista-proxy/main.go index 1227cb11..ccd10462 100644 --- a/go/svc/arista-proxy/main.go +++ b/dc/arista-proxy/main.go @@ -8,7 +8,7 @@ import ( "github.com/golang/glog" "github.com/ybbus/jsonrpc" - pb "code.hackerspace.pl/hscloud/go/svc/arista-proxy/proto" + pb "code.hackerspace.pl/hscloud/dc/arista-proxy/proto" ) var ( diff --git a/go/svc/arista-proxy/proto/.gitignore b/dc/arista-proxy/proto/.gitignore similarity index 100% rename from go/svc/arista-proxy/proto/.gitignore rename to dc/arista-proxy/proto/.gitignore diff --git a/go/svc/arista-proxy/proto/BUILD.bazel b/dc/arista-proxy/proto/BUILD.bazel similarity index 78% rename from go/svc/arista-proxy/proto/BUILD.bazel rename to dc/arista-proxy/proto/BUILD.bazel index af116e39..2df4f584 100644 --- a/go/svc/arista-proxy/proto/BUILD.bazel +++ b/dc/arista-proxy/proto/BUILD.bazel @@ -10,7 +10,7 @@ proto_library( go_proto_library( name = "proto_go_proto", compilers = ["@io_bazel_rules_go//proto:go_grpc"], - importpath = "code.hackerspace.pl/hscloud/go/svc/arista-proxy/proto", + importpath = "code.hackerspace.pl/hscloud/dc/arista-proxy/proto", proto = ":proto_proto", visibility = ["//visibility:public"], ) @@ -18,6 +18,6 @@ go_proto_library( go_library( name = "go_default_library", embed = [":proto_go_proto"], - importpath = "code.hackerspace.pl/hscloud/go/svc/arista-proxy/proto", + importpath = "code.hackerspace.pl/hscloud/dc/arista-proxy/proto", visibility = ["//visibility:public"], ) diff --git a/go/svc/arista-proxy/proto/arista.proto b/dc/arista-proxy/proto/arista.proto similarity index 90% rename from go/svc/arista-proxy/proto/arista.proto rename to dc/arista-proxy/proto/arista.proto index d306b437..2874f702 100644 --- a/go/svc/arista-proxy/proto/arista.proto +++ b/dc/arista-proxy/proto/arista.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package proto; -option go_package = "code.hackerspace.pl/hscloud/go/svc/arista-proxy/proto"; +option go_package = "code.hackerspace.pl/hscloud/dc/arista-proxy/proto"; message ShowVersionRequest { }; diff --git a/go/svc/arista-proxy/service.go b/dc/arista-proxy/service.go similarity index 98% rename from go/svc/arista-proxy/service.go rename to dc/arista-proxy/service.go index d7e2a297..3144ff74 100644 --- a/go/svc/arista-proxy/service.go +++ b/dc/arista-proxy/service.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - pb "code.hackerspace.pl/hscloud/go/svc/arista-proxy/proto" + pb "code.hackerspace.pl/hscloud/dc/arista-proxy/proto" ) func (s *server) ShowVersion(ctx context.Context, req *pb.ShowVersionRequest) (*pb.ShowVersionResponse, error) { diff --git a/go/svc/cmc-proxy/BUILD.bazel b/dc/cmc-proxy/BUILD.bazel similarity index 84% rename from go/svc/cmc-proxy/BUILD.bazel rename to dc/cmc-proxy/BUILD.bazel index 56f3495d..b2f68cae 100644 --- a/go/svc/cmc-proxy/BUILD.bazel +++ b/dc/cmc-proxy/BUILD.bazel @@ -6,11 +6,11 @@ go_library( "client.go", "main.go", ], - importpath = "code.hackerspace.pl/hscloud/go/svc/cmc-proxy", + importpath = "code.hackerspace.pl/hscloud/dc/cmc-proxy", visibility = ["//visibility:private"], deps = [ + "//dc/cmc-proxy/proto:go_default_library", "//go/mirko:go_default_library", - "//go/svc/cmc-proxy/proto:go_default_library", "@com_github_cenkalti_backoff//:go_default_library", "@com_github_golang_glog//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", diff --git a/go/svc/cmc-proxy/README.md b/dc/cmc-proxy/README.md similarity index 100% rename from go/svc/cmc-proxy/README.md rename to dc/cmc-proxy/README.md diff --git a/go/svc/cmc-proxy/client.go b/dc/cmc-proxy/client.go similarity index 100% rename from go/svc/cmc-proxy/client.go rename to dc/cmc-proxy/client.go diff --git a/go/svc/cmc-proxy/main.go b/dc/cmc-proxy/main.go similarity index 96% rename from go/svc/cmc-proxy/main.go rename to dc/cmc-proxy/main.go index 5ae09d06..dc0cfb48 100644 --- a/go/svc/cmc-proxy/main.go +++ b/dc/cmc-proxy/main.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - pb "code.hackerspace.pl/hscloud/go/svc/cmc-proxy/proto" + pb "code.hackerspace.pl/hscloud/dc/cmc-proxy/proto" ) var ( diff --git a/go/svc/cmc-proxy/proto/.gitignore b/dc/cmc-proxy/proto/.gitignore similarity index 100% rename from go/svc/cmc-proxy/proto/.gitignore rename to dc/cmc-proxy/proto/.gitignore diff --git a/go/svc/cmc-proxy/proto/BUILD.bazel b/dc/cmc-proxy/proto/BUILD.bazel similarity index 78% rename from go/svc/cmc-proxy/proto/BUILD.bazel rename to dc/cmc-proxy/proto/BUILD.bazel index 605570cc..14b05693 100644 --- a/go/svc/cmc-proxy/proto/BUILD.bazel +++ b/dc/cmc-proxy/proto/BUILD.bazel @@ -10,7 +10,7 @@ proto_library( go_proto_library( name = "proto_go_proto", compilers = ["@io_bazel_rules_go//proto:go_grpc"], - importpath = "code.hackerspace.pl/hscloud/go/svc/cmc-proxy/proto", + importpath = "code.hackerspace.pl/hscloud/dc/cmc-proxy/proto", proto = ":proto_proto", visibility = ["//visibility:public"], ) @@ -18,6 +18,6 @@ go_proto_library( go_library( name = "go_default_library", embed = [":proto_go_proto"], - importpath = "code.hackerspace.pl/hscloud/go/svc/cmc-proxy/proto", + importpath = "code.hackerspace.pl/hscloud/dc/cmc-proxy/proto", visibility = ["//visibility:public"], ) diff --git a/go/svc/cmc-proxy/proto/proxy.proto b/dc/cmc-proxy/proto/proxy.proto similarity index 76% rename from go/svc/cmc-proxy/proto/proxy.proto rename to dc/cmc-proxy/proto/proxy.proto index a2316934..5afe6b93 100644 --- a/go/svc/cmc-proxy/proto/proxy.proto +++ b/dc/cmc-proxy/proto/proxy.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package proto; -option go_package = "code.hackerspace.pl/hscloud/go/svc/cmc-proxy/proto"; +option go_package = "code.hackerspace.pl/hscloud/dc/cmc-proxy/proto"; message GetKVMDataRequest { int64 blade_num = 1; diff --git a/go/svc/m6220-proxy/BUILD.bazel b/dc/m6220-proxy/BUILD.bazel similarity index 85% rename from go/svc/m6220-proxy/BUILD.bazel rename to dc/m6220-proxy/BUILD.bazel index 90bfb1e3..50fa6923 100644 --- a/go/svc/m6220-proxy/BUILD.bazel +++ b/dc/m6220-proxy/BUILD.bazel @@ -6,11 +6,11 @@ go_library( "cli.go", "main.go", ], - importpath = "code.hackerspace.pl/hscloud/go/svc/m6220-proxy", + importpath = "code.hackerspace.pl/hscloud/dc/m6220-proxy", visibility = ["//visibility:private"], deps = [ + "//dc/m6220-proxy/proto:go_default_library", "//go/mirko:go_default_library", - "//go/svc/m6220-proxy/proto:go_default_library", "//proto/infra:go_default_library", "@com_github_golang_glog//:go_default_library", "@com_github_ziutek_telnet//:go_default_library", diff --git a/go/svc/m6220-proxy/cli.go b/dc/m6220-proxy/cli.go similarity index 100% rename from go/svc/m6220-proxy/cli.go rename to dc/m6220-proxy/cli.go diff --git a/go/svc/m6220-proxy/main.go b/dc/m6220-proxy/main.go similarity index 99% rename from go/svc/m6220-proxy/main.go rename to dc/m6220-proxy/main.go index a2ca4dbf..6fd972d3 100644 --- a/go/svc/m6220-proxy/main.go +++ b/dc/m6220-proxy/main.go @@ -14,7 +14,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - pb "code.hackerspace.pl/hscloud/go/svc/m6220-proxy/proto" + pb "code.hackerspace.pl/hscloud/dc/m6220-proxy/proto" ipb "code.hackerspace.pl/hscloud/proto/infra" ) diff --git a/go/svc/m6220-proxy/proto/.gitignore b/dc/m6220-proxy/proto/.gitignore similarity index 100% rename from go/svc/m6220-proxy/proto/.gitignore rename to dc/m6220-proxy/proto/.gitignore diff --git a/go/svc/m6220-proxy/proto/BUILD.bazel b/dc/m6220-proxy/proto/BUILD.bazel similarity index 78% rename from go/svc/m6220-proxy/proto/BUILD.bazel rename to dc/m6220-proxy/proto/BUILD.bazel index 8cbed6be..4e0ae7e1 100644 --- a/go/svc/m6220-proxy/proto/BUILD.bazel +++ b/dc/m6220-proxy/proto/BUILD.bazel @@ -10,7 +10,7 @@ proto_library( go_proto_library( name = "proto_go_proto", compilers = ["@io_bazel_rules_go//proto:go_grpc"], - importpath = "code.hackerspace.pl/hscloud/go/svc/m6220-proxy/proto", + importpath = "code.hackerspace.pl/hscloud/dc/m6220-proxy/proto", proto = ":proto_proto", visibility = ["//visibility:public"], ) @@ -18,6 +18,6 @@ go_proto_library( go_library( name = "go_default_library", embed = [":proto_go_proto"], - importpath = "code.hackerspace.pl/hscloud/go/svc/m6220-proxy/proto", + importpath = "code.hackerspace.pl/hscloud/dc/m6220-proxy/proto", visibility = ["//visibility:public"], ) diff --git a/go/svc/m6220-proxy/proto/proxy.proto b/dc/m6220-proxy/proto/proxy.proto similarity index 78% rename from go/svc/m6220-proxy/proto/proxy.proto rename to dc/m6220-proxy/proto/proxy.proto index bc840ad6..b8444c34 100644 --- a/go/svc/m6220-proxy/proto/proxy.proto +++ b/dc/m6220-proxy/proto/proxy.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package proto; -option go_package = "code.hackerspace.pl/hscloud/go/svc/m6220-proxy/proto"; +option go_package = "code.hackerspace.pl/hscloud/dc/m6220-proxy/proto"; message RunCommandRequest { string command = 1; diff --git a/go/svc/topo/.gitignore b/dc/topo/.gitignore similarity index 100% rename from go/svc/topo/.gitignore rename to dc/topo/.gitignore diff --git a/go/svc/topo/BUILD.bazel b/dc/topo/BUILD.bazel similarity index 75% rename from go/svc/topo/BUILD.bazel rename to dc/topo/BUILD.bazel index 93c92a5f..c10300c3 100644 --- a/go/svc/topo/BUILD.bazel +++ b/dc/topo/BUILD.bazel @@ -6,15 +6,15 @@ go_library( "main.go", "service.go", ], - importpath = "code.hackerspace.pl/hscloud/go/svc/topo", + importpath = "code.hackerspace.pl/hscloud/dc/topo", visibility = ["//visibility:private"], deps = [ + "//dc/topo/assets:go_default_library", + "//dc/topo/graph:go_default_library", + "//dc/topo/proto:go_default_library", + "//dc/topo/state:go_default_library", "//go/mirko:go_default_library", "//go/statusz:go_default_library", - "//go/svc/topo/assets:go_default_library", - "//go/svc/topo/graph:go_default_library", - "//go/svc/topo/proto:go_default_library", - "//go/svc/topo/state:go_default_library", "//proto/infra:go_default_library", "@com_github_digitalocean_go_netbox//netbox:go_default_library", "@com_github_digitalocean_go_netbox//netbox/client:go_default_library", diff --git a/go/svc/topo/assets/BUILD b/dc/topo/assets/BUILD.bazel similarity index 73% rename from go/svc/topo/assets/BUILD rename to dc/topo/assets/BUILD.bazel index f8d186ba..401487b2 100644 --- a/go/svc/topo/assets/BUILD +++ b/dc/topo/assets/BUILD.bazel @@ -12,6 +12,6 @@ go_embed_data( go_library( name = "go_default_library", srcs = [":assets"], - importpath = "code.hackerspace.pl/hscloud/go/svc/topo/assets", - visibility = ["//go/svc/topo:__pkg__"], + importpath = "code.hackerspace.pl/hscloud/dc/topo/assets", + visibility = ["//dc/topo:__pkg__"], ) diff --git a/go/svc/topo/assets/full.render.js b/dc/topo/assets/full.render.js similarity index 100% rename from go/svc/topo/assets/full.render.js rename to dc/topo/assets/full.render.js diff --git a/go/svc/topo/assets/viz.js b/dc/topo/assets/viz.js similarity index 100% rename from go/svc/topo/assets/viz.js rename to dc/topo/assets/viz.js diff --git a/go/svc/topo/graph/BUILD.bazel b/dc/topo/graph/BUILD.bazel similarity index 80% rename from go/svc/topo/graph/BUILD.bazel rename to dc/topo/graph/BUILD.bazel index 205b4014..26a5fc2a 100644 --- a/go/svc/topo/graph/BUILD.bazel +++ b/dc/topo/graph/BUILD.bazel @@ -3,10 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["graph.go"], - importpath = "code.hackerspace.pl/hscloud/go/svc/topo/graph", + importpath = "code.hackerspace.pl/hscloud/dc/topo/graph", visibility = ["//visibility:public"], deps = [ - "//go/svc/topo/proto:go_default_library", + "//dc/topo/proto:go_default_library", "@com_github_digitalocean_go_netbox//netbox/client:go_default_library", "@com_github_digitalocean_go_netbox//netbox/client/dcim:go_default_library", "@com_github_digitalocean_go_netbox//netbox/models:go_default_library", diff --git a/go/svc/topo/graph/graph.go b/dc/topo/graph/graph.go similarity index 99% rename from go/svc/topo/graph/graph.go rename to dc/topo/graph/graph.go index 72e69b27..4d31f39e 100644 --- a/go/svc/topo/graph/graph.go +++ b/dc/topo/graph/graph.go @@ -10,7 +10,7 @@ import ( "github.com/digitalocean/go-netbox/netbox/models" "github.com/golang/glog" - pb "code.hackerspace.pl/hscloud/go/svc/topo/proto" + pb "code.hackerspace.pl/hscloud/dc/topo/proto" ) type MachinePort struct { diff --git a/go/svc/topo/main.go b/dc/topo/main.go similarity index 91% rename from go/svc/topo/main.go rename to dc/topo/main.go index 4efe8783..fd1fb8f6 100644 --- a/go/svc/topo/main.go +++ b/dc/topo/main.go @@ -13,9 +13,9 @@ import ( "github.com/golang/glog" "github.com/golang/protobuf/proto" - "code.hackerspace.pl/hscloud/go/svc/topo/graph" - pb "code.hackerspace.pl/hscloud/go/svc/topo/proto" - "code.hackerspace.pl/hscloud/go/svc/topo/state" + "code.hackerspace.pl/hscloud/dc/topo/graph" + pb "code.hackerspace.pl/hscloud/dc/topo/proto" + "code.hackerspace.pl/hscloud/dc/topo/state" ) var ( diff --git a/go/svc/topo/proto/.gitignore b/dc/topo/proto/.gitignore similarity index 100% rename from go/svc/topo/proto/.gitignore rename to dc/topo/proto/.gitignore diff --git a/go/svc/topo/proto/BUILD.bazel b/dc/topo/proto/BUILD.bazel similarity index 78% rename from go/svc/topo/proto/BUILD.bazel rename to dc/topo/proto/BUILD.bazel index b56fa572..3caae5b1 100644 --- a/go/svc/topo/proto/BUILD.bazel +++ b/dc/topo/proto/BUILD.bazel @@ -9,7 +9,7 @@ proto_library( go_proto_library( name = "proto_go_proto", - importpath = "code.hackerspace.pl/hscloud/go/svc/topo/proto", + importpath = "code.hackerspace.pl/hscloud/dc/topo/proto", proto = ":proto_proto", visibility = ["//visibility:public"], ) @@ -17,6 +17,6 @@ go_proto_library( go_library( name = "go_default_library", embed = [":proto_go_proto"], - importpath = "code.hackerspace.pl/hscloud/go/svc/topo/proto", + importpath = "code.hackerspace.pl/hscloud/dc/topo/proto", visibility = ["//visibility:public"], ) diff --git a/go/svc/topo/proto/topo.proto b/dc/topo/proto/topo.proto similarity index 90% rename from go/svc/topo/proto/topo.proto rename to dc/topo/proto/topo.proto index 3f6e4044..0127bf85 100644 --- a/go/svc/topo/proto/topo.proto +++ b/dc/topo/proto/topo.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package topo; -option go_package = "code.hackerspace.pl/hscloud/go/svc/topo/proto"; +option go_package = "code.hackerspace.pl/hscloud/dc/topo/proto"; message Config { repeated Switch switch = 1; diff --git a/go/svc/topo/service.go b/dc/topo/service.go similarity index 97% rename from go/svc/topo/service.go rename to dc/topo/service.go index fbbee921..89199390 100644 --- a/go/svc/topo/service.go +++ b/dc/topo/service.go @@ -13,9 +13,9 @@ import ( "code.hackerspace.pl/hscloud/go/statusz" ipb "code.hackerspace.pl/hscloud/proto/infra" - "code.hackerspace.pl/hscloud/go/svc/topo/assets" - "code.hackerspace.pl/hscloud/go/svc/topo/graph" - "code.hackerspace.pl/hscloud/go/svc/topo/state" + "code.hackerspace.pl/hscloud/dc/topo/assets" + "code.hackerspace.pl/hscloud/dc/topo/graph" + "code.hackerspace.pl/hscloud/dc/topo/state" ) type Service struct { diff --git a/go/svc/topo/state/BUILD.bazel b/dc/topo/state/BUILD.bazel similarity index 73% rename from go/svc/topo/state/BUILD.bazel rename to dc/topo/state/BUILD.bazel index 680e0877..892e3022 100644 --- a/go/svc/topo/state/BUILD.bazel +++ b/dc/topo/state/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["state.go"], - importpath = "code.hackerspace.pl/hscloud/go/svc/topo/state", + importpath = "code.hackerspace.pl/hscloud/dc/topo/state", visibility = ["//visibility:public"], deps = [ + "//dc/topo/proto:go_default_library", "//go/pki:go_default_library", - "//go/svc/topo/proto:go_default_library", "//proto/infra:go_default_library", "@org_golang_google_grpc//:go_default_library", ], diff --git a/go/svc/topo/state/state.go b/dc/topo/state/state.go similarity index 96% rename from go/svc/topo/state/state.go rename to dc/topo/state/state.go index 08403e70..116a55a2 100644 --- a/go/svc/topo/state/state.go +++ b/dc/topo/state/state.go @@ -10,7 +10,7 @@ import ( "code.hackerspace.pl/hscloud/go/pki" ipb "code.hackerspace.pl/hscloud/proto/infra" - pb "code.hackerspace.pl/hscloud/go/svc/topo/proto" + pb "code.hackerspace.pl/hscloud/dc/topo/proto" ) type SwitchportState struct {