Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the cmdDel interface bug #21

Merged
merged 1 commit into from
Oct 5, 2017
Merged

fix the cmdDel interface bug #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions multus/multus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down