github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-07-19 18:12:18 +00:00
Code Issues Projects Releases Wiki Activity

fix the cmdDel interface bug

Browse Source 
Change-Id: Ie266603cff714998dd29bb62e3aa6de531b46c23
This commit is contained in:
kuralamudhan ramakrishnan 2017-09-28 15:42:56 +01:00
parent a4fcc2ef7f
commit fe50bb89ff
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
multus/multus.go
View File

@ -521,8 +521,6 @@ func cmdDel(args *skel.CmdArgs) error {
var result error var result error
var nopodnet bool var nopodnet bool
var Delegates []map[string]interface{}
in, err := loadNetConf(args.StdinData) in, err := loadNetConf(args.StdinData)
if err != nil { if err != nil {
return err return err
@ -552,13 +550,13 @@ func cmdDel(args *skel.CmdArgs) error {
return fmt.Errorf("Multus: Err in reading the delegates: %v", err) return fmt.Errorf("Multus: Err in reading the delegates: %v", err)
} }
if err := json.Unmarshal(netconfBytes, &Delegates); err != nil { if err := json.Unmarshal(netconfBytes, &in.Delegates); err != nil {
return fmt.Errorf("Multus: failed to load netconf: %v", err) return fmt.Errorf("Multus: failed to load netconf: %v", err)
} }
} }
podifName := getifname() podifName := getifname()
for _, delegate := range Delegates { for _, delegate := range in.Delegates {
r := delegateDel(podifName, args.IfName, delegate) r := delegateDel(podifName, args.IfName, delegate)
if r != nil { if r != nil {
return r return r