This commit is contained in:
Lars Ekman 2022-12-23 10:14:47 +01:00
parent b169f22eb8
commit 3bd3759424
2 changed files with 36 additions and 35 deletions

View File

@ -770,9 +770,9 @@ func CanUseIPVSProxier(ipvs utilipvs.Interface, ipsetver IPSetVersioner, schedul
// from documentation is not unheard of, so the restricion to not use the TEST-NET-2 range // from documentation is not unheard of, so the restricion to not use the TEST-NET-2 range
// must be documented. // must be documented.
vs := utilipvs.VirtualServer{ vs := utilipvs.VirtualServer{
Address: net.ParseIP("198.51.100.0"), Address: net.ParseIP("198.51.100.0"),
Protocol: "TCP", Protocol: "TCP",
Port: 20000, Port: 20000,
Scheduler: scheduler, Scheduler: scheduler,
} }
if err := ipvs.AddVirtualServer(&vs); err != nil { if err := ipvs.AddVirtualServer(&vs); err != nil {

View File

@ -77,9 +77,10 @@ func (f *fakeIPGetter) BindedIPs() (sets.String, error) {
// fakeIpvs implements utilipvs.Interface // fakeIpvs implements utilipvs.Interface
type fakeIpvs struct { type fakeIpvs struct {
ipvsErr string ipvsErr string
vsCreated bool vsCreated bool
} }
func (f *fakeIpvs) Flush() error { func (f *fakeIpvs) Flush() error {
return nil return nil
} }
@ -107,7 +108,7 @@ func (f *fakeIpvs) GetVirtualServers() ([]*utilipvs.VirtualServer, error) {
return nil, fmt.Errorf("oops") return nil, fmt.Errorf("oops")
} }
if f.vsCreated { if f.vsCreated {
vs := []*utilipvs.VirtualServer{&utilipvs.VirtualServer{}} vs := []*utilipvs.VirtualServer{{}}
return vs, nil return vs, nil
} }
return nil, nil return nil, nil
@ -312,48 +313,48 @@ func TestCleanupLeftovers(t *testing.T) {
func TestCanUseIPVSProxier(t *testing.T) { func TestCanUseIPVSProxier(t *testing.T) {
testCases := []struct { testCases := []struct {
name string name string
scheduler string scheduler string
ipsetVersion string ipsetVersion string
ipsetErr error ipsetErr error
ipvsErr string ipvsErr string
ok bool ok bool
}{ }{
{ {
name: "happy days", name: "happy days",
ipsetVersion: MinIPSetCheckVersion, ipsetVersion: MinIPSetCheckVersion,
ok: true, ok: true,
}, },
{ {
name: "ipset error", name: "ipset error",
scheduler: "", scheduler: "",
ipsetVersion: MinIPSetCheckVersion, ipsetVersion: MinIPSetCheckVersion,
ipsetErr: fmt.Errorf("oops"), ipsetErr: fmt.Errorf("oops"),
ok: false, ok: false,
}, },
{ {
name: "ipset version too low", name: "ipset version too low",
scheduler: "rr", scheduler: "rr",
ipsetVersion: "4.3.0", ipsetVersion: "4.3.0",
ok: false, ok: false,
}, },
{ {
name: "GetVirtualServers fail", name: "GetVirtualServers fail",
ipsetVersion: MinIPSetCheckVersion, ipsetVersion: MinIPSetCheckVersion,
ipvsErr: "GetVirtualServers", ipvsErr: "GetVirtualServers",
ok: false, ok: false,
}, },
{ {
name: "AddVirtualServer fail", name: "AddVirtualServer fail",
ipsetVersion: MinIPSetCheckVersion, ipsetVersion: MinIPSetCheckVersion,
ipvsErr: "AddVirtualServer", ipvsErr: "AddVirtualServer",
ok: false, ok: false,
}, },
{ {
name: "DeleteVirtualServer fail", name: "DeleteVirtualServer fail",
ipsetVersion: MinIPSetCheckVersion, ipsetVersion: MinIPSetCheckVersion,
ipvsErr: "DeleteVirtualServer", ipvsErr: "DeleteVirtualServer",
ok: false, ok: false,
}, },
} }