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

adding k8sclient bug fixes

Browse Source
This commit is contained in:
rkamudhan
2018-07-27 01:10:00 +01:00
committed by Kuralamudhan Ramakrishnan
parent 7372922617
commit 707007abba
3 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
k8sclient/k8sclient_test.go
View File

@@ -79,17 +79,19 @@ var _ = Describe("k8sclient operations", func() {
kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, args, tmpDir)
k8sArgs, err := GetK8sArgs(args)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, k8sArgs, tmpDir)
Expect(err).NotTo(HaveOccurred())
Expect(fKubeClient.PodCount).To(Equal(1))
Expect(fKubeClient.NetCount).To(Equal(2))
Expect(len(delegates)).To(Equal(2))
Expect(delegates[0].Name).To(Equal("net1"))
Expect(delegates[0].Type).To(Equal("mynet"))
Expect(delegates[0].Conf.Name).To(Equal("net1"))
Expect(delegates[0].Conf.Type).To(Equal("mynet"))
Expect(delegates[0].MasterPlugin).To(BeFalse())
Expect(delegates[1].Name).To(Equal("net2"))
Expect(delegates[1].Type).To(Equal("mynet2"))
Expect(delegates[1].Conf.Name).To(Equal("net2"))
Expect(delegates[1].Conf.Type).To(Equal("mynet2"))
Expect(delegates[1].MasterPlugin).To(BeFalse())
})
@@ -110,7 +112,9 @@ var _ = Describe("k8sclient operations", func() {
kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, args, tmpDir)
k8sArgs, err := GetK8sArgs(args)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, k8sArgs, tmpDir)
Expect(len(delegates)).To(Equal(0))
Expect(err).To(MatchError("GetK8sNetwork: failed getting the delegate: getKubernetesDelegate: failed to get network resource, refer Multus README.md for the usage guide: resource not found"))
})
@@ -152,18 +156,20 @@ var _ = Describe("k8sclient operations", func() {
kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, args, tmpDir)
k8sArgs, err := GetK8sArgs(args)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, k8sArgs, tmpDir)
Expect(err).NotTo(HaveOccurred())
Expect(fKubeClient.PodCount).To(Equal(1))
Expect(fKubeClient.NetCount).To(Equal(3))
Expect(len(delegates)).To(Equal(3))
Expect(delegates[0].Name).To(Equal("net1"))
Expect(delegates[0].Type).To(Equal("mynet"))
Expect(delegates[1].Name).To(Equal("net2"))
Expect(delegates[1].Type).To(Equal("mynet2"))
Expect(delegates[2].Name).To(Equal("net3"))
Expect(delegates[2].Type).To(Equal("mynet3"))
Expect(delegates[0].Conf.Name).To(Equal("net1"))
Expect(delegates[0].Conf.Type).To(Equal("mynet"))
Expect(delegates[1].Conf.Name).To(Equal("net2"))
Expect(delegates[1].Conf.Type).To(Equal("mynet2"))
Expect(delegates[2].Conf.Name).To(Equal("net3"))
Expect(delegates[2].Conf.Type).To(Equal("mynet3"))
})
It("fails when the JSON format annotation is invalid", func() {
@@ -177,7 +183,9 @@ var _ = Describe("k8sclient operations", func() {
kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, args, tmpDir)
k8sArgs, err := GetK8sArgs(args)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, k8sArgs, tmpDir)
Expect(len(delegates)).To(Equal(0))
Expect(err).To(MatchError("parsePodNetworkAnnotation: failed to parse pod Network Attachment Selection Annotation JSON format: invalid character 'a' looking for beginning of value"))
})
@@ -205,16 +213,18 @@ var _ = Describe("k8sclient operations", func() {
kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, args, tmpDir)
k8sArgs, err := GetK8sArgs(args)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, k8sArgs, tmpDir)
Expect(err).NotTo(HaveOccurred())
Expect(fKubeClient.PodCount).To(Equal(1))
Expect(fKubeClient.NetCount).To(Equal(2))
Expect(len(delegates)).To(Equal(2))
Expect(delegates[0].Name).To(Equal("net1"))
Expect(delegates[0].Type).To(Equal("mynet"))
Expect(delegates[1].Name).To(Equal("net2"))
Expect(delegates[1].Type).To(Equal("mynet2"))
Expect(delegates[0].Conf.Name).To(Equal("net1"))
Expect(delegates[0].Conf.Type).To(Equal("mynet"))
Expect(delegates[1].Conf.Name).To(Equal("net2"))
Expect(delegates[1].Conf.Type).To(Equal("mynet2"))
})
It("injects network name into minimal thick plugin CNI config", func() {
@@ -227,14 +237,18 @@ var _ = Describe("k8sclient operations", func() {
fKubeClient.AddPod(fakePod)
fKubeClient.AddNetConfig(fakePod.ObjectMeta.Namespace, "net1", "{\"type\": \"mynet\"}")
delegates, err := GetK8sNetwork(args, "", fKubeClient, tmpDir)
kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred())
k8sArgs, err := GetK8sArgs(args)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, k8sArgs, tmpDir)
Expect(err).NotTo(HaveOccurred())
Expect(fKubeClient.PodCount).To(Equal(1))
Expect(fKubeClient.NetCount).To(Equal(1))
Expect(len(delegates)).To(Equal(1))
Expect(delegates[0].Name).To(Equal("net1"))
Expect(delegates[0].Type).To(Equal("mynet"))
Expect(delegates[0].Conf.Name).To(Equal("net1"))
Expect(delegates[0].Conf.Type).To(Equal("mynet"))
})
It("fails when on-disk config file is not valid", func() {
@@ -256,7 +270,9 @@ var _ = Describe("k8sclient operations", func() {
kubeClient, err := GetK8sClient("", fKubeClient)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, args, tmpDir)
k8sArgs, err := GetK8sArgs(args)
Expect(err).NotTo(HaveOccurred())
delegates, err := GetK8sNetwork(kubeClient, k8sArgs, tmpDir)
Expect(len(delegates)).To(Equal(0))
Expect(err).To(MatchError(fmt.Sprintf("GetK8sNetwork: failed getting the delegate: cniConfigFromNetworkResource: err in getCNIConfigFromFile: Error loading CNI config file %s: error parsing configuration: invalid character 'a' looking for beginning of value", net2Name)))
})