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

Support CNI 1.0.0

Browse Source 
Fix #792
This commit is contained in:
Tomofumi Hayashi
2022-03-02 01:55:23 +09:00
parent ecc98be9c6
commit 93ec0c121e
835 changed files with 80172 additions and 36848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

437
pkg/netutils/netutils_test.go
View File

@@ -22,7 +22,8 @@ import (
"github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/types/020"
"github.com/containernetworking/cni/pkg/types/current"
cni040 "github.com/containernetworking/cni/pkg/types/040"
cni100 "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/testutils"
@@ -98,11 +99,11 @@ func test020ResultHasIPv6DefaultRoute(data []byte) bool {
return false
}
func testResultHasIPv4DefaultRoute(data []byte) bool {
resultRaw, err := current.NewResult(data)
func test040ResultHasIPv4DefaultRoute(data []byte) bool {
resultRaw, err := cni040.NewResult(data)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
result, err := current.GetResult(resultRaw)
result, err := cni040.GetResult(resultRaw)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
for _, r := range result.Routes {
@@ -113,11 +114,41 @@ func testResultHasIPv4DefaultRoute(data []byte) bool {
return false
}
func testResultHasIPv6DefaultRoute(data []byte) bool {
resultRaw, err := current.NewResult(data)
func test040ResultHasIPv6DefaultRoute(data []byte) bool {
resultRaw, err := cni040.NewResult(data)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
result, err := current.GetResult(resultRaw)
result, err := cni040.GetResult(resultRaw)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
for _, r := range result.Routes {
if r.Dst.String() == "::/0" {
return true
}
}
return false
}
func test100ResultHasIPv4DefaultRoute(data []byte) bool {
resultRaw, err := cni100.NewResult(data)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
result, err := cni100.GetResult(resultRaw)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
for _, r := range result.Routes {
if r.Dst.String() == "0.0.0.0/0" {
return true
}
}
return false
}
func test100ResultHasIPv6DefaultRoute(data []byte) bool {
resultRaw, err := cni100.NewResult(data)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
result, err := cni100.GetResult(resultRaw)
ExpectWithOffset(1, err).NotTo(HaveOccurred())
for _, r := range result.Routes {
@@ -444,8 +475,8 @@ var _ = Describe("netutil cnicache function testing", func() {
newResult, err := deleteDefaultGWCacheBytes(origResult, true, false)
Expect(err).NotTo(HaveOccurred())
Expect(testResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
Expect(testResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test040ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
Expect(test040ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
// Simplified CNI Cache with 0.3.0/0.3.1/0.4.0 Result
type CNICacheResult030_040 struct {
@@ -518,8 +549,8 @@ var _ = Describe("netutil cnicache function testing", func() {
newResult, err := deleteDefaultGWCacheBytes(origResult, false, true)
Expect(err).NotTo(HaveOccurred())
Expect(testResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(testResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
Expect(test040ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test040ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
// Simplified CNI Cache with 0.3.0/0.3.1/0.4.0 Result
type CNICacheResult030_040 struct {
@@ -536,6 +567,150 @@ var _ = Describe("netutil cnicache function testing", func() {
Expect(len(result.Result.Routes)).To(Equal(5))
})
It("verify ipv4 default gateway is removed from CNI 1.0.0 results", func() {
origResult := []byte(`{
"kind": "cniCacheV1",
"result": {
"cniVersion": "1.0.0",
"dns": {},
"interfaces": [
{
"mac": "0a:c2:e6:3d:45:17",
"name": "net1",
"sandbox": "/var/run/netns/bb74fcb9-989a-4589-b2df-ddd0384a8ee5"
}
],
"ips": [
{
"address": "10.1.1.103/24",
"interface": 0
},
{
"address": "10::1:1:103/64",
"interface": 0
}
],
"routes": [
{
"dst": "20.0.0.0/24",
"gw": "10.1.1.1"
},
{
"dst": "0.0.0.0/0",
"gw": "10.1.1.1"
},
{
"dst": "30.0.0.0/24",
"gw": "10.1.1.1"
},
{
"dst": "20::0:0:0/56",
"gw": "10::1:1:1"
},
{
"dst": "::0/0",
"gw": "10::1:1:1"
},
{
"dst": "30::0:0:0/64",
"gw": "10::1:1:1"
}
]
}
}`)
newResult, err := deleteDefaultGWCacheBytes(origResult, true, false)
Expect(err).NotTo(HaveOccurred())
Expect(test100ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
Expect(test100ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
// Simplified CNI Cache with 1.0.0 Result
type CNICacheResult100 struct {
Kind string `json:"kind"`
Result struct {
Routes []struct {
Dst string `json:"dst"`
Gw string `json:"gw"`
} `json:"routes"`
} `json:"result"`
}
result := CNICacheResult100{}
Expect(json.Unmarshal(newResult, &result)).NotTo(HaveOccurred())
Expect(len(result.Result.Routes)).To(Equal(5))
})
It("verify ipv6 default gateway is removed from CNI 1.0.0 results", func() {
origResult := []byte(`{
"kind": "cniCacheV1",
"result": {
"cniVersion": "1.0.0",
"dns": {},
"interfaces": [
{
"mac": "0a:c2:e6:3d:45:17",
"name": "net1",
"sandbox": "/var/run/netns/bb74fcb9-989a-4589-b2df-ddd0384a8ee5"
}
],
"ips": [
{
"address": "10.1.1.103/24",
"interface": 0
},
{
"address": "10::1:1:103/64",
"interface": 0
}
],
"routes": [
{
"dst": "20.0.0.0/24",
"gw": "10.1.1.1"
},
{
"dst": "0.0.0.0/0",
"gw": "10.1.1.1"
},
{
"dst": "30.0.0.0/24",
"gw": "10.1.1.1"
},
{
"dst": "20::0:0:0/56",
"gw": "10::1:1:1"
},
{
"dst": "::0/0",
"gw": "10::1:1:1"
},
{
"dst": "30::0:0:0/64",
"gw": "10::1:1:1"
}
]
}
}`)
newResult, err := deleteDefaultGWCacheBytes(origResult, false, true)
Expect(err).NotTo(HaveOccurred())
Expect(test100ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test100ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
// Simplified CNI Cache with 1.0.0 Result
type CNICacheResult100 struct {
Kind string `json:"kind"`
Result struct {
Routes []struct {
Dst string `json:"dst"`
Gw string `json:"gw"`
} `json:"routes"`
} `json:"result"`
}
result := CNICacheResult100{}
Expect(json.Unmarshal(newResult, &result)).NotTo(HaveOccurred())
Expect(len(result.Result.Routes)).To(Equal(5))
})
It("verify ipv4 default gateway is added to CNI 0.1.0/0.2.0 results without routes", func() {
origResult := []byte(`{
"kind": "cniCacheV1",
@@ -818,8 +993,8 @@ var _ = Describe("netutil cnicache function testing", func() {
newResult, err := addDefaultGWCacheBytes(origResult, []net.IP{net.ParseIP("10.1.1.1")})
Expect(err).NotTo(HaveOccurred())
Expect(testResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(testResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
Expect(test040ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test040ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
// Simplified CNI Cache with 0.3.0/0.3.1/0.4.0 Result
type CNICacheResult030_040 struct {
@@ -884,8 +1059,8 @@ var _ = Describe("netutil cnicache function testing", func() {
newResult, err := addDefaultGWCacheBytes(origResult, []net.IP{net.ParseIP("10.1.1.1")})
Expect(err).NotTo(HaveOccurred())
Expect(testResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(testResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
Expect(test040ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test040ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
// Simplified CNI Cache with 0.3.0/0.3.1/0.4.0 Result
type CNICacheResult030_040 struct {
@@ -932,8 +1107,8 @@ var _ = Describe("netutil cnicache function testing", func() {
newResult, err := addDefaultGWCacheBytes(origResult, []net.IP{net.ParseIP("10::1:1:1")})
Expect(err).NotTo(HaveOccurred())
Expect(testResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
Expect(testResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test040ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
Expect(test040ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
// Simplified CNI Cache with 0.3.0/0.3.1/0.4.0 Result
type CNICacheResult030_040 struct {
@@ -1002,8 +1177,8 @@ var _ = Describe("netutil cnicache function testing", func() {
newResult, err := addDefaultGWCacheBytes(origResult, []net.IP{net.ParseIP("10::1:1:1")})
Expect(err).NotTo(HaveOccurred())
Expect(testResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(testResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test040ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test040ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
// Simplified CNI Cache with 0.3.0/0.3.1/0.4.0 Result
type CNICacheResult030_040 struct {
@@ -1020,5 +1195,229 @@ var _ = Describe("netutil cnicache function testing", func() {
Expect(len(result.Result.Routes)).To(Equal(6))
})
It("verify ipv4 default gateway is added to CNI 1.0.0 results without routes", func() {
origResult := []byte(`{
"kind": "cniCacheV1",
"result": {
"cniVersion": "1.0.0",
"dns": {},
"interfaces": [
{
"mac": "0a:c2:e6:3d:45:17",
"name": "net1",
"sandbox": "/var/run/netns/bb74fcb9-989a-4589-b2df-ddd0384a8ee5"
}
],
"ips": [
{
"address": "10.1.1.103/24",
"interface": 0
},
{
"address": "10::1:1:103/64",
"interface": 0
}
]
}
}`)
newResult, err := addDefaultGWCacheBytes(origResult, []net.IP{net.ParseIP("10.1.1.1")})
Expect(err).NotTo(HaveOccurred())
Expect(test100ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test100ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
// Simplified CNI Cache with 1.0.0 Result
type CNICacheResult100 struct {
Kind string `json:"kind"`
Result struct {
Routes []struct {
Dst string `json:"dst"`
Gw string `json:"gw"`
} `json:"routes"`
} `json:"result"`
}
result := CNICacheResult100{}
Expect(json.Unmarshal(newResult, &result)).NotTo(HaveOccurred())
Expect(len(result.Result.Routes)).To(Equal(1))
})
It("verify ipv4 default gateway is added to CNI 1.0.0 results", func() {
origResult := []byte(`{
"kind": "cniCacheV1",
"result": {
"cniVersion": "1.0.0",
"dns": {},
"interfaces": [
{
"mac": "0a:c2:e6:3d:45:17",
"name": "net1",
"sandbox": "/var/run/netns/bb74fcb9-989a-4589-b2df-ddd0384a8ee5"
}
],
"ips": [
{
"address": "10.1.1.103/24",
"interface": 0
},
{
"address": "10::1:1:103/64",
"interface": 0
}
],
"routes": [
{
"dst": "20.0.0.0/24",
"gw": "10.1.1.1"
},
{
"dst": "30.0.0.0/24",
"gw": "10.1.1.1"
},
{
"dst": "20::0:0:0/56",
"gw": "10::1:1:1"
},
{
"dst": "30::0:0:0/64",
"gw": "10::1:1:1"
}
]
}
}`)
newResult, err := addDefaultGWCacheBytes(origResult, []net.IP{net.ParseIP("10.1.1.1")})
Expect(err).NotTo(HaveOccurred())
Expect(test100ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test100ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
// Simplified CNI Cache with 1.0.0 Result
type CNICacheResult100 struct {
Kind string `json:"kind"`
Result struct {
Routes []struct {
Dst string `json:"dst"`
Gw string `json:"gw"`
} `json:"routes"`
} `json:"result"`
}
result := CNICacheResult100{}
Expect(json.Unmarshal(newResult, &result)).NotTo(HaveOccurred())
Expect(len(result.Result.Routes)).To(Equal(5))
})
It("verify ipv6 default gateway is added to CNI 1.0.0 results without routes", func() {
origResult := []byte(`{
"kind": "cniCacheV1",
"result": {
"cniVersion": "1.0.0",
"dns": {},
"interfaces": [
{
"mac": "0a:c2:e6:3d:45:17",
"name": "net1",
"sandbox": "/var/run/netns/bb74fcb9-989a-4589-b2df-ddd0384a8ee5"
}
],
"ips": [
{
"address": "10.1.1.103/24",
"interface": 0
},
{
"address": "10::1:1:103/64",
"interface": 0
}
]
}
}`)
newResult, err := addDefaultGWCacheBytes(origResult, []net.IP{net.ParseIP("10::1:1:1")})
Expect(err).NotTo(HaveOccurred())
Expect(test100ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeFalse())
Expect(test100ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
// Simplified CNI Cache with 1.0.0 Result
type CNICacheResult100 struct {
Kind string `json:"kind"`
Result struct {
Routes []struct {
Dst string `json:"dst"`
Gw string `json:"gw"`
} `json:"routes"`
} `json:"result"`
}
result := CNICacheResult100{}
Expect(json.Unmarshal(newResult, &result)).NotTo(HaveOccurred())
Expect(len(result.Result.Routes)).To(Equal(1))
})
It("verify ipv6 default gateway is added to CNI 1.0.0 results", func() {
origResult := []byte(`{
"kind": "cniCacheV1",
"result": {
"cniVersion": "1.0.0",
"dns": {},
"interfaces": [
{
"mac": "0a:c2:e6:3d:45:17",
"name": "net1",
"sandbox": "/var/run/netns/bb74fcb9-989a-4589-b2df-ddd0384a8ee5"
}
],
"ips": [
{
"address": "10.1.1.103/24",
"interface": 0
},
{
"address": "10::1:1:103/64",
"interface": 0
}
],
"routes": [
{
"dst": "20.0.0.0/24",
"gw": "10.1.1.1"
},
{
"dst": "30.0.0.0/24",
"gw": "10.1.1.1"
},
{
"dst": "0.0.0.0/0",
"gw": "10.1.1.1"
},
{
"dst": "20::0:0:0/56",
"gw": "10::1:1:1"
},
{
"dst": "30::0:0:0/64",
"gw": "10::1:1:1"
}
]
}
}`)
newResult, err := addDefaultGWCacheBytes(origResult, []net.IP{net.ParseIP("10::1:1:1")})
Expect(err).NotTo(HaveOccurred())
Expect(test100ResultHasIPv4DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
Expect(test100ResultHasIPv6DefaultRoute(testGetResultFromCache(newResult))).To(BeTrue())
// Simplified CNI Cache with 1.0.0 Result
type CNICacheResult100 struct {
Kind string `json:"kind"`
Result struct {
Routes []struct {
Dst string `json:"dst"`
Gw string `json:"gw"`
} `json:"routes"`
} `json:"result"`
}
result := CNICacheResult100{}
Expect(json.Unmarshal(newResult, &result)).NotTo(HaveOccurred())
Expect(len(result.Result.Routes)).To(Equal(6))
})
})
})