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

Merge remote-tracking branch 'origin/master' into tuninig-iplink

Browse Source
This commit is contained in:
Tomofumi Hayashi
2018-07-31 12:58:12 +09:00
parent 3a7f254a63 2b819b5571
commit 635cb22f12
3 changed files with 108 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ type MACEnvArgs struct {
}
func parseConf(data []byte, envArgs string) (*TuningConf, error) {
conf := TuningConf{Promisc: false, Mtu: -1}
conf := TuningConf{Promisc: false}
if err := json.Unmarshal(data, &conf); err != nil {
return nil, fmt.Errorf("failed to load netconf: %v", err)
}
@ -110,13 +110,12 @@ func changeMacAddr(ifName string, newMacAddr string) error {
return netlink.LinkSetUp(link)
}
func updateResultsMacAddr(config TuningConf, ifName string, newMacAddr string) error {
func updateResultsMacAddr(config TuningConf, ifName string, newMacAddr string) {
for _, i := range config.PrevResult.Interfaces {
if i.Name == ifName {
i.Mac = newMacAddr
}
}
return nil
}
func changePromisc(ifName string, val bool) error {
@ -169,7 +168,7 @@ func cmdAdd(args *skel.CmdArgs) error {
if tuningConf.Mac != "" {
if err = changeMacAddr(args.IfName, tuningConf.Mac); err == nil {
err = updateResultsMacAddr(*tuningConf, args.IfName, tuningConf.Mac)
updateResultsMacAddr(*tuningConf, args.IfName, tuningConf.Mac)
}
}
@ -179,7 +178,7 @@ func cmdAdd(args *skel.CmdArgs) error {
}
}
if tuningConf.Mtu != -1 {
if tuningConf.Mtu != 0 {
if err = changeMtu(args.IfName, tuningConf.Mtu); err != nil {
return err
}