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

Merge pull request #60 from eyakubovich/fix-plugin-del

Browse Source 
bug fix: exec of DEL cmd caused JSON decode error
This commit is contained in:
Michael Bridgen
2015-09-22 16:39:59 +01:00
parent cc918a1aea 9ea56937d4
commit 2a58bd9379
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libcni/api.go
View File

@ -43,20 +43,18 @@ type CNIConfig struct {
} }
func (c *CNIConfig) AddNetwork(net *NetworkConfig, rt *RuntimeConf) (*types.Result, error) { func (c *CNIConfig) AddNetwork(net *NetworkConfig, rt *RuntimeConf) (*types.Result, error) {
return c.execPlugin("ADD", net, rt) pluginPath := invoke.FindInPath(net.Network.Type, c.Path)
return invoke.ExecPluginWithResult(pluginPath, net.Bytes, c.args("ADD", rt))
} }
func (c *CNIConfig) DelNetwork(net *NetworkConfig, rt *RuntimeConf) error { func (c *CNIConfig) DelNetwork(net *NetworkConfig, rt *RuntimeConf) error {
_, err := c.execPlugin("DEL", net, rt) pluginPath := invoke.FindInPath(net.Network.Type, c.Path)
return err return invoke.ExecPluginWithoutResult(pluginPath, net.Bytes, c.args("DEL", rt))
} }
// ===== // =====
func (c *CNIConfig) args(action string, rt *RuntimeConf) *invoke.Args {
func (c *CNIConfig) execPlugin(action string, conf *NetworkConfig, rt *RuntimeConf) (*types.Result, error) { return &invoke.Args{
pluginPath := invoke.FindInPath(conf.Network.Type, c.Path)
args := &invoke.Args{
Command: action, Command: action,
ContainerID: rt.ContainerID, ContainerID: rt.ContainerID,
NetNS: rt.NetNS, NetNS: rt.NetNS,
@ -64,5 +62,4 @@ func (c *CNIConfig) execPlugin(action string, conf *NetworkConfig, rt *RuntimeCo
IfName: rt.IfName, IfName: rt.IfName,
Path: strings.Join(c.Path, ":"), Path: strings.Join(c.Path, ":"),
} }
return invoke.ExecPlugin(pluginPath, conf.Bytes, args)
} }

22
pkg/invoke/exec.go
View File

@ -41,7 +41,23 @@ func pluginErr(err error, output []byte) error {
return err return err
} }
func ExecPlugin(pluginPath string, netconf []byte, args CNIArgs) (*types.Result, error) { func ExecPluginWithResult(pluginPath string, netconf []byte, args CNIArgs) (*types.Result, error) {
stdoutBytes, err := execPlugin(pluginPath, netconf, args)
if err != nil {
return nil, err
}
res := &types.Result{}
err = json.Unmarshal(stdoutBytes, res)
return res, err
}
func ExecPluginWithoutResult(pluginPath string, netconf []byte, args CNIArgs) error {
_, err := execPlugin(pluginPath, netconf, args)
return err
}
func execPlugin(pluginPath string, netconf []byte, args CNIArgs) ([]byte, error) {
if pluginPath == "" { if pluginPath == "" {
return nil, fmt.Errorf("could not find %q plugin", filepath.Base(pluginPath)) return nil, fmt.Errorf("could not find %q plugin", filepath.Base(pluginPath))
} }
@ -60,7 +76,5 @@ func ExecPlugin(pluginPath string, netconf []byte, args CNIArgs) (*types.Result,
return nil, pluginErr(err, stdout.Bytes()) return nil, pluginErr(err, stdout.Bytes())
} }
res := &types.Result{} return stdout.Bytes(), nil
err := json.Unmarshal(stdout.Bytes(), res)
return res, err
} }

5
pkg/ipam/ipam.go
View File

@ -29,15 +29,14 @@ func ExecAdd(plugin string, netconf []byte) (*types.Result, error) {
if os.Getenv("CNI_COMMAND") != "ADD" { if os.Getenv("CNI_COMMAND") != "ADD" {
return nil, fmt.Errorf("CNI_COMMAND is not ADD") return nil, fmt.Errorf("CNI_COMMAND is not ADD")
} }
return invoke.ExecPlugin(invoke.Find(plugin), netconf, invoke.ArgsFromEnv()) return invoke.ExecPluginWithResult(invoke.Find(plugin), netconf, invoke.ArgsFromEnv())
} }
func ExecDel(plugin string, netconf []byte) error { func ExecDel(plugin string, netconf []byte) error {
if os.Getenv("CNI_COMMAND") != "DEL" { if os.Getenv("CNI_COMMAND") != "DEL" {
return fmt.Errorf("CNI_COMMAND is not DEL") return fmt.Errorf("CNI_COMMAND is not DEL")
} }
_, err := invoke.ExecPlugin(invoke.Find(plugin), netconf, invoke.ArgsFromEnv()) return invoke.ExecPluginWithoutResult(invoke.Find(plugin), netconf, invoke.ArgsFromEnv())
return err
} }
// ConfigureIface takes the result of IPAM plugin and // ConfigureIface takes the result of IPAM plugin and