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

tuning: always update MAC in CNI result

Browse Source 
Since the CNI Spec bump to v1.0 the tuning plugin no longer updates the
mac address in the cni result for 0.4.0 or below configs. I don't think
this ever worked when the cni result was converted to a different version.

A test has been added to ensure it is working for all spec versions.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
This commit is contained in:
Paul Holzinger 2021-05-05 13:15:41 +02:00
parent b41052c547
commit bdaaa20ef2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/meta/tuning/tuning.go
View File

@ -145,7 +145,7 @@ func changeMacAddr(ifName string, newMacAddr string) error {
return netlink.LinkSetHardwareAddr(link, addr) return netlink.LinkSetHardwareAddr(link, addr)
} }
func updateResultsMacAddr(config TuningConf, ifName string, newMacAddr string) { func updateResultsMacAddr(config *TuningConf, ifName string, newMacAddr string) {
// Parse previous result. // Parse previous result.
if config.PrevResult == nil { if config.PrevResult == nil {
return return
@ -159,6 +159,7 @@ func updateResultsMacAddr(config TuningConf, ifName string, newMacAddr string) {
i.Mac = newMacAddr i.Mac = newMacAddr
} }
} }
config.PrevResult = result
} }
func changePromisc(ifName string, val bool) error { func changePromisc(ifName string, val bool) error {
@ -327,7 +328,7 @@ func cmdAdd(args *skel.CmdArgs) error {
} }
} }
updateResultsMacAddr(*tuningConf, args.IfName, tuningConf.Mac) updateResultsMacAddr(tuningConf, args.IfName, tuningConf.Mac)
} }
if tuningConf.Promisc != false { if tuningConf.Promisc != false {

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

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