github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-16 06:26:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21 from Intel-Corp/pr-issue#19

Browse Source 
fix the cmdDel interface bug
This commit is contained in:
Kuralamudhan Ramakrishnan
2017-10-05 15:56:24 +01:00
committed by GitHub
parent a4fcc2ef7f fe50bb89ff
commit 833a064001
1 changed files with 2 additions and 4 deletions
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 nopodnet bool
var Delegates []map[string]interface{}
in, err := loadNetConf(args.StdinData)
if err != nil {
return err
@@ -552,13 +550,13 @@ func cmdDel(args *skel.CmdArgs) error {
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)
}
}
podifName := getifname()
for _, delegate := range Delegates {
for _, delegate := range in.Delegates {
r := delegateDel(podifName, args.IfName, delegate)
if r != nil {
return r