diff --git a/spinifex/network/external/eip_test.go b/spinifex/network/external/eip_test.go index 7d0b34f0d..a838953be 100644 --- a/spinifex/network/external/eip_test.go +++ b/spinifex/network/external/eip_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" ) func TestNewEIPManager_RejectsNilNAT(t *testing.T) { diff --git a/spinifex/network/external/igw.go b/spinifex/network/external/igw.go index 34216dc0c..6f9486ec8 100644 --- a/spinifex/network/external/igw.go +++ b/spinifex/network/external/igw.go @@ -7,9 +7,9 @@ import ( "log/slog" "github.com/mulgadc/spinifex/spinifex/network/ovn" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" ) // FlowsBarrier blocks until ovn-northd has compiled NB → SB and every diff --git a/spinifex/network/external/igw_test.go b/spinifex/network/external/igw_test.go index 7f9bb186f..7351ad9fd 100644 --- a/spinifex/network/external/igw_test.go +++ b/spinifex/network/external/igw_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" ) func seedVPCRouter(t *testing.T, m *mock.Client, vpcID, cidr string) { diff --git a/spinifex/network/external/natgw_test.go b/spinifex/network/external/natgw_test.go index 7a0ae38ad..2f9582c2e 100644 --- a/spinifex/network/external/natgw_test.go +++ b/spinifex/network/external/natgw_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" ) func TestNewNATGWManager_RejectsNilNAT(t *testing.T) { diff --git a/spinifex/network/external/pool_test.go b/spinifex/network/external/pool_test.go index 6e0f0a3bc..918035b23 100644 --- a/spinifex/network/external/pool_test.go +++ b/spinifex/network/external/pool_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" ) func TestFindPool_AZBeatsRegionBeatsUnscoped(t *testing.T) { diff --git a/spinifex/network/ovn/client.go b/spinifex/network/ovn/client.go index 8c7415f31..961cbd6a3 100644 --- a/spinifex/network/ovn/client.go +++ b/spinifex/network/ovn/client.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" ) // ErrNATNotFound is returned by DeleteNAT / DeleteNATByExternalIP when the diff --git a/spinifex/network/ovn/live.go b/spinifex/network/ovn/live.go index 84699c32c..d51bc36b7 100644 --- a/spinifex/network/ovn/live.go +++ b/spinifex/network/ovn/live.go @@ -6,7 +6,7 @@ import ( "log/slog" "slices" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/ovn-kubernetes/libovsdb/client" "github.com/ovn-kubernetes/libovsdb/model" "github.com/ovn-kubernetes/libovsdb/ovsdb" diff --git a/spinifex/network/ovn/mock/mock.go b/spinifex/network/ovn/mock/mock.go index b7970ec46..3d5b110dc 100644 --- a/spinifex/network/ovn/mock/mock.go +++ b/spinifex/network/ovn/mock/mock.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/mulgadc/spinifex/spinifex/network/ovn" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/network/ovn/mock/mock_test.go b/spinifex/network/ovn/mock/mock_test.go index db7ff9b79..da21a9677 100644 --- a/spinifex/network/ovn/mock/mock_test.go +++ b/spinifex/network/ovn/mock/mock_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" ) func TestClient_DeleteAllNATsByExternalIP(t *testing.T) { diff --git a/spinifex/services/vpcd/nbdb/model.go b/spinifex/network/ovn/nbdb/model.go similarity index 98% rename from spinifex/services/vpcd/nbdb/model.go rename to spinifex/network/ovn/nbdb/model.go index 46e4395ac..b3091589e 100644 --- a/spinifex/services/vpcd/nbdb/model.go +++ b/spinifex/network/ovn/nbdb/model.go @@ -7,7 +7,7 @@ // To regenerate from the full OVN NB schema (requires OVN installed): // // go install github.com/ovn-kubernetes/libovsdb/cmd/modelgen@latest -// modelgen -p nbdb -o spinifex/services/vpcd/nbdb /usr/share/ovn/ovn-nb.ovsschema +// modelgen -p nbdb -o spinifex/network/ovn/nbdb /usr/share/ovn/ovn-nb.ovsschema package nbdb import "github.com/ovn-kubernetes/libovsdb/model" diff --git a/spinifex/services/vpcd/nbdb/model_test.go b/spinifex/network/ovn/nbdb/model_test.go similarity index 100% rename from spinifex/services/vpcd/nbdb/model_test.go rename to spinifex/network/ovn/nbdb/model_test.go diff --git a/spinifex/network/policy/nat.go b/spinifex/network/policy/nat.go index 0dfefea75..450af8d08 100644 --- a/spinifex/network/policy/nat.go +++ b/spinifex/network/policy/nat.go @@ -7,8 +7,8 @@ import ( "log/slog" "github.com/mulgadc/spinifex/spinifex/network/ovn" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" ) // EIPSpec is a 1:1 Elastic IP NAT (dnat_and_snat) attaching ExternalIP to diff --git a/spinifex/network/policy/nat_test.go b/spinifex/network/policy/nat_test.go index 9d587f7e7..0ccb2f444 100644 --- a/spinifex/network/policy/nat_test.go +++ b/spinifex/network/policy/nat_test.go @@ -9,8 +9,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/host" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" ) func seedRouter(t *testing.T, m *mock.Client, vpcID string) string { diff --git a/spinifex/network/policy/route.go b/spinifex/network/policy/route.go index d6c401156..c5ee2b18f 100644 --- a/spinifex/network/policy/route.go +++ b/spinifex/network/policy/route.go @@ -6,8 +6,8 @@ import ( "net/netip" "github.com/mulgadc/spinifex/spinifex/network/ovn" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" ) // defaultRoutePrefix is the IPv4 default-route prefix used by AddDefaultRoute diff --git a/spinifex/network/policy/route_test.go b/spinifex/network/policy/route_test.go index 5e830e5c4..e16a11457 100644 --- a/spinifex/network/policy/route_test.go +++ b/spinifex/network/policy/route_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" ) func findRoute(m *mock.Client, prefix string) *nbdb.LogicalRouterStaticRoute { diff --git a/spinifex/network/reconcile/apply.go b/spinifex/network/reconcile/apply.go index 500e03bc2..ef3fe9cdf 100644 --- a/spinifex/network/reconcile/apply.go +++ b/spinifex/network/reconcile/apply.go @@ -6,8 +6,8 @@ import ( "log/slog" "net/netip" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/network/topology/manager_live.go b/spinifex/network/topology/manager_live.go index 6b465126a..99f42a9c5 100644 --- a/spinifex/network/topology/manager_live.go +++ b/spinifex/network/topology/manager_live.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/mulgadc/spinifex/spinifex/network/ovn" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/services/vpcd/topology.go b/spinifex/services/vpcd/topology.go index 609f6d94a..f335a2e37 100644 --- a/spinifex/services/vpcd/topology.go +++ b/spinifex/services/vpcd/topology.go @@ -12,9 +12,9 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/network/external" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/services/vpcd/topology_test.go b/spinifex/services/vpcd/topology_test.go index 821d2d2c0..829dd81e1 100644 --- a/spinifex/services/vpcd/topology_test.go +++ b/spinifex/services/vpcd/topology_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" + "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/services/vpcd/nbdb" "github.com/mulgadc/spinifex/spinifex/testutil" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats-server/v2/server"