host-device plugin: result is valid JSON

test:
- feed valid config JSON to plugin
- execute plugin inside the namespace with the test device
This commit is contained in:
Gabriel Rosenhouse
2017-09-12 21:01:58 -07:00
parent 25ca6ccb52
commit c238c93b5e
2 changed files with 17 additions and 6 deletions

View File

@ -25,6 +25,7 @@ import (
"strings"
"github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/types/current"
"github.com/containernetworking/cni/pkg/version"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/vishvananda/netlink"
@ -64,6 +65,7 @@ func cmdAdd(args *skel.CmdArgs) error {
return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)
}
defer containerNs.Close()
defer (&current.Result{}).Print()
return addLink(cfg.Device, cfg.HWAddr, cfg.KernelPath, containerNs)
}
@ -77,6 +79,7 @@ func cmdDel(args *skel.CmdArgs) error {
return fmt.Errorf("failed to open netns %q: %v", args.Netns, err)
}
defer containerNs.Close()
defer fmt.Println(`{}`)
return removeLink(cfg.Device, cfg.HWAddr, cfg.KernelPath, containerNs)
}