From cd445c5e7e94fb13535c051a307d4f69336252ab Mon Sep 17 00:00:00 2001 From: astoycos Date: Tue, 7 Dec 2021 16:38:33 -0500 Subject: [PATCH] Move libovsdbops package Move the libovsdbops package out of the `go-controller/pkg/ovn` directory and into `go-controller/pkg` since its used by many packages in the directory. Signed-off-by: astoycos --- go-controller/hybrid-overlay/pkg/controller/master.go | 3 ++- go-controller/hybrid-overlay/pkg/controller/master_test.go | 3 ++- go-controller/hybrid-overlay/pkg/controller/out.txt | 0 go-controller/pkg/{ovn => }/libovsdbops/acl.go | 0 go-controller/pkg/{ovn => }/libovsdbops/chassis.go | 0 go-controller/pkg/{ovn => }/libovsdbops/datapath.go | 0 go-controller/pkg/{ovn => }/libovsdbops/lbgroup.go | 0 go-controller/pkg/{ovn => }/libovsdbops/loadbalancer.go | 0 .../pkg/{ovn => }/libovsdbops/logical_switch_port.go | 0 go-controller/pkg/{ovn => }/libovsdbops/mac_binding.go | 0 go-controller/pkg/{ovn => }/libovsdbops/meter.go | 0 go-controller/pkg/{ovn => }/libovsdbops/model.go | 0 go-controller/pkg/{ovn => }/libovsdbops/model_client.go | 0 .../pkg/{ovn => }/libovsdbops/model_client_test.go | 0 go-controller/pkg/{ovn => }/libovsdbops/named_uuid.go | 0 go-controller/pkg/{ovn => }/libovsdbops/nb_global.go | 0 go-controller/pkg/{ovn => }/libovsdbops/portgroup.go | 0 go-controller/pkg/{ovn => }/libovsdbops/router.go | 0 go-controller/pkg/{ovn => }/libovsdbops/sb_global.go | 0 go-controller/pkg/{ovn => }/libovsdbops/switch.go | 0 go-controller/pkg/{ovn => }/libovsdbops/switch_test.go | 0 go-controller/pkg/{ovn => }/libovsdbops/transact.go | 0 go-controller/pkg/metrics/master.go | 3 ++- go-controller/pkg/metrics/ovn_db.go | 4 ++-- go-controller/pkg/node/node_test.go | 1 + go-controller/pkg/ovn/address_set/address_set.go | 6 ++++-- go-controller/pkg/ovn/controller/services/repair.go | 3 ++- go-controller/pkg/ovn/controller/unidling/unidle.go | 1 + go-controller/pkg/ovn/egressfirewall.go | 3 ++- go-controller/pkg/ovn/egressfirewall_test.go | 3 ++- go-controller/pkg/ovn/egressgw.go | 3 ++- go-controller/pkg/ovn/egressgw_test.go | 3 ++- go-controller/pkg/ovn/egressip.go | 3 ++- go-controller/pkg/ovn/gateway_cleanup.go | 3 ++- go-controller/pkg/ovn/gateway_init.go | 3 ++- go-controller/pkg/ovn/gateway_test.go | 3 ++- go-controller/pkg/ovn/gress_policy.go | 3 ++- go-controller/pkg/ovn/loadbalancer/lb_cache.go | 3 ++- go-controller/pkg/ovn/loadbalancer/loadbalancer.go | 2 +- go-controller/pkg/ovn/master.go | 3 ++- go-controller/pkg/ovn/ovn.go | 3 ++- go-controller/pkg/ovn/pods.go | 5 +++-- go-controller/pkg/ovn/pods_test.go | 3 ++- go-controller/pkg/ovn/policy.go | 3 ++- go-controller/pkg/ovn/policy_test.go | 3 ++- go-controller/pkg/util/ovn.go | 3 ++- go-controller/pkg/util/util.go | 3 ++- 47 files changed, 54 insertions(+), 28 deletions(-) delete mode 100644 go-controller/hybrid-overlay/pkg/controller/out.txt rename go-controller/pkg/{ovn => }/libovsdbops/acl.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/chassis.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/datapath.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/lbgroup.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/loadbalancer.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/logical_switch_port.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/mac_binding.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/meter.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/model.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/model_client.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/model_client_test.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/named_uuid.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/nb_global.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/portgroup.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/router.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/sb_global.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/switch.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/switch_test.go (100%) rename go-controller/pkg/{ovn => }/libovsdbops/transact.go (100%) diff --git a/go-controller/hybrid-overlay/pkg/controller/master.go b/go-controller/hybrid-overlay/pkg/controller/master.go index 97373c32124..3bc5d1e0676 100644 --- a/go-controller/hybrid-overlay/pkg/controller/master.go +++ b/go-controller/hybrid-overlay/pkg/controller/master.go @@ -12,8 +12,9 @@ import ( "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/informer" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/subnetallocator" ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util" diff --git a/go-controller/hybrid-overlay/pkg/controller/master_test.go b/go-controller/hybrid-overlay/pkg/controller/master_test.go index 79f139ae151..c1c47da4825 100644 --- a/go-controller/hybrid-overlay/pkg/controller/master_test.go +++ b/go-controller/hybrid-overlay/pkg/controller/master_test.go @@ -16,8 +16,9 @@ import ( "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/informer" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + ovntest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing" libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" diff --git a/go-controller/hybrid-overlay/pkg/controller/out.txt b/go-controller/hybrid-overlay/pkg/controller/out.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/go-controller/pkg/ovn/libovsdbops/acl.go b/go-controller/pkg/libovsdbops/acl.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/acl.go rename to go-controller/pkg/libovsdbops/acl.go diff --git a/go-controller/pkg/ovn/libovsdbops/chassis.go b/go-controller/pkg/libovsdbops/chassis.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/chassis.go rename to go-controller/pkg/libovsdbops/chassis.go diff --git a/go-controller/pkg/ovn/libovsdbops/datapath.go b/go-controller/pkg/libovsdbops/datapath.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/datapath.go rename to go-controller/pkg/libovsdbops/datapath.go diff --git a/go-controller/pkg/ovn/libovsdbops/lbgroup.go b/go-controller/pkg/libovsdbops/lbgroup.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/lbgroup.go rename to go-controller/pkg/libovsdbops/lbgroup.go diff --git a/go-controller/pkg/ovn/libovsdbops/loadbalancer.go b/go-controller/pkg/libovsdbops/loadbalancer.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/loadbalancer.go rename to go-controller/pkg/libovsdbops/loadbalancer.go diff --git a/go-controller/pkg/ovn/libovsdbops/logical_switch_port.go b/go-controller/pkg/libovsdbops/logical_switch_port.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/logical_switch_port.go rename to go-controller/pkg/libovsdbops/logical_switch_port.go diff --git a/go-controller/pkg/ovn/libovsdbops/mac_binding.go b/go-controller/pkg/libovsdbops/mac_binding.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/mac_binding.go rename to go-controller/pkg/libovsdbops/mac_binding.go diff --git a/go-controller/pkg/ovn/libovsdbops/meter.go b/go-controller/pkg/libovsdbops/meter.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/meter.go rename to go-controller/pkg/libovsdbops/meter.go diff --git a/go-controller/pkg/ovn/libovsdbops/model.go b/go-controller/pkg/libovsdbops/model.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/model.go rename to go-controller/pkg/libovsdbops/model.go diff --git a/go-controller/pkg/ovn/libovsdbops/model_client.go b/go-controller/pkg/libovsdbops/model_client.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/model_client.go rename to go-controller/pkg/libovsdbops/model_client.go diff --git a/go-controller/pkg/ovn/libovsdbops/model_client_test.go b/go-controller/pkg/libovsdbops/model_client_test.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/model_client_test.go rename to go-controller/pkg/libovsdbops/model_client_test.go diff --git a/go-controller/pkg/ovn/libovsdbops/named_uuid.go b/go-controller/pkg/libovsdbops/named_uuid.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/named_uuid.go rename to go-controller/pkg/libovsdbops/named_uuid.go diff --git a/go-controller/pkg/ovn/libovsdbops/nb_global.go b/go-controller/pkg/libovsdbops/nb_global.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/nb_global.go rename to go-controller/pkg/libovsdbops/nb_global.go diff --git a/go-controller/pkg/ovn/libovsdbops/portgroup.go b/go-controller/pkg/libovsdbops/portgroup.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/portgroup.go rename to go-controller/pkg/libovsdbops/portgroup.go diff --git a/go-controller/pkg/ovn/libovsdbops/router.go b/go-controller/pkg/libovsdbops/router.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/router.go rename to go-controller/pkg/libovsdbops/router.go diff --git a/go-controller/pkg/ovn/libovsdbops/sb_global.go b/go-controller/pkg/libovsdbops/sb_global.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/sb_global.go rename to go-controller/pkg/libovsdbops/sb_global.go diff --git a/go-controller/pkg/ovn/libovsdbops/switch.go b/go-controller/pkg/libovsdbops/switch.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/switch.go rename to go-controller/pkg/libovsdbops/switch.go diff --git a/go-controller/pkg/ovn/libovsdbops/switch_test.go b/go-controller/pkg/libovsdbops/switch_test.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/switch_test.go rename to go-controller/pkg/libovsdbops/switch_test.go diff --git a/go-controller/pkg/ovn/libovsdbops/transact.go b/go-controller/pkg/libovsdbops/transact.go similarity index 100% rename from go-controller/pkg/ovn/libovsdbops/transact.go rename to go-controller/pkg/libovsdbops/transact.go diff --git a/go-controller/pkg/metrics/master.go b/go-controller/pkg/metrics/master.go index 88ffb81e66e..2dd68613d86 100644 --- a/go-controller/pkg/metrics/master.go +++ b/go-controller/pkg/metrics/master.go @@ -10,9 +10,10 @@ import ( "github.com/ovn-org/libovsdb/client" "github.com/ovn-org/libovsdb/model" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util" "github.com/prometheus/client_golang/prometheus" diff --git a/go-controller/pkg/metrics/ovn_db.go b/go-controller/pkg/metrics/ovn_db.go index c271b06149a..b5a534ab3c5 100644 --- a/go-controller/pkg/metrics/ovn_db.go +++ b/go-controller/pkg/metrics/ovn_db.go @@ -266,10 +266,10 @@ func ovnE2eTimeStampUpdater(direction, database string) { var err error if direction == "sb" { - stdout, stderr, err = util.RunOVNSbctlUnix("--if-exists", "--no-leader-only", + stdout, stderr, err = util.RunOVNSbctl("--if-exists", "--no-leader-only", "get", "SB_Global", ".", "options:e2e_timestamp") } else { - stdout, stderr, err = util.RunOVNNbctlUnix("--if-exists", "--no-leader-only", + stdout, stderr, err = util.RunOVNNbctl("--if-exists", "--no-leader-only", "get", "NB_Global", ".", "options:e2e_timestamp") } if err != nil { diff --git a/go-controller/pkg/node/node_test.go b/go-controller/pkg/node/node_test.go index 932153f4f9c..7808344cc11 100644 --- a/go-controller/pkg/node/node_test.go +++ b/go-controller/pkg/node/node_test.go @@ -9,6 +9,7 @@ import ( "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube/mocks" + ovntest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing" netlink_mocks "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/mocks/github.com/vishvananda/netlink" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" diff --git a/go-controller/pkg/ovn/address_set/address_set.go b/go-controller/pkg/ovn/address_set/address_set.go index 52826c22365..4e5694807c3 100644 --- a/go-controller/pkg/ovn/address_set/address_set.go +++ b/go-controller/pkg/ovn/address_set/address_set.go @@ -3,19 +3,21 @@ package addressset import ( "context" "fmt" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" "net" "sort" "strings" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" + "github.com/pkg/errors" libovsdbclient "github.com/ovn-org/libovsdb/client" "github.com/ovn-org/libovsdb/model" "github.com/ovn-org/libovsdb/ovsdb" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" + libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util" "k8s.io/apimachinery/pkg/util/sets" diff --git a/go-controller/pkg/ovn/controller/services/repair.go b/go-controller/pkg/ovn/controller/services/repair.go index 02affe27bbb..6feafb98108 100644 --- a/go-controller/pkg/ovn/controller/services/repair.go +++ b/go-controller/pkg/ovn/controller/services/repair.go @@ -8,7 +8,8 @@ import ( libovsdbclient "github.com/ovn-org/libovsdb/client" globalconfig "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" + ovnlb "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/loadbalancer" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/go-controller/pkg/ovn/controller/unidling/unidle.go b/go-controller/pkg/ovn/controller/unidling/unidle.go index 36745b6c3c7..eb0e9a844cc 100644 --- a/go-controller/pkg/ovn/controller/unidling/unidle.go +++ b/go-controller/pkg/ovn/controller/unidling/unidle.go @@ -11,6 +11,7 @@ import ( "github.com/ovn-org/libovsdb/ovsdb" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb" ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util" kapi "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/go-controller/pkg/ovn/egressfirewall.go b/go-controller/pkg/ovn/egressfirewall.go index c61b4c3c4bd..d4d2cd252a8 100644 --- a/go-controller/pkg/ovn/egressfirewall.go +++ b/go-controller/pkg/ovn/egressfirewall.go @@ -10,9 +10,10 @@ import ( "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" egressfirewallapi "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressfirewall/v1" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" kapi "k8s.io/api/core/v1" diff --git a/go-controller/pkg/ovn/egressfirewall_test.go b/go-controller/pkg/ovn/egressfirewall_test.go index d91a8d2da0f..b567a6785df 100644 --- a/go-controller/pkg/ovn/egressfirewall_test.go +++ b/go-controller/pkg/ovn/egressfirewall_test.go @@ -11,9 +11,10 @@ import ( "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" egressfirewallapi "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressfirewall/v1" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb" libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb" t "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" diff --git a/go-controller/pkg/ovn/egressgw.go b/go-controller/pkg/ovn/egressgw.go index 667d5198625..557e2f3a20a 100644 --- a/go-controller/pkg/ovn/egressgw.go +++ b/go-controller/pkg/ovn/egressgw.go @@ -15,8 +15,9 @@ import ( libovsdbclient "github.com/ovn-org/libovsdb/client" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util" diff --git a/go-controller/pkg/ovn/egressgw_test.go b/go-controller/pkg/ovn/egressgw_test.go index 3434178c6e3..63c9dd20b6e 100644 --- a/go-controller/pkg/ovn/egressgw_test.go +++ b/go-controller/pkg/ovn/egressgw_test.go @@ -7,8 +7,9 @@ import ( "strconv" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" diff --git a/go-controller/pkg/ovn/egressip.go b/go-controller/pkg/ovn/egressip.go index b152d4c4a32..3ef3328f01b 100644 --- a/go-controller/pkg/ovn/egressip.go +++ b/go-controller/pkg/ovn/egressip.go @@ -19,9 +19,10 @@ import ( "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" egressipv1 "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressip/v1" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/metrics" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util" kapi "k8s.io/api/core/v1" diff --git a/go-controller/pkg/ovn/gateway_cleanup.go b/go-controller/pkg/ovn/gateway_cleanup.go index cfd91896e70..9133c6153e5 100644 --- a/go-controller/pkg/ovn/gateway_cleanup.go +++ b/go-controller/pkg/ovn/gateway_cleanup.go @@ -6,8 +6,9 @@ import ( "strconv" "strings" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + ovnlb "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/loadbalancer" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" diff --git a/go-controller/pkg/ovn/gateway_init.go b/go-controller/pkg/ovn/gateway_init.go index a656719b436..9809542fe0e 100644 --- a/go-controller/pkg/ovn/gateway_init.go +++ b/go-controller/pkg/ovn/gateway_init.go @@ -8,8 +8,9 @@ import ( "strings" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util" diff --git a/go-controller/pkg/ovn/gateway_test.go b/go-controller/pkg/ovn/gateway_test.go index 867425544f3..bd0928b6268 100644 --- a/go-controller/pkg/ovn/gateway_test.go +++ b/go-controller/pkg/ovn/gateway_test.go @@ -10,8 +10,9 @@ import ( "github.com/onsi/gomega" "github.com/onsi/gomega/format" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + ovnlb "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/loadbalancer" ovntest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb" diff --git a/go-controller/pkg/ovn/gress_policy.go b/go-controller/pkg/ovn/gress_policy.go index 295a31e717b..dfb45eee188 100644 --- a/go-controller/pkg/ovn/gress_policy.go +++ b/go-controller/pkg/ovn/gress_policy.go @@ -8,10 +8,11 @@ import ( "github.com/ovn-org/libovsdb/client" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/gateway" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util" diff --git a/go-controller/pkg/ovn/loadbalancer/lb_cache.go b/go-controller/pkg/ovn/loadbalancer/lb_cache.go index 3e0caadd636..a5487ecc723 100644 --- a/go-controller/pkg/ovn/loadbalancer/lb_cache.go +++ b/go-controller/pkg/ovn/loadbalancer/lb_cache.go @@ -6,7 +6,8 @@ import ( "sync" libovsdbclient "github.com/ovn-org/libovsdb/client" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" + "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/go-controller/pkg/ovn/loadbalancer/loadbalancer.go b/go-controller/pkg/ovn/loadbalancer/loadbalancer.go index 1063833e04c..0f8afb1c819 100644 --- a/go-controller/pkg/ovn/loadbalancer/loadbalancer.go +++ b/go-controller/pkg/ovn/loadbalancer/loadbalancer.go @@ -9,8 +9,8 @@ import ( libovsdbclient "github.com/ovn-org/libovsdb/client" libovsdb "github.com/ovn-org/libovsdb/ovsdb" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" "k8s.io/klog/v2" ) diff --git a/go-controller/pkg/ovn/master.go b/go-controller/pkg/ovn/master.go index d9a00d6123c..70aea49f1b9 100644 --- a/go-controller/pkg/ovn/master.go +++ b/go-controller/pkg/ovn/master.go @@ -25,9 +25,10 @@ import ( hocontroller "github.com/ovn-org/ovn-kubernetes/go-controller/hybrid-overlay/pkg/controller" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/informer" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/metrics" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + ovnlb "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/loadbalancer" lsm "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/logical_switch_manager" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" diff --git a/go-controller/pkg/ovn/ovn.go b/go-controller/pkg/ovn/ovn.go index a663dd561fc..7069c7c6997 100644 --- a/go-controller/pkg/ovn/ovn.go +++ b/go-controller/pkg/ovn/ovn.go @@ -21,12 +21,13 @@ import ( egressipv1 "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/egressip/v1" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/metrics" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set" svccontroller "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/controller/services" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/controller/unidling" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + lsm "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/logical_switch_manager" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/subnetallocator" ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" diff --git a/go-controller/pkg/ovn/pods.go b/go-controller/pkg/ovn/pods.go index 56d33ee697d..20479e1881e 100644 --- a/go-controller/pkg/ovn/pods.go +++ b/go-controller/pkg/ovn/pods.go @@ -3,10 +3,11 @@ package ovn import ( "context" "fmt" - ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" "net" "time" + ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/metrics" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/ipallocator" @@ -20,8 +21,8 @@ import ( libovsdbclient "github.com/ovn-org/libovsdb/client" "github.com/ovn-org/libovsdb/model" "github.com/ovn-org/libovsdb/ovsdb" + libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" ) func (oc *Controller) syncPods(pods []interface{}) { diff --git a/go-controller/pkg/ovn/pods_test.go b/go-controller/pkg/ovn/pods_test.go index b123f803637..f447c748094 100644 --- a/go-controller/pkg/ovn/pods_test.go +++ b/go-controller/pkg/ovn/pods_test.go @@ -21,8 +21,9 @@ import ( "github.com/onsi/ginkgo" "github.com/onsi/gomega" + libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - libovsdbops "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb" ) diff --git a/go-controller/pkg/ovn/policy.go b/go-controller/pkg/ovn/policy.go index 94bcdc856f4..f78fdf52234 100644 --- a/go-controller/pkg/ovn/policy.go +++ b/go-controller/pkg/ovn/policy.go @@ -12,8 +12,9 @@ import ( ovsdb "github.com/ovn-org/libovsdb/ovsdb" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util" kapi "k8s.io/api/core/v1" diff --git a/go-controller/pkg/ovn/policy_test.go b/go-controller/pkg/ovn/policy_test.go index e0f55645aec..7dbdcc3186d 100644 --- a/go-controller/pkg/ovn/policy_test.go +++ b/go-controller/pkg/ovn/policy_test.go @@ -14,9 +14,10 @@ import ( libovsdbclient "github.com/ovn-org/libovsdb/client" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + ovntest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb" libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb" diff --git a/go-controller/pkg/util/ovn.go b/go-controller/pkg/util/ovn.go index 7bdcdcfd844..8294371bbc2 100644 --- a/go-controller/pkg/util/ovn.go +++ b/go-controller/pkg/util/ovn.go @@ -11,7 +11,8 @@ import ( libovsdbclient "github.com/ovn-org/libovsdb/client" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb" ) diff --git a/go-controller/pkg/util/util.go b/go-controller/pkg/util/util.go index 3c76b2fa074..b624f3bc878 100644 --- a/go-controller/pkg/util/util.go +++ b/go-controller/pkg/util/util.go @@ -12,8 +12,9 @@ import ( libovsdbclient "github.com/ovn-org/libovsdb/client" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdbops" "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb" - "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/libovsdbops" + "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types" "github.com/urfave/cli/v2"