rancher/multus-cni
1
0
Fork 0
forked from github/multus-cni
Code Issues Pull Requests Projects Releases Wiki Activity

Bump libcni version

Browse Source
This commit is contained in:
Tomofumi Hayashi
2021-03-11 04:14:57 +09:00
parent dc9315f125
commit 5feb1343cd
20 changed files with 437 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/multus/multus_test.go
View File

@@ -34,11 +34,11 @@ import (
cniversion "github.com/containernetworking/cni/pkg/version"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake"
"gopkg.in/intel/multus-cni.v3/pkg/k8sclient"
"gopkg.in/intel/multus-cni.v3/pkg/logging"
testhelpers "gopkg.in/intel/multus-cni.v3/pkg/testing"
"gopkg.in/intel/multus-cni.v3/pkg/types"
netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"
@@ -64,10 +64,11 @@ type fakePlugin struct {
type fakeExec struct {
cniversion.PluginDecoder
addIndex int
delIndex int
chkIndex int
plugins []*fakePlugin
addIndex int
delIndex int
chkIndex int
expectedDelSkip int
plugins []*fakePlugin
}
func (f *fakeExec) addPlugin(expectedEnv []string, expectedIfname, expectedConf string, result *current.Result, err error) {
@@ -78,6 +79,9 @@ func (f *fakeExec) addPlugin(expectedEnv []string, expectedIfname, expectedConf
result: result,
err: err,
})
if err != nil && err.Error() == "missing network name" {
f.expectedDelSkip++
}
}
func (f *fakeExec) addPlugin020(expectedEnv []string, expectedIfname, expectedConf string, result *types020.Result, err error) {
@@ -88,6 +92,9 @@ func (f *fakeExec) addPlugin020(expectedEnv []string, expectedIfname, expectedCo
result: result,
err: err,
})
if err != nil && err.Error() == "missing network name" {
f.expectedDelSkip++
}
}
func matchArray(a1, a2 []string) {
@@ -135,7 +142,7 @@ func (f *fakeExec) ExecPlugin(ctx context.Context, pluginPath string, stdinData
f.chkIndex++
case "DEL":
Expect(len(f.plugins)).To(BeNumerically(">", f.delIndex))
index = len(f.plugins) - f.delIndex - 1
index = len(f.plugins) - f.expectedDelSkip - f.delIndex - 1
f.delIndex++
default:
// Should never be reached
@@ -143,7 +150,8 @@ func (f *fakeExec) ExecPlugin(ctx context.Context, pluginPath string, stdinData
}
plugin := f.plugins[index]
GinkgoT().Logf("[%s %d] exec plugin %q found %+v\n", cmd, index, pluginPath, plugin)
//GinkgoT().Logf("[%s %d] exec plugin %q found %+v\n", cmd, index, pluginPath, plugin)
fmt.Printf("[%s %d] exec plugin %q found %+v\n", cmd, index, pluginPath, plugin)
// strip prevResult from stdinData; tests don't need it
var m map[string]interface{}
@@ -1284,7 +1292,7 @@ var _ = Describe("multus operations cniVersion 0.2.0 config", func() {
os.Setenv("CNI_COMMAND", "ADD")
os.Setenv("CNI_IFNAME", "eth0")
_, err = CmdAdd(args, fExec, nil)
Expect(fExec.addIndex).To(Equal(2))
Expect(fExec.addIndex).To(Equal(1))
Expect(fExec.delIndex).To(Equal(2))
Expect(err).To(HaveOccurred())
@@ -2527,14 +2535,14 @@ var _ = Describe("multus operations cniVersion 0.4.0 config", func() {
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
// This plugin invocation should fail
err := fmt.Errorf("expected plugin failure")
err := fmt.Errorf("missing network name")
fExec.addPlugin(nil, "net1", expectedConf2, nil, err)
os.Setenv("CNI_COMMAND", "ADD")
os.Setenv("CNI_IFNAME", "eth0")
_, err = CmdAdd(args, fExec, nil)
Expect(fExec.addIndex).To(Equal(2))
Expect(fExec.delIndex).To(Equal(2))
Expect(fExec.addIndex).To(Equal(1))
Expect(fExec.delIndex).To(Equal(1))
Expect(err).To(HaveOccurred())
// Cleanup default network file.