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

Factor an API out into a module

Browse Source 
This takes some of the machinery from CNI and from the rkt networking
code, and turns it into a library that can be linked into go apps.

Included is an example command-line application that uses the library,
called `cnitool`.

Other headline changes:

 * Plugin exec'ing is factored out

The motivation here is to factor out the protocol for invoking
plugins. To that end, a generalisation of the code from api.go and
pkg/plugin/ipam.go goes into pkg/invoke/exec.go.

 * Move argument-handling and conf-loading into public API

The fact that the arguments get turned into an environment for the
plugin is incidental to the API; so, provide a way of supplying them
as a struct or saying "just use the same arguments as I got" (the
latter is for IPAM plugins).
This commit is contained in:
Michael Bridgen
2015-08-07 16:27:52 +01:00
parent 5da5738456
commit b88f173c43
28 changed files with 643 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/meta/flannel/flannel.go
View File

@ -29,8 +29,9 @@ import (
"strconv"
"strings"
"github.com/appc/cni/pkg/plugin"
"github.com/appc/cni/pkg/ipam"
"github.com/appc/cni/pkg/skel"
"github.com/appc/cni/pkg/types"
)
const (
@ -39,7 +40,7 @@ const (
)
type NetConf struct {
plugin.NetConf
types.NetConf
SubnetFile string `json:"subnetFile"`
Delegate map[string]interface{} `json:"delegate"`
}
@ -130,7 +131,7 @@ func delegateAdd(cid string, netconf map[string]interface{}) error {
return err
}
result, err := plugin.ExecAdd(netconf["type"].(string), netconfBytes)
result, err := ipam.ExecAdd(netconf["type"].(string), netconfBytes)
if err != nil {
return err
}
@ -199,8 +200,8 @@ func cmdAdd(args *skel.CmdArgs) error {
n.Delegate["ipam"] = map[string]interface{}{
"type": "host-local",
"subnet": fenv.sn.String(),
"routes": []plugin.Route{
plugin.Route{
"routes": []types.Route{
types.Route{
Dst: *fenv.nw,
},
},
@ -215,12 +216,12 @@ func cmdDel(args *skel.CmdArgs) error {
return err
}
n := &plugin.NetConf{}
n := &types.NetConf{}
if err = json.Unmarshal(netconfBytes, n); err != nil {
return fmt.Errorf("failed to parse netconf: %v", err)
}
return plugin.ExecDel(n.Type, netconfBytes)
return ipam.ExecDel(n.Type, netconfBytes)
}
func main() {