github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-01 17:09:45 +00:00
Code Issues Projects Releases Wiki Activity

increased code coverage in multus.go and conf.go, also added bug fixes and formatting

Browse Source
This commit is contained in:
Nikhil
2019-07-11 15:03:53 -04:00
committed by Tomofumi Hayashi
parent 074bd27c18
commit d4a7aae89c
4 changed files with 880 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

727
multus/multus_test.go
View File

@@ -28,11 +28,12 @@ import (
"github.com/containernetworking/cni/pkg/skel" "github.com/containernetworking/cni/pkg/skel"
cnitypes "github.com/containernetworking/cni/pkg/types" cnitypes "github.com/containernetworking/cni/pkg/types"
"github.com/containernetworking/cni/pkg/types/020" types020 "github.com/containernetworking/cni/pkg/types/020"
cniversion "github.com/containernetworking/cni/pkg/version" cniversion "github.com/containernetworking/cni/pkg/version"
"github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils" "github.com/containernetworking/plugins/pkg/testutils"
"github.com/intel/multus-cni/logging"
testhelpers "github.com/intel/multus-cni/testing" testhelpers "github.com/intel/multus-cni/testing"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
@@ -176,22 +177,24 @@ var _ = Describe("multus operations", func() {
Netns: testNS.Path(), Netns: testNS.Path(),
IfName: "eth0", IfName: "eth0",
StdinData: []byte(`{ StdinData: []byte(`{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
"defaultnetworkfile": "/tmp/foo.multus.conf", "defaultnetworkfile": "/tmp/foo.multus.conf",
"defaultnetworkwaitseconds": 3, "defaultnetworkwaitseconds": 3,
"delegates": [{ "delegates": [{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
},{ },{
"name": "other1", "name": "other1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "other-plugin" "type": "other-plugin"
}] }]
}`), }`),
} }
logging.SetLogLevel("verbose")
// Touch the default network file. // Touch the default network file.
configPath := "/tmp/foo.multus.conf" configPath := "/tmp/foo.multus.conf"
os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755) os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
@@ -204,10 +207,10 @@ var _ = Describe("multus operations", func() {
}, },
} }
expectedConf1 := `{ expectedConf1 := `{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}` }`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil) fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
expectedResult2 := &types020.Result{ expectedResult2 := &types020.Result{
@@ -217,10 +220,10 @@ var _ = Describe("multus operations", func() {
}, },
} }
expectedConf2 := `{ expectedConf2 := `{
"name": "other1", "name": "other1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "other-plugin" "type": "other-plugin"
}` }`
fExec.addPlugin(nil, "net1", expectedConf2, expectedResult2, nil) fExec.addPlugin(nil, "net1", expectedConf2, expectedResult2, nil)
os.Setenv("CNI_COMMAND", "ADD") os.Setenv("CNI_COMMAND", "ADD")
@@ -243,31 +246,267 @@ var _ = Describe("multus operations", func() {
errRemove := os.Remove(configPath) errRemove := os.Remove(configPath)
Expect(errRemove).NotTo(HaveOccurred()) Expect(errRemove).NotTo(HaveOccurred())
} }
})
It("executes delegates given faulty namespace", func() {
args := &skel.CmdArgs{
ContainerID: "123456789",
Netns: "fsdadfad",
IfName: "eth0",
StdinData: []byte(`{
"name": "node-cni-network",
"type": "multus",
"defaultnetworkfile": "/tmp/foo.multus.conf",
"defaultnetworkwaitseconds": 3,
"delegates": [{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
},{
"name": "other1",
"cniVersion": "0.2.0",
"type": "other-plugin"
}]
}`),
}
// Netns is given garbage value
// Touch the default network file.
configPath := "/tmp/foo.multus.conf"
os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
fExec := &fakeExec{}
expectedResult1 := &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.2/24"),
},
}
expectedConf1 := `{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
}`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
expectedResult2 := &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.5/24"),
},
}
expectedConf2 := `{
"name": "other1",
"cniVersion": "0.2.0",
"type": "other-plugin"
}`
fExec.addPlugin(nil, "net1", expectedConf2, expectedResult2, nil)
os.Setenv("CNI_COMMAND", "ADD")
os.Setenv("CNI_IFNAME", "eth0")
result, err := cmdAdd(args, fExec, nil)
Expect(err).NotTo(HaveOccurred())
Expect(fExec.addIndex).To(Equal(len(fExec.plugins)))
r := result.(*types020.Result)
// plugin 1 is the masterplugin
Expect(reflect.DeepEqual(r, expectedResult1)).To(BeTrue())
os.Setenv("CNI_COMMAND", "DEL")
os.Setenv("CNI_IFNAME", "eth0")
err = cmdDel(args, fExec, nil)
Expect(err).NotTo(HaveOccurred())
Expect(fExec.delIndex).To(Equal(len(fExec.plugins)))
// Cleanup default network file.
if _, errStat := os.Stat(configPath); errStat == nil {
errRemove := os.Remove(configPath)
Expect(errRemove).NotTo(HaveOccurred())
}
})
It("returns the previous result using cmdGet", func() {
args := &skel.CmdArgs{
ContainerID: "123456789",
Netns: testNS.Path(),
IfName: "eth0",
StdinData: []byte(`{
"name": "node-cni-network",
"type": "multus",
"defaultnetworkfile": "/tmp/foo.multus.conf",
"defaultnetworkwaitseconds": 3,
"delegates": [{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
},{
"name": "other1",
"cniVersion": "0.2.0",
"type": "other-plugin"
}]
}`),
}
// Touch the default network file.
configPath := "/tmp/foo.multus.conf"
os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
fExec := &fakeExec{}
expectedResult1 := &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.2/24"),
},
}
expectedConf1 := `{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
}`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
expectedResult2 := &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.5/24"),
},
}
expectedConf2 := `{
"name": "other1",
"cniVersion": "0.2.0",
"type": "other-plugin"
}`
fExec.addPlugin(nil, "net1", expectedConf2, expectedResult2, nil)
os.Setenv("CNI_COMMAND", "ADD")
os.Setenv("CNI_IFNAME", "eth0")
result, err := cmdAdd(args, fExec, nil)
Expect(err).NotTo(HaveOccurred())
Expect(fExec.addIndex).To(Equal(len(fExec.plugins)))
r := result.(*types020.Result)
// plugin 1 is the masterplugin
Expect(reflect.DeepEqual(r, expectedResult1)).To(BeTrue())
result, err = cmdGet(args, fExec, nil)
Expect(err).NotTo(HaveOccurred())
os.Setenv("CNI_COMMAND", "DEL")
os.Setenv("CNI_IFNAME", "eth0")
err = cmdDel(args, fExec, nil)
Expect(err).NotTo(HaveOccurred())
Expect(fExec.delIndex).To(Equal(len(fExec.plugins)))
// Cleanup default network file.
if _, errStat := os.Stat(configPath); errStat == nil {
errRemove := os.Remove(configPath)
Expect(errRemove).NotTo(HaveOccurred())
}
})
It("fails to load NetConf with bad json in cmdAdd/Del", func() {
args := &skel.CmdArgs{
ContainerID: "123456789",
Netns: testNS.Path(),
IfName: "eth0",
StdinData: []byte(`{
"name": "node-cni-network",
"type": "multus",
"defaultnetworkfile": "/tmp/foo.multus.conf",
"defaultnetworkwaitseconds": 3,
"delegates": [{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
},{
"name": "other1",
"cniVersion": "0.2.0",
"type": "other-plugin"
}]
`),
}
// Missing close bracket in StdinData
// Touch the default network file.
configPath := "/tmp/foo.multus.conf"
os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
fExec := &fakeExec{}
expectedResult1 := &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.2/24"),
},
}
expectedConf1 := `{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
}`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
expectedResult2 := &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.5/24"),
},
}
expectedConf2 := `{
"name": "other1",
"cniVersion": "0.2.0",
"type": "other-plugin"
}`
fExec.addPlugin(nil, "net1", expectedConf2, expectedResult2, nil)
os.Setenv("CNI_COMMAND", "ADD")
os.Setenv("CNI_IFNAME", "eth0")
_, err := cmdAdd(args, fExec, nil)
Expect(err).To(HaveOccurred())
err = cmdDel(args, fExec, nil)
Expect(err).To(HaveOccurred())
})
It("fails to save NetConf with bad filepath", func() {
meme := []byte(`meme`)
err := saveScratchNetConf("123456789", "", meme)
Expect(err).To(HaveOccurred())
})
It("fails to delete delegates with bad filepath", func() {
err := deleteDelegates("123456789", "bad!file!~?Path$^")
Expect(err).To(HaveOccurred())
})
It("delete delegates given good filepath", func() {
os.MkdirAll("/opt/cni/bin", 0755)
d1 := []byte("blah")
ioutil.WriteFile("/opt/cni/bin/123456789", d1, 0644)
err := deleteDelegates("123456789", "/opt/cni/bin")
Expect(err).NotTo(HaveOccurred())
}) })
It("executes delegates and cleans up on failure", func() { It("executes delegates and cleans up on failure", func() {
expectedConf1 := `{ expectedConf1 := `{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}` }`
expectedConf2 := `{ expectedConf2 := `{
"name": "other1", "name": "other1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "other-plugin" "type": "other-plugin"
}` }`
args := &skel.CmdArgs{ args := &skel.CmdArgs{
ContainerID: "123456789", ContainerID: "123456789",
Netns: testNS.Path(), Netns: testNS.Path(),
IfName: "eth0", IfName: "eth0",
StdinData: []byte(fmt.Sprintf(`{ StdinData: []byte(fmt.Sprintf(`{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
"defaultnetworkfile": "/tmp/foo.multus.conf", "defaultnetworkfile": "/tmp/foo.multus.conf",
"defaultnetworkwaitseconds": 3, "defaultnetworkwaitseconds": 3,
"delegates": [%s,%s] "delegates": [%s,%s]
}`, expectedConf1, expectedConf2)), }`, expectedConf1, expectedConf2)),
} }
// Touch the default network file. // Touch the default network file.
@@ -302,40 +541,98 @@ var _ = Describe("multus operations", func() {
}) })
It("executes delegates and cleans up on failure with missing name field", func() {
expectedConf1 := `{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
}`
expectedConf2 := `{
"name": "",
"cniVersion": "0.2.0",
"type": "other-plugin"
}`
// took out the name in expectedConf2, expecting a new value to be filled in by cmdAdd
args := &skel.CmdArgs{
ContainerID: "123456789",
Netns: testNS.Path(),
IfName: "eth0",
StdinData: []byte(fmt.Sprintf(`{
"name": "node-cni-network",
"type": "multus",
"defaultnetworkfile": "/tmp/foo.multus.conf",
"defaultnetworkwaitseconds": 3,
"delegates": [%s,%s]
}`, expectedConf1, expectedConf2)),
}
// Touch the default network file.
configPath := "/tmp/foo.multus.conf"
os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
fExec := &fakeExec{}
expectedResult1 := &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.2/24"),
},
}
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
// This plugin invocation should fail
err := fmt.Errorf("expected plugin failure")
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(err).To(HaveOccurred())
// Cleanup default network file.
if _, errStat := os.Stat(configPath); errStat == nil {
errRemove := os.Remove(configPath)
Expect(errRemove).NotTo(HaveOccurred())
}
})
It("executes delegates with interface name and MAC and IP addr", func() { It("executes delegates with interface name and MAC and IP addr", func() {
podNet := `[{"name":"net1", podNet := `[{"name":"net1",
"interface": "test1", "interface": "test1",
"ips":"1.2.3.4/24"}, "ips":"1.2.3.4/24"},
{"name":"net2", {"name":"net2",
"mac": "c2:11:22:33:44:66", "mac": "c2:11:22:33:44:66",
"ips": "10.0.0.1"} "ips": "10.0.0.1"}
]` ]`
fakePod := testhelpers.NewFakePod("testpod", podNet, "") fakePod := testhelpers.NewFakePod("testpod", podNet, "")
net1 := `{ net1 := `{
"name": "net1", "name": "net1",
"type": "mynet", "type": "mynet",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}` }`
net2 := `{ net2 := `{
"name": "net2", "name": "net2",
"type": "mynet2", "type": "mynet2",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}` }`
args := &skel.CmdArgs{ args := &skel.CmdArgs{
ContainerID: "123456789", ContainerID: "123456789",
Netns: testNS.Path(), Netns: testNS.Path(),
IfName: "eth0", IfName: "eth0",
Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace), Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace),
StdinData: []byte(`{ StdinData: []byte(`{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml", "kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"delegates": [{ "delegates": [{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}] }]
}`), }`),
} }
fExec := &fakeExec{} fExec := &fakeExec{}
@@ -346,10 +643,10 @@ var _ = Describe("multus operations", func() {
}, },
} }
expectedConf1 := `{ expectedConf1 := `{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}` }`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil) fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
fExec.addPlugin([]string{"CNI_ARGS=IgnoreUnknown=true;IP=1.2.3.4/24"}, "test1", net1, &types020.Result{ fExec.addPlugin([]string{"CNI_ARGS=IgnoreUnknown=true;IP=1.2.3.4/24"}, "test1", net1, &types020.Result{
CNIVersion: "0.2.0", CNIVersion: "0.2.0",
@@ -384,35 +681,35 @@ var _ = Describe("multus operations", func() {
It("executes delegates and kubernetes networks", func() { It("executes delegates and kubernetes networks", func() {
fakePod := testhelpers.NewFakePod("testpod", "net1,net2", "") fakePod := testhelpers.NewFakePod("testpod", "net1,net2", "")
net1 := `{ net1 := `{
"name": "net1", "name": "net1",
"type": "mynet", "type": "mynet",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}` }`
net2 := `{ net2 := `{
"name": "net2", "name": "net2",
"type": "mynet2", "type": "mynet2",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}` }`
net3 := `{ net3 := `{
"name": "net3", "name": "net3",
"type": "mynet3", "type": "mynet3",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}` }`
args := &skel.CmdArgs{ args := &skel.CmdArgs{
ContainerID: "123456789", ContainerID: "123456789",
Netns: testNS.Path(), Netns: testNS.Path(),
IfName: "eth0", IfName: "eth0",
Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace), Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace),
StdinData: []byte(`{ StdinData: []byte(`{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml", "kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"delegates": [{ "delegates": [{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}] }]
}`), }`),
} }
fExec := &fakeExec{} fExec := &fakeExec{}
@@ -423,10 +720,10 @@ var _ = Describe("multus operations", func() {
}, },
} }
expectedConf1 := `{ expectedConf1 := `{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}` }`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil) fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
fExec.addPlugin(nil, "net1", net1, &types020.Result{ fExec.addPlugin(nil, "net1", net1, &types020.Result{
CNIVersion: "0.2.0", CNIVersion: "0.2.0",
@@ -463,25 +760,25 @@ var _ = Describe("multus operations", func() {
It("executes kubernetes networks and delete it after pod removal", func() { It("executes kubernetes networks and delete it after pod removal", func() {
fakePod := testhelpers.NewFakePod("testpod", "net1", "") fakePod := testhelpers.NewFakePod("testpod", "net1", "")
net1 := `{ net1 := `{
"name": "net1", "name": "net1",
"type": "mynet", "type": "mynet",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}` }`
args := &skel.CmdArgs{ args := &skel.CmdArgs{
ContainerID: "123456789", ContainerID: "123456789",
Netns: testNS.Path(), Netns: testNS.Path(),
IfName: "eth0", IfName: "eth0",
Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace), Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace),
StdinData: []byte(`{ StdinData: []byte(`{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml", "kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"delegates": [{ "delegates": [{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}] }]
}`), }`),
} }
fExec := &fakeExec{} fExec := &fakeExec{}
@@ -492,10 +789,78 @@ var _ = Describe("multus operations", func() {
}, },
} }
expectedConf1 := `{ expectedConf1 := `{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}` }`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
fExec.addPlugin(nil, "net1", net1, &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.3/24"),
},
}, nil)
fKubeClient := testhelpers.NewFakeKubeClient()
fKubeClient.AddPod(fakePod)
fKubeClient.AddNetConfig(fakePod.ObjectMeta.Namespace, "net1", net1)
os.Setenv("CNI_COMMAND", "ADD")
os.Setenv("CNI_IFNAME", "eth0")
result, err := cmdAdd(args, fExec, fKubeClient)
Expect(err).NotTo(HaveOccurred())
Expect(fExec.addIndex).To(Equal(len(fExec.plugins)))
Expect(fKubeClient.PodCount).To(Equal(2))
Expect(fKubeClient.NetCount).To(Equal(1))
r := result.(*types020.Result)
// plugin 1 is the masterplugin
Expect(reflect.DeepEqual(r, expectedResult1)).To(BeTrue())
os.Setenv("CNI_COMMAND", "DEL")
os.Setenv("CNI_IFNAME", "eth0")
// set fKubeClient to nil to emulate no pod info
fKubeClient.DeletePod(fakePod)
err = cmdDel(args, fExec, fKubeClient)
Expect(err).NotTo(HaveOccurred())
Expect(fExec.delIndex).To(Equal(len(fExec.plugins)))
})
It("executes kubernetes networks and delete it after pod removal", func() {
fakePod := testhelpers.NewFakePod("testpod", "net1", "")
net1 := `{
"name": "net1",
"type": "mynet",
"cniVersion": "0.2.0"
}`
args := &skel.CmdArgs{
ContainerID: "123456789",
Netns: testNS.Path(),
IfName: "eth0",
Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace),
StdinData: []byte(`{
"name": "node-cni-network",
"type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"delegates": [{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
}]
}`),
}
fExec := &fakeExec{}
expectedResult1 := &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.2/24"),
},
}
expectedConf1 := `{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
}`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil) fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
fExec.addPlugin(nil, "net1", net1, &types020.Result{ fExec.addPlugin(nil, "net1", net1, &types020.Result{
CNIVersion: "0.2.0", CNIVersion: "0.2.0",
@@ -534,38 +899,38 @@ var _ = Describe("multus operations", func() {
Netns: testNS.Path(), Netns: testNS.Path(),
IfName: "eth0", IfName: "eth0",
StdinData: []byte(`{ StdinData: []byte(`{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
"delegates": [{ "delegates": [{
"cniVersion": "0.3.1", "cniVersion": "0.3.1",
"name": "mynet-confList", "name": "mynet-confList",
"plugins": [ "plugins": [
{ {
"type": "firstPlugin", "type": "firstPlugin",
"capabilities": {"portMappings": true} "capabilities": {"portMappings": true}
} }
] ]
}], }],
"runtimeConfig": { "runtimeConfig": {
"portMappings": [ "portMappings": [
{"hostPort": 8080, "containerPort": 80, "protocol": "tcp"} {"hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
] ]
} }
}`), }`),
} }
fExec := &fakeExec{} fExec := &fakeExec{}
expectedConf1 := `{ expectedConf1 := `{
"capabilities": {"portMappings": true}, "capabilities": {"portMappings": true},
"name": "mynet-confList", "name": "mynet-confList",
"cniVersion": "0.3.1", "cniVersion": "0.3.1",
"type": "firstPlugin", "type": "firstPlugin",
"runtimeConfig": { "runtimeConfig": {
"portMappings": [ "portMappings": [
{"hostPort": 8080, "containerPort": 80, "protocol": "tcp"} {"hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
] ]
} }
}` }`
fExec.addPlugin(nil, "eth0", expectedConf1, nil, nil) fExec.addPlugin(nil, "eth0", expectedConf1, nil, nil)
os.Setenv("CNI_COMMAND", "ADD") os.Setenv("CNI_COMMAND", "ADD")
os.Setenv("CNI_IFNAME", "eth0") os.Setenv("CNI_IFNAME", "eth0")
@@ -576,10 +941,10 @@ var _ = Describe("multus operations", func() {
It("executes clusterNetwork delegate", func() { It("executes clusterNetwork delegate", func() {
fakePod := testhelpers.NewFakePod("testpod", "", "kube-system/net1") fakePod := testhelpers.NewFakePod("testpod", "", "kube-system/net1")
net1 := `{ net1 := `{
"name": "net1", "name": "net1",
"type": "mynet", "type": "mynet",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}` }`
expectedResult1 := &types020.Result{ expectedResult1 := &types020.Result{
CNIVersion: "0.2.0", CNIVersion: "0.2.0",
IP4: &types020.IPConfig{ IP4: &types020.IPConfig{
@@ -592,13 +957,13 @@ var _ = Describe("multus operations", func() {
IfName: "eth0", IfName: "eth0",
Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace), Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace),
StdinData: []byte(`{ StdinData: []byte(`{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml", "kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"defaultNetworks": [], "defaultNetworks": [],
"clusterNetwork": "net1", "clusterNetwork": "net1",
"delegates": [] "delegates": []
}`), }`),
} }
fExec := &fakeExec{} fExec := &fakeExec{}
@@ -632,26 +997,26 @@ var _ = Describe("multus operations", func() {
fakePod := testhelpers.NewFakePod("testpod", "net1", "") fakePod := testhelpers.NewFakePod("testpod", "net1", "")
net1 := `{ net1 := `{
"name": "net1", "name": "net1",
"type": "mynet", "type": "mynet",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}` }`
args := &skel.CmdArgs{ args := &skel.CmdArgs{
ContainerID: "123456789", ContainerID: "123456789",
Netns: testNS.Path(), Netns: testNS.Path(),
IfName: "eth0", IfName: "eth0",
Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace), Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace),
StdinData: []byte(fmt.Sprintf(`{ StdinData: []byte(fmt.Sprintf(`{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml", "kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"cniDir": "%s", "cniDir": "%s",
"delegates": [{ "delegates": [{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}] }]
}`, tmpCNIDir)), }`, tmpCNIDir)),
} }
fExec := &fakeExec{} fExec := &fakeExec{}
@@ -662,10 +1027,10 @@ var _ = Describe("multus operations", func() {
}, },
} }
expectedConf1 := `{ expectedConf1 := `{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}` }`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil) fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
fExec.addPlugin(nil, "net1", net1, &types020.Result{ fExec.addPlugin(nil, "net1", net1, &types020.Result{
CNIVersion: "0.2.0", CNIVersion: "0.2.0",
@@ -710,26 +1075,26 @@ var _ = Describe("multus operations", func() {
fakePod := testhelpers.NewFakePod("testpod", "net1", "") fakePod := testhelpers.NewFakePod("testpod", "net1", "")
net1 := `{ net1 := `{
"name": "net1", "name": "net1",
"type": "mynet", "type": "mynet",
"cniVersion": "0.2.0" "cniVersion": "0.2.0"
}` }`
args := &skel.CmdArgs{ args := &skel.CmdArgs{
ContainerID: "123456789", ContainerID: "123456789",
Netns: testNS.Path(), Netns: testNS.Path(),
IfName: "eth0", IfName: "eth0",
Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace), Args: fmt.Sprintf("K8S_POD_NAME=%s;K8S_POD_NAMESPACE=%s", fakePod.ObjectMeta.Name, fakePod.ObjectMeta.Namespace),
StdinData: []byte(fmt.Sprintf(`{ StdinData: []byte(fmt.Sprintf(`{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml", "kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"cniDir": "%s", "cniDir": "%s",
"delegates": [{ "delegates": [{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}] }]
}`, tmpCNIDir)), }`, tmpCNIDir)),
} }
fExec := &fakeExec{} fExec := &fakeExec{}
@@ -740,10 +1105,10 @@ var _ = Describe("multus operations", func() {
}, },
} }
expectedConf1 := `{ expectedConf1 := `{
"name": "weave1", "name": "weave1",
"cniVersion": "0.2.0", "cniVersion": "0.2.0",
"type": "weave-net" "type": "weave-net"
}` }`
fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil) fExec.addPlugin(nil, "eth0", expectedConf1, expectedResult1, nil)
fExec.addPlugin(nil, "net1", net1, &types020.Result{ fExec.addPlugin(nil, "net1", net1, &types020.Result{
CNIVersion: "0.2.0", CNIVersion: "0.2.0",

54
testing/testing.go
View File

@@ -16,14 +16,19 @@
package testing package testing
import ( import (
"encoding/json"
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"net" "net"
"os"
"strings" "strings"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/containernetworking/cni/pkg/types"
types020 "github.com/containernetworking/cni/pkg/types/020"
"github.com/onsi/gomega" "github.com/onsi/gomega"
) )
@@ -153,3 +158,52 @@ func EnsureCIDR(cidr string) *net.IPNet {
net.IP = ip net.IP = ip
return net return net
} }
// Implements Result interface
type Result struct {
CNIVersion string `json:"cniVersion,omitempty"`
IP4 *types020.IPConfig `json:"ip4,omitempty"`
IP6 *types020.IPConfig `json:"ip6,omitempty"`
DNS types.DNS `json:"dns,omitempty"`
}
func (r *Result) Version() string {
return r.CNIVersion
}
func (r *Result) GetAsVersion(version string) (types.Result, error) {
for _, supportedVersion := range types020.SupportedVersions {
if version == supportedVersion {
r.CNIVersion = version
return r, nil
}
}
return nil, fmt.Errorf("cannot convert version %q to %s", types020.SupportedVersions, version)
}
func (r *Result) Print() error {
return r.PrintTo(os.Stdout)
}
func (r *Result) PrintTo(writer io.Writer) error {
data, err := json.MarshalIndent(r, "", " ")
if err != nil {
return err
}
_, err = writer.Write(data)
return err
}
// String returns a formatted string in the form of "[IP4: $1,][ IP6: $2,] DNS: $3" where
// $1 represents the receiver's IPv4, $2 represents the receiver's IPv6 and $3 the
// receiver's DNS. If $1 or $2 are nil, they won't be present in the returned string.
func (r *Result) String() string {
var str string
if r.IP4 != nil {
str = fmt.Sprintf("IP4:%+v, ", *r.IP4)
}
if r.IP6 != nil {
str += fmt.Sprintf("IP6:%+v, ", *r.IP6)
}
return fmt.Sprintf("%sDNS:%+v", str, r.DNS)
}

5
types/conf.go
View File

@@ -45,6 +45,7 @@ func LoadDelegateNetConfList(bytes []byte, delegateConf *DelegateNetConf) error
if delegateConf.ConfList.Plugins == nil { if delegateConf.ConfList.Plugins == nil {
return logging.Errorf("delegate must have the 'type'or 'Plugin' field") return logging.Errorf("delegate must have the 'type'or 'Plugin' field")
} }
if delegateConf.ConfList.Plugins[0].Type == "" { if delegateConf.ConfList.Plugins[0].Type == "" {
return logging.Errorf("a plugin delegate must have the 'type' field") return logging.Errorf("a plugin delegate must have the 'type' field")
} }
@@ -129,7 +130,6 @@ func CreateCNIRuntimeConf(args *skel.CmdArgs, k8sArgs *K8sArgs, ifName string, r
// LoadNetworkStatus create network status from CNI result // LoadNetworkStatus create network status from CNI result
func LoadNetworkStatus(r types.Result, netName string, defaultNet bool) (*NetworkStatus, error) { func LoadNetworkStatus(r types.Result, netName string, defaultNet bool) (*NetworkStatus, error) {
logging.Debugf("LoadNetworkStatus: %v, %s, %t", r, netName, defaultNet) logging.Debugf("LoadNetworkStatus: %v, %s, %t", r, netName, defaultNet)
netstatus := &NetworkStatus{} netstatus := &NetworkStatus{}
netstatus.Name = netName netstatus.Name = netName
netstatus.Default = defaultNet netstatus.Default = defaultNet
@@ -138,9 +138,8 @@ func LoadNetworkStatus(r types.Result, netName string, defaultNet bool) (*Networ
result, err := current.NewResultFromResult(r) result, err := current.NewResultFromResult(r)
if err != nil { if err != nil {
logging.Errorf("error convert the type.Result to current.Result: %v", err) logging.Errorf("error convert the type.Result to current.Result: %v", err)
return netstatus, nil return netstatus, err
} }
for _, ifs := range result.Interfaces { for _, ifs := range result.Interfaces {
//Only pod interfaces can have sandbox information //Only pod interfaces can have sandbox information
if ifs.Sandbox != "" { if ifs.Sandbox != "" {

280
types/conf_test.go
View File

@@ -17,8 +17,17 @@ package types
import ( import (
"encoding/json" "encoding/json"
"fmt"
"io/ioutil"
"os"
"testing" "testing"
"github.com/containernetworking/cni/pkg/skel"
types020 "github.com/containernetworking/cni/pkg/types/020"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
testhelpers "github.com/intel/multus-cni/testing"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
@@ -29,6 +38,29 @@ func TestConf(t *testing.T) {
} }
var _ = Describe("config operations", func() { var _ = Describe("config operations", func() {
var testNS ns.NetNS
var tmpDir string
BeforeEach(func() {
// Create a new NetNS so we don't modify the host
var err error
testNS, err = testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
os.Setenv("CNI_NETNS", testNS.Path())
os.Setenv("CNI_PATH", "/some/path")
tmpDir, err = ioutil.TempDir("", "multus_tmp")
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
Expect(testNS.Close()).To(Succeed())
os.Unsetenv("CNI_PATH")
os.Unsetenv("CNI_ARGS")
err := os.RemoveAll(tmpDir)
Expect(err).NotTo(HaveOccurred())
})
It("parses a valid multus configuration", func() { It("parses a valid multus configuration", func() {
conf := `{ conf := `{
"name": "node-cni-network", "name": "node-cni-network",
@@ -52,7 +84,7 @@ var _ = Describe("config operations", func() {
Expect(len(netConf.RuntimeConfig.PortMaps)).To(Equal(1)) Expect(len(netConf.RuntimeConfig.PortMaps)).To(Equal(1))
}) })
It("fails to load invalid multus configuration", func() { It("fails to load invalid multus configuration (bad json)", func() {
conf := `{ conf := `{
"name": "node-cni-network", "name": "node-cni-network",
"type": "multus", "type": "multus",
@@ -65,9 +97,68 @@ var _ = Describe("config operations", func() {
{"hostPort": 8080, "containerPort": 80, "protocol": "tcp"} {"hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
] ]
}` }`
// missing end bracket // Error in conf json: missing end bracket
_, err := LoadNetConf([]byte(conf)) _, err := LoadNetConf([]byte(conf))
Expect(err).To(HaveOccurred()) Expect(err).To(HaveOccurred())
_, err = LoadDelegateNetConf([]byte(conf), nil, "")
Expect(err).To(HaveOccurred())
err = LoadDelegateNetConfList([]byte(conf), &DelegateNetConf{})
Expect(err).To(HaveOccurred())
_, err = addDeviceIDInConfList([]byte(conf), "")
Expect(err).To(HaveOccurred())
_, err = delegateAddDeviceID([]byte(conf), "")
Expect(err).To(HaveOccurred())
})
It("checks if logFile and logLevel are set correctly", func() {
conf := `{
"name": "node-cni-network",
"type": "multus",
"logLevel": "debug",
"logFile": "/var/log/multus.log",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"delegates": [{
"type": "weave-net"
}],
"runtimeConfig": {
"portMappings": [
{"hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
]
}
}`
netConf, err := LoadNetConf([]byte(conf))
Expect(err).NotTo(HaveOccurred())
Expect(netConf.LogLevel).To(Equal("debug"))
Expect(netConf.LogFile).To(Equal("/var/log/multus.log"))
})
It("prevResult with no errors", func() {
conf := `{
"name": "node-cni-network",
"type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"prevResult": {
"ips": [
{
"version": "4",
"address": "10.0.0.5/32",
"interface": 2
}
]},
"delegates": [{
"type": "weave-net"
}],
"runtimeConfig": {
"portMappings": [
{"hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
]
}
}`
_, err := LoadNetConf([]byte(conf))
Expect(err).NotTo(HaveOccurred())
}) })
It("succeeds if only delegates are set", func() { It("succeeds if only delegates are set", func() {
@@ -108,6 +199,33 @@ var _ = Describe("config operations", func() {
Expect(err).To(HaveOccurred()) Expect(err).To(HaveOccurred())
}) })
It("fails when delegate field exists but fields are named incorrectly", func() {
conf := `{
"name": "node-cni-network",
"type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"prevResult": {
"ips": [
{
"version": "4",
"address": "10.0.0.5/32",
"interface": 2
}
]
},
"delegates": [{
"thejohn": "weave-net"
}],
"runtimeConfig": {
"portMappings": [
{"hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
]
}
}`
_, err := LoadNetConf([]byte(conf))
Expect(err).To(HaveOccurred())
})
It("has defaults set for network readiness", func() { It("has defaults set for network readiness", func() {
conf := `{ conf := `{
"name": "defaultnetwork", "name": "defaultnetwork",
@@ -240,4 +358,162 @@ var _ = Describe("config operations", func() {
Expect(hostDeviceConfList.Plugins[0].PCIBusID).To(Equal("0000:00:00.3")) Expect(hostDeviceConfList.Plugins[0].PCIBusID).To(Equal("0000:00:00.3"))
}) })
It("creates a valid CNI runtime config", func() {
args := &skel.CmdArgs{
ContainerID: "123456789",
Netns: testNS.Path(),
IfName: "eth0",
StdinData: []byte(`{
"name": "node-cni-network",
"type": "multus",
"defaultnetworkfile": "/tmp/foo.multus.conf",
"defaultnetworkwaitseconds": 3,
"delegates": [{
"name": "weave1",
"cniVersion": "0.2.0",
"type": "weave-net"
},{
"name": "other1",
"cniVersion": "0.2.0",
"type": "other-plugin"
}]
}`),
}
k8sArgs := &K8sArgs{K8S_POD_NAME: "dummy", K8S_POD_NAMESPACE: "namespacedummy", K8S_POD_INFRA_CONTAINER_ID: "123456789"}
rc := &RuntimeConfig{}
tempportmap := make([]PortMapEntry, 2)
rc.PortMaps = tempportmap
rc.PortMaps[0].HostPort = 0
rc.PortMaps[0].ContainerPort = 1
rc.PortMaps[0].Protocol = "sampleProtocol"
rc.PortMaps[0].HostIP = "sampleHostIP"
rc.PortMaps[1].HostPort = 1
rc.PortMaps[1].ContainerPort = 2
rc.PortMaps[1].Protocol = "anotherSampleProtocol"
rc.PortMaps[1].HostIP = "anotherSampleHostIP"
rt := CreateCNIRuntimeConf(args, k8sArgs, "", rc)
fmt.Println("rt.ContainerID: ", rt.ContainerID)
Expect(rt.ContainerID).To(Equal("123456789"))
Expect(rt.NetNS).To(Equal(args.Netns))
Expect(rt.IfName).To(Equal(""))
Expect(rt.CapabilityArgs["portMappings"]).To(Equal(rc.PortMaps))
})
It("can loadnetworkstatus", func() {
result := &types020.Result{
CNIVersion: "0.2.0",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.2/24"),
},
}
conf := `{
"name": "node-cni-network",
"type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"delegates": [{
"type": "weave-net"
}],
"runtimeConfig": {
"portMappings": [
{"hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
]
}
}`
delegate, err := LoadDelegateNetConf([]byte(conf), nil, "0000:00:00.0")
Expect(err).NotTo(HaveOccurred())
delegateNetStatus, err := LoadNetworkStatus(result, delegate.Conf.Name, delegate.MasterPlugin)
GinkgoT().Logf("delegateNetStatus %+v\n", delegateNetStatus)
Expect(err).NotTo(HaveOccurred())
})
It("cannot loadnetworkstatus given incompatible CNIVersion", func() {
result := &testhelpers.Result{
CNIVersion: "1.2.3",
IP4: &types020.IPConfig{
IP: *testhelpers.EnsureCIDR("1.1.1.2/24"),
},
}
conf := `{
"name": "node-cni-network",
"type": "multus",
"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
"delegates": [{
"type": "weave-net"
}],
"runtimeConfig": {
"portMappings": [
{"hostPort": 8080, "containerPort": 80, "protocol": "tcp"}
]
}
}`
delegate, err := LoadDelegateNetConf([]byte(conf), nil, "0000:00:00.0")
Expect(err).NotTo(HaveOccurred())
fmt.Println("result.Version: ", result.Version())
delegateNetStatus, err := LoadNetworkStatus(result, delegate.Conf.Name, delegate.MasterPlugin)
GinkgoT().Logf("delegateNetStatus %+v\n", delegateNetStatus)
Expect(err).To(HaveOccurred())
})
}) })
// type Result struct {
// CNIVersion string `json:"cniVersion,omitempty"`
// IP4 *types020.IPConfig `json:"ip4,omitempty"`
// IP6 *types020.IPConfig `json:"ip6,omitempty"`
// DNS types.DNS `json:"dns,omitempty"`
// }
// func (r *Result) Version() string {
// return r.CNIVersion
// }
// func (r *Result) GetAsVersion(version string) (types.Result, error) {
// for _, supportedVersion := range types020.SupportedVersions {
// if version == supportedVersion {
// r.CNIVersion = version
// return r, nil
// }
// }
// return nil, fmt.Errorf("cannot convert version %q to %s", types020.SupportedVersions, version)
// }
// func (r *Result) Print() error {
// return r.PrintTo(os.Stdout)
// }
// func (r *Result) PrintTo(writer io.Writer) error {
// data, err := json.MarshalIndent(r, "", " ")
// if err != nil {
// return err
// }
// _, err = writer.Write(data)
// return err
// }
// // String returns a formatted string in the form of "[IP4: $1,][ IP6: $2,] DNS: $3" where
// // $1 represents the receiver's IPv4, $2 represents the receiver's IPv6 and $3 the
// // receiver's DNS. If $1 or $2 are nil, they won't be present in the returned string.
// func (r *Result) String() string {
// var str string
// if r.IP4 != nil {
// str = fmt.Sprintf("IP4:%+v, ", *r.IP4)
// }
// if r.IP6 != nil {
// str += fmt.Sprintf("IP6:%+v, ", *r.IP6)
// }
// return fmt.Sprintf("%sDNS:%+v", str, r.DNS)
// }