rancher/plugins
1
0
Fork 1
mirror of https://github.com/rancher/plugins.git synced 2025-09-09 22:55:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #626 from Luap99/tuning-mac

Browse Source 
tuning: always update MAC in CNI result
This commit is contained in:
Dan Williams
2021-05-05 10:24:13 -05:00
committed by GitHub
parent a5b79632bd bdaaa20ef2
commit faf6d2629d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/meta/tuning/tuning_test.go
View File

@@ -468,11 +468,12 @@ var _ = Describe("tuning plugin", func() {
})
It(fmt.Sprintf("[%s] configures and deconfigures mac address (from conf file) with ADD/DEL", ver), func() {
mac := "c2:11:22:33:44:55"
conf := []byte(fmt.Sprintf(`{
"name": "test",
"type": "iplink",
"cniVersion": "%s",
"mac": "c2:11:22:33:44:55",
"mac": "%s",
"prevResult": {
"interfaces": [
{"name": "dummy0", "sandbox":"netns"}
@@ -486,7 +487,7 @@ var _ = Describe("tuning plugin", func() {
}
]
}
}`, ver))
}`, ver, mac))
args := &skel.CmdArgs{
ContainerID: "dummy",
@@ -511,9 +512,10 @@ var _ = Describe("tuning plugin", func() {
Expect(len(result.IPs)).To(Equal(1))
Expect(result.IPs[0].Address.String()).To(Equal("10.0.0.2/24"))
Expect(result.Interfaces[0].Mac).To(Equal(mac))
link, err := netlink.LinkByName(IFNAME)
Expect(err).NotTo(HaveOccurred())
hw, err := net.ParseMAC("c2:11:22:33:44:55")
hw, err := net.ParseMAC(mac)
Expect(err).NotTo(HaveOccurred())
Expect(link.Attrs().HardwareAddr).To(Equal(hw))