Replace multus code with NPWG client library code

This commit is contained in:
Tomofumi Hayashi
2019-12-05 15:43:27 +09:00
committed by Tomofumi Hayashi
parent f4f2f65d1d
commit 9874c14e23
266 changed files with 28931 additions and 513 deletions

View File

@@ -37,6 +37,8 @@ import (
"github.com/intel/multus-cni/logging"
testhelpers "github.com/intel/multus-cni/testing"
"github.com/intel/multus-cni/types"
netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake"
"k8s.io/client-go/kubernetes/fake"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -159,6 +161,14 @@ func (f *fakeExec) FindInPath(plugin string, paths []string) (string, error) {
return filepath.Join(paths[0], plugin), nil
}
// NewFakeClientInfo returns fake client (just for testing)
func NewFakeClientInfo() *k8sclient.ClientInfo {
return &k8sclient.ClientInfo{
Client: fake.NewSimpleClientset(),
NetClient: netfake.NewSimpleClientset().K8sCniCncfIoV1(),
}
}
var _ = Describe("multus operations", func() {
var testNS ns.NetNS
var tmpDir string
@@ -1334,7 +1344,7 @@ var _ = Describe("multus operations", func() {
},
}, nil)
clientInfo := k8sclient.NewFakeClientInfo()
clientInfo := NewFakeClientInfo()
_, err := clientInfo.Client.Core().Pods(fakePod.ObjectMeta.Namespace).Create(fakePod)
Expect(err).NotTo(HaveOccurred())
@@ -1413,7 +1423,7 @@ var _ = Describe("multus operations", func() {
},
}, nil)
clientInfo := k8sclient.NewFakeClientInfo()
clientInfo := NewFakeClientInfo()
_, err := clientInfo.Client.Core().Pods(fakePod.ObjectMeta.Namespace).Create(fakePod)
Expect(err).NotTo(HaveOccurred())
@@ -1482,7 +1492,7 @@ var _ = Describe("multus operations", func() {
},
}, nil)
clientInfo := k8sclient.NewFakeClientInfo()
clientInfo := NewFakeClientInfo()
_, err := clientInfo.Client.Core().Pods(fakePod.ObjectMeta.Namespace).Create(fakePod)
Expect(err).NotTo(HaveOccurred())
@@ -1552,7 +1562,7 @@ var _ = Describe("multus operations", func() {
},
}, nil)
fKubeClient := k8sclient.NewFakeClientInfo()
fKubeClient := NewFakeClientInfo()
fKubeClient.AddPod(fakePod)
_, err := fKubeClient.AddNetAttachDef(
testhelpers.NewFakeNetAttachDef(fakePod.ObjectMeta.Namespace, "net1", net1))
@@ -1620,7 +1630,7 @@ var _ = Describe("multus operations", func() {
},
}, nil)
fKubeClient := k8sclient.NewFakeClientInfo()
fKubeClient := NewFakeClientInfo()
fKubeClient.AddPod(fakePod)
_, err := fKubeClient.AddNetAttachDef(
testhelpers.NewFakeNetAttachDef(fakePod.ObjectMeta.Namespace, "net1", net1))
@@ -1720,7 +1730,7 @@ var _ = Describe("multus operations", func() {
fExec := &fakeExec{}
fExec.addPlugin020(nil, "eth0", net1, expectedResult1, nil)
fKubeClient := k8sclient.NewFakeClientInfo()
fKubeClient := NewFakeClientInfo()
fKubeClient.AddPod(fakePod)
_, err := fKubeClient.AddNetAttachDef(testhelpers.NewFakeNetAttachDef("kube-system", "net1", net1))
Expect(err).NotTo(HaveOccurred())
@@ -1789,7 +1799,7 @@ var _ = Describe("multus operations", func() {
},
}, nil)
fKubeClient := k8sclient.NewFakeClientInfo()
fKubeClient := NewFakeClientInfo()
fKubeClient.AddPod(fakePod)
_, err = fKubeClient.AddNetAttachDef(
testhelpers.NewFakeNetAttachDef(fakePod.ObjectMeta.Namespace, "net1", net1))
@@ -1865,7 +1875,7 @@ var _ = Describe("multus operations", func() {
},
}, nil)
fKubeClient := k8sclient.NewFakeClientInfo()
fKubeClient := NewFakeClientInfo()
fKubeClient.AddPod(fakePod)
_, err = fKubeClient.AddNetAttachDef(
testhelpers.NewFakeNetAttachDef(fakePod.ObjectMeta.Namespace, "net1", net1))