From 6a3cdece855fcc80d678d768b3272c176ace5c80 Mon Sep 17 00:00:00 2001 From: hzma Date: Mon, 22 Apr 2024 15:57:55 +0800 Subject: [PATCH] drop both IPv4 and IPv6 traffic in networkpolicy drop acl (#3940) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * drop both IPv4 and IPv6 traffic in networkpolicy drop acl Signed-off-by: 马洪贞 * exec mockgen cmd Signed-off-by: 马洪贞 --------- Signed-off-by: 马洪贞 --- go.mod | 1 + go.sum | 2 + mocks/pkg/ovs/interface.go | 669 +++++++++++++------------- pkg/controller/controller_test.go | 2 +- pkg/controller/network_policy.go | 33 +- pkg/controller/security_group_test.go | 2 +- pkg/controller/subnet_test.go | 2 +- pkg/ovs/interface.go | 2 +- pkg/ovs/ovn-nb-acl.go | 30 +- pkg/ovs/ovn-nb-acl_test.go | 16 +- 10 files changed, 370 insertions(+), 389 deletions(-) diff --git a/go.mod b/go.mod index 973a0a9b1df2..59bed247e18a 100644 --- a/go.mod +++ b/go.mod @@ -35,6 +35,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 github.com/vishvananda/netlink v1.2.1-beta.2 + go.uber.org/mock v0.4.0 golang.org/x/exp v0.0.0-20231006140011-7918f672742d golang.org/x/mod v0.17.0 golang.org/x/sys v0.19.0 diff --git a/go.sum b/go.sum index ee3770afce7f..275826c60c38 100644 --- a/go.sum +++ b/go.sum @@ -1903,6 +1903,8 @@ go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/mocks/pkg/ovs/interface.go b/mocks/pkg/ovs/interface.go index 84638ad416b7..13bc3ba32af4 100644 --- a/mocks/pkg/ovs/interface.go +++ b/mocks/pkg/ovs/interface.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ../pkg/ovs/interface.go +// +// Generated by this command: +// +// mockgen -source=../pkg/ovs/interface.go -destination=./pkg/ovs/interface.go -package=ovs +// // Package ovs is a generated GoMock package. package ovs @@ -7,13 +12,13 @@ package ovs import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" v1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1" ovs "github.com/kubeovn/kube-ovn/pkg/ovs" ovnnb "github.com/kubeovn/kube-ovn/pkg/ovsdb/ovnnb" ovnsb "github.com/kubeovn/kube-ovn/pkg/ovsdb/ovnsb" util "github.com/kubeovn/kube-ovn/pkg/util" ovsdb "github.com/ovn-org/libovsdb/ovsdb" + gomock "go.uber.org/mock/gomock" v10 "k8s.io/api/networking/v1" ) @@ -64,7 +69,7 @@ func (m *MockNBGlobal) SetAzName(azName string) error { } // SetAzName indicates an expected call of SetAzName. -func (mr *MockNBGlobalMockRecorder) SetAzName(azName interface{}) *gomock.Call { +func (mr *MockNBGlobalMockRecorder) SetAzName(azName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAzName", reflect.TypeOf((*MockNBGlobal)(nil).SetAzName), azName) } @@ -78,7 +83,7 @@ func (m *MockNBGlobal) SetICAutoRoute(enable bool, blackList []string) error { } // SetICAutoRoute indicates an expected call of SetICAutoRoute. -func (mr *MockNBGlobalMockRecorder) SetICAutoRoute(enable, blackList interface{}) *gomock.Call { +func (mr *MockNBGlobalMockRecorder) SetICAutoRoute(enable, blackList any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetICAutoRoute", reflect.TypeOf((*MockNBGlobal)(nil).SetICAutoRoute), enable, blackList) } @@ -92,7 +97,7 @@ func (m *MockNBGlobal) SetLsCtSkipDstLportIPs(enabled bool) error { } // SetLsCtSkipDstLportIPs indicates an expected call of SetLsCtSkipDstLportIPs. -func (mr *MockNBGlobalMockRecorder) SetLsCtSkipDstLportIPs(enabled interface{}) *gomock.Call { +func (mr *MockNBGlobalMockRecorder) SetLsCtSkipDstLportIPs(enabled any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLsCtSkipDstLportIPs", reflect.TypeOf((*MockNBGlobal)(nil).SetLsCtSkipDstLportIPs), enabled) } @@ -106,7 +111,7 @@ func (m *MockNBGlobal) SetLsDnatModDlDst(enabled bool) error { } // SetLsDnatModDlDst indicates an expected call of SetLsDnatModDlDst. -func (mr *MockNBGlobalMockRecorder) SetLsDnatModDlDst(enabled interface{}) *gomock.Call { +func (mr *MockNBGlobalMockRecorder) SetLsDnatModDlDst(enabled any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLsDnatModDlDst", reflect.TypeOf((*MockNBGlobal)(nil).SetLsDnatModDlDst), enabled) } @@ -126,9 +131,9 @@ func (mr *MockNBGlobalMockRecorder) SetUseCtInvMatch() *gomock.Call { } // UpdateNbGlobal mocks base method. -func (m *MockNBGlobal) UpdateNbGlobal(nbGlobal *ovnnb.NBGlobal, fields ...interface{}) error { +func (m *MockNBGlobal) UpdateNbGlobal(nbGlobal *ovnnb.NBGlobal, fields ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{nbGlobal} + varargs := []any{nbGlobal} for _, a := range fields { varargs = append(varargs, a) } @@ -138,9 +143,9 @@ func (m *MockNBGlobal) UpdateNbGlobal(nbGlobal *ovnnb.NBGlobal, fields ...interf } // UpdateNbGlobal indicates an expected call of UpdateNbGlobal. -func (mr *MockNBGlobalMockRecorder) UpdateNbGlobal(nbGlobal interface{}, fields ...interface{}) *gomock.Call { +func (mr *MockNBGlobalMockRecorder) UpdateNbGlobal(nbGlobal any, fields ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{nbGlobal}, fields...) + varargs := append([]any{nbGlobal}, fields...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateNbGlobal", reflect.TypeOf((*MockNBGlobal)(nil).UpdateNbGlobal), varargs...) } @@ -176,7 +181,7 @@ func (m *MockLogicalRouter) CreateLogicalRouter(lrName string) error { } // CreateLogicalRouter indicates an expected call of CreateLogicalRouter. -func (mr *MockLogicalRouterMockRecorder) CreateLogicalRouter(lrName interface{}) *gomock.Call { +func (mr *MockLogicalRouterMockRecorder) CreateLogicalRouter(lrName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLogicalRouter", reflect.TypeOf((*MockLogicalRouter)(nil).CreateLogicalRouter), lrName) } @@ -190,7 +195,7 @@ func (m *MockLogicalRouter) DeleteLogicalRouter(lrName string) error { } // DeleteLogicalRouter indicates an expected call of DeleteLogicalRouter. -func (mr *MockLogicalRouterMockRecorder) DeleteLogicalRouter(lrName interface{}) *gomock.Call { +func (mr *MockLogicalRouterMockRecorder) DeleteLogicalRouter(lrName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouter", reflect.TypeOf((*MockLogicalRouter)(nil).DeleteLogicalRouter), lrName) } @@ -205,7 +210,7 @@ func (m *MockLogicalRouter) GetLogicalRouter(lrName string, ignoreNotFound bool) } // GetLogicalRouter indicates an expected call of GetLogicalRouter. -func (mr *MockLogicalRouterMockRecorder) GetLogicalRouter(lrName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockLogicalRouterMockRecorder) GetLogicalRouter(lrName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouter", reflect.TypeOf((*MockLogicalRouter)(nil).GetLogicalRouter), lrName, ignoreNotFound) } @@ -220,7 +225,7 @@ func (m *MockLogicalRouter) ListLogicalRouter(needVendorFilter bool, filter func } // ListLogicalRouter indicates an expected call of ListLogicalRouter. -func (mr *MockLogicalRouterMockRecorder) ListLogicalRouter(needVendorFilter, filter interface{}) *gomock.Call { +func (mr *MockLogicalRouterMockRecorder) ListLogicalRouter(needVendorFilter, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouter", reflect.TypeOf((*MockLogicalRouter)(nil).ListLogicalRouter), needVendorFilter, filter) } @@ -235,7 +240,7 @@ func (m *MockLogicalRouter) LogicalRouterExists(name string) (bool, error) { } // LogicalRouterExists indicates an expected call of LogicalRouterExists. -func (mr *MockLogicalRouterMockRecorder) LogicalRouterExists(name interface{}) *gomock.Call { +func (mr *MockLogicalRouterMockRecorder) LogicalRouterExists(name any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalRouterExists", reflect.TypeOf((*MockLogicalRouter)(nil).LogicalRouterExists), name) } @@ -243,7 +248,7 @@ func (mr *MockLogicalRouterMockRecorder) LogicalRouterExists(name interface{}) * // LogicalRouterUpdateLoadBalancers mocks base method. func (m *MockLogicalRouter) LogicalRouterUpdateLoadBalancers(lrName string, op ovsdb.Mutator, lbNames ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lrName, op} + varargs := []any{lrName, op} for _, a := range lbNames { varargs = append(varargs, a) } @@ -253,9 +258,9 @@ func (m *MockLogicalRouter) LogicalRouterUpdateLoadBalancers(lrName string, op o } // LogicalRouterUpdateLoadBalancers indicates an expected call of LogicalRouterUpdateLoadBalancers. -func (mr *MockLogicalRouterMockRecorder) LogicalRouterUpdateLoadBalancers(lrName, op interface{}, lbNames ...interface{}) *gomock.Call { +func (mr *MockLogicalRouterMockRecorder) LogicalRouterUpdateLoadBalancers(lrName, op any, lbNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lrName, op}, lbNames...) + varargs := append([]any{lrName, op}, lbNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalRouterUpdateLoadBalancers", reflect.TypeOf((*MockLogicalRouter)(nil).LogicalRouterUpdateLoadBalancers), varargs...) } @@ -291,7 +296,7 @@ func (m *MockLogicalRouterPort) CreateLogicalRouterPort(lrName, lrpName, mac str } // CreateLogicalRouterPort indicates an expected call of CreateLogicalRouterPort. -func (mr *MockLogicalRouterPortMockRecorder) CreateLogicalRouterPort(lrName, lrpName, mac, networks interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) CreateLogicalRouterPort(lrName, lrpName, mac, networks any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLogicalRouterPort", reflect.TypeOf((*MockLogicalRouterPort)(nil).CreateLogicalRouterPort), lrName, lrpName, mac, networks) } @@ -305,7 +310,7 @@ func (m *MockLogicalRouterPort) CreatePeerRouterPort(localRouter, remoteRouter, } // CreatePeerRouterPort indicates an expected call of CreatePeerRouterPort. -func (mr *MockLogicalRouterPortMockRecorder) CreatePeerRouterPort(localRouter, remoteRouter, localRouterPortIP interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) CreatePeerRouterPort(localRouter, remoteRouter, localRouterPortIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreatePeerRouterPort", reflect.TypeOf((*MockLogicalRouterPort)(nil).CreatePeerRouterPort), localRouter, remoteRouter, localRouterPortIP) } @@ -319,7 +324,7 @@ func (m *MockLogicalRouterPort) DeleteLogicalRouterPort(lrpName string) error { } // DeleteLogicalRouterPort indicates an expected call of DeleteLogicalRouterPort. -func (mr *MockLogicalRouterPortMockRecorder) DeleteLogicalRouterPort(lrpName interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) DeleteLogicalRouterPort(lrpName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPort", reflect.TypeOf((*MockLogicalRouterPort)(nil).DeleteLogicalRouterPort), lrpName) } @@ -333,7 +338,7 @@ func (m *MockLogicalRouterPort) DeleteLogicalRouterPorts(externalIDs map[string] } // DeleteLogicalRouterPorts indicates an expected call of DeleteLogicalRouterPorts. -func (mr *MockLogicalRouterPortMockRecorder) DeleteLogicalRouterPorts(externalIDs, filter interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) DeleteLogicalRouterPorts(externalIDs, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPorts", reflect.TypeOf((*MockLogicalRouterPort)(nil).DeleteLogicalRouterPorts), externalIDs, filter) } @@ -348,7 +353,7 @@ func (m *MockLogicalRouterPort) GetLogicalRouterPort(lrpName string, ignoreNotFo } // GetLogicalRouterPort indicates an expected call of GetLogicalRouterPort. -func (mr *MockLogicalRouterPortMockRecorder) GetLogicalRouterPort(lrpName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) GetLogicalRouterPort(lrpName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouterPort", reflect.TypeOf((*MockLogicalRouterPort)(nil).GetLogicalRouterPort), lrpName, ignoreNotFound) } @@ -363,7 +368,7 @@ func (m *MockLogicalRouterPort) GetLogicalRouterPortByUUID(uuid string) (*ovnnb. } // GetLogicalRouterPortByUUID indicates an expected call of GetLogicalRouterPortByUUID. -func (mr *MockLogicalRouterPortMockRecorder) GetLogicalRouterPortByUUID(uuid interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) GetLogicalRouterPortByUUID(uuid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouterPortByUUID", reflect.TypeOf((*MockLogicalRouterPort)(nil).GetLogicalRouterPortByUUID), uuid) } @@ -378,7 +383,7 @@ func (m *MockLogicalRouterPort) ListLogicalRouterPorts(externalIDs map[string]st } // ListLogicalRouterPorts indicates an expected call of ListLogicalRouterPorts. -func (mr *MockLogicalRouterPortMockRecorder) ListLogicalRouterPorts(externalIDs, filter interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) ListLogicalRouterPorts(externalIDs, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouterPorts", reflect.TypeOf((*MockLogicalRouterPort)(nil).ListLogicalRouterPorts), externalIDs, filter) } @@ -393,7 +398,7 @@ func (m *MockLogicalRouterPort) LogicalRouterPortExists(lrpName string) (bool, e } // LogicalRouterPortExists indicates an expected call of LogicalRouterPortExists. -func (mr *MockLogicalRouterPortMockRecorder) LogicalRouterPortExists(lrpName interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) LogicalRouterPortExists(lrpName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalRouterPortExists", reflect.TypeOf((*MockLogicalRouterPort)(nil).LogicalRouterPortExists), lrpName) } @@ -407,7 +412,7 @@ func (m *MockLogicalRouterPort) UpdateLogicalRouterPortOptions(lrpName string, o } // UpdateLogicalRouterPortOptions indicates an expected call of UpdateLogicalRouterPortOptions. -func (mr *MockLogicalRouterPortMockRecorder) UpdateLogicalRouterPortOptions(lrpName, options interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) UpdateLogicalRouterPortOptions(lrpName, options any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateLogicalRouterPortOptions", reflect.TypeOf((*MockLogicalRouterPort)(nil).UpdateLogicalRouterPortOptions), lrpName, options) } @@ -421,7 +426,7 @@ func (m *MockLogicalRouterPort) UpdateLogicalRouterPortRA(lrpName, ipv6RAConfigs } // UpdateLogicalRouterPortRA indicates an expected call of UpdateLogicalRouterPortRA. -func (mr *MockLogicalRouterPortMockRecorder) UpdateLogicalRouterPortRA(lrpName, ipv6RAConfigsStr, enableIPv6RA interface{}) *gomock.Call { +func (mr *MockLogicalRouterPortMockRecorder) UpdateLogicalRouterPortRA(lrpName, ipv6RAConfigsStr, enableIPv6RA any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateLogicalRouterPortRA", reflect.TypeOf((*MockLogicalRouterPort)(nil).UpdateLogicalRouterPortRA), lrpName, ipv6RAConfigsStr, enableIPv6RA) } @@ -459,7 +464,7 @@ func (m *MockBFD) CreateBFD(lrpName, dstIP string, minRx, minTx, detectMult int) } // CreateBFD indicates an expected call of CreateBFD. -func (mr *MockBFDMockRecorder) CreateBFD(lrpName, dstIP, minRx, minTx, detectMult interface{}) *gomock.Call { +func (mr *MockBFDMockRecorder) CreateBFD(lrpName, dstIP, minRx, minTx, detectMult any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBFD", reflect.TypeOf((*MockBFD)(nil).CreateBFD), lrpName, dstIP, minRx, minTx, detectMult) } @@ -473,7 +478,7 @@ func (m *MockBFD) DeleteBFD(lrpName, dstIP string) error { } // DeleteBFD indicates an expected call of DeleteBFD. -func (mr *MockBFDMockRecorder) DeleteBFD(lrpName, dstIP interface{}) *gomock.Call { +func (mr *MockBFDMockRecorder) DeleteBFD(lrpName, dstIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteBFD", reflect.TypeOf((*MockBFD)(nil).DeleteBFD), lrpName, dstIP) } @@ -510,7 +515,7 @@ func (m *MockLogicalSwitch) CreateBareLogicalSwitch(lsName string) error { } // CreateBareLogicalSwitch indicates an expected call of CreateBareLogicalSwitch. -func (mr *MockLogicalSwitchMockRecorder) CreateBareLogicalSwitch(lsName interface{}) *gomock.Call { +func (mr *MockLogicalSwitchMockRecorder) CreateBareLogicalSwitch(lsName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBareLogicalSwitch", reflect.TypeOf((*MockLogicalSwitch)(nil).CreateBareLogicalSwitch), lsName) } @@ -524,7 +529,7 @@ func (m *MockLogicalSwitch) CreateLogicalSwitch(lsName, lrName, cidrBlock, gatew } // CreateLogicalSwitch indicates an expected call of CreateLogicalSwitch. -func (mr *MockLogicalSwitchMockRecorder) CreateLogicalSwitch(lsName, lrName, cidrBlock, gateway, needRouter, randomAllocateGW interface{}) *gomock.Call { +func (mr *MockLogicalSwitchMockRecorder) CreateLogicalSwitch(lsName, lrName, cidrBlock, gateway, needRouter, randomAllocateGW any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLogicalSwitch", reflect.TypeOf((*MockLogicalSwitch)(nil).CreateLogicalSwitch), lsName, lrName, cidrBlock, gateway, needRouter, randomAllocateGW) } @@ -538,7 +543,7 @@ func (m *MockLogicalSwitch) DeleteLogicalSwitch(lsName string) error { } // DeleteLogicalSwitch indicates an expected call of DeleteLogicalSwitch. -func (mr *MockLogicalSwitchMockRecorder) DeleteLogicalSwitch(lsName interface{}) *gomock.Call { +func (mr *MockLogicalSwitchMockRecorder) DeleteLogicalSwitch(lsName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalSwitch", reflect.TypeOf((*MockLogicalSwitch)(nil).DeleteLogicalSwitch), lsName) } @@ -553,7 +558,7 @@ func (m *MockLogicalSwitch) ListLogicalSwitch(needVendorFilter bool, filter func } // ListLogicalSwitch indicates an expected call of ListLogicalSwitch. -func (mr *MockLogicalSwitchMockRecorder) ListLogicalSwitch(needVendorFilter, filter interface{}) *gomock.Call { +func (mr *MockLogicalSwitchMockRecorder) ListLogicalSwitch(needVendorFilter, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalSwitch", reflect.TypeOf((*MockLogicalSwitch)(nil).ListLogicalSwitch), needVendorFilter, filter) } @@ -568,7 +573,7 @@ func (m *MockLogicalSwitch) LogicalSwitchExists(lsName string) (bool, error) { } // LogicalSwitchExists indicates an expected call of LogicalSwitchExists. -func (mr *MockLogicalSwitchMockRecorder) LogicalSwitchExists(lsName interface{}) *gomock.Call { +func (mr *MockLogicalSwitchMockRecorder) LogicalSwitchExists(lsName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalSwitchExists", reflect.TypeOf((*MockLogicalSwitch)(nil).LogicalSwitchExists), lsName) } @@ -576,7 +581,7 @@ func (mr *MockLogicalSwitchMockRecorder) LogicalSwitchExists(lsName interface{}) // LogicalSwitchUpdateLoadBalancers mocks base method. func (m *MockLogicalSwitch) LogicalSwitchUpdateLoadBalancers(lsName string, op ovsdb.Mutator, lbNames ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lsName, op} + varargs := []any{lsName, op} for _, a := range lbNames { varargs = append(varargs, a) } @@ -586,9 +591,9 @@ func (m *MockLogicalSwitch) LogicalSwitchUpdateLoadBalancers(lsName string, op o } // LogicalSwitchUpdateLoadBalancers indicates an expected call of LogicalSwitchUpdateLoadBalancers. -func (mr *MockLogicalSwitchMockRecorder) LogicalSwitchUpdateLoadBalancers(lsName, op interface{}, lbNames ...interface{}) *gomock.Call { +func (mr *MockLogicalSwitchMockRecorder) LogicalSwitchUpdateLoadBalancers(lsName, op any, lbNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lsName, op}, lbNames...) + varargs := append([]any{lsName, op}, lbNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalSwitchUpdateLoadBalancers", reflect.TypeOf((*MockLogicalSwitch)(nil).LogicalSwitchUpdateLoadBalancers), varargs...) } @@ -624,7 +629,7 @@ func (m *MockLogicalSwitchPort) CreateBareLogicalSwitchPort(lsName, lspName, ip, } // CreateBareLogicalSwitchPort indicates an expected call of CreateBareLogicalSwitchPort. -func (mr *MockLogicalSwitchPortMockRecorder) CreateBareLogicalSwitchPort(lsName, lspName, ip, mac interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) CreateBareLogicalSwitchPort(lsName, lspName, ip, mac any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBareLogicalSwitchPort", reflect.TypeOf((*MockLogicalSwitchPort)(nil).CreateBareLogicalSwitchPort), lsName, lspName, ip, mac) } @@ -638,7 +643,7 @@ func (m *MockLogicalSwitchPort) CreateLocalnetLogicalSwitchPort(lsName, lspName, } // CreateLocalnetLogicalSwitchPort indicates an expected call of CreateLocalnetLogicalSwitchPort. -func (mr *MockLogicalSwitchPortMockRecorder) CreateLocalnetLogicalSwitchPort(lsName, lspName, provider, cidrBlock, vlanID interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) CreateLocalnetLogicalSwitchPort(lsName, lspName, provider, cidrBlock, vlanID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLocalnetLogicalSwitchPort", reflect.TypeOf((*MockLogicalSwitchPort)(nil).CreateLocalnetLogicalSwitchPort), lsName, lspName, provider, cidrBlock, vlanID) } @@ -652,7 +657,7 @@ func (m *MockLogicalSwitchPort) CreateLogicalSwitchPort(lsName, lspName, ip, mac } // CreateLogicalSwitchPort indicates an expected call of CreateLogicalSwitchPort. -func (mr *MockLogicalSwitchPortMockRecorder) CreateLogicalSwitchPort(lsName, lspName, ip, mac, podName, namespace, portSecurity, securityGroups, vips, enableDHCP, dhcpOptions, vpc interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) CreateLogicalSwitchPort(lsName, lspName, ip, mac, podName, namespace, portSecurity, securityGroups, vips, enableDHCP, dhcpOptions, vpc any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLogicalSwitchPort", reflect.TypeOf((*MockLogicalSwitchPort)(nil).CreateLogicalSwitchPort), lsName, lspName, ip, mac, podName, namespace, portSecurity, securityGroups, vips, enableDHCP, dhcpOptions, vpc) } @@ -660,7 +665,7 @@ func (mr *MockLogicalSwitchPortMockRecorder) CreateLogicalSwitchPort(lsName, lsp // CreateVirtualLogicalSwitchPorts mocks base method. func (m *MockLogicalSwitchPort) CreateVirtualLogicalSwitchPorts(lsName string, ips ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lsName} + varargs := []any{lsName} for _, a := range ips { varargs = append(varargs, a) } @@ -670,9 +675,9 @@ func (m *MockLogicalSwitchPort) CreateVirtualLogicalSwitchPorts(lsName string, i } // CreateVirtualLogicalSwitchPorts indicates an expected call of CreateVirtualLogicalSwitchPorts. -func (mr *MockLogicalSwitchPortMockRecorder) CreateVirtualLogicalSwitchPorts(lsName interface{}, ips ...interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) CreateVirtualLogicalSwitchPorts(lsName any, ips ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lsName}, ips...) + varargs := append([]any{lsName}, ips...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateVirtualLogicalSwitchPorts", reflect.TypeOf((*MockLogicalSwitchPort)(nil).CreateVirtualLogicalSwitchPorts), varargs...) } @@ -685,7 +690,7 @@ func (m *MockLogicalSwitchPort) DeleteLogicalSwitchPort(lspName string) error { } // DeleteLogicalSwitchPort indicates an expected call of DeleteLogicalSwitchPort. -func (mr *MockLogicalSwitchPortMockRecorder) DeleteLogicalSwitchPort(lspName interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) DeleteLogicalSwitchPort(lspName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalSwitchPort", reflect.TypeOf((*MockLogicalSwitchPort)(nil).DeleteLogicalSwitchPort), lspName) } @@ -699,7 +704,7 @@ func (m *MockLogicalSwitchPort) DeleteLogicalSwitchPorts(externalIDs map[string] } // DeleteLogicalSwitchPorts indicates an expected call of DeleteLogicalSwitchPorts. -func (mr *MockLogicalSwitchPortMockRecorder) DeleteLogicalSwitchPorts(externalIDs, filter interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) DeleteLogicalSwitchPorts(externalIDs, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalSwitchPorts", reflect.TypeOf((*MockLogicalSwitchPort)(nil).DeleteLogicalSwitchPorts), externalIDs, filter) } @@ -713,7 +718,7 @@ func (m *MockLogicalSwitchPort) EnablePortLayer2forward(lspName string) error { } // EnablePortLayer2forward indicates an expected call of EnablePortLayer2forward. -func (mr *MockLogicalSwitchPortMockRecorder) EnablePortLayer2forward(lspName interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) EnablePortLayer2forward(lspName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnablePortLayer2forward", reflect.TypeOf((*MockLogicalSwitchPort)(nil).EnablePortLayer2forward), lspName) } @@ -728,7 +733,7 @@ func (m *MockLogicalSwitchPort) GetLogicalSwitchPort(lspName string, ignoreNotFo } // GetLogicalSwitchPort indicates an expected call of GetLogicalSwitchPort. -func (mr *MockLogicalSwitchPortMockRecorder) GetLogicalSwitchPort(lspName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) GetLogicalSwitchPort(lspName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalSwitchPort", reflect.TypeOf((*MockLogicalSwitchPort)(nil).GetLogicalSwitchPort), lspName, ignoreNotFound) } @@ -743,7 +748,7 @@ func (m *MockLogicalSwitchPort) ListLogicalSwitchPorts(needVendorFilter bool, ex } // ListLogicalSwitchPorts indicates an expected call of ListLogicalSwitchPorts. -func (mr *MockLogicalSwitchPortMockRecorder) ListLogicalSwitchPorts(needVendorFilter, externalIDs, filter interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) ListLogicalSwitchPorts(needVendorFilter, externalIDs, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalSwitchPorts", reflect.TypeOf((*MockLogicalSwitchPort)(nil).ListLogicalSwitchPorts), needVendorFilter, externalIDs, filter) } @@ -773,7 +778,7 @@ func (m *MockLogicalSwitchPort) ListNormalLogicalSwitchPorts(needVendorFilter bo } // ListNormalLogicalSwitchPorts indicates an expected call of ListNormalLogicalSwitchPorts. -func (mr *MockLogicalSwitchPortMockRecorder) ListNormalLogicalSwitchPorts(needVendorFilter, externalIDs interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) ListNormalLogicalSwitchPorts(needVendorFilter, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListNormalLogicalSwitchPorts", reflect.TypeOf((*MockLogicalSwitchPort)(nil).ListNormalLogicalSwitchPorts), needVendorFilter, externalIDs) } @@ -788,7 +793,7 @@ func (m *MockLogicalSwitchPort) LogicalSwitchPortExists(name string) (bool, erro } // LogicalSwitchPortExists indicates an expected call of LogicalSwitchPortExists. -func (mr *MockLogicalSwitchPortMockRecorder) LogicalSwitchPortExists(name interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) LogicalSwitchPortExists(name any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalSwitchPortExists", reflect.TypeOf((*MockLogicalSwitchPort)(nil).LogicalSwitchPortExists), name) } @@ -802,7 +807,7 @@ func (m *MockLogicalSwitchPort) SetLogicalSwitchPortArpProxy(lspName string, ena } // SetLogicalSwitchPortArpProxy indicates an expected call of SetLogicalSwitchPortArpProxy. -func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortArpProxy(lspName, enableArpProxy interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortArpProxy(lspName, enableArpProxy any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortArpProxy", reflect.TypeOf((*MockLogicalSwitchPort)(nil).SetLogicalSwitchPortArpProxy), lspName, enableArpProxy) } @@ -816,7 +821,7 @@ func (m *MockLogicalSwitchPort) SetLogicalSwitchPortExternalIDs(lspName string, } // SetLogicalSwitchPortExternalIDs indicates an expected call of SetLogicalSwitchPortExternalIDs. -func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortExternalIDs(lspName, externalIDs interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortExternalIDs(lspName, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortExternalIDs", reflect.TypeOf((*MockLogicalSwitchPort)(nil).SetLogicalSwitchPortExternalIDs), lspName, externalIDs) } @@ -830,7 +835,7 @@ func (m *MockLogicalSwitchPort) SetLogicalSwitchPortSecurity(portSecurity bool, } // SetLogicalSwitchPortSecurity indicates an expected call of SetLogicalSwitchPortSecurity. -func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortSecurity(portSecurity, lspName, mac, ips, vips interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortSecurity(portSecurity, lspName, mac, ips, vips any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortSecurity", reflect.TypeOf((*MockLogicalSwitchPort)(nil).SetLogicalSwitchPortSecurity), portSecurity, lspName, mac, ips, vips) } @@ -838,7 +843,7 @@ func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortSecurity(portSe // SetLogicalSwitchPortVirtualParents mocks base method. func (m *MockLogicalSwitchPort) SetLogicalSwitchPortVirtualParents(lsName, parents string, ips ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lsName, parents} + varargs := []any{lsName, parents} for _, a := range ips { varargs = append(varargs, a) } @@ -848,9 +853,9 @@ func (m *MockLogicalSwitchPort) SetLogicalSwitchPortVirtualParents(lsName, paren } // SetLogicalSwitchPortVirtualParents indicates an expected call of SetLogicalSwitchPortVirtualParents. -func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortVirtualParents(lsName, parents interface{}, ips ...interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortVirtualParents(lsName, parents any, ips ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lsName, parents}, ips...) + varargs := append([]any{lsName, parents}, ips...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortVirtualParents", reflect.TypeOf((*MockLogicalSwitchPort)(nil).SetLogicalSwitchPortVirtualParents), varargs...) } @@ -863,7 +868,7 @@ func (m *MockLogicalSwitchPort) SetLogicalSwitchPortVlanTag(lspName string, vlan } // SetLogicalSwitchPortVlanTag indicates an expected call of SetLogicalSwitchPortVlanTag. -func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortVlanTag(lspName, vlanID interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortVlanTag(lspName, vlanID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortVlanTag", reflect.TypeOf((*MockLogicalSwitchPort)(nil).SetLogicalSwitchPortVlanTag), lspName, vlanID) } @@ -877,7 +882,7 @@ func (m *MockLogicalSwitchPort) SetLogicalSwitchPortsSecurityGroup(sgName, op st } // SetLogicalSwitchPortsSecurityGroup indicates an expected call of SetLogicalSwitchPortsSecurityGroup. -func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortsSecurityGroup(sgName, op interface{}) *gomock.Call { +func (mr *MockLogicalSwitchPortMockRecorder) SetLogicalSwitchPortsSecurityGroup(sgName, op any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortsSecurityGroup", reflect.TypeOf((*MockLogicalSwitchPort)(nil).SetLogicalSwitchPortsSecurityGroup), sgName, op) } @@ -914,7 +919,7 @@ func (m *MockLoadBalancer) CreateLoadBalancer(lbName, protocol, selectFields str } // CreateLoadBalancer indicates an expected call of CreateLoadBalancer. -func (mr *MockLoadBalancerMockRecorder) CreateLoadBalancer(lbName, protocol, selectFields interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) CreateLoadBalancer(lbName, protocol, selectFields any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLoadBalancer", reflect.TypeOf((*MockLoadBalancer)(nil).CreateLoadBalancer), lbName, protocol, selectFields) } @@ -928,7 +933,7 @@ func (m *MockLoadBalancer) DeleteLoadBalancers(filter func(*ovnnb.LoadBalancer) } // DeleteLoadBalancers indicates an expected call of DeleteLoadBalancers. -func (mr *MockLoadBalancerMockRecorder) DeleteLoadBalancers(filter interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) DeleteLoadBalancers(filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLoadBalancers", reflect.TypeOf((*MockLoadBalancer)(nil).DeleteLoadBalancers), filter) } @@ -943,7 +948,7 @@ func (m *MockLoadBalancer) GetLoadBalancer(lbName string, ignoreNotFound bool) ( } // GetLoadBalancer indicates an expected call of GetLoadBalancer. -func (mr *MockLoadBalancerMockRecorder) GetLoadBalancer(lbName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) GetLoadBalancer(lbName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLoadBalancer", reflect.TypeOf((*MockLoadBalancer)(nil).GetLoadBalancer), lbName, ignoreNotFound) } @@ -958,7 +963,7 @@ func (m *MockLoadBalancer) ListLoadBalancers(filter func(*ovnnb.LoadBalancer) bo } // ListLoadBalancers indicates an expected call of ListLoadBalancers. -func (mr *MockLoadBalancerMockRecorder) ListLoadBalancers(filter interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) ListLoadBalancers(filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLoadBalancers", reflect.TypeOf((*MockLoadBalancer)(nil).ListLoadBalancers), filter) } @@ -972,7 +977,7 @@ func (m *MockLoadBalancer) LoadBalancerAddHealthCheck(lbName, vip string, ignore } // LoadBalancerAddHealthCheck indicates an expected call of LoadBalancerAddHealthCheck. -func (mr *MockLoadBalancerMockRecorder) LoadBalancerAddHealthCheck(lbName, vip, ignoreHealthCheck, ipPortMapping, externals interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) LoadBalancerAddHealthCheck(lbName, vip, ignoreHealthCheck, ipPortMapping, externals any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerAddHealthCheck", reflect.TypeOf((*MockLoadBalancer)(nil).LoadBalancerAddHealthCheck), lbName, vip, ignoreHealthCheck, ipPortMapping, externals) } @@ -986,7 +991,7 @@ func (m *MockLoadBalancer) LoadBalancerAddIPPortMapping(lbName, vip string, ipPo } // LoadBalancerAddIPPortMapping indicates an expected call of LoadBalancerAddIPPortMapping. -func (mr *MockLoadBalancerMockRecorder) LoadBalancerAddIPPortMapping(lbName, vip, ipPortMappings interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) LoadBalancerAddIPPortMapping(lbName, vip, ipPortMappings any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerAddIPPortMapping", reflect.TypeOf((*MockLoadBalancer)(nil).LoadBalancerAddIPPortMapping), lbName, vip, ipPortMappings) } @@ -994,7 +999,7 @@ func (mr *MockLoadBalancerMockRecorder) LoadBalancerAddIPPortMapping(lbName, vip // LoadBalancerAddVip mocks base method. func (m *MockLoadBalancer) LoadBalancerAddVip(lbName, vip string, backends ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lbName, vip} + varargs := []any{lbName, vip} for _, a := range backends { varargs = append(varargs, a) } @@ -1004,9 +1009,9 @@ func (m *MockLoadBalancer) LoadBalancerAddVip(lbName, vip string, backends ...st } // LoadBalancerAddVip indicates an expected call of LoadBalancerAddVip. -func (mr *MockLoadBalancerMockRecorder) LoadBalancerAddVip(lbName, vip interface{}, backends ...interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) LoadBalancerAddVip(lbName, vip any, backends ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lbName, vip}, backends...) + varargs := append([]any{lbName, vip}, backends...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerAddVip", reflect.TypeOf((*MockLoadBalancer)(nil).LoadBalancerAddVip), varargs...) } @@ -1019,7 +1024,7 @@ func (m *MockLoadBalancer) LoadBalancerDeleteHealthCheck(lbName, uuid string) er } // LoadBalancerDeleteHealthCheck indicates an expected call of LoadBalancerDeleteHealthCheck. -func (mr *MockLoadBalancerMockRecorder) LoadBalancerDeleteHealthCheck(lbName, uuid interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) LoadBalancerDeleteHealthCheck(lbName, uuid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerDeleteHealthCheck", reflect.TypeOf((*MockLoadBalancer)(nil).LoadBalancerDeleteHealthCheck), lbName, uuid) } @@ -1033,7 +1038,7 @@ func (m *MockLoadBalancer) LoadBalancerDeleteIPPortMapping(lbName, vip string) e } // LoadBalancerDeleteIPPortMapping indicates an expected call of LoadBalancerDeleteIPPortMapping. -func (mr *MockLoadBalancerMockRecorder) LoadBalancerDeleteIPPortMapping(lbName, vip interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) LoadBalancerDeleteIPPortMapping(lbName, vip any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerDeleteIPPortMapping", reflect.TypeOf((*MockLoadBalancer)(nil).LoadBalancerDeleteIPPortMapping), lbName, vip) } @@ -1047,7 +1052,7 @@ func (m *MockLoadBalancer) LoadBalancerDeleteVip(lbName, vip string, ignoreHealt } // LoadBalancerDeleteVip indicates an expected call of LoadBalancerDeleteVip. -func (mr *MockLoadBalancerMockRecorder) LoadBalancerDeleteVip(lbName, vip, ignoreHealthCheck interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) LoadBalancerDeleteVip(lbName, vip, ignoreHealthCheck any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerDeleteVip", reflect.TypeOf((*MockLoadBalancer)(nil).LoadBalancerDeleteVip), lbName, vip, ignoreHealthCheck) } @@ -1062,7 +1067,7 @@ func (m *MockLoadBalancer) LoadBalancerExists(lbName string) (bool, error) { } // LoadBalancerExists indicates an expected call of LoadBalancerExists. -func (mr *MockLoadBalancerMockRecorder) LoadBalancerExists(lbName interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) LoadBalancerExists(lbName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerExists", reflect.TypeOf((*MockLoadBalancer)(nil).LoadBalancerExists), lbName) } @@ -1076,7 +1081,7 @@ func (m *MockLoadBalancer) LoadBalancerUpdateIPPortMapping(lbName, vip string, i } // LoadBalancerUpdateIPPortMapping indicates an expected call of LoadBalancerUpdateIPPortMapping. -func (mr *MockLoadBalancerMockRecorder) LoadBalancerUpdateIPPortMapping(lbName, vip, ipPortMappings interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) LoadBalancerUpdateIPPortMapping(lbName, vip, ipPortMappings any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerUpdateIPPortMapping", reflect.TypeOf((*MockLoadBalancer)(nil).LoadBalancerUpdateIPPortMapping), lbName, vip, ipPortMappings) } @@ -1090,7 +1095,7 @@ func (m *MockLoadBalancer) SetLoadBalancerAffinityTimeout(lbName string, timeout } // SetLoadBalancerAffinityTimeout indicates an expected call of SetLoadBalancerAffinityTimeout. -func (mr *MockLoadBalancerMockRecorder) SetLoadBalancerAffinityTimeout(lbName, timeout interface{}) *gomock.Call { +func (mr *MockLoadBalancerMockRecorder) SetLoadBalancerAffinityTimeout(lbName, timeout any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLoadBalancerAffinityTimeout", reflect.TypeOf((*MockLoadBalancer)(nil).SetLoadBalancerAffinityTimeout), lbName, timeout) } @@ -1127,7 +1132,7 @@ func (m *MockLoadBalancerHealthCheck) AddLoadBalancerHealthCheck(lbName, vip str } // AddLoadBalancerHealthCheck indicates an expected call of AddLoadBalancerHealthCheck. -func (mr *MockLoadBalancerHealthCheckMockRecorder) AddLoadBalancerHealthCheck(lbName, vip, externals interface{}) *gomock.Call { +func (mr *MockLoadBalancerHealthCheckMockRecorder) AddLoadBalancerHealthCheck(lbName, vip, externals any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddLoadBalancerHealthCheck", reflect.TypeOf((*MockLoadBalancerHealthCheck)(nil).AddLoadBalancerHealthCheck), lbName, vip, externals) } @@ -1141,7 +1146,7 @@ func (m *MockLoadBalancerHealthCheck) CreateLoadBalancerHealthCheck(lbName, vip } // CreateLoadBalancerHealthCheck indicates an expected call of CreateLoadBalancerHealthCheck. -func (mr *MockLoadBalancerHealthCheckMockRecorder) CreateLoadBalancerHealthCheck(lbName, vip, lbhc interface{}) *gomock.Call { +func (mr *MockLoadBalancerHealthCheckMockRecorder) CreateLoadBalancerHealthCheck(lbName, vip, lbhc any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLoadBalancerHealthCheck", reflect.TypeOf((*MockLoadBalancerHealthCheck)(nil).CreateLoadBalancerHealthCheck), lbName, vip, lbhc) } @@ -1155,7 +1160,7 @@ func (m *MockLoadBalancerHealthCheck) DeleteLoadBalancerHealthCheck(lbName, vip } // DeleteLoadBalancerHealthCheck indicates an expected call of DeleteLoadBalancerHealthCheck. -func (mr *MockLoadBalancerHealthCheckMockRecorder) DeleteLoadBalancerHealthCheck(lbName, vip interface{}) *gomock.Call { +func (mr *MockLoadBalancerHealthCheckMockRecorder) DeleteLoadBalancerHealthCheck(lbName, vip any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLoadBalancerHealthCheck", reflect.TypeOf((*MockLoadBalancerHealthCheck)(nil).DeleteLoadBalancerHealthCheck), lbName, vip) } @@ -1169,7 +1174,7 @@ func (m *MockLoadBalancerHealthCheck) DeleteLoadBalancerHealthChecks(filter func } // DeleteLoadBalancerHealthChecks indicates an expected call of DeleteLoadBalancerHealthChecks. -func (mr *MockLoadBalancerHealthCheckMockRecorder) DeleteLoadBalancerHealthChecks(filter interface{}) *gomock.Call { +func (mr *MockLoadBalancerHealthCheckMockRecorder) DeleteLoadBalancerHealthChecks(filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLoadBalancerHealthChecks", reflect.TypeOf((*MockLoadBalancerHealthCheck)(nil).DeleteLoadBalancerHealthChecks), filter) } @@ -1185,7 +1190,7 @@ func (m *MockLoadBalancerHealthCheck) GetLoadBalancerHealthCheck(lbName, vip str } // GetLoadBalancerHealthCheck indicates an expected call of GetLoadBalancerHealthCheck. -func (mr *MockLoadBalancerHealthCheckMockRecorder) GetLoadBalancerHealthCheck(lbName, vip, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockLoadBalancerHealthCheckMockRecorder) GetLoadBalancerHealthCheck(lbName, vip, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLoadBalancerHealthCheck", reflect.TypeOf((*MockLoadBalancerHealthCheck)(nil).GetLoadBalancerHealthCheck), lbName, vip, ignoreNotFound) } @@ -1200,7 +1205,7 @@ func (m *MockLoadBalancerHealthCheck) ListLoadBalancerHealthChecks(filter func(* } // ListLoadBalancerHealthChecks indicates an expected call of ListLoadBalancerHealthChecks. -func (mr *MockLoadBalancerHealthCheckMockRecorder) ListLoadBalancerHealthChecks(filter interface{}) *gomock.Call { +func (mr *MockLoadBalancerHealthCheckMockRecorder) ListLoadBalancerHealthChecks(filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLoadBalancerHealthChecks", reflect.TypeOf((*MockLoadBalancerHealthCheck)(nil).ListLoadBalancerHealthChecks), filter) } @@ -1215,7 +1220,7 @@ func (m *MockLoadBalancerHealthCheck) LoadBalancerHealthCheckExists(lbName, vip } // LoadBalancerHealthCheckExists indicates an expected call of LoadBalancerHealthCheckExists. -func (mr *MockLoadBalancerHealthCheckMockRecorder) LoadBalancerHealthCheckExists(lbName, vip interface{}) *gomock.Call { +func (mr *MockLoadBalancerHealthCheckMockRecorder) LoadBalancerHealthCheckExists(lbName, vip any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerHealthCheckExists", reflect.TypeOf((*MockLoadBalancerHealthCheck)(nil).LoadBalancerHealthCheckExists), lbName, vip) } @@ -1252,7 +1257,7 @@ func (m *MockPortGroup) CreatePortGroup(pgName string, externalIDs map[string]st } // CreatePortGroup indicates an expected call of CreatePortGroup. -func (mr *MockPortGroupMockRecorder) CreatePortGroup(pgName, externalIDs interface{}) *gomock.Call { +func (mr *MockPortGroupMockRecorder) CreatePortGroup(pgName, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreatePortGroup", reflect.TypeOf((*MockPortGroup)(nil).CreatePortGroup), pgName, externalIDs) } @@ -1266,7 +1271,7 @@ func (m *MockPortGroup) DeletePortGroup(pgName string) error { } // DeletePortGroup indicates an expected call of DeletePortGroup. -func (mr *MockPortGroupMockRecorder) DeletePortGroup(pgName interface{}) *gomock.Call { +func (mr *MockPortGroupMockRecorder) DeletePortGroup(pgName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeletePortGroup", reflect.TypeOf((*MockPortGroup)(nil).DeletePortGroup), pgName) } @@ -1281,7 +1286,7 @@ func (m *MockPortGroup) GetPortGroup(pgName string, ignoreNotFound bool) (*ovnnb } // GetPortGroup indicates an expected call of GetPortGroup. -func (mr *MockPortGroupMockRecorder) GetPortGroup(pgName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockPortGroupMockRecorder) GetPortGroup(pgName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPortGroup", reflect.TypeOf((*MockPortGroup)(nil).GetPortGroup), pgName, ignoreNotFound) } @@ -1296,7 +1301,7 @@ func (m *MockPortGroup) ListPortGroups(externalIDs map[string]string) ([]ovnnb.P } // ListPortGroups indicates an expected call of ListPortGroups. -func (mr *MockPortGroupMockRecorder) ListPortGroups(externalIDs interface{}) *gomock.Call { +func (mr *MockPortGroupMockRecorder) ListPortGroups(externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListPortGroups", reflect.TypeOf((*MockPortGroup)(nil).ListPortGroups), externalIDs) } @@ -1304,7 +1309,7 @@ func (mr *MockPortGroupMockRecorder) ListPortGroups(externalIDs interface{}) *go // PortGroupAddPorts mocks base method. func (m *MockPortGroup) PortGroupAddPorts(pgName string, lspNames ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{pgName} + varargs := []any{pgName} for _, a := range lspNames { varargs = append(varargs, a) } @@ -1314,9 +1319,9 @@ func (m *MockPortGroup) PortGroupAddPorts(pgName string, lspNames ...string) err } // PortGroupAddPorts indicates an expected call of PortGroupAddPorts. -func (mr *MockPortGroupMockRecorder) PortGroupAddPorts(pgName interface{}, lspNames ...interface{}) *gomock.Call { +func (mr *MockPortGroupMockRecorder) PortGroupAddPorts(pgName any, lspNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{pgName}, lspNames...) + varargs := append([]any{pgName}, lspNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PortGroupAddPorts", reflect.TypeOf((*MockPortGroup)(nil).PortGroupAddPorts), varargs...) } @@ -1330,7 +1335,7 @@ func (m *MockPortGroup) PortGroupExists(pgName string) (bool, error) { } // PortGroupExists indicates an expected call of PortGroupExists. -func (mr *MockPortGroupMockRecorder) PortGroupExists(pgName interface{}) *gomock.Call { +func (mr *MockPortGroupMockRecorder) PortGroupExists(pgName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PortGroupExists", reflect.TypeOf((*MockPortGroup)(nil).PortGroupExists), pgName) } @@ -1338,7 +1343,7 @@ func (mr *MockPortGroupMockRecorder) PortGroupExists(pgName interface{}) *gomock // PortGroupRemovePorts mocks base method. func (m *MockPortGroup) PortGroupRemovePorts(pgName string, lspNames ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{pgName} + varargs := []any{pgName} for _, a := range lspNames { varargs = append(varargs, a) } @@ -1348,9 +1353,9 @@ func (m *MockPortGroup) PortGroupRemovePorts(pgName string, lspNames ...string) } // PortGroupRemovePorts indicates an expected call of PortGroupRemovePorts. -func (mr *MockPortGroupMockRecorder) PortGroupRemovePorts(pgName interface{}, lspNames ...interface{}) *gomock.Call { +func (mr *MockPortGroupMockRecorder) PortGroupRemovePorts(pgName any, lspNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{pgName}, lspNames...) + varargs := append([]any{pgName}, lspNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PortGroupRemovePorts", reflect.TypeOf((*MockPortGroup)(nil).PortGroupRemovePorts), varargs...) } @@ -1363,7 +1368,7 @@ func (m *MockPortGroup) PortGroupSetPorts(pgName string, ports []string) error { } // PortGroupSetPorts indicates an expected call of PortGroupSetPorts. -func (mr *MockPortGroupMockRecorder) PortGroupSetPorts(pgName, ports interface{}) *gomock.Call { +func (mr *MockPortGroupMockRecorder) PortGroupSetPorts(pgName, ports any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PortGroupSetPorts", reflect.TypeOf((*MockPortGroup)(nil).PortGroupSetPorts), pgName, ports) } @@ -1400,7 +1405,7 @@ func (m *MockACL) CreateGatewayACL(lsName, pgName, gateway string) error { } // CreateGatewayACL indicates an expected call of CreateGatewayACL. -func (mr *MockACLMockRecorder) CreateGatewayACL(lsName, pgName, gateway interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) CreateGatewayACL(lsName, pgName, gateway any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateGatewayACL", reflect.TypeOf((*MockACL)(nil).CreateGatewayACL), lsName, pgName, gateway) } @@ -1414,7 +1419,7 @@ func (m *MockACL) CreateNodeACL(pgName, nodeIPStr, joinIPStr string) error { } // CreateNodeACL indicates an expected call of CreateNodeACL. -func (mr *MockACLMockRecorder) CreateNodeACL(pgName, nodeIPStr, joinIPStr interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) CreateNodeACL(pgName, nodeIPStr, joinIPStr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateNodeACL", reflect.TypeOf((*MockACL)(nil).CreateNodeACL), pgName, nodeIPStr, joinIPStr) } @@ -1428,7 +1433,7 @@ func (m *MockACL) CreateSgBaseACL(sgName, direction string) error { } // CreateSgBaseACL indicates an expected call of CreateSgBaseACL. -func (mr *MockACLMockRecorder) CreateSgBaseACL(sgName, direction interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) CreateSgBaseACL(sgName, direction any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSgBaseACL", reflect.TypeOf((*MockACL)(nil).CreateSgBaseACL), sgName, direction) } @@ -1442,7 +1447,7 @@ func (m *MockACL) CreateSgDenyAllACL(sgName string) error { } // CreateSgDenyAllACL indicates an expected call of CreateSgDenyAllACL. -func (mr *MockACLMockRecorder) CreateSgDenyAllACL(sgName interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) CreateSgDenyAllACL(sgName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSgDenyAllACL", reflect.TypeOf((*MockACL)(nil).CreateSgDenyAllACL), sgName) } @@ -1456,7 +1461,7 @@ func (m *MockACL) DeleteAcls(parentName, parentType, direction string, externalI } // DeleteAcls indicates an expected call of DeleteAcls. -func (mr *MockACLMockRecorder) DeleteAcls(parentName, parentType, direction, externalIDs interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) DeleteAcls(parentName, parentType, direction, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAcls", reflect.TypeOf((*MockACL)(nil).DeleteAcls), parentName, parentType, direction, externalIDs) } @@ -1471,7 +1476,7 @@ func (m *MockACL) DeleteAclsOps(parentName, parentType, direction string, extern } // DeleteAclsOps indicates an expected call of DeleteAclsOps. -func (mr *MockACLMockRecorder) DeleteAclsOps(parentName, parentType, direction, externalIDs interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) DeleteAclsOps(parentName, parentType, direction, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAclsOps", reflect.TypeOf((*MockACL)(nil).DeleteAclsOps), parentName, parentType, direction, externalIDs) } @@ -1492,17 +1497,17 @@ func (mr *MockACLMockRecorder) SGLostACL(sg any) *gomock.Call { } // SetACLLog mocks base method. -func (m *MockACL) SetACLLog(pgName, protocol string, logEnable, isIngress bool) error { +func (m *MockACL) SetACLLog(pgName string, logEnable, isIngress bool) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetACLLog", pgName, protocol, logEnable, isIngress) + ret := m.ctrl.Call(m, "SetACLLog", pgName, logEnable, isIngress) ret0, _ := ret[0].(error) return ret0 } // SetACLLog indicates an expected call of SetACLLog. -func (mr *MockACLMockRecorder) SetACLLog(pgName, protocol, logEnable, isIngress interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) SetACLLog(pgName, logEnable, isIngress any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetACLLog", reflect.TypeOf((*MockACL)(nil).SetACLLog), pgName, protocol, logEnable, isIngress) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetACLLog", reflect.TypeOf((*MockACL)(nil).SetACLLog), pgName, logEnable, isIngress) } // SetLogicalSwitchPrivate mocks base method. @@ -1514,7 +1519,7 @@ func (m *MockACL) SetLogicalSwitchPrivate(lsName, cidrBlock, nodeSwitchCIDR stri } // SetLogicalSwitchPrivate indicates an expected call of SetLogicalSwitchPrivate. -func (mr *MockACLMockRecorder) SetLogicalSwitchPrivate(lsName, cidrBlock, nodeSwitchCIDR, allowSubnets interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) SetLogicalSwitchPrivate(lsName, cidrBlock, nodeSwitchCIDR, allowSubnets any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPrivate", reflect.TypeOf((*MockACL)(nil).SetLogicalSwitchPrivate), lsName, cidrBlock, nodeSwitchCIDR, allowSubnets) } @@ -1529,7 +1534,7 @@ func (m *MockACL) UpdateEgressACLOps(pgName, asEgressName, asExceptName, protoco } // UpdateEgressACLOps indicates an expected call of UpdateEgressACLOps. -func (mr *MockACLMockRecorder) UpdateEgressACLOps(pgName, asEgressName, asExceptName, protocol, npp, logEnable, namedPortMap interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) UpdateEgressACLOps(pgName, asEgressName, asExceptName, protocol, npp, logEnable, namedPortMap any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEgressACLOps", reflect.TypeOf((*MockACL)(nil).UpdateEgressACLOps), pgName, asEgressName, asExceptName, protocol, npp, logEnable, namedPortMap) } @@ -1544,7 +1549,7 @@ func (m *MockACL) UpdateIngressACLOps(pgName, asIngressName, asExceptName, proto } // UpdateIngressACLOps indicates an expected call of UpdateIngressACLOps. -func (mr *MockACLMockRecorder) UpdateIngressACLOps(pgName, asIngressName, asExceptName, protocol, npp, logEnable, namedPortMap interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) UpdateIngressACLOps(pgName, asIngressName, asExceptName, protocol, npp, logEnable, namedPortMap any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateIngressACLOps", reflect.TypeOf((*MockACL)(nil).UpdateIngressACLOps), pgName, asIngressName, asExceptName, protocol, npp, logEnable, namedPortMap) } @@ -1558,7 +1563,7 @@ func (m *MockACL) UpdateLogicalSwitchACL(lsName string, subnetAcls []v1.ACL) err } // UpdateLogicalSwitchACL indicates an expected call of UpdateLogicalSwitchACL. -func (mr *MockACLMockRecorder) UpdateLogicalSwitchACL(lsName, subnetAcls interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) UpdateLogicalSwitchACL(lsName, subnetAcls any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateLogicalSwitchACL", reflect.TypeOf((*MockACL)(nil).UpdateLogicalSwitchACL), lsName, subnetAcls) } @@ -1572,7 +1577,7 @@ func (m *MockACL) UpdateSgACL(sg *v1.SecurityGroup, direction string) error { } // UpdateSgACL indicates an expected call of UpdateSgACL. -func (mr *MockACLMockRecorder) UpdateSgACL(sg, direction interface{}) *gomock.Call { +func (mr *MockACLMockRecorder) UpdateSgACL(sg, direction any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSgACL", reflect.TypeOf((*MockACL)(nil).UpdateSgACL), sg, direction) } @@ -1603,7 +1608,7 @@ func (m *MockAddressSet) EXPECT() *MockAddressSetMockRecorder { // AddressSetUpdateAddress mocks base method. func (m *MockAddressSet) AddressSetUpdateAddress(asName string, addresses ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{asName} + varargs := []any{asName} for _, a := range addresses { varargs = append(varargs, a) } @@ -1613,9 +1618,9 @@ func (m *MockAddressSet) AddressSetUpdateAddress(asName string, addresses ...str } // AddressSetUpdateAddress indicates an expected call of AddressSetUpdateAddress. -func (mr *MockAddressSetMockRecorder) AddressSetUpdateAddress(asName interface{}, addresses ...interface{}) *gomock.Call { +func (mr *MockAddressSetMockRecorder) AddressSetUpdateAddress(asName any, addresses ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{asName}, addresses...) + varargs := append([]any{asName}, addresses...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddressSetUpdateAddress", reflect.TypeOf((*MockAddressSet)(nil).AddressSetUpdateAddress), varargs...) } @@ -1628,7 +1633,7 @@ func (m *MockAddressSet) CreateAddressSet(asName string, externalIDs map[string] } // CreateAddressSet indicates an expected call of CreateAddressSet. -func (mr *MockAddressSetMockRecorder) CreateAddressSet(asName, externalIDs interface{}) *gomock.Call { +func (mr *MockAddressSetMockRecorder) CreateAddressSet(asName, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAddressSet", reflect.TypeOf((*MockAddressSet)(nil).CreateAddressSet), asName, externalIDs) } @@ -1642,7 +1647,7 @@ func (m *MockAddressSet) DeleteAddressSet(asName string) error { } // DeleteAddressSet indicates an expected call of DeleteAddressSet. -func (mr *MockAddressSetMockRecorder) DeleteAddressSet(asName interface{}) *gomock.Call { +func (mr *MockAddressSetMockRecorder) DeleteAddressSet(asName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAddressSet", reflect.TypeOf((*MockAddressSet)(nil).DeleteAddressSet), asName) } @@ -1656,7 +1661,7 @@ func (m *MockAddressSet) DeleteAddressSets(externalIDs map[string]string) error } // DeleteAddressSets indicates an expected call of DeleteAddressSets. -func (mr *MockAddressSetMockRecorder) DeleteAddressSets(externalIDs interface{}) *gomock.Call { +func (mr *MockAddressSetMockRecorder) DeleteAddressSets(externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAddressSets", reflect.TypeOf((*MockAddressSet)(nil).DeleteAddressSets), externalIDs) } @@ -1671,7 +1676,7 @@ func (m *MockAddressSet) ListAddressSets(externalIDs map[string]string) ([]ovnnb } // ListAddressSets indicates an expected call of ListAddressSets. -func (mr *MockAddressSetMockRecorder) ListAddressSets(externalIDs interface{}) *gomock.Call { +func (mr *MockAddressSetMockRecorder) ListAddressSets(externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAddressSets", reflect.TypeOf((*MockAddressSet)(nil).ListAddressSets), externalIDs) } @@ -1702,7 +1707,7 @@ func (m *MockLogicalRouterStaticRoute) EXPECT() *MockLogicalRouterStaticRouteMoc // AddLogicalRouterStaticRoute mocks base method. func (m *MockLogicalRouterStaticRoute) AddLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix string, bfdID *string, nexthops ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lrName, routeTable, policy, ipPrefix, bfdID} + varargs := []any{lrName, routeTable, policy, ipPrefix, bfdID} for _, a := range nexthops { varargs = append(varargs, a) } @@ -1712,9 +1717,9 @@ func (m *MockLogicalRouterStaticRoute) AddLogicalRouterStaticRoute(lrName, route } // AddLogicalRouterStaticRoute indicates an expected call of AddLogicalRouterStaticRoute. -func (mr *MockLogicalRouterStaticRouteMockRecorder) AddLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix, bfdID interface{}, nexthops ...interface{}) *gomock.Call { +func (mr *MockLogicalRouterStaticRouteMockRecorder) AddLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix, bfdID any, nexthops ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lrName, routeTable, policy, ipPrefix, bfdID}, nexthops...) + varargs := append([]any{lrName, routeTable, policy, ipPrefix, bfdID}, nexthops...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddLogicalRouterStaticRoute", reflect.TypeOf((*MockLogicalRouterStaticRoute)(nil).AddLogicalRouterStaticRoute), varargs...) } @@ -1727,7 +1732,7 @@ func (m *MockLogicalRouterStaticRoute) ClearLogicalRouterStaticRoute(lrName stri } // ClearLogicalRouterStaticRoute indicates an expected call of ClearLogicalRouterStaticRoute. -func (mr *MockLogicalRouterStaticRouteMockRecorder) ClearLogicalRouterStaticRoute(lrName interface{}) *gomock.Call { +func (mr *MockLogicalRouterStaticRouteMockRecorder) ClearLogicalRouterStaticRoute(lrName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearLogicalRouterStaticRoute", reflect.TypeOf((*MockLogicalRouterStaticRoute)(nil).ClearLogicalRouterStaticRoute), lrName) } @@ -1741,7 +1746,7 @@ func (m *MockLogicalRouterStaticRoute) DeleteLogicalRouterStaticRoute(lrName str } // DeleteLogicalRouterStaticRoute indicates an expected call of DeleteLogicalRouterStaticRoute. -func (mr *MockLogicalRouterStaticRouteMockRecorder) DeleteLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix, nextHop interface{}) *gomock.Call { +func (mr *MockLogicalRouterStaticRouteMockRecorder) DeleteLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix, nextHop any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterStaticRoute", reflect.TypeOf((*MockLogicalRouterStaticRoute)(nil).DeleteLogicalRouterStaticRoute), lrName, routeTable, policy, ipPrefix, nextHop) } @@ -1756,7 +1761,7 @@ func (m *MockLogicalRouterStaticRoute) ListLogicalRouterStaticRoutes(lrName stri } // ListLogicalRouterStaticRoutes indicates an expected call of ListLogicalRouterStaticRoutes. -func (mr *MockLogicalRouterStaticRouteMockRecorder) ListLogicalRouterStaticRoutes(lrName, routeTable, policy, ipPrefix, externalIDs interface{}) *gomock.Call { +func (mr *MockLogicalRouterStaticRouteMockRecorder) ListLogicalRouterStaticRoutes(lrName, routeTable, policy, ipPrefix, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouterStaticRoutes", reflect.TypeOf((*MockLogicalRouterStaticRoute)(nil).ListLogicalRouterStaticRoutes), lrName, routeTable, policy, ipPrefix, externalIDs) } @@ -1771,7 +1776,7 @@ func (m *MockLogicalRouterStaticRoute) ListLogicalRouterStaticRoutesByOption(lrN } // ListLogicalRouterStaticRoutesByOption indicates an expected call of ListLogicalRouterStaticRoutesByOption. -func (mr *MockLogicalRouterStaticRouteMockRecorder) ListLogicalRouterStaticRoutesByOption(lrName, routeTable, key, value interface{}) *gomock.Call { +func (mr *MockLogicalRouterStaticRouteMockRecorder) ListLogicalRouterStaticRoutesByOption(lrName, routeTable, key, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouterStaticRoutesByOption", reflect.TypeOf((*MockLogicalRouterStaticRoute)(nil).ListLogicalRouterStaticRoutesByOption), lrName, routeTable, key, value) } @@ -1786,7 +1791,7 @@ func (m *MockLogicalRouterStaticRoute) LogicalRouterStaticRouteExists(lrName, ro } // LogicalRouterStaticRouteExists indicates an expected call of LogicalRouterStaticRouteExists. -func (mr *MockLogicalRouterStaticRouteMockRecorder) LogicalRouterStaticRouteExists(lrName, routeTable, policy, ipPrefix, nexthop interface{}) *gomock.Call { +func (mr *MockLogicalRouterStaticRouteMockRecorder) LogicalRouterStaticRouteExists(lrName, routeTable, policy, ipPrefix, nexthop any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalRouterStaticRouteExists", reflect.TypeOf((*MockLogicalRouterStaticRoute)(nil).LogicalRouterStaticRouteExists), lrName, routeTable, policy, ipPrefix, nexthop) } @@ -1823,7 +1828,7 @@ func (m *MockLogicalRouterPolicy) AddLogicalRouterPolicy(lrName string, priority } // AddLogicalRouterPolicy indicates an expected call of AddLogicalRouterPolicy. -func (mr *MockLogicalRouterPolicyMockRecorder) AddLogicalRouterPolicy(lrName, priority, match, action, nextHops, externalIDs interface{}) *gomock.Call { +func (mr *MockLogicalRouterPolicyMockRecorder) AddLogicalRouterPolicy(lrName, priority, match, action, nextHops, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddLogicalRouterPolicy", reflect.TypeOf((*MockLogicalRouterPolicy)(nil).AddLogicalRouterPolicy), lrName, priority, match, action, nextHops, externalIDs) } @@ -1837,7 +1842,7 @@ func (m *MockLogicalRouterPolicy) ClearLogicalRouterPolicy(lrName string) error } // ClearLogicalRouterPolicy indicates an expected call of ClearLogicalRouterPolicy. -func (mr *MockLogicalRouterPolicyMockRecorder) ClearLogicalRouterPolicy(lrName interface{}) *gomock.Call { +func (mr *MockLogicalRouterPolicyMockRecorder) ClearLogicalRouterPolicy(lrName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearLogicalRouterPolicy", reflect.TypeOf((*MockLogicalRouterPolicy)(nil).ClearLogicalRouterPolicy), lrName) } @@ -1851,7 +1856,7 @@ func (m *MockLogicalRouterPolicy) DeleteLogicalRouterPolicies(lrName string, pri } // DeleteLogicalRouterPolicies indicates an expected call of DeleteLogicalRouterPolicies. -func (mr *MockLogicalRouterPolicyMockRecorder) DeleteLogicalRouterPolicies(lrName, priority, externalIDs interface{}) *gomock.Call { +func (mr *MockLogicalRouterPolicyMockRecorder) DeleteLogicalRouterPolicies(lrName, priority, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPolicies", reflect.TypeOf((*MockLogicalRouterPolicy)(nil).DeleteLogicalRouterPolicies), lrName, priority, externalIDs) } @@ -1865,7 +1870,7 @@ func (m *MockLogicalRouterPolicy) DeleteLogicalRouterPolicy(lrName string, prior } // DeleteLogicalRouterPolicy indicates an expected call of DeleteLogicalRouterPolicy. -func (mr *MockLogicalRouterPolicyMockRecorder) DeleteLogicalRouterPolicy(lrName, priority, match interface{}) *gomock.Call { +func (mr *MockLogicalRouterPolicyMockRecorder) DeleteLogicalRouterPolicy(lrName, priority, match any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPolicy", reflect.TypeOf((*MockLogicalRouterPolicy)(nil).DeleteLogicalRouterPolicy), lrName, priority, match) } @@ -1879,7 +1884,7 @@ func (m *MockLogicalRouterPolicy) DeleteLogicalRouterPolicyByNexthop(lrName stri } // DeleteLogicalRouterPolicyByNexthop indicates an expected call of DeleteLogicalRouterPolicyByNexthop. -func (mr *MockLogicalRouterPolicyMockRecorder) DeleteLogicalRouterPolicyByNexthop(lrName, priority, nexthop interface{}) *gomock.Call { +func (mr *MockLogicalRouterPolicyMockRecorder) DeleteLogicalRouterPolicyByNexthop(lrName, priority, nexthop any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPolicyByNexthop", reflect.TypeOf((*MockLogicalRouterPolicy)(nil).DeleteLogicalRouterPolicyByNexthop), lrName, priority, nexthop) } @@ -1893,7 +1898,7 @@ func (m *MockLogicalRouterPolicy) DeleteLogicalRouterPolicyByUUID(lrName, uuid s } // DeleteLogicalRouterPolicyByUUID indicates an expected call of DeleteLogicalRouterPolicyByUUID. -func (mr *MockLogicalRouterPolicyMockRecorder) DeleteLogicalRouterPolicyByUUID(lrName, uuid interface{}) *gomock.Call { +func (mr *MockLogicalRouterPolicyMockRecorder) DeleteLogicalRouterPolicyByUUID(lrName, uuid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPolicyByUUID", reflect.TypeOf((*MockLogicalRouterPolicy)(nil).DeleteLogicalRouterPolicyByUUID), lrName, uuid) } @@ -1908,7 +1913,7 @@ func (m *MockLogicalRouterPolicy) GetLogicalRouterPoliciesByExtID(lrName, key, v } // GetLogicalRouterPoliciesByExtID indicates an expected call of GetLogicalRouterPoliciesByExtID. -func (mr *MockLogicalRouterPolicyMockRecorder) GetLogicalRouterPoliciesByExtID(lrName, key, value interface{}) *gomock.Call { +func (mr *MockLogicalRouterPolicyMockRecorder) GetLogicalRouterPoliciesByExtID(lrName, key, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouterPoliciesByExtID", reflect.TypeOf((*MockLogicalRouterPolicy)(nil).GetLogicalRouterPoliciesByExtID), lrName, key, value) } @@ -1923,7 +1928,7 @@ func (m *MockLogicalRouterPolicy) GetLogicalRouterPolicy(lrName string, priority } // GetLogicalRouterPolicy indicates an expected call of GetLogicalRouterPolicy. -func (mr *MockLogicalRouterPolicyMockRecorder) GetLogicalRouterPolicy(lrName, priority, match, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockLogicalRouterPolicyMockRecorder) GetLogicalRouterPolicy(lrName, priority, match, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouterPolicy", reflect.TypeOf((*MockLogicalRouterPolicy)(nil).GetLogicalRouterPolicy), lrName, priority, match, ignoreNotFound) } @@ -1938,7 +1943,7 @@ func (m *MockLogicalRouterPolicy) ListLogicalRouterPolicies(lrName string, prior } // ListLogicalRouterPolicies indicates an expected call of ListLogicalRouterPolicies. -func (mr *MockLogicalRouterPolicyMockRecorder) ListLogicalRouterPolicies(lrName, priority, externalIDs, ignoreExtIDEmptyValue interface{}) *gomock.Call { +func (mr *MockLogicalRouterPolicyMockRecorder) ListLogicalRouterPolicies(lrName, priority, externalIDs, ignoreExtIDEmptyValue any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouterPolicies", reflect.TypeOf((*MockLogicalRouterPolicy)(nil).ListLogicalRouterPolicies), lrName, priority, externalIDs, ignoreExtIDEmptyValue) } @@ -1975,7 +1980,7 @@ func (m *MockNAT) AddNat(lrName, natType, externalIP, logicalIP, logicalMac, por } // AddNat indicates an expected call of AddNat. -func (mr *MockNATMockRecorder) AddNat(lrName, natType, externalIP, logicalIP, logicalMac, port, options interface{}) *gomock.Call { +func (mr *MockNATMockRecorder) AddNat(lrName, natType, externalIP, logicalIP, logicalMac, port, options any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNat", reflect.TypeOf((*MockNAT)(nil).AddNat), lrName, natType, externalIP, logicalIP, logicalMac, port, options) } @@ -1989,7 +1994,7 @@ func (m *MockNAT) DeleteNat(lrName, natType, externalIP, logicalIP string) error } // DeleteNat indicates an expected call of DeleteNat. -func (mr *MockNATMockRecorder) DeleteNat(lrName, natType, externalIP, logicalIP interface{}) *gomock.Call { +func (mr *MockNATMockRecorder) DeleteNat(lrName, natType, externalIP, logicalIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteNat", reflect.TypeOf((*MockNAT)(nil).DeleteNat), lrName, natType, externalIP, logicalIP) } @@ -2003,7 +2008,7 @@ func (m *MockNAT) DeleteNats(lrName, natType, logicalIP string) error { } // DeleteNats indicates an expected call of DeleteNats. -func (mr *MockNATMockRecorder) DeleteNats(lrName, natType, logicalIP interface{}) *gomock.Call { +func (mr *MockNATMockRecorder) DeleteNats(lrName, natType, logicalIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteNats", reflect.TypeOf((*MockNAT)(nil).DeleteNats), lrName, natType, logicalIP) } @@ -2018,7 +2023,7 @@ func (m *MockNAT) GetNATByUUID(uuid string) (*ovnnb.NAT, error) { } // GetNATByUUID indicates an expected call of GetNATByUUID. -func (mr *MockNATMockRecorder) GetNATByUUID(uuid interface{}) *gomock.Call { +func (mr *MockNATMockRecorder) GetNATByUUID(uuid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNATByUUID", reflect.TypeOf((*MockNAT)(nil).GetNATByUUID), uuid) } @@ -2033,7 +2038,7 @@ func (m *MockNAT) ListNats(lrName, natType, logicalIP string, externalIDs map[st } // ListNats indicates an expected call of ListNats. -func (mr *MockNATMockRecorder) ListNats(lrName, natType, logicalIP, externalIDs interface{}) *gomock.Call { +func (mr *MockNATMockRecorder) ListNats(lrName, natType, logicalIP, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListNats", reflect.TypeOf((*MockNAT)(nil).ListNats), lrName, natType, logicalIP, externalIDs) } @@ -2048,7 +2053,7 @@ func (m *MockNAT) NatExists(lrName, natType, externalIP, logicalIP string) (bool } // NatExists indicates an expected call of NatExists. -func (mr *MockNATMockRecorder) NatExists(lrName, natType, externalIP, logicalIP interface{}) *gomock.Call { +func (mr *MockNATMockRecorder) NatExists(lrName, natType, externalIP, logicalIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NatExists", reflect.TypeOf((*MockNAT)(nil).NatExists), lrName, natType, externalIP, logicalIP) } @@ -2062,7 +2067,7 @@ func (m *MockNAT) UpdateDnatAndSnat(lrName, externalIP, logicalIP, lspName, exte } // UpdateDnatAndSnat indicates an expected call of UpdateDnatAndSnat. -func (mr *MockNATMockRecorder) UpdateDnatAndSnat(lrName, externalIP, logicalIP, lspName, externalMac, gatewayType interface{}) *gomock.Call { +func (mr *MockNATMockRecorder) UpdateDnatAndSnat(lrName, externalIP, logicalIP, lspName, externalMac, gatewayType any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateDnatAndSnat", reflect.TypeOf((*MockNAT)(nil).UpdateDnatAndSnat), lrName, externalIP, logicalIP, lspName, externalMac, gatewayType) } @@ -2076,7 +2081,7 @@ func (m *MockNAT) UpdateSnat(lrName, externalIP, logicalIP string) error { } // UpdateSnat indicates an expected call of UpdateSnat. -func (mr *MockNATMockRecorder) UpdateSnat(lrName, externalIP, logicalIP interface{}) *gomock.Call { +func (mr *MockNATMockRecorder) UpdateSnat(lrName, externalIP, logicalIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSnat", reflect.TypeOf((*MockNAT)(nil).UpdateSnat), lrName, externalIP, logicalIP) } @@ -2113,7 +2118,7 @@ func (m *MockDHCPOptions) DeleteDHCPOptions(lsName, protocol string) error { } // DeleteDHCPOptions indicates an expected call of DeleteDHCPOptions. -func (mr *MockDHCPOptionsMockRecorder) DeleteDHCPOptions(lsName, protocol interface{}) *gomock.Call { +func (mr *MockDHCPOptionsMockRecorder) DeleteDHCPOptions(lsName, protocol any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDHCPOptions", reflect.TypeOf((*MockDHCPOptions)(nil).DeleteDHCPOptions), lsName, protocol) } @@ -2121,7 +2126,7 @@ func (mr *MockDHCPOptionsMockRecorder) DeleteDHCPOptions(lsName, protocol interf // DeleteDHCPOptionsByUUIDs mocks base method. func (m *MockDHCPOptions) DeleteDHCPOptionsByUUIDs(uuidList ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range uuidList { varargs = append(varargs, a) } @@ -2131,7 +2136,7 @@ func (m *MockDHCPOptions) DeleteDHCPOptionsByUUIDs(uuidList ...string) error { } // DeleteDHCPOptionsByUUIDs indicates an expected call of DeleteDHCPOptionsByUUIDs. -func (mr *MockDHCPOptionsMockRecorder) DeleteDHCPOptionsByUUIDs(uuidList ...interface{}) *gomock.Call { +func (mr *MockDHCPOptionsMockRecorder) DeleteDHCPOptionsByUUIDs(uuidList ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDHCPOptionsByUUIDs", reflect.TypeOf((*MockDHCPOptions)(nil).DeleteDHCPOptionsByUUIDs), uuidList...) } @@ -2146,7 +2151,7 @@ func (m *MockDHCPOptions) ListDHCPOptions(needVendorFilter bool, externalIDs map } // ListDHCPOptions indicates an expected call of ListDHCPOptions. -func (mr *MockDHCPOptionsMockRecorder) ListDHCPOptions(needVendorFilter, externalIDs interface{}) *gomock.Call { +func (mr *MockDHCPOptionsMockRecorder) ListDHCPOptions(needVendorFilter, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListDHCPOptions", reflect.TypeOf((*MockDHCPOptions)(nil).ListDHCPOptions), needVendorFilter, externalIDs) } @@ -2161,7 +2166,7 @@ func (m *MockDHCPOptions) UpdateDHCPOptions(subnet *v1.Subnet, mtu int) (*ovs.DH } // UpdateDHCPOptions indicates an expected call of UpdateDHCPOptions. -func (mr *MockDHCPOptionsMockRecorder) UpdateDHCPOptions(subnet, mtu interface{}) *gomock.Call { +func (mr *MockDHCPOptionsMockRecorder) UpdateDHCPOptions(subnet, mtu any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateDHCPOptions", reflect.TypeOf((*MockDHCPOptions)(nil).UpdateDHCPOptions), subnet, mtu) } @@ -2198,7 +2203,7 @@ func (m *MockNbClient) AddLoadBalancerHealthCheck(lbName, vip string, externals } // AddLoadBalancerHealthCheck indicates an expected call of AddLoadBalancerHealthCheck. -func (mr *MockNbClientMockRecorder) AddLoadBalancerHealthCheck(lbName, vip, externals interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) AddLoadBalancerHealthCheck(lbName, vip, externals any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddLoadBalancerHealthCheck", reflect.TypeOf((*MockNbClient)(nil).AddLoadBalancerHealthCheck), lbName, vip, externals) } @@ -2212,7 +2217,7 @@ func (m *MockNbClient) AddLogicalRouterPolicy(lrName string, priority int, match } // AddLogicalRouterPolicy indicates an expected call of AddLogicalRouterPolicy. -func (mr *MockNbClientMockRecorder) AddLogicalRouterPolicy(lrName, priority, match, action, nextHops, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) AddLogicalRouterPolicy(lrName, priority, match, action, nextHops, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddLogicalRouterPolicy", reflect.TypeOf((*MockNbClient)(nil).AddLogicalRouterPolicy), lrName, priority, match, action, nextHops, externalIDs) } @@ -2220,7 +2225,7 @@ func (mr *MockNbClientMockRecorder) AddLogicalRouterPolicy(lrName, priority, mat // AddLogicalRouterStaticRoute mocks base method. func (m *MockNbClient) AddLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix string, bfdID *string, nexthops ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lrName, routeTable, policy, ipPrefix, bfdID} + varargs := []any{lrName, routeTable, policy, ipPrefix, bfdID} for _, a := range nexthops { varargs = append(varargs, a) } @@ -2230,9 +2235,9 @@ func (m *MockNbClient) AddLogicalRouterStaticRoute(lrName, routeTable, policy, i } // AddLogicalRouterStaticRoute indicates an expected call of AddLogicalRouterStaticRoute. -func (mr *MockNbClientMockRecorder) AddLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix, bfdID interface{}, nexthops ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) AddLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix, bfdID any, nexthops ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lrName, routeTable, policy, ipPrefix, bfdID}, nexthops...) + varargs := append([]any{lrName, routeTable, policy, ipPrefix, bfdID}, nexthops...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddLogicalRouterStaticRoute", reflect.TypeOf((*MockNbClient)(nil).AddLogicalRouterStaticRoute), varargs...) } @@ -2245,7 +2250,7 @@ func (m *MockNbClient) AddNat(lrName, natType, externalIP, logicalIP, logicalMac } // AddNat indicates an expected call of AddNat. -func (mr *MockNbClientMockRecorder) AddNat(lrName, natType, externalIP, logicalIP, logicalMac, port, options interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) AddNat(lrName, natType, externalIP, logicalIP, logicalMac, port, options any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNat", reflect.TypeOf((*MockNbClient)(nil).AddNat), lrName, natType, externalIP, logicalIP, logicalMac, port, options) } @@ -2253,7 +2258,7 @@ func (mr *MockNbClientMockRecorder) AddNat(lrName, natType, externalIP, logicalI // AddressSetUpdateAddress mocks base method. func (m *MockNbClient) AddressSetUpdateAddress(asName string, addresses ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{asName} + varargs := []any{asName} for _, a := range addresses { varargs = append(varargs, a) } @@ -2263,9 +2268,9 @@ func (m *MockNbClient) AddressSetUpdateAddress(asName string, addresses ...strin } // AddressSetUpdateAddress indicates an expected call of AddressSetUpdateAddress. -func (mr *MockNbClientMockRecorder) AddressSetUpdateAddress(asName interface{}, addresses ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) AddressSetUpdateAddress(asName any, addresses ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{asName}, addresses...) + varargs := append([]any{asName}, addresses...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddressSetUpdateAddress", reflect.TypeOf((*MockNbClient)(nil).AddressSetUpdateAddress), varargs...) } @@ -2278,7 +2283,7 @@ func (m *MockNbClient) ClearLogicalRouterPolicy(lrName string) error { } // ClearLogicalRouterPolicy indicates an expected call of ClearLogicalRouterPolicy. -func (mr *MockNbClientMockRecorder) ClearLogicalRouterPolicy(lrName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ClearLogicalRouterPolicy(lrName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearLogicalRouterPolicy", reflect.TypeOf((*MockNbClient)(nil).ClearLogicalRouterPolicy), lrName) } @@ -2292,7 +2297,7 @@ func (m *MockNbClient) ClearLogicalRouterStaticRoute(lrName string) error { } // ClearLogicalRouterStaticRoute indicates an expected call of ClearLogicalRouterStaticRoute. -func (mr *MockNbClientMockRecorder) ClearLogicalRouterStaticRoute(lrName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ClearLogicalRouterStaticRoute(lrName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearLogicalRouterStaticRoute", reflect.TypeOf((*MockNbClient)(nil).ClearLogicalRouterStaticRoute), lrName) } @@ -2306,7 +2311,7 @@ func (m *MockNbClient) CreateAddressSet(asName string, externalIDs map[string]st } // CreateAddressSet indicates an expected call of CreateAddressSet. -func (mr *MockNbClientMockRecorder) CreateAddressSet(asName, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateAddressSet(asName, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAddressSet", reflect.TypeOf((*MockNbClient)(nil).CreateAddressSet), asName, externalIDs) } @@ -2321,7 +2326,7 @@ func (m *MockNbClient) CreateBFD(lrpName, dstIP string, minRx, minTx, detectMult } // CreateBFD indicates an expected call of CreateBFD. -func (mr *MockNbClientMockRecorder) CreateBFD(lrpName, dstIP, minRx, minTx, detectMult interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateBFD(lrpName, dstIP, minRx, minTx, detectMult any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBFD", reflect.TypeOf((*MockNbClient)(nil).CreateBFD), lrpName, dstIP, minRx, minTx, detectMult) } @@ -2335,7 +2340,7 @@ func (m *MockNbClient) CreateBareLogicalSwitch(lsName string) error { } // CreateBareLogicalSwitch indicates an expected call of CreateBareLogicalSwitch. -func (mr *MockNbClientMockRecorder) CreateBareLogicalSwitch(lsName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateBareLogicalSwitch(lsName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBareLogicalSwitch", reflect.TypeOf((*MockNbClient)(nil).CreateBareLogicalSwitch), lsName) } @@ -2349,7 +2354,7 @@ func (m *MockNbClient) CreateBareLogicalSwitchPort(lsName, lspName, ip, mac stri } // CreateBareLogicalSwitchPort indicates an expected call of CreateBareLogicalSwitchPort. -func (mr *MockNbClientMockRecorder) CreateBareLogicalSwitchPort(lsName, lspName, ip, mac interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateBareLogicalSwitchPort(lsName, lspName, ip, mac any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBareLogicalSwitchPort", reflect.TypeOf((*MockNbClient)(nil).CreateBareLogicalSwitchPort), lsName, lspName, ip, mac) } @@ -2363,7 +2368,7 @@ func (m *MockNbClient) CreateGatewayACL(lsName, pgName, gateway string) error { } // CreateGatewayACL indicates an expected call of CreateGatewayACL. -func (mr *MockNbClientMockRecorder) CreateGatewayACL(lsName, pgName, gateway interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateGatewayACL(lsName, pgName, gateway any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateGatewayACL", reflect.TypeOf((*MockNbClient)(nil).CreateGatewayACL), lsName, pgName, gateway) } @@ -2371,7 +2376,7 @@ func (mr *MockNbClientMockRecorder) CreateGatewayACL(lsName, pgName, gateway int // CreateGatewayLogicalSwitch mocks base method. func (m *MockNbClient) CreateGatewayLogicalSwitch(lsName, lrName, provider, ip, mac string, vlanID int, chassises ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lsName, lrName, provider, ip, mac, vlanID} + varargs := []any{lsName, lrName, provider, ip, mac, vlanID} for _, a := range chassises { varargs = append(varargs, a) } @@ -2381,9 +2386,9 @@ func (m *MockNbClient) CreateGatewayLogicalSwitch(lsName, lrName, provider, ip, } // CreateGatewayLogicalSwitch indicates an expected call of CreateGatewayLogicalSwitch. -func (mr *MockNbClientMockRecorder) CreateGatewayLogicalSwitch(lsName, lrName, provider, ip, mac, vlanID interface{}, chassises ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateGatewayLogicalSwitch(lsName, lrName, provider, ip, mac, vlanID any, chassises ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lsName, lrName, provider, ip, mac, vlanID}, chassises...) + varargs := append([]any{lsName, lrName, provider, ip, mac, vlanID}, chassises...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateGatewayLogicalSwitch", reflect.TypeOf((*MockNbClient)(nil).CreateGatewayLogicalSwitch), varargs...) } @@ -2396,7 +2401,7 @@ func (m *MockNbClient) CreateLoadBalancer(lbName, protocol, selectFields string) } // CreateLoadBalancer indicates an expected call of CreateLoadBalancer. -func (mr *MockNbClientMockRecorder) CreateLoadBalancer(lbName, protocol, selectFields interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateLoadBalancer(lbName, protocol, selectFields any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLoadBalancer", reflect.TypeOf((*MockNbClient)(nil).CreateLoadBalancer), lbName, protocol, selectFields) } @@ -2410,7 +2415,7 @@ func (m *MockNbClient) CreateLoadBalancerHealthCheck(lbName, vip string, lbhc *o } // CreateLoadBalancerHealthCheck indicates an expected call of CreateLoadBalancerHealthCheck. -func (mr *MockNbClientMockRecorder) CreateLoadBalancerHealthCheck(lbName, vip, lbhc interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateLoadBalancerHealthCheck(lbName, vip, lbhc any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLoadBalancerHealthCheck", reflect.TypeOf((*MockNbClient)(nil).CreateLoadBalancerHealthCheck), lbName, vip, lbhc) } @@ -2424,7 +2429,7 @@ func (m *MockNbClient) CreateLocalnetLogicalSwitchPort(lsName, lspName, provider } // CreateLocalnetLogicalSwitchPort indicates an expected call of CreateLocalnetLogicalSwitchPort. -func (mr *MockNbClientMockRecorder) CreateLocalnetLogicalSwitchPort(lsName, lspName, provider, cidrBlock, vlanID interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateLocalnetLogicalSwitchPort(lsName, lspName, provider, cidrBlock, vlanID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLocalnetLogicalSwitchPort", reflect.TypeOf((*MockNbClient)(nil).CreateLocalnetLogicalSwitchPort), lsName, lspName, provider, cidrBlock, vlanID) } @@ -2432,7 +2437,7 @@ func (mr *MockNbClientMockRecorder) CreateLocalnetLogicalSwitchPort(lsName, lspN // CreateLogicalPatchPort mocks base method. func (m *MockNbClient) CreateLogicalPatchPort(lsName, lrName, lspName, lrpName, ip, mac string, chassises ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lsName, lrName, lspName, lrpName, ip, mac} + varargs := []any{lsName, lrName, lspName, lrpName, ip, mac} for _, a := range chassises { varargs = append(varargs, a) } @@ -2442,9 +2447,9 @@ func (m *MockNbClient) CreateLogicalPatchPort(lsName, lrName, lspName, lrpName, } // CreateLogicalPatchPort indicates an expected call of CreateLogicalPatchPort. -func (mr *MockNbClientMockRecorder) CreateLogicalPatchPort(lsName, lrName, lspName, lrpName, ip, mac interface{}, chassises ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateLogicalPatchPort(lsName, lrName, lspName, lrpName, ip, mac any, chassises ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lsName, lrName, lspName, lrpName, ip, mac}, chassises...) + varargs := append([]any{lsName, lrName, lspName, lrpName, ip, mac}, chassises...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLogicalPatchPort", reflect.TypeOf((*MockNbClient)(nil).CreateLogicalPatchPort), varargs...) } @@ -2457,7 +2462,7 @@ func (m *MockNbClient) CreateLogicalRouter(lrName string) error { } // CreateLogicalRouter indicates an expected call of CreateLogicalRouter. -func (mr *MockNbClientMockRecorder) CreateLogicalRouter(lrName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateLogicalRouter(lrName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLogicalRouter", reflect.TypeOf((*MockNbClient)(nil).CreateLogicalRouter), lrName) } @@ -2471,7 +2476,7 @@ func (m *MockNbClient) CreateLogicalRouterPort(lrName, lrpName, mac string, netw } // CreateLogicalRouterPort indicates an expected call of CreateLogicalRouterPort. -func (mr *MockNbClientMockRecorder) CreateLogicalRouterPort(lrName, lrpName, mac, networks interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateLogicalRouterPort(lrName, lrpName, mac, networks any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLogicalRouterPort", reflect.TypeOf((*MockNbClient)(nil).CreateLogicalRouterPort), lrName, lrpName, mac, networks) } @@ -2485,7 +2490,7 @@ func (m *MockNbClient) CreateLogicalSwitch(lsName, lrName, cidrBlock, gateway st } // CreateLogicalSwitch indicates an expected call of CreateLogicalSwitch. -func (mr *MockNbClientMockRecorder) CreateLogicalSwitch(lsName, lrName, cidrBlock, gateway, needRouter, randomAllocateGW interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateLogicalSwitch(lsName, lrName, cidrBlock, gateway, needRouter, randomAllocateGW any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLogicalSwitch", reflect.TypeOf((*MockNbClient)(nil).CreateLogicalSwitch), lsName, lrName, cidrBlock, gateway, needRouter, randomAllocateGW) } @@ -2499,7 +2504,7 @@ func (m *MockNbClient) CreateLogicalSwitchPort(lsName, lspName, ip, mac, podName } // CreateLogicalSwitchPort indicates an expected call of CreateLogicalSwitchPort. -func (mr *MockNbClientMockRecorder) CreateLogicalSwitchPort(lsName, lspName, ip, mac, podName, namespace, portSecurity, securityGroups, vips, enableDHCP, dhcpOptions, vpc interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateLogicalSwitchPort(lsName, lspName, ip, mac, podName, namespace, portSecurity, securityGroups, vips, enableDHCP, dhcpOptions, vpc any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateLogicalSwitchPort", reflect.TypeOf((*MockNbClient)(nil).CreateLogicalSwitchPort), lsName, lspName, ip, mac, podName, namespace, portSecurity, securityGroups, vips, enableDHCP, dhcpOptions, vpc) } @@ -2513,7 +2518,7 @@ func (m *MockNbClient) CreateNodeACL(pgName, nodeIPStr, joinIPStr string) error } // CreateNodeACL indicates an expected call of CreateNodeACL. -func (mr *MockNbClientMockRecorder) CreateNodeACL(pgName, nodeIPStr, joinIPStr interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateNodeACL(pgName, nodeIPStr, joinIPStr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateNodeACL", reflect.TypeOf((*MockNbClient)(nil).CreateNodeACL), pgName, nodeIPStr, joinIPStr) } @@ -2527,7 +2532,7 @@ func (m *MockNbClient) CreatePeerRouterPort(localRouter, remoteRouter, localRout } // CreatePeerRouterPort indicates an expected call of CreatePeerRouterPort. -func (mr *MockNbClientMockRecorder) CreatePeerRouterPort(localRouter, remoteRouter, localRouterPortIP interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreatePeerRouterPort(localRouter, remoteRouter, localRouterPortIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreatePeerRouterPort", reflect.TypeOf((*MockNbClient)(nil).CreatePeerRouterPort), localRouter, remoteRouter, localRouterPortIP) } @@ -2541,7 +2546,7 @@ func (m *MockNbClient) CreatePortGroup(pgName string, externalIDs map[string]str } // CreatePortGroup indicates an expected call of CreatePortGroup. -func (mr *MockNbClientMockRecorder) CreatePortGroup(pgName, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreatePortGroup(pgName, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreatePortGroup", reflect.TypeOf((*MockNbClient)(nil).CreatePortGroup), pgName, externalIDs) } @@ -2555,7 +2560,7 @@ func (m *MockNbClient) CreateSgBaseACL(sgName, direction string) error { } // CreateSgBaseACL indicates an expected call of CreateSgBaseACL. -func (mr *MockNbClientMockRecorder) CreateSgBaseACL(sgName, direction interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateSgBaseACL(sgName, direction any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSgBaseACL", reflect.TypeOf((*MockNbClient)(nil).CreateSgBaseACL), sgName, direction) } @@ -2569,7 +2574,7 @@ func (m *MockNbClient) CreateSgDenyAllACL(sgName string) error { } // CreateSgDenyAllACL indicates an expected call of CreateSgDenyAllACL. -func (mr *MockNbClientMockRecorder) CreateSgDenyAllACL(sgName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateSgDenyAllACL(sgName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSgDenyAllACL", reflect.TypeOf((*MockNbClient)(nil).CreateSgDenyAllACL), sgName) } @@ -2577,7 +2582,7 @@ func (mr *MockNbClientMockRecorder) CreateSgDenyAllACL(sgName interface{}) *gomo // CreateVirtualLogicalSwitchPorts mocks base method. func (m *MockNbClient) CreateVirtualLogicalSwitchPorts(lsName string, ips ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lsName} + varargs := []any{lsName} for _, a := range ips { varargs = append(varargs, a) } @@ -2587,9 +2592,9 @@ func (m *MockNbClient) CreateVirtualLogicalSwitchPorts(lsName string, ips ...str } // CreateVirtualLogicalSwitchPorts indicates an expected call of CreateVirtualLogicalSwitchPorts. -func (mr *MockNbClientMockRecorder) CreateVirtualLogicalSwitchPorts(lsName interface{}, ips ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) CreateVirtualLogicalSwitchPorts(lsName any, ips ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lsName}, ips...) + varargs := append([]any{lsName}, ips...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateVirtualLogicalSwitchPorts", reflect.TypeOf((*MockNbClient)(nil).CreateVirtualLogicalSwitchPorts), varargs...) } @@ -2602,7 +2607,7 @@ func (m *MockNbClient) DeleteAcls(parentName, parentType, direction string, exte } // DeleteAcls indicates an expected call of DeleteAcls. -func (mr *MockNbClientMockRecorder) DeleteAcls(parentName, parentType, direction, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteAcls(parentName, parentType, direction, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAcls", reflect.TypeOf((*MockNbClient)(nil).DeleteAcls), parentName, parentType, direction, externalIDs) } @@ -2617,7 +2622,7 @@ func (m *MockNbClient) DeleteAclsOps(parentName, parentType, direction string, e } // DeleteAclsOps indicates an expected call of DeleteAclsOps. -func (mr *MockNbClientMockRecorder) DeleteAclsOps(parentName, parentType, direction, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteAclsOps(parentName, parentType, direction, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAclsOps", reflect.TypeOf((*MockNbClient)(nil).DeleteAclsOps), parentName, parentType, direction, externalIDs) } @@ -2631,7 +2636,7 @@ func (m *MockNbClient) DeleteAddressSet(asName string) error { } // DeleteAddressSet indicates an expected call of DeleteAddressSet. -func (mr *MockNbClientMockRecorder) DeleteAddressSet(asName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteAddressSet(asName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAddressSet", reflect.TypeOf((*MockNbClient)(nil).DeleteAddressSet), asName) } @@ -2645,7 +2650,7 @@ func (m *MockNbClient) DeleteAddressSets(externalIDs map[string]string) error { } // DeleteAddressSets indicates an expected call of DeleteAddressSets. -func (mr *MockNbClientMockRecorder) DeleteAddressSets(externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteAddressSets(externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAddressSets", reflect.TypeOf((*MockNbClient)(nil).DeleteAddressSets), externalIDs) } @@ -2659,7 +2664,7 @@ func (m *MockNbClient) DeleteBFD(lrpName, dstIP string) error { } // DeleteBFD indicates an expected call of DeleteBFD. -func (mr *MockNbClientMockRecorder) DeleteBFD(lrpName, dstIP interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteBFD(lrpName, dstIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteBFD", reflect.TypeOf((*MockNbClient)(nil).DeleteBFD), lrpName, dstIP) } @@ -2673,7 +2678,7 @@ func (m *MockNbClient) DeleteDHCPOptions(lsName, protocol string) error { } // DeleteDHCPOptions indicates an expected call of DeleteDHCPOptions. -func (mr *MockNbClientMockRecorder) DeleteDHCPOptions(lsName, protocol interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteDHCPOptions(lsName, protocol any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDHCPOptions", reflect.TypeOf((*MockNbClient)(nil).DeleteDHCPOptions), lsName, protocol) } @@ -2681,7 +2686,7 @@ func (mr *MockNbClientMockRecorder) DeleteDHCPOptions(lsName, protocol interface // DeleteDHCPOptionsByUUIDs mocks base method. func (m *MockNbClient) DeleteDHCPOptionsByUUIDs(uuidList ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range uuidList { varargs = append(varargs, a) } @@ -2691,7 +2696,7 @@ func (m *MockNbClient) DeleteDHCPOptionsByUUIDs(uuidList ...string) error { } // DeleteDHCPOptionsByUUIDs indicates an expected call of DeleteDHCPOptionsByUUIDs. -func (mr *MockNbClientMockRecorder) DeleteDHCPOptionsByUUIDs(uuidList ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteDHCPOptionsByUUIDs(uuidList ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDHCPOptionsByUUIDs", reflect.TypeOf((*MockNbClient)(nil).DeleteDHCPOptionsByUUIDs), uuidList...) } @@ -2705,7 +2710,7 @@ func (m *MockNbClient) DeleteLoadBalancerHealthCheck(lbName, vip string) error { } // DeleteLoadBalancerHealthCheck indicates an expected call of DeleteLoadBalancerHealthCheck. -func (mr *MockNbClientMockRecorder) DeleteLoadBalancerHealthCheck(lbName, vip interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLoadBalancerHealthCheck(lbName, vip any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLoadBalancerHealthCheck", reflect.TypeOf((*MockNbClient)(nil).DeleteLoadBalancerHealthCheck), lbName, vip) } @@ -2719,7 +2724,7 @@ func (m *MockNbClient) DeleteLoadBalancerHealthChecks(filter func(*ovnnb.LoadBal } // DeleteLoadBalancerHealthChecks indicates an expected call of DeleteLoadBalancerHealthChecks. -func (mr *MockNbClientMockRecorder) DeleteLoadBalancerHealthChecks(filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLoadBalancerHealthChecks(filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLoadBalancerHealthChecks", reflect.TypeOf((*MockNbClient)(nil).DeleteLoadBalancerHealthChecks), filter) } @@ -2733,7 +2738,7 @@ func (m *MockNbClient) DeleteLoadBalancers(filter func(*ovnnb.LoadBalancer) bool } // DeleteLoadBalancers indicates an expected call of DeleteLoadBalancers. -func (mr *MockNbClientMockRecorder) DeleteLoadBalancers(filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLoadBalancers(filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLoadBalancers", reflect.TypeOf((*MockNbClient)(nil).DeleteLoadBalancers), filter) } @@ -2747,7 +2752,7 @@ func (m *MockNbClient) DeleteLogicalGatewaySwitch(lsName, lrName string) error { } // DeleteLogicalGatewaySwitch indicates an expected call of DeleteLogicalGatewaySwitch. -func (mr *MockNbClientMockRecorder) DeleteLogicalGatewaySwitch(lsName, lrName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalGatewaySwitch(lsName, lrName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalGatewaySwitch", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalGatewaySwitch), lsName, lrName) } @@ -2761,7 +2766,7 @@ func (m *MockNbClient) DeleteLogicalRouter(lrName string) error { } // DeleteLogicalRouter indicates an expected call of DeleteLogicalRouter. -func (mr *MockNbClientMockRecorder) DeleteLogicalRouter(lrName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalRouter(lrName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouter", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalRouter), lrName) } @@ -2775,7 +2780,7 @@ func (m *MockNbClient) DeleteLogicalRouterPolicies(lrName string, priority int, } // DeleteLogicalRouterPolicies indicates an expected call of DeleteLogicalRouterPolicies. -func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPolicies(lrName, priority, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPolicies(lrName, priority, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPolicies", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalRouterPolicies), lrName, priority, externalIDs) } @@ -2789,7 +2794,7 @@ func (m *MockNbClient) DeleteLogicalRouterPolicy(lrName string, priority int, ma } // DeleteLogicalRouterPolicy indicates an expected call of DeleteLogicalRouterPolicy. -func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPolicy(lrName, priority, match interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPolicy(lrName, priority, match any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPolicy", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalRouterPolicy), lrName, priority, match) } @@ -2803,7 +2808,7 @@ func (m *MockNbClient) DeleteLogicalRouterPolicyByNexthop(lrName string, priorit } // DeleteLogicalRouterPolicyByNexthop indicates an expected call of DeleteLogicalRouterPolicyByNexthop. -func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPolicyByNexthop(lrName, priority, nexthop interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPolicyByNexthop(lrName, priority, nexthop any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPolicyByNexthop", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalRouterPolicyByNexthop), lrName, priority, nexthop) } @@ -2817,7 +2822,7 @@ func (m *MockNbClient) DeleteLogicalRouterPolicyByUUID(lrName, uuid string) erro } // DeleteLogicalRouterPolicyByUUID indicates an expected call of DeleteLogicalRouterPolicyByUUID. -func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPolicyByUUID(lrName, uuid interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPolicyByUUID(lrName, uuid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPolicyByUUID", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalRouterPolicyByUUID), lrName, uuid) } @@ -2831,7 +2836,7 @@ func (m *MockNbClient) DeleteLogicalRouterPort(lrpName string) error { } // DeleteLogicalRouterPort indicates an expected call of DeleteLogicalRouterPort. -func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPort(lrpName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPort(lrpName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPort", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalRouterPort), lrpName) } @@ -2845,7 +2850,7 @@ func (m *MockNbClient) DeleteLogicalRouterPorts(externalIDs map[string]string, f } // DeleteLogicalRouterPorts indicates an expected call of DeleteLogicalRouterPorts. -func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPorts(externalIDs, filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalRouterPorts(externalIDs, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterPorts", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalRouterPorts), externalIDs, filter) } @@ -2859,7 +2864,7 @@ func (m *MockNbClient) DeleteLogicalRouterStaticRoute(lrName string, routeTable, } // DeleteLogicalRouterStaticRoute indicates an expected call of DeleteLogicalRouterStaticRoute. -func (mr *MockNbClientMockRecorder) DeleteLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix, nextHop interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalRouterStaticRoute(lrName, routeTable, policy, ipPrefix, nextHop any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalRouterStaticRoute", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalRouterStaticRoute), lrName, routeTable, policy, ipPrefix, nextHop) } @@ -2873,7 +2878,7 @@ func (m *MockNbClient) DeleteLogicalSwitch(lsName string) error { } // DeleteLogicalSwitch indicates an expected call of DeleteLogicalSwitch. -func (mr *MockNbClientMockRecorder) DeleteLogicalSwitch(lsName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalSwitch(lsName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalSwitch", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalSwitch), lsName) } @@ -2887,7 +2892,7 @@ func (m *MockNbClient) DeleteLogicalSwitchPort(lspName string) error { } // DeleteLogicalSwitchPort indicates an expected call of DeleteLogicalSwitchPort. -func (mr *MockNbClientMockRecorder) DeleteLogicalSwitchPort(lspName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalSwitchPort(lspName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalSwitchPort", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalSwitchPort), lspName) } @@ -2901,7 +2906,7 @@ func (m *MockNbClient) DeleteLogicalSwitchPorts(externalIDs map[string]string, f } // DeleteLogicalSwitchPorts indicates an expected call of DeleteLogicalSwitchPorts. -func (mr *MockNbClientMockRecorder) DeleteLogicalSwitchPorts(externalIDs, filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteLogicalSwitchPorts(externalIDs, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLogicalSwitchPorts", reflect.TypeOf((*MockNbClient)(nil).DeleteLogicalSwitchPorts), externalIDs, filter) } @@ -2915,7 +2920,7 @@ func (m *MockNbClient) DeleteNat(lrName, natType, externalIP, logicalIP string) } // DeleteNat indicates an expected call of DeleteNat. -func (mr *MockNbClientMockRecorder) DeleteNat(lrName, natType, externalIP, logicalIP interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteNat(lrName, natType, externalIP, logicalIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteNat", reflect.TypeOf((*MockNbClient)(nil).DeleteNat), lrName, natType, externalIP, logicalIP) } @@ -2929,7 +2934,7 @@ func (m *MockNbClient) DeleteNats(lrName, natType, logicalIP string) error { } // DeleteNats indicates an expected call of DeleteNats. -func (mr *MockNbClientMockRecorder) DeleteNats(lrName, natType, logicalIP interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteNats(lrName, natType, logicalIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteNats", reflect.TypeOf((*MockNbClient)(nil).DeleteNats), lrName, natType, logicalIP) } @@ -2943,7 +2948,7 @@ func (m *MockNbClient) DeletePortGroup(pgName string) error { } // DeletePortGroup indicates an expected call of DeletePortGroup. -func (mr *MockNbClientMockRecorder) DeletePortGroup(pgName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeletePortGroup(pgName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeletePortGroup", reflect.TypeOf((*MockNbClient)(nil).DeletePortGroup), pgName) } @@ -2957,7 +2962,7 @@ func (m *MockNbClient) DeleteSecurityGroup(sgName string) error { } // DeleteSecurityGroup indicates an expected call of DeleteSecurityGroup. -func (mr *MockNbClientMockRecorder) DeleteSecurityGroup(sgName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) DeleteSecurityGroup(sgName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSecurityGroup", reflect.TypeOf((*MockNbClient)(nil).DeleteSecurityGroup), sgName) } @@ -2971,13 +2976,13 @@ func (m *MockNbClient) EnablePortLayer2forward(lspName string) error { } // EnablePortLayer2forward indicates an expected call of EnablePortLayer2forward. -func (mr *MockNbClientMockRecorder) EnablePortLayer2forward(lspName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) EnablePortLayer2forward(lspName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnablePortLayer2forward", reflect.TypeOf((*MockNbClient)(nil).EnablePortLayer2forward), lspName) } // GetEntityInfo mocks base method. -func (m *MockNbClient) GetEntityInfo(entity interface{}) error { +func (m *MockNbClient) GetEntityInfo(entity any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetEntityInfo", entity) ret0, _ := ret[0].(error) @@ -2985,7 +2990,7 @@ func (m *MockNbClient) GetEntityInfo(entity interface{}) error { } // GetEntityInfo indicates an expected call of GetEntityInfo. -func (mr *MockNbClientMockRecorder) GetEntityInfo(entity interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetEntityInfo(entity any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEntityInfo", reflect.TypeOf((*MockNbClient)(nil).GetEntityInfo), entity) } @@ -3000,7 +3005,7 @@ func (m *MockNbClient) GetLoadBalancer(lbName string, ignoreNotFound bool) (*ovn } // GetLoadBalancer indicates an expected call of GetLoadBalancer. -func (mr *MockNbClientMockRecorder) GetLoadBalancer(lbName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetLoadBalancer(lbName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLoadBalancer", reflect.TypeOf((*MockNbClient)(nil).GetLoadBalancer), lbName, ignoreNotFound) } @@ -3016,7 +3021,7 @@ func (m *MockNbClient) GetLoadBalancerHealthCheck(lbName, vip string, ignoreNotF } // GetLoadBalancerHealthCheck indicates an expected call of GetLoadBalancerHealthCheck. -func (mr *MockNbClientMockRecorder) GetLoadBalancerHealthCheck(lbName, vip, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetLoadBalancerHealthCheck(lbName, vip, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLoadBalancerHealthCheck", reflect.TypeOf((*MockNbClient)(nil).GetLoadBalancerHealthCheck), lbName, vip, ignoreNotFound) } @@ -3031,7 +3036,7 @@ func (m *MockNbClient) GetLogicalRouter(lrName string, ignoreNotFound bool) (*ov } // GetLogicalRouter indicates an expected call of GetLogicalRouter. -func (mr *MockNbClientMockRecorder) GetLogicalRouter(lrName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetLogicalRouter(lrName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouter", reflect.TypeOf((*MockNbClient)(nil).GetLogicalRouter), lrName, ignoreNotFound) } @@ -3046,7 +3051,7 @@ func (m *MockNbClient) GetLogicalRouterPoliciesByExtID(lrName, key, value string } // GetLogicalRouterPoliciesByExtID indicates an expected call of GetLogicalRouterPoliciesByExtID. -func (mr *MockNbClientMockRecorder) GetLogicalRouterPoliciesByExtID(lrName, key, value interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetLogicalRouterPoliciesByExtID(lrName, key, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouterPoliciesByExtID", reflect.TypeOf((*MockNbClient)(nil).GetLogicalRouterPoliciesByExtID), lrName, key, value) } @@ -3061,7 +3066,7 @@ func (m *MockNbClient) GetLogicalRouterPolicy(lrName string, priority int, match } // GetLogicalRouterPolicy indicates an expected call of GetLogicalRouterPolicy. -func (mr *MockNbClientMockRecorder) GetLogicalRouterPolicy(lrName, priority, match, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetLogicalRouterPolicy(lrName, priority, match, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouterPolicy", reflect.TypeOf((*MockNbClient)(nil).GetLogicalRouterPolicy), lrName, priority, match, ignoreNotFound) } @@ -3076,7 +3081,7 @@ func (m *MockNbClient) GetLogicalRouterPort(lrpName string, ignoreNotFound bool) } // GetLogicalRouterPort indicates an expected call of GetLogicalRouterPort. -func (mr *MockNbClientMockRecorder) GetLogicalRouterPort(lrpName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetLogicalRouterPort(lrpName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouterPort", reflect.TypeOf((*MockNbClient)(nil).GetLogicalRouterPort), lrpName, ignoreNotFound) } @@ -3091,7 +3096,7 @@ func (m *MockNbClient) GetLogicalRouterPortByUUID(uuid string) (*ovnnb.LogicalRo } // GetLogicalRouterPortByUUID indicates an expected call of GetLogicalRouterPortByUUID. -func (mr *MockNbClientMockRecorder) GetLogicalRouterPortByUUID(uuid interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetLogicalRouterPortByUUID(uuid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalRouterPortByUUID", reflect.TypeOf((*MockNbClient)(nil).GetLogicalRouterPortByUUID), uuid) } @@ -3106,7 +3111,7 @@ func (m *MockNbClient) GetLogicalSwitchPort(lspName string, ignoreNotFound bool) } // GetLogicalSwitchPort indicates an expected call of GetLogicalSwitchPort. -func (mr *MockNbClientMockRecorder) GetLogicalSwitchPort(lspName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetLogicalSwitchPort(lspName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLogicalSwitchPort", reflect.TypeOf((*MockNbClient)(nil).GetLogicalSwitchPort), lspName, ignoreNotFound) } @@ -3121,7 +3126,7 @@ func (m *MockNbClient) GetNATByUUID(uuid string) (*ovnnb.NAT, error) { } // GetNATByUUID indicates an expected call of GetNATByUUID. -func (mr *MockNbClientMockRecorder) GetNATByUUID(uuid interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetNATByUUID(uuid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNATByUUID", reflect.TypeOf((*MockNbClient)(nil).GetNATByUUID), uuid) } @@ -3151,7 +3156,7 @@ func (m *MockNbClient) GetPortGroup(pgName string, ignoreNotFound bool) (*ovnnb. } // GetPortGroup indicates an expected call of GetPortGroup. -func (mr *MockNbClientMockRecorder) GetPortGroup(pgName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) GetPortGroup(pgName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPortGroup", reflect.TypeOf((*MockNbClient)(nil).GetPortGroup), pgName, ignoreNotFound) } @@ -3166,7 +3171,7 @@ func (m *MockNbClient) ListAddressSets(externalIDs map[string]string) ([]ovnnb.A } // ListAddressSets indicates an expected call of ListAddressSets. -func (mr *MockNbClientMockRecorder) ListAddressSets(externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListAddressSets(externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAddressSets", reflect.TypeOf((*MockNbClient)(nil).ListAddressSets), externalIDs) } @@ -3181,7 +3186,7 @@ func (m *MockNbClient) ListDHCPOptions(needVendorFilter bool, externalIDs map[st } // ListDHCPOptions indicates an expected call of ListDHCPOptions. -func (mr *MockNbClientMockRecorder) ListDHCPOptions(needVendorFilter, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListDHCPOptions(needVendorFilter, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListDHCPOptions", reflect.TypeOf((*MockNbClient)(nil).ListDHCPOptions), needVendorFilter, externalIDs) } @@ -3196,7 +3201,7 @@ func (m *MockNbClient) ListLoadBalancerHealthChecks(filter func(*ovnnb.LoadBalan } // ListLoadBalancerHealthChecks indicates an expected call of ListLoadBalancerHealthChecks. -func (mr *MockNbClientMockRecorder) ListLoadBalancerHealthChecks(filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListLoadBalancerHealthChecks(filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLoadBalancerHealthChecks", reflect.TypeOf((*MockNbClient)(nil).ListLoadBalancerHealthChecks), filter) } @@ -3211,7 +3216,7 @@ func (m *MockNbClient) ListLoadBalancers(filter func(*ovnnb.LoadBalancer) bool) } // ListLoadBalancers indicates an expected call of ListLoadBalancers. -func (mr *MockNbClientMockRecorder) ListLoadBalancers(filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListLoadBalancers(filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLoadBalancers", reflect.TypeOf((*MockNbClient)(nil).ListLoadBalancers), filter) } @@ -3226,7 +3231,7 @@ func (m *MockNbClient) ListLogicalRouter(needVendorFilter bool, filter func(*ovn } // ListLogicalRouter indicates an expected call of ListLogicalRouter. -func (mr *MockNbClientMockRecorder) ListLogicalRouter(needVendorFilter, filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListLogicalRouter(needVendorFilter, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouter", reflect.TypeOf((*MockNbClient)(nil).ListLogicalRouter), needVendorFilter, filter) } @@ -3241,7 +3246,7 @@ func (m *MockNbClient) ListLogicalRouterPolicies(lrName string, priority int, ex } // ListLogicalRouterPolicies indicates an expected call of ListLogicalRouterPolicies. -func (mr *MockNbClientMockRecorder) ListLogicalRouterPolicies(lrName, priority, externalIDs, ignoreExtIDEmptyValue interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListLogicalRouterPolicies(lrName, priority, externalIDs, ignoreExtIDEmptyValue any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouterPolicies", reflect.TypeOf((*MockNbClient)(nil).ListLogicalRouterPolicies), lrName, priority, externalIDs, ignoreExtIDEmptyValue) } @@ -3256,7 +3261,7 @@ func (m *MockNbClient) ListLogicalRouterPorts(externalIDs map[string]string, fil } // ListLogicalRouterPorts indicates an expected call of ListLogicalRouterPorts. -func (mr *MockNbClientMockRecorder) ListLogicalRouterPorts(externalIDs, filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListLogicalRouterPorts(externalIDs, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouterPorts", reflect.TypeOf((*MockNbClient)(nil).ListLogicalRouterPorts), externalIDs, filter) } @@ -3271,7 +3276,7 @@ func (m *MockNbClient) ListLogicalRouterStaticRoutes(lrName string, routeTable, } // ListLogicalRouterStaticRoutes indicates an expected call of ListLogicalRouterStaticRoutes. -func (mr *MockNbClientMockRecorder) ListLogicalRouterStaticRoutes(lrName, routeTable, policy, ipPrefix, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListLogicalRouterStaticRoutes(lrName, routeTable, policy, ipPrefix, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouterStaticRoutes", reflect.TypeOf((*MockNbClient)(nil).ListLogicalRouterStaticRoutes), lrName, routeTable, policy, ipPrefix, externalIDs) } @@ -3286,7 +3291,7 @@ func (m *MockNbClient) ListLogicalRouterStaticRoutesByOption(lrName, routeTable, } // ListLogicalRouterStaticRoutesByOption indicates an expected call of ListLogicalRouterStaticRoutesByOption. -func (mr *MockNbClientMockRecorder) ListLogicalRouterStaticRoutesByOption(lrName, routeTable, key, value interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListLogicalRouterStaticRoutesByOption(lrName, routeTable, key, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalRouterStaticRoutesByOption", reflect.TypeOf((*MockNbClient)(nil).ListLogicalRouterStaticRoutesByOption), lrName, routeTable, key, value) } @@ -3301,7 +3306,7 @@ func (m *MockNbClient) ListLogicalSwitch(needVendorFilter bool, filter func(*ovn } // ListLogicalSwitch indicates an expected call of ListLogicalSwitch. -func (mr *MockNbClientMockRecorder) ListLogicalSwitch(needVendorFilter, filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListLogicalSwitch(needVendorFilter, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalSwitch", reflect.TypeOf((*MockNbClient)(nil).ListLogicalSwitch), needVendorFilter, filter) } @@ -3316,7 +3321,7 @@ func (m *MockNbClient) ListLogicalSwitchPorts(needVendorFilter bool, externalIDs } // ListLogicalSwitchPorts indicates an expected call of ListLogicalSwitchPorts. -func (mr *MockNbClientMockRecorder) ListLogicalSwitchPorts(needVendorFilter, externalIDs, filter interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListLogicalSwitchPorts(needVendorFilter, externalIDs, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLogicalSwitchPorts", reflect.TypeOf((*MockNbClient)(nil).ListLogicalSwitchPorts), needVendorFilter, externalIDs, filter) } @@ -3346,7 +3351,7 @@ func (m *MockNbClient) ListNats(lrName, natType, logicalIP string, externalIDs m } // ListNats indicates an expected call of ListNats. -func (mr *MockNbClientMockRecorder) ListNats(lrName, natType, logicalIP, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListNats(lrName, natType, logicalIP, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListNats", reflect.TypeOf((*MockNbClient)(nil).ListNats), lrName, natType, logicalIP, externalIDs) } @@ -3361,7 +3366,7 @@ func (m *MockNbClient) ListNormalLogicalSwitchPorts(needVendorFilter bool, exter } // ListNormalLogicalSwitchPorts indicates an expected call of ListNormalLogicalSwitchPorts. -func (mr *MockNbClientMockRecorder) ListNormalLogicalSwitchPorts(needVendorFilter, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListNormalLogicalSwitchPorts(needVendorFilter, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListNormalLogicalSwitchPorts", reflect.TypeOf((*MockNbClient)(nil).ListNormalLogicalSwitchPorts), needVendorFilter, externalIDs) } @@ -3376,7 +3381,7 @@ func (m *MockNbClient) ListPortGroups(externalIDs map[string]string) ([]ovnnb.Po } // ListPortGroups indicates an expected call of ListPortGroups. -func (mr *MockNbClientMockRecorder) ListPortGroups(externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) ListPortGroups(externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListPortGroups", reflect.TypeOf((*MockNbClient)(nil).ListPortGroups), externalIDs) } @@ -3390,7 +3395,7 @@ func (m *MockNbClient) LoadBalancerAddHealthCheck(lbName, vip string, ignoreHeal } // LoadBalancerAddHealthCheck indicates an expected call of LoadBalancerAddHealthCheck. -func (mr *MockNbClientMockRecorder) LoadBalancerAddHealthCheck(lbName, vip, ignoreHealthCheck, ipPortMapping, externals interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LoadBalancerAddHealthCheck(lbName, vip, ignoreHealthCheck, ipPortMapping, externals any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerAddHealthCheck", reflect.TypeOf((*MockNbClient)(nil).LoadBalancerAddHealthCheck), lbName, vip, ignoreHealthCheck, ipPortMapping, externals) } @@ -3404,7 +3409,7 @@ func (m *MockNbClient) LoadBalancerAddIPPortMapping(lbName, vip string, ipPortMa } // LoadBalancerAddIPPortMapping indicates an expected call of LoadBalancerAddIPPortMapping. -func (mr *MockNbClientMockRecorder) LoadBalancerAddIPPortMapping(lbName, vip, ipPortMappings interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LoadBalancerAddIPPortMapping(lbName, vip, ipPortMappings any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerAddIPPortMapping", reflect.TypeOf((*MockNbClient)(nil).LoadBalancerAddIPPortMapping), lbName, vip, ipPortMappings) } @@ -3412,7 +3417,7 @@ func (mr *MockNbClientMockRecorder) LoadBalancerAddIPPortMapping(lbName, vip, ip // LoadBalancerAddVip mocks base method. func (m *MockNbClient) LoadBalancerAddVip(lbName, vip string, backends ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lbName, vip} + varargs := []any{lbName, vip} for _, a := range backends { varargs = append(varargs, a) } @@ -3422,9 +3427,9 @@ func (m *MockNbClient) LoadBalancerAddVip(lbName, vip string, backends ...string } // LoadBalancerAddVip indicates an expected call of LoadBalancerAddVip. -func (mr *MockNbClientMockRecorder) LoadBalancerAddVip(lbName, vip interface{}, backends ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LoadBalancerAddVip(lbName, vip any, backends ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lbName, vip}, backends...) + varargs := append([]any{lbName, vip}, backends...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerAddVip", reflect.TypeOf((*MockNbClient)(nil).LoadBalancerAddVip), varargs...) } @@ -3437,7 +3442,7 @@ func (m *MockNbClient) LoadBalancerDeleteHealthCheck(lbName, uuid string) error } // LoadBalancerDeleteHealthCheck indicates an expected call of LoadBalancerDeleteHealthCheck. -func (mr *MockNbClientMockRecorder) LoadBalancerDeleteHealthCheck(lbName, uuid interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LoadBalancerDeleteHealthCheck(lbName, uuid any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerDeleteHealthCheck", reflect.TypeOf((*MockNbClient)(nil).LoadBalancerDeleteHealthCheck), lbName, uuid) } @@ -3451,7 +3456,7 @@ func (m *MockNbClient) LoadBalancerDeleteIPPortMapping(lbName, vip string) error } // LoadBalancerDeleteIPPortMapping indicates an expected call of LoadBalancerDeleteIPPortMapping. -func (mr *MockNbClientMockRecorder) LoadBalancerDeleteIPPortMapping(lbName, vip interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LoadBalancerDeleteIPPortMapping(lbName, vip any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerDeleteIPPortMapping", reflect.TypeOf((*MockNbClient)(nil).LoadBalancerDeleteIPPortMapping), lbName, vip) } @@ -3465,7 +3470,7 @@ func (m *MockNbClient) LoadBalancerDeleteVip(lbName, vip string, ignoreHealthChe } // LoadBalancerDeleteVip indicates an expected call of LoadBalancerDeleteVip. -func (mr *MockNbClientMockRecorder) LoadBalancerDeleteVip(lbName, vip, ignoreHealthCheck interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LoadBalancerDeleteVip(lbName, vip, ignoreHealthCheck any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerDeleteVip", reflect.TypeOf((*MockNbClient)(nil).LoadBalancerDeleteVip), lbName, vip, ignoreHealthCheck) } @@ -3480,7 +3485,7 @@ func (m *MockNbClient) LoadBalancerExists(lbName string) (bool, error) { } // LoadBalancerExists indicates an expected call of LoadBalancerExists. -func (mr *MockNbClientMockRecorder) LoadBalancerExists(lbName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LoadBalancerExists(lbName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerExists", reflect.TypeOf((*MockNbClient)(nil).LoadBalancerExists), lbName) } @@ -3495,7 +3500,7 @@ func (m *MockNbClient) LoadBalancerHealthCheckExists(lbName, vip string) (bool, } // LoadBalancerHealthCheckExists indicates an expected call of LoadBalancerHealthCheckExists. -func (mr *MockNbClientMockRecorder) LoadBalancerHealthCheckExists(lbName, vip interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LoadBalancerHealthCheckExists(lbName, vip any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerHealthCheckExists", reflect.TypeOf((*MockNbClient)(nil).LoadBalancerHealthCheckExists), lbName, vip) } @@ -3509,7 +3514,7 @@ func (m *MockNbClient) LoadBalancerUpdateIPPortMapping(lbName, vip string, ipPor } // LoadBalancerUpdateIPPortMapping indicates an expected call of LoadBalancerUpdateIPPortMapping. -func (mr *MockNbClientMockRecorder) LoadBalancerUpdateIPPortMapping(lbName, vip, ipPortMappings interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LoadBalancerUpdateIPPortMapping(lbName, vip, ipPortMappings any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadBalancerUpdateIPPortMapping", reflect.TypeOf((*MockNbClient)(nil).LoadBalancerUpdateIPPortMapping), lbName, vip, ipPortMappings) } @@ -3524,7 +3529,7 @@ func (m *MockNbClient) LogicalRouterExists(name string) (bool, error) { } // LogicalRouterExists indicates an expected call of LogicalRouterExists. -func (mr *MockNbClientMockRecorder) LogicalRouterExists(name interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LogicalRouterExists(name any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalRouterExists", reflect.TypeOf((*MockNbClient)(nil).LogicalRouterExists), name) } @@ -3539,7 +3544,7 @@ func (m *MockNbClient) LogicalRouterPortExists(lrpName string) (bool, error) { } // LogicalRouterPortExists indicates an expected call of LogicalRouterPortExists. -func (mr *MockNbClientMockRecorder) LogicalRouterPortExists(lrpName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LogicalRouterPortExists(lrpName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalRouterPortExists", reflect.TypeOf((*MockNbClient)(nil).LogicalRouterPortExists), lrpName) } @@ -3554,7 +3559,7 @@ func (m *MockNbClient) LogicalRouterStaticRouteExists(lrName, routeTable, policy } // LogicalRouterStaticRouteExists indicates an expected call of LogicalRouterStaticRouteExists. -func (mr *MockNbClientMockRecorder) LogicalRouterStaticRouteExists(lrName, routeTable, policy, ipPrefix, nexthop interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LogicalRouterStaticRouteExists(lrName, routeTable, policy, ipPrefix, nexthop any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalRouterStaticRouteExists", reflect.TypeOf((*MockNbClient)(nil).LogicalRouterStaticRouteExists), lrName, routeTable, policy, ipPrefix, nexthop) } @@ -3562,7 +3567,7 @@ func (mr *MockNbClientMockRecorder) LogicalRouterStaticRouteExists(lrName, route // LogicalRouterUpdateLoadBalancers mocks base method. func (m *MockNbClient) LogicalRouterUpdateLoadBalancers(lrName string, op ovsdb.Mutator, lbNames ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lrName, op} + varargs := []any{lrName, op} for _, a := range lbNames { varargs = append(varargs, a) } @@ -3572,9 +3577,9 @@ func (m *MockNbClient) LogicalRouterUpdateLoadBalancers(lrName string, op ovsdb. } // LogicalRouterUpdateLoadBalancers indicates an expected call of LogicalRouterUpdateLoadBalancers. -func (mr *MockNbClientMockRecorder) LogicalRouterUpdateLoadBalancers(lrName, op interface{}, lbNames ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LogicalRouterUpdateLoadBalancers(lrName, op any, lbNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lrName, op}, lbNames...) + varargs := append([]any{lrName, op}, lbNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalRouterUpdateLoadBalancers", reflect.TypeOf((*MockNbClient)(nil).LogicalRouterUpdateLoadBalancers), varargs...) } @@ -3588,7 +3593,7 @@ func (m *MockNbClient) LogicalSwitchExists(lsName string) (bool, error) { } // LogicalSwitchExists indicates an expected call of LogicalSwitchExists. -func (mr *MockNbClientMockRecorder) LogicalSwitchExists(lsName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LogicalSwitchExists(lsName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalSwitchExists", reflect.TypeOf((*MockNbClient)(nil).LogicalSwitchExists), lsName) } @@ -3603,7 +3608,7 @@ func (m *MockNbClient) LogicalSwitchPortExists(name string) (bool, error) { } // LogicalSwitchPortExists indicates an expected call of LogicalSwitchPortExists. -func (mr *MockNbClientMockRecorder) LogicalSwitchPortExists(name interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LogicalSwitchPortExists(name any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalSwitchPortExists", reflect.TypeOf((*MockNbClient)(nil).LogicalSwitchPortExists), name) } @@ -3611,7 +3616,7 @@ func (mr *MockNbClientMockRecorder) LogicalSwitchPortExists(name interface{}) *g // LogicalSwitchUpdateLoadBalancers mocks base method. func (m *MockNbClient) LogicalSwitchUpdateLoadBalancers(lsName string, op ovsdb.Mutator, lbNames ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lsName, op} + varargs := []any{lsName, op} for _, a := range lbNames { varargs = append(varargs, a) } @@ -3621,9 +3626,9 @@ func (m *MockNbClient) LogicalSwitchUpdateLoadBalancers(lsName string, op ovsdb. } // LogicalSwitchUpdateLoadBalancers indicates an expected call of LogicalSwitchUpdateLoadBalancers. -func (mr *MockNbClientMockRecorder) LogicalSwitchUpdateLoadBalancers(lsName, op interface{}, lbNames ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) LogicalSwitchUpdateLoadBalancers(lsName, op any, lbNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lsName, op}, lbNames...) + varargs := append([]any{lsName, op}, lbNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogicalSwitchUpdateLoadBalancers", reflect.TypeOf((*MockNbClient)(nil).LogicalSwitchUpdateLoadBalancers), varargs...) } @@ -3637,7 +3642,7 @@ func (m *MockNbClient) NatExists(lrName, natType, externalIP, logicalIP string) } // NatExists indicates an expected call of NatExists. -func (mr *MockNbClientMockRecorder) NatExists(lrName, natType, externalIP, logicalIP interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) NatExists(lrName, natType, externalIP, logicalIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NatExists", reflect.TypeOf((*MockNbClient)(nil).NatExists), lrName, natType, externalIP, logicalIP) } @@ -3645,7 +3650,7 @@ func (mr *MockNbClientMockRecorder) NatExists(lrName, natType, externalIP, logic // PortGroupAddPorts mocks base method. func (m *MockNbClient) PortGroupAddPorts(pgName string, lspNames ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{pgName} + varargs := []any{pgName} for _, a := range lspNames { varargs = append(varargs, a) } @@ -3655,9 +3660,9 @@ func (m *MockNbClient) PortGroupAddPorts(pgName string, lspNames ...string) erro } // PortGroupAddPorts indicates an expected call of PortGroupAddPorts. -func (mr *MockNbClientMockRecorder) PortGroupAddPorts(pgName interface{}, lspNames ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) PortGroupAddPorts(pgName any, lspNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{pgName}, lspNames...) + varargs := append([]any{pgName}, lspNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PortGroupAddPorts", reflect.TypeOf((*MockNbClient)(nil).PortGroupAddPorts), varargs...) } @@ -3671,7 +3676,7 @@ func (m *MockNbClient) PortGroupExists(pgName string) (bool, error) { } // PortGroupExists indicates an expected call of PortGroupExists. -func (mr *MockNbClientMockRecorder) PortGroupExists(pgName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) PortGroupExists(pgName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PortGroupExists", reflect.TypeOf((*MockNbClient)(nil).PortGroupExists), pgName) } @@ -3679,7 +3684,7 @@ func (mr *MockNbClientMockRecorder) PortGroupExists(pgName interface{}) *gomock. // PortGroupRemovePorts mocks base method. func (m *MockNbClient) PortGroupRemovePorts(pgName string, lspNames ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{pgName} + varargs := []any{pgName} for _, a := range lspNames { varargs = append(varargs, a) } @@ -3689,9 +3694,9 @@ func (m *MockNbClient) PortGroupRemovePorts(pgName string, lspNames ...string) e } // PortGroupRemovePorts indicates an expected call of PortGroupRemovePorts. -func (mr *MockNbClientMockRecorder) PortGroupRemovePorts(pgName interface{}, lspNames ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) PortGroupRemovePorts(pgName any, lspNames ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{pgName}, lspNames...) + varargs := append([]any{pgName}, lspNames...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PortGroupRemovePorts", reflect.TypeOf((*MockNbClient)(nil).PortGroupRemovePorts), varargs...) } @@ -3704,7 +3709,7 @@ func (m *MockNbClient) PortGroupSetPorts(pgName string, ports []string) error { } // PortGroupSetPorts indicates an expected call of PortGroupSetPorts. -func (mr *MockNbClientMockRecorder) PortGroupSetPorts(pgName, ports interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) PortGroupSetPorts(pgName, ports any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PortGroupSetPorts", reflect.TypeOf((*MockNbClient)(nil).PortGroupSetPorts), pgName, ports) } @@ -3718,25 +3723,11 @@ func (m *MockNbClient) RemoveLogicalPatchPort(lspName, lrpName string) error { } // RemoveLogicalPatchPort indicates an expected call of RemoveLogicalPatchPort. -func (mr *MockNbClientMockRecorder) RemoveLogicalPatchPort(lspName, lrpName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) RemoveLogicalPatchPort(lspName, lrpName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveLogicalPatchPort", reflect.TypeOf((*MockNbClient)(nil).RemoveLogicalPatchPort), lspName, lrpName) } -// ResetLogicalSwitchPortMigrateOptions mocks base method. -func (m *MockNbClient) ResetLogicalSwitchPortMigrateOptions(lspName, srcNodeName, targetNodeName string, migratedFail bool) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ResetLogicalSwitchPortMigrateOptions", lspName, srcNodeName, targetNodeName, migratedFail) - ret0, _ := ret[0].(error) - return ret0 -} - -// ResetLogicalSwitchPortMigrateOptions indicates an expected call of ResetLogicalSwitchPortMigrateOptions. -func (mr *MockNbClientMockRecorder) ResetLogicalSwitchPortMigrateOptions(lspName, srcNodeName, targetNodeName, migratedFail any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResetLogicalSwitchPortMigrateOptions", reflect.TypeOf((*MockNbClient)(nil).ResetLogicalSwitchPortMigrateOptions), lspName, srcNodeName, targetNodeName, migratedFail) -} - // SGLostACL mocks base method. func (m *MockNbClient) SGLostACL(sg *v1.SecurityGroup) (bool, error) { m.ctrl.T.Helper() @@ -3753,17 +3744,17 @@ func (mr *MockNbClientMockRecorder) SGLostACL(sg any) *gomock.Call { } // SetACLLog mocks base method. -func (m *MockNbClient) SetACLLog(pgName, protocol string, logEnable, isIngress bool) error { +func (m *MockNbClient) SetACLLog(pgName string, logEnable, isIngress bool) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetACLLog", pgName, protocol, logEnable, isIngress) + ret := m.ctrl.Call(m, "SetACLLog", pgName, logEnable, isIngress) ret0, _ := ret[0].(error) return ret0 } // SetACLLog indicates an expected call of SetACLLog. -func (mr *MockNbClientMockRecorder) SetACLLog(pgName, protocol, logEnable, isIngress interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetACLLog(pgName, logEnable, isIngress any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetACLLog", reflect.TypeOf((*MockNbClient)(nil).SetACLLog), pgName, protocol, logEnable, isIngress) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetACLLog", reflect.TypeOf((*MockNbClient)(nil).SetACLLog), pgName, logEnable, isIngress) } // SetAzName mocks base method. @@ -3775,7 +3766,7 @@ func (m *MockNbClient) SetAzName(azName string) error { } // SetAzName indicates an expected call of SetAzName. -func (mr *MockNbClientMockRecorder) SetAzName(azName interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetAzName(azName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAzName", reflect.TypeOf((*MockNbClient)(nil).SetAzName), azName) } @@ -3789,7 +3780,7 @@ func (m *MockNbClient) SetICAutoRoute(enable bool, blackList []string) error { } // SetICAutoRoute indicates an expected call of SetICAutoRoute. -func (mr *MockNbClientMockRecorder) SetICAutoRoute(enable, blackList interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetICAutoRoute(enable, blackList any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetICAutoRoute", reflect.TypeOf((*MockNbClient)(nil).SetICAutoRoute), enable, blackList) } @@ -3803,7 +3794,7 @@ func (m *MockNbClient) SetLoadBalancerAffinityTimeout(lbName string, timeout int } // SetLoadBalancerAffinityTimeout indicates an expected call of SetLoadBalancerAffinityTimeout. -func (mr *MockNbClientMockRecorder) SetLoadBalancerAffinityTimeout(lbName, timeout interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLoadBalancerAffinityTimeout(lbName, timeout any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLoadBalancerAffinityTimeout", reflect.TypeOf((*MockNbClient)(nil).SetLoadBalancerAffinityTimeout), lbName, timeout) } @@ -3817,7 +3808,7 @@ func (m *MockNbClient) SetLogicalSwitchPortArpProxy(lspName string, enableArpPro } // SetLogicalSwitchPortArpProxy indicates an expected call of SetLogicalSwitchPortArpProxy. -func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortArpProxy(lspName, enableArpProxy interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortArpProxy(lspName, enableArpProxy any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortArpProxy", reflect.TypeOf((*MockNbClient)(nil).SetLogicalSwitchPortArpProxy), lspName, enableArpProxy) } @@ -3831,7 +3822,7 @@ func (m *MockNbClient) SetLogicalSwitchPortExternalIDs(lspName string, externalI } // SetLogicalSwitchPortExternalIDs indicates an expected call of SetLogicalSwitchPortExternalIDs. -func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortExternalIDs(lspName, externalIDs interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortExternalIDs(lspName, externalIDs any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortExternalIDs", reflect.TypeOf((*MockNbClient)(nil).SetLogicalSwitchPortExternalIDs), lspName, externalIDs) } @@ -3845,7 +3836,7 @@ func (m *MockNbClient) SetLogicalSwitchPortSecurity(portSecurity bool, lspName, } // SetLogicalSwitchPortSecurity indicates an expected call of SetLogicalSwitchPortSecurity. -func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortSecurity(portSecurity, lspName, mac, ips, vips interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortSecurity(portSecurity, lspName, mac, ips, vips any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortSecurity", reflect.TypeOf((*MockNbClient)(nil).SetLogicalSwitchPortSecurity), portSecurity, lspName, mac, ips, vips) } @@ -3853,7 +3844,7 @@ func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortSecurity(portSecurity, l // SetLogicalSwitchPortVirtualParents mocks base method. func (m *MockNbClient) SetLogicalSwitchPortVirtualParents(lsName, parents string, ips ...string) error { m.ctrl.T.Helper() - varargs := []interface{}{lsName, parents} + varargs := []any{lsName, parents} for _, a := range ips { varargs = append(varargs, a) } @@ -3863,9 +3854,9 @@ func (m *MockNbClient) SetLogicalSwitchPortVirtualParents(lsName, parents string } // SetLogicalSwitchPortVirtualParents indicates an expected call of SetLogicalSwitchPortVirtualParents. -func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortVirtualParents(lsName, parents interface{}, ips ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortVirtualParents(lsName, parents any, ips ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{lsName, parents}, ips...) + varargs := append([]any{lsName, parents}, ips...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortVirtualParents", reflect.TypeOf((*MockNbClient)(nil).SetLogicalSwitchPortVirtualParents), varargs...) } @@ -3878,7 +3869,7 @@ func (m *MockNbClient) SetLogicalSwitchPortVlanTag(lspName string, vlanID int) e } // SetLogicalSwitchPortVlanTag indicates an expected call of SetLogicalSwitchPortVlanTag. -func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortVlanTag(lspName, vlanID interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortVlanTag(lspName, vlanID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortVlanTag", reflect.TypeOf((*MockNbClient)(nil).SetLogicalSwitchPortVlanTag), lspName, vlanID) } @@ -3892,7 +3883,7 @@ func (m *MockNbClient) SetLogicalSwitchPortsSecurityGroup(sgName, op string) err } // SetLogicalSwitchPortsSecurityGroup indicates an expected call of SetLogicalSwitchPortsSecurityGroup. -func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortsSecurityGroup(sgName, op interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLogicalSwitchPortsSecurityGroup(sgName, op any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPortsSecurityGroup", reflect.TypeOf((*MockNbClient)(nil).SetLogicalSwitchPortsSecurityGroup), sgName, op) } @@ -3906,7 +3897,7 @@ func (m *MockNbClient) SetLogicalSwitchPrivate(lsName, cidrBlock, nodeSwitchCIDR } // SetLogicalSwitchPrivate indicates an expected call of SetLogicalSwitchPrivate. -func (mr *MockNbClientMockRecorder) SetLogicalSwitchPrivate(lsName, cidrBlock, nodeSwitchCIDR, allowSubnets interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLogicalSwitchPrivate(lsName, cidrBlock, nodeSwitchCIDR, allowSubnets any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogicalSwitchPrivate", reflect.TypeOf((*MockNbClient)(nil).SetLogicalSwitchPrivate), lsName, cidrBlock, nodeSwitchCIDR, allowSubnets) } @@ -3920,7 +3911,7 @@ func (m *MockNbClient) SetLsCtSkipDstLportIPs(enabled bool) error { } // SetLsCtSkipDstLportIPs indicates an expected call of SetLsCtSkipDstLportIPs. -func (mr *MockNbClientMockRecorder) SetLsCtSkipDstLportIPs(enabled interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLsCtSkipDstLportIPs(enabled any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLsCtSkipDstLportIPs", reflect.TypeOf((*MockNbClient)(nil).SetLsCtSkipDstLportIPs), enabled) } @@ -3934,7 +3925,7 @@ func (m *MockNbClient) SetLsDnatModDlDst(enabled bool) error { } // SetLsDnatModDlDst indicates an expected call of SetLsDnatModDlDst. -func (mr *MockNbClientMockRecorder) SetLsDnatModDlDst(enabled interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) SetLsDnatModDlDst(enabled any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLsDnatModDlDst", reflect.TypeOf((*MockNbClient)(nil).SetLsDnatModDlDst), enabled) } @@ -3962,7 +3953,7 @@ func (m *MockNbClient) Transact(method string, operations []ovsdb.Operation) err } // Transact indicates an expected call of Transact. -func (mr *MockNbClientMockRecorder) Transact(method, operations interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) Transact(method, operations any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Transact", reflect.TypeOf((*MockNbClient)(nil).Transact), method, operations) } @@ -3977,7 +3968,7 @@ func (m *MockNbClient) UpdateDHCPOptions(subnet *v1.Subnet, mtu int) (*ovs.DHCPO } // UpdateDHCPOptions indicates an expected call of UpdateDHCPOptions. -func (mr *MockNbClientMockRecorder) UpdateDHCPOptions(subnet, mtu interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateDHCPOptions(subnet, mtu any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateDHCPOptions", reflect.TypeOf((*MockNbClient)(nil).UpdateDHCPOptions), subnet, mtu) } @@ -3991,7 +3982,7 @@ func (m *MockNbClient) UpdateDnatAndSnat(lrName, externalIP, logicalIP, lspName, } // UpdateDnatAndSnat indicates an expected call of UpdateDnatAndSnat. -func (mr *MockNbClientMockRecorder) UpdateDnatAndSnat(lrName, externalIP, logicalIP, lspName, externalMac, gatewayType interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateDnatAndSnat(lrName, externalIP, logicalIP, lspName, externalMac, gatewayType any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateDnatAndSnat", reflect.TypeOf((*MockNbClient)(nil).UpdateDnatAndSnat), lrName, externalIP, logicalIP, lspName, externalMac, gatewayType) } @@ -4006,7 +3997,7 @@ func (m *MockNbClient) UpdateEgressACLOps(pgName, asEgressName, asExceptName, pr } // UpdateEgressACLOps indicates an expected call of UpdateEgressACLOps. -func (mr *MockNbClientMockRecorder) UpdateEgressACLOps(pgName, asEgressName, asExceptName, protocol, npp, logEnable, namedPortMap interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateEgressACLOps(pgName, asEgressName, asExceptName, protocol, npp, logEnable, namedPortMap any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEgressACLOps", reflect.TypeOf((*MockNbClient)(nil).UpdateEgressACLOps), pgName, asEgressName, asExceptName, protocol, npp, logEnable, namedPortMap) } @@ -4021,7 +4012,7 @@ func (m *MockNbClient) UpdateIngressACLOps(pgName, asIngressName, asExceptName, } // UpdateIngressACLOps indicates an expected call of UpdateIngressACLOps. -func (mr *MockNbClientMockRecorder) UpdateIngressACLOps(pgName, asIngressName, asExceptName, protocol, npp, logEnable, namedPortMap interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateIngressACLOps(pgName, asIngressName, asExceptName, protocol, npp, logEnable, namedPortMap any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateIngressACLOps", reflect.TypeOf((*MockNbClient)(nil).UpdateIngressACLOps), pgName, asIngressName, asExceptName, protocol, npp, logEnable, namedPortMap) } @@ -4035,7 +4026,7 @@ func (m *MockNbClient) UpdateLogicalRouterPortOptions(lrpName string, options ma } // UpdateLogicalRouterPortOptions indicates an expected call of UpdateLogicalRouterPortOptions. -func (mr *MockNbClientMockRecorder) UpdateLogicalRouterPortOptions(lrpName, options interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateLogicalRouterPortOptions(lrpName, options any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateLogicalRouterPortOptions", reflect.TypeOf((*MockNbClient)(nil).UpdateLogicalRouterPortOptions), lrpName, options) } @@ -4049,7 +4040,7 @@ func (m *MockNbClient) UpdateLogicalRouterPortRA(lrpName, ipv6RAConfigsStr strin } // UpdateLogicalRouterPortRA indicates an expected call of UpdateLogicalRouterPortRA. -func (mr *MockNbClientMockRecorder) UpdateLogicalRouterPortRA(lrpName, ipv6RAConfigsStr, enableIPv6RA interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateLogicalRouterPortRA(lrpName, ipv6RAConfigsStr, enableIPv6RA any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateLogicalRouterPortRA", reflect.TypeOf((*MockNbClient)(nil).UpdateLogicalRouterPortRA), lrpName, ipv6RAConfigsStr, enableIPv6RA) } @@ -4063,15 +4054,15 @@ func (m *MockNbClient) UpdateLogicalSwitchACL(lsName string, subnetAcls []v1.ACL } // UpdateLogicalSwitchACL indicates an expected call of UpdateLogicalSwitchACL. -func (mr *MockNbClientMockRecorder) UpdateLogicalSwitchACL(lsName, subnetAcls interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateLogicalSwitchACL(lsName, subnetAcls any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateLogicalSwitchACL", reflect.TypeOf((*MockNbClient)(nil).UpdateLogicalSwitchACL), lsName, subnetAcls) } // UpdateNbGlobal mocks base method. -func (m *MockNbClient) UpdateNbGlobal(nbGlobal *ovnnb.NBGlobal, fields ...interface{}) error { +func (m *MockNbClient) UpdateNbGlobal(nbGlobal *ovnnb.NBGlobal, fields ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{nbGlobal} + varargs := []any{nbGlobal} for _, a := range fields { varargs = append(varargs, a) } @@ -4081,9 +4072,9 @@ func (m *MockNbClient) UpdateNbGlobal(nbGlobal *ovnnb.NBGlobal, fields ...interf } // UpdateNbGlobal indicates an expected call of UpdateNbGlobal. -func (mr *MockNbClientMockRecorder) UpdateNbGlobal(nbGlobal interface{}, fields ...interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateNbGlobal(nbGlobal any, fields ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{nbGlobal}, fields...) + varargs := append([]any{nbGlobal}, fields...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateNbGlobal", reflect.TypeOf((*MockNbClient)(nil).UpdateNbGlobal), varargs...) } @@ -4096,7 +4087,7 @@ func (m *MockNbClient) UpdateSgACL(sg *v1.SecurityGroup, direction string) error } // UpdateSgACL indicates an expected call of UpdateSgACL. -func (mr *MockNbClientMockRecorder) UpdateSgACL(sg, direction interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateSgACL(sg, direction any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSgACL", reflect.TypeOf((*MockNbClient)(nil).UpdateSgACL), sg, direction) } @@ -4110,7 +4101,7 @@ func (m *MockNbClient) UpdateSnat(lrName, externalIP, logicalIP string) error { } // UpdateSnat indicates an expected call of UpdateSnat. -func (mr *MockNbClientMockRecorder) UpdateSnat(lrName, externalIP, logicalIP interface{}) *gomock.Call { +func (mr *MockNbClientMockRecorder) UpdateSnat(lrName, externalIP, logicalIP any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSnat", reflect.TypeOf((*MockNbClient)(nil).UpdateSnat), lrName, externalIP, logicalIP) } @@ -4147,7 +4138,7 @@ func (m *MockSbClient) DeleteChassis(chassisName string) error { } // DeleteChassis indicates an expected call of DeleteChassis. -func (mr *MockSbClientMockRecorder) DeleteChassis(chassisName interface{}) *gomock.Call { +func (mr *MockSbClientMockRecorder) DeleteChassis(chassisName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteChassis", reflect.TypeOf((*MockSbClient)(nil).DeleteChassis), chassisName) } @@ -4161,7 +4152,7 @@ func (m *MockSbClient) DeleteChassisByHost(node string) error { } // DeleteChassisByHost indicates an expected call of DeleteChassisByHost. -func (mr *MockSbClientMockRecorder) DeleteChassisByHost(node interface{}) *gomock.Call { +func (mr *MockSbClientMockRecorder) DeleteChassisByHost(node any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteChassisByHost", reflect.TypeOf((*MockSbClient)(nil).DeleteChassisByHost), node) } @@ -4176,7 +4167,7 @@ func (m *MockSbClient) GetAllChassisByHost(nodeName string) (*[]ovnsb.Chassis, e } // GetAllChassisByHost indicates an expected call of GetAllChassisByHost. -func (mr *MockSbClientMockRecorder) GetAllChassisByHost(nodeName interface{}) *gomock.Call { +func (mr *MockSbClientMockRecorder) GetAllChassisByHost(nodeName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllChassisByHost", reflect.TypeOf((*MockSbClient)(nil).GetAllChassisByHost), nodeName) } @@ -4191,7 +4182,7 @@ func (m *MockSbClient) GetChassis(chassisName string, ignoreNotFound bool) (*ovn } // GetChassis indicates an expected call of GetChassis. -func (mr *MockSbClientMockRecorder) GetChassis(chassisName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockSbClientMockRecorder) GetChassis(chassisName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChassis", reflect.TypeOf((*MockSbClient)(nil).GetChassis), chassisName, ignoreNotFound) } @@ -4206,13 +4197,13 @@ func (m *MockSbClient) GetChassisByHost(nodeName string) (*ovnsb.Chassis, error) } // GetChassisByHost indicates an expected call of GetChassisByHost. -func (mr *MockSbClientMockRecorder) GetChassisByHost(nodeName interface{}) *gomock.Call { +func (mr *MockSbClientMockRecorder) GetChassisByHost(nodeName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChassisByHost", reflect.TypeOf((*MockSbClient)(nil).GetChassisByHost), nodeName) } // GetEntityInfo mocks base method. -func (m *MockSbClient) GetEntityInfo(entity interface{}) error { +func (m *MockSbClient) GetEntityInfo(entity any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetEntityInfo", entity) ret0, _ := ret[0].(error) @@ -4220,7 +4211,7 @@ func (m *MockSbClient) GetEntityInfo(entity interface{}) error { } // GetEntityInfo indicates an expected call of GetEntityInfo. -func (mr *MockSbClientMockRecorder) GetEntityInfo(entity interface{}) *gomock.Call { +func (mr *MockSbClientMockRecorder) GetEntityInfo(entity any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEntityInfo", reflect.TypeOf((*MockSbClient)(nil).GetEntityInfo), entity) } @@ -4264,15 +4255,15 @@ func (m *MockSbClient) Transact(method string, operations []ovsdb.Operation) err } // Transact indicates an expected call of Transact. -func (mr *MockSbClientMockRecorder) Transact(method, operations interface{}) *gomock.Call { +func (mr *MockSbClientMockRecorder) Transact(method, operations any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Transact", reflect.TypeOf((*MockSbClient)(nil).Transact), method, operations) } // UpdateChassis mocks base method. -func (m *MockSbClient) UpdateChassis(chassis *ovnsb.Chassis, fields ...interface{}) error { +func (m *MockSbClient) UpdateChassis(chassis *ovnsb.Chassis, fields ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{chassis} + varargs := []any{chassis} for _, a := range fields { varargs = append(varargs, a) } @@ -4282,9 +4273,9 @@ func (m *MockSbClient) UpdateChassis(chassis *ovnsb.Chassis, fields ...interface } // UpdateChassis indicates an expected call of UpdateChassis. -func (mr *MockSbClientMockRecorder) UpdateChassis(chassis interface{}, fields ...interface{}) *gomock.Call { +func (mr *MockSbClientMockRecorder) UpdateChassis(chassis any, fields ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{chassis}, fields...) + varargs := append([]any{chassis}, fields...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateChassis", reflect.TypeOf((*MockSbClient)(nil).UpdateChassis), varargs...) } @@ -4297,7 +4288,7 @@ func (m *MockSbClient) UpdateChassisTag(chassisName, nodeName string) error { } // UpdateChassisTag indicates an expected call of UpdateChassisTag. -func (mr *MockSbClientMockRecorder) UpdateChassisTag(chassisName, nodeName interface{}) *gomock.Call { +func (mr *MockSbClientMockRecorder) UpdateChassisTag(chassisName, nodeName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateChassisTag", reflect.TypeOf((*MockSbClient)(nil).UpdateChassisTag), chassisName, nodeName) } @@ -4326,7 +4317,7 @@ func (m *MockCommon) EXPECT() *MockCommonMockRecorder { } // GetEntityInfo mocks base method. -func (m *MockCommon) GetEntityInfo(entity interface{}) error { +func (m *MockCommon) GetEntityInfo(entity any) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetEntityInfo", entity) ret0, _ := ret[0].(error) @@ -4334,7 +4325,7 @@ func (m *MockCommon) GetEntityInfo(entity interface{}) error { } // GetEntityInfo indicates an expected call of GetEntityInfo. -func (mr *MockCommonMockRecorder) GetEntityInfo(entity interface{}) *gomock.Call { +func (mr *MockCommonMockRecorder) GetEntityInfo(entity any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEntityInfo", reflect.TypeOf((*MockCommon)(nil).GetEntityInfo), entity) } @@ -4348,7 +4339,7 @@ func (m *MockCommon) Transact(method string, operations []ovsdb.Operation) error } // Transact indicates an expected call of Transact. -func (mr *MockCommonMockRecorder) Transact(method, operations interface{}) *gomock.Call { +func (mr *MockCommonMockRecorder) Transact(method, operations any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Transact", reflect.TypeOf((*MockCommon)(nil).Transact), method, operations) } @@ -4385,7 +4376,7 @@ func (m *MockChassis) DeleteChassis(chassisName string) error { } // DeleteChassis indicates an expected call of DeleteChassis. -func (mr *MockChassisMockRecorder) DeleteChassis(chassisName interface{}) *gomock.Call { +func (mr *MockChassisMockRecorder) DeleteChassis(chassisName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteChassis", reflect.TypeOf((*MockChassis)(nil).DeleteChassis), chassisName) } @@ -4399,7 +4390,7 @@ func (m *MockChassis) DeleteChassisByHost(node string) error { } // DeleteChassisByHost indicates an expected call of DeleteChassisByHost. -func (mr *MockChassisMockRecorder) DeleteChassisByHost(node interface{}) *gomock.Call { +func (mr *MockChassisMockRecorder) DeleteChassisByHost(node any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteChassisByHost", reflect.TypeOf((*MockChassis)(nil).DeleteChassisByHost), node) } @@ -4414,7 +4405,7 @@ func (m *MockChassis) GetAllChassisByHost(nodeName string) (*[]ovnsb.Chassis, er } // GetAllChassisByHost indicates an expected call of GetAllChassisByHost. -func (mr *MockChassisMockRecorder) GetAllChassisByHost(nodeName interface{}) *gomock.Call { +func (mr *MockChassisMockRecorder) GetAllChassisByHost(nodeName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllChassisByHost", reflect.TypeOf((*MockChassis)(nil).GetAllChassisByHost), nodeName) } @@ -4429,7 +4420,7 @@ func (m *MockChassis) GetChassis(chassisName string, ignoreNotFound bool) (*ovns } // GetChassis indicates an expected call of GetChassis. -func (mr *MockChassisMockRecorder) GetChassis(chassisName, ignoreNotFound interface{}) *gomock.Call { +func (mr *MockChassisMockRecorder) GetChassis(chassisName, ignoreNotFound any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChassis", reflect.TypeOf((*MockChassis)(nil).GetChassis), chassisName, ignoreNotFound) } @@ -4444,7 +4435,7 @@ func (m *MockChassis) GetChassisByHost(nodeName string) (*ovnsb.Chassis, error) } // GetChassisByHost indicates an expected call of GetChassisByHost. -func (mr *MockChassisMockRecorder) GetChassisByHost(nodeName interface{}) *gomock.Call { +func (mr *MockChassisMockRecorder) GetChassisByHost(nodeName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChassisByHost", reflect.TypeOf((*MockChassis)(nil).GetChassisByHost), nodeName) } @@ -4480,9 +4471,9 @@ func (mr *MockChassisMockRecorder) ListChassis() *gomock.Call { } // UpdateChassis mocks base method. -func (m *MockChassis) UpdateChassis(chassis *ovnsb.Chassis, fields ...interface{}) error { +func (m *MockChassis) UpdateChassis(chassis *ovnsb.Chassis, fields ...any) error { m.ctrl.T.Helper() - varargs := []interface{}{chassis} + varargs := []any{chassis} for _, a := range fields { varargs = append(varargs, a) } @@ -4492,9 +4483,9 @@ func (m *MockChassis) UpdateChassis(chassis *ovnsb.Chassis, fields ...interface{ } // UpdateChassis indicates an expected call of UpdateChassis. -func (mr *MockChassisMockRecorder) UpdateChassis(chassis interface{}, fields ...interface{}) *gomock.Call { +func (mr *MockChassisMockRecorder) UpdateChassis(chassis any, fields ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{chassis}, fields...) + varargs := append([]any{chassis}, fields...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateChassis", reflect.TypeOf((*MockChassis)(nil).UpdateChassis), varargs...) } @@ -4507,7 +4498,7 @@ func (m *MockChassis) UpdateChassisTag(chassisName, nodeName string) error { } // UpdateChassisTag indicates an expected call of UpdateChassisTag. -func (mr *MockChassisMockRecorder) UpdateChassisTag(chassisName, nodeName interface{}) *gomock.Call { +func (mr *MockChassisMockRecorder) UpdateChassisTag(chassisName, nodeName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateChassisTag", reflect.TypeOf((*MockChassis)(nil).UpdateChassisTag), chassisName, nodeName) } diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go index f5e62425469a..c012e0ffcd9e 100644 --- a/pkg/controller/controller_test.go +++ b/pkg/controller/controller_test.go @@ -3,8 +3,8 @@ package controller import ( "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "k8s.io/client-go/informers" coreinformers "k8s.io/client-go/informers/core/v1" diff --git a/pkg/controller/network_policy.go b/pkg/controller/network_policy.go index a2a9f3111384..f7bcf22ce965 100644 --- a/pkg/controller/network_policy.go +++ b/pkg/controller/network_policy.go @@ -337,17 +337,16 @@ func (c *Controller) handleUpdateNp(key string) error { ingressACLOps = append(ingressACLOps, ops...) } - - if err = c.OVNNbClient.Transact("add-ingress-acls", ingressACLOps); err != nil { - return fmt.Errorf("add ingress acls to %s: %v", pgName, err) - } - - if err = c.OVNNbClient.SetACLLog(pgName, protocol, logEnable, true); err != nil { - // just log and do not return err here - klog.Errorf("failed to set ingress acl log for np %s, %v", key, err) - } } } + if err := c.OVNNbClient.Transact("add-ingress-acls", ingressACLOps); err != nil { + return fmt.Errorf("add ingress acls to %s: %v", pgName, err) + } + + if err := c.OVNNbClient.SetACLLog(pgName, logEnable, true); err != nil { + // just log and do not return err here + klog.Errorf("failed to set ingress acl log for np %s, %v", key, err) + } ass, err := c.OVNNbClient.ListAddressSets(map[string]string{ networkPolicyKey: fmt.Sprintf("%s/%s/%s", np.Namespace, npName, "ingress"), @@ -491,16 +490,16 @@ func (c *Controller) handleUpdateNp(key string) error { egressACLOps = append(egressACLOps, ops...) } - if err = c.OVNNbClient.Transact("add-egress-acls", egressACLOps); err != nil { - return fmt.Errorf("add egress acls to %s: %v", pgName, err) - } - - if err = c.OVNNbClient.SetACLLog(pgName, protocol, logEnable, false); err != nil { - // just log and do not return err here - klog.Errorf("failed to set egress acl log for np %s, %v", key, err) - } } } + if err := c.OVNNbClient.Transact("add-egress-acls", egressACLOps); err != nil { + return fmt.Errorf("add egress acls to %s: %v", pgName, err) + } + + if err := c.OVNNbClient.SetACLLog(pgName, logEnable, false); err != nil { + // just log and do not return err here + klog.Errorf("failed to set egress acl log for np %s, %v", key, err) + } ass, err := c.OVNNbClient.ListAddressSets(map[string]string{ networkPolicyKey: fmt.Sprintf("%s/%s/%s", np.Namespace, npName, "egress"), diff --git a/pkg/controller/security_group_test.go b/pkg/controller/security_group_test.go index a4516c238cdd..dbd6fecb5c76 100644 --- a/pkg/controller/security_group_test.go +++ b/pkg/controller/security_group_test.go @@ -3,8 +3,8 @@ package controller import ( "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "github.com/kubeovn/kube-ovn/pkg/ovs" "github.com/kubeovn/kube-ovn/pkg/ovsdb/ovnnb" diff --git a/pkg/controller/subnet_test.go b/pkg/controller/subnet_test.go index f328ddf1ea83..f6e2eefa1de0 100644 --- a/pkg/controller/subnet_test.go +++ b/pkg/controller/subnet_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/ovs/interface.go b/pkg/ovs/interface.go index dd7caaa108f1..e290c765022e 100644 --- a/pkg/ovs/interface.go +++ b/pkg/ovs/interface.go @@ -124,7 +124,7 @@ type ACL interface { CreateSgBaseACL(sgName, direction string) error UpdateSgACL(sg *kubeovnv1.SecurityGroup, direction string) error UpdateLogicalSwitchACL(lsName string, subnetAcls []kubeovnv1.ACL) error - SetACLLog(pgName, protocol string, logEnable, isIngress bool) error + SetACLLog(pgName string, logEnable, isIngress bool) error SetLogicalSwitchPrivate(lsName, cidrBlock, nodeSwitchCIDR string, allowSubnets []string) error SGLostACL(sg *kubeovnv1.SecurityGroup) (bool, error) DeleteAcls(parentName, parentType, direction string, externalIDs map[string]string) error diff --git a/pkg/ovs/ovn-nb-acl.go b/pkg/ovs/ovn-nb-acl.go index 23138e3692b0..f726480a601f 100644 --- a/pkg/ovs/ovn-nb-acl.go +++ b/pkg/ovs/ovn-nb-acl.go @@ -24,15 +24,10 @@ func (c *OVNNbClient) UpdateIngressACLOps(pgName, asIngressName, asExceptName, p if strings.HasSuffix(asIngressName, ".0") || strings.HasSuffix(asIngressName, ".all") { // create the default drop rule for only once - ipSuffix := "ip4" - if protocol == kubeovnv1.ProtocolIPv6 { - ipSuffix = "ip6" - } - - /* default drop acl */ + // both IPv4 and IPv6 traffic should be forbade in dual-stack situation allIPMatch := NewAndACLMatch( NewACLMatch("outport", "==", "@"+pgName, ""), - NewACLMatch(ipSuffix, "", "", ""), + NewACLMatch("ip", "", "", ""), ) options := func(acl *ovnnb.ACL) { if logEnable { @@ -74,15 +69,10 @@ func (c *OVNNbClient) UpdateEgressACLOps(pgName, asEgressName, asExceptName, pro if strings.HasSuffix(asEgressName, ".0") || strings.HasSuffix(asEgressName, ".all") { // create the default drop rule for only once - ipSuffix := "ip4" - if protocol == kubeovnv1.ProtocolIPv6 { - ipSuffix = "ip6" - } - - /* default drop acl */ + // both IPv4 and IPv6 traffic should be forbade in dual-stack situation allIPMatch := NewAndACLMatch( NewACLMatch("inport", "==", "@"+pgName, ""), - NewACLMatch(ipSuffix, "", "", ""), + NewACLMatch("ip", "", "", ""), ) options := func(acl *ovnnb.ACL) { if logEnable { @@ -595,7 +585,7 @@ func (c *OVNNbClient) SetLogicalSwitchPrivate(lsName, cidrBlock, nodeSwitchCIDR return nil } -func (c *OVNNbClient) SetACLLog(pgName, protocol string, logEnable, isIngress bool) error { +func (c *OVNNbClient) SetACLLog(pgName string, logEnable, isIngress bool) error { direction := ovnnb.ACLDirectionToLport portDirection := "outport" if !isIngress { @@ -603,15 +593,10 @@ func (c *OVNNbClient) SetACLLog(pgName, protocol string, logEnable, isIngress bo portDirection = "inport" } - ipSuffix := "ip4" - if protocol == kubeovnv1.ProtocolIPv6 { - ipSuffix = "ip6" - } - // match all traffic to or from pgName allIPMatch := NewAndACLMatch( NewACLMatch(portDirection, "==", "@"+pgName, ""), - NewACLMatch(ipSuffix, "", "", ""), + NewACLMatch("ip", "", "", ""), ) acl, err := c.GetACL(pgName, direction, util.IngressDefaultDrop, allIPMatch.String(), true) @@ -624,6 +609,9 @@ func (c *OVNNbClient) SetACLLog(pgName, protocol string, logEnable, isIngress bo return nil // skip if acl not found } + if acl.Log == logEnable { + return nil + } acl.Log = logEnable err = c.UpdateACL(acl, &acl.Log) diff --git a/pkg/ovs/ovn-nb-acl_test.go b/pkg/ovs/ovn-nb-acl_test.go index 9738c7e88814..5eee92677433 100644 --- a/pkg/ovs/ovn-nb-acl_test.go +++ b/pkg/ovs/ovn-nb-acl_test.go @@ -94,7 +94,7 @@ func (suite *OvnClientTestSuite) testUpdateIngressACLOps() { require.NoError(t, err) require.Len(t, ops, 4) - expect(ops[0].Row, "drop", ovnnb.ACLDirectionToLport, fmt.Sprintf("outport == @%s && ip4", pgName), util.IngressDefaultDrop) + expect(ops[0].Row, "drop", ovnnb.ACLDirectionToLport, fmt.Sprintf("outport == @%s && ip", pgName), util.IngressDefaultDrop) matches := newNetworkPolicyACLMatch(pgName, asIngressName, asExceptName, protocol, ovnnb.ACLDirectionToLport, npp, nil) i := 1 @@ -120,7 +120,7 @@ func (suite *OvnClientTestSuite) testUpdateIngressACLOps() { require.NoError(t, err) require.Len(t, ops, 3) - expect(ops[0].Row, "drop", ovnnb.ACLDirectionToLport, fmt.Sprintf("outport == @%s && ip6", pgName), util.IngressDefaultDrop) + expect(ops[0].Row, "drop", ovnnb.ACLDirectionToLport, fmt.Sprintf("outport == @%s && ip", pgName), util.IngressDefaultDrop) matches := newNetworkPolicyACLMatch(pgName, asIngressName, asExceptName, protocol, ovnnb.ACLDirectionToLport, nil, nil) i := 1 @@ -164,7 +164,7 @@ func (suite *OvnClientTestSuite) testUpdateEgressACLOps() { require.NoError(t, err) require.Len(t, ops, 4) - expect(ops[0].Row, "drop", ovnnb.ACLDirectionFromLport, fmt.Sprintf("inport == @%s && ip4", pgName), util.EgressDefaultDrop) + expect(ops[0].Row, "drop", ovnnb.ACLDirectionFromLport, fmt.Sprintf("inport == @%s && ip", pgName), util.EgressDefaultDrop) matches := newNetworkPolicyACLMatch(pgName, asEgressName, asExceptName, protocol, ovnnb.ACLDirectionFromLport, npp, nil) i := 1 @@ -190,7 +190,7 @@ func (suite *OvnClientTestSuite) testUpdateEgressACLOps() { require.NoError(t, err) require.Len(t, ops, 3) - expect(ops[0].Row, "drop", ovnnb.ACLDirectionFromLport, fmt.Sprintf("inport == @%s && ip6", pgName), util.EgressDefaultDrop) + expect(ops[0].Row, "drop", ovnnb.ACLDirectionFromLport, fmt.Sprintf("inport == @%s && ip", pgName), util.EgressDefaultDrop) matches := newNetworkPolicyACLMatch(pgName, asEgressName, asExceptName, protocol, ovnnb.ACLDirectionFromLport, nil, nil) i := 1 @@ -702,7 +702,7 @@ func (suite *OvnClientTestSuite) testSetACLLog() { require.NoError(t, err) t.Run("set ingress acl log to false", func(t *testing.T) { - match := fmt.Sprintf("outport == @%s && ip4", pgName) + match := fmt.Sprintf("outport == @%s && ip", pgName) acl := newACL(pgName, ovnnb.ACLDirectionToLport, util.IngressDefaultDrop, match, ovnnb.ACLActionDrop, func(acl *ovnnb.ACL) { acl.Name = &pgName acl.Log = true @@ -712,7 +712,7 @@ func (suite *OvnClientTestSuite) testSetACLLog() { err = ovnClient.CreateAcls(pgName, portGroupKey, acl) require.NoError(t, err) - err = ovnClient.SetACLLog(pgName, kubeovnv1.ProtocolIPv4, false, true) + err = ovnClient.SetACLLog(pgName, false, true) require.NoError(t, err) acl, err = ovnClient.GetACL(pgName, ovnnb.ACLDirectionToLport, util.IngressDefaultDrop, match, false) @@ -721,7 +721,7 @@ func (suite *OvnClientTestSuite) testSetACLLog() { }) t.Run("set egress acl log to false", func(t *testing.T) { - match := fmt.Sprintf("inport == @%s && ip4", pgName) + match := fmt.Sprintf("inport == @%s && ip", pgName) acl := newACL(pgName, ovnnb.ACLDirectionFromLport, util.IngressDefaultDrop, match, ovnnb.ACLActionDrop, func(acl *ovnnb.ACL) { acl.Name = &pgName acl.Log = false @@ -731,7 +731,7 @@ func (suite *OvnClientTestSuite) testSetACLLog() { err = ovnClient.CreateAcls(pgName, portGroupKey, acl) require.NoError(t, err) - err = ovnClient.SetACLLog(pgName, kubeovnv1.ProtocolIPv4, true, false) + err = ovnClient.SetACLLog(pgName, true, false) require.NoError(t, err) acl, err = ovnClient.GetACL(pgName, ovnnb.ACLDirectionFromLport, util.IngressDefaultDrop, match, false)