ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

plugins: update to spec version 1.0.0

Browse Source 
Signed-off-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Dan Williams
2020-09-30 10:40:15 -05:00
parent 9e2430bb80
commit 7d8c767622
53 changed files with 350 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/main/macvlan/macvlan_test.go
View File

@ -22,7 +22,8 @@ import (
"github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/types"
"github.com/containernetworking/cni/pkg/types/current"
types040 "github.com/containernetworking/cni/pkg/types/040"
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
@ -129,7 +130,7 @@ var _ = Describe("macvlan Operations", func() {
It("creates an macvlan link in a non-default namespace", func() {
conf := &NetConf{
NetConf: types.NetConf{
CNIVersion: "0.3.1",
CNIVersion: current.ImplementedSpecVersion,
Name: "testConfig",
Type: "macvlan",
},
@ -167,7 +168,7 @@ var _ = Describe("macvlan Operations", func() {
const IFNAME = "macvl0"
conf := fmt.Sprintf(`{
"cniVersion": "0.3.1",
"cniVersion": "%s",
"name": "mynet",
"type": "macvlan",
"master": "%s",
@ -175,7 +176,7 @@ var _ = Describe("macvlan Operations", func() {
"type": "host-local",
"subnet": "10.1.2.0/24"
}
}`, MASTER_NAME)
}`, current.ImplementedSpecVersion, MASTER_NAME)
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
@ -253,7 +254,7 @@ var _ = Describe("macvlan Operations", func() {
const IFNAME = "macvl0"
conf := fmt.Sprintf(`{
"cniVersion": "0.3.0",
"cniVersion": "%s",
"name": "mynet",
"type": "macvlan",
"master": "%s",
@ -261,7 +262,7 @@ var _ = Describe("macvlan Operations", func() {
"type": "host-local",
"subnet": "10.1.2.0/24"
}
}`, MASTER_NAME)
}`, current.ImplementedSpecVersion, MASTER_NAME)
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
@ -291,12 +292,12 @@ var _ = Describe("macvlan Operations", func() {
const IFNAME = "macvl0"
conf := fmt.Sprintf(`{
"cniVersion": "0.3.1",
"cniVersion": "%s",
"name": "mynet",
"type": "macvlan",
"master": "%s",
"ipam": {}
}`, MASTER_NAME)
}`, current.ImplementedSpecVersion, MASTER_NAME)
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
@ -395,7 +396,7 @@ var _ = Describe("macvlan Operations", func() {
StdinData: []byte(conf),
}
var result *current.Result
var result *types040.Result
err = originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()
@ -404,7 +405,7 @@ var _ = Describe("macvlan Operations", func() {
})
Expect(err).NotTo(HaveOccurred())
result, err = current.GetResult(r)
result, err = types040.GetResult(r)
Expect(err).NotTo(HaveOccurred())
Expect(len(result.Interfaces)).To(Equal(1))
@ -487,15 +488,15 @@ var _ = Describe("macvlan Operations", func() {
It("configures and deconfigures a macvlan link with ADD/DEL, without master config", func() {
const IFNAME = "macvl0"
conf := `{
"cniVersion": "0.3.1",
conf := fmt.Sprintf(`{
"cniVersion": "%s",
"name": "mynet",
"type": "macvlan",
"ipam": {
"type": "host-local",
"subnet": "10.1.2.0/24"
}
}`
}`, current.ImplementedSpecVersion)
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())
@ -598,7 +599,7 @@ var _ = Describe("macvlan Operations", func() {
const IFNAME = "macvl0"
conf := fmt.Sprintf(`{
"cniVersion": "0.3.1",
"cniVersion": "0.4.0",
"name": "mynet",
"type": "macvlan",
"master": "%s",
@ -617,7 +618,7 @@ var _ = Describe("macvlan Operations", func() {
Args: "IgnoreUnknown=true;MAC=c2:11:22:33:44:55",
}
var result *current.Result
var result *types040.Result
err = originalNS.Do(func(ns.NetNS) error {
defer GinkgoRecover()
@ -626,7 +627,7 @@ var _ = Describe("macvlan Operations", func() {
})
Expect(err).NotTo(HaveOccurred())
result, err = current.GetResult(r)
result, err = types040.GetResult(r)
Expect(err).NotTo(HaveOccurred())
Expect(len(result.Interfaces)).To(Equal(1))
@ -683,7 +684,7 @@ var _ = Describe("macvlan Operations", func() {
const IFNAME = "macvl0"
conf := fmt.Sprintf(`{
"cniVersion": "0.3.1",
"cniVersion": "%s",
"capabilities": {"mac": true},
"RuntimeConfig": {
"mac": "c2:11:22:33:44:55"
@ -692,7 +693,7 @@ var _ = Describe("macvlan Operations", func() {
"type": "macvlan",
"master": "%s",
"ipam": {}
}`, MASTER_NAME)
}`, current.ImplementedSpecVersion, MASTER_NAME)
targetNs, err := testutils.NewNS()
Expect(err).NotTo(HaveOccurred())