Initial CNI integration commit

This commit contains the initial set of changes to add
CNI sevice to libnetwork drivers. This is done using
a cniserver which acts as a side car for libnetwork daemon
to process CNI requests.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>

Author: abhi

Makefile

@@ -36,7 +36,8 @@ build-local:
 	@mkdir -p "bin"
 	go build -tags experimental -o "bin/dnet" ./cmd/dnet
 	go build -o "bin/docker-proxy" ./cmd/proxy
-
+	go build -o "bin/cniserver" ./pkg/server
+	go build -o "bin/cnictl" ./cni/
 clean:
 	@echo "🐳 $@"
 	@if [ -d bin ]; then \

api/api.go

@@ -650,8 +650,9 @@ func procPublishService(c libnetwork.NetworkController, vars map[string]string,
 	if err != nil {
 		return "", endpointToService(convertNetworkError(err))
 	}
+	epResp := getEndpointInfo(ep)
 
-	return ep.ID(), &createdResponse
+	return epResp, &createdResponse
 }
 
 func procUnpublishService(c libnetwork.NetworkController, vars map[string]string, body []byte) (interface{}, *responseStatus) {
@@ -707,6 +708,12 @@ func procAttachBackend(c libnetwork.NetworkController, vars map[string]string, b
 	if err != nil {
 		return nil, convertNetworkError(err)
 	}
+	if bk.SandboxKey != "" {
+		err = sb.SetKey(bk.SandboxKey)
+		if err != nil {
+			return nil, convertNetworkError(err)
+		}
+	}
 
 	return sb.Key(), &successResponse
 }

api/types.go

@@ -1,6 +1,11 @@
 package api
 
-import "github.com/docker/libnetwork/types"
+import (
+	"net"
+
+	"github.com/docker/libnetwork"
+	"github.com/docker/libnetwork/types"
+)
 
 /***********
  Resources
@@ -72,8 +77,9 @@ type sandboxCreate struct {
 
 // endpointJoin represents the expected body of the "join endpoint" or "leave endpoint" http request messages
 type endpointJoin struct {
-	SandboxID string   `json:"sandbox_id"`
-	Aliases   []string `json:"aliases"`
+	SandboxID  string   `json:"sandbox_id"`
+	Aliases    []string `json:"aliases"`
+	SandboxKey string   `json:"sandbox_key"`
 }
 
 // servicePublish represents the body of the "publish service" http request message
@@ -94,3 +100,34 @@ type extraHost struct {
 	Name    string `json:"name"`
 	Address string `json:"address"`
 }
+
+// endpointInfo contants the endpoint info for https response message on endpoint creation
+type endpointInfo struct {
+	ID          string           `json:"id"`
+	Address     net.IPNet        `json:"address"`
+	AddressIPv6 net.IPNet        `json:"address_ipv6"`
+	MacAddress  net.HardwareAddr `json:"mac_address"`
+	Gateway     net.IP           `json:"gateway"`
+	GatewayIPv6 net.IP           `json:"gateway_ipv6"`
+}
+
+func getEndpointInfo(ep libnetwork.Endpoint) endpointInfo {
+	epInfo := endpointInfo{ID: ep.ID()}
+
+	if ipv4 := ep.Info().Iface().Address(); ipv4 != nil {
+		epInfo.Address = *ipv4
+	}
+	if ipv6 := ep.Info().Iface().AddressIPv6(); ipv6 != nil {
+		epInfo.AddressIPv6 = *ipv6
+	}
+	if mac := ep.Info().Iface().MacAddress(); mac != nil {
+		epInfo.MacAddress = mac
+	}
+	if gw := ep.Info().Gateway(); gw != nil {
+		epInfo.Gateway = gw
+	}
+	if gw6 := ep.Info().GatewayIPv6(); gw6 != nil {
+		epInfo.GatewayIPv6 = gw6
+	}
+	return epInfo
+}

client/service.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/stringid"
+	"github.com/docker/libnetwork"
 	flag "github.com/docker/libnetwork/client/mflag"
 	"github.com/docker/libnetwork/netutils"
 )
@@ -173,19 +174,19 @@ func (cli *NetworkCli) CmdServicePublish(chain string, args ...string) error {
 	}
 
 	sn, nn := parseServiceName(cmd.Arg(0))
-	sc := serviceCreate{Name: sn, Network: nn, MyAliases: flAlias.GetAll()}
+	sc := ServiceCreate{Name: sn, Network: nn, MyAliases: flAlias.GetAll()}
 	obj, _, err := readBody(cli.call("POST", "/services", sc, nil))
 	if err != nil {
 		return err
 	}
 
-	var replyID string
-	err = json.Unmarshal(obj, &replyID)
+	var ep libnetwork.Endpoint
+	err = json.Unmarshal(obj, &ep)
 	if err != nil {
 		return err
 	}
 
-	fmt.Fprintf(cli.out, "%s\n", replyID)
+	fmt.Fprintf(cli.out, "%s\n", ep.ID())
 	return nil
 }
 
@@ -205,7 +206,7 @@ func (cli *NetworkCli) CmdServiceUnpublish(chain string, args ...string) error {
 		return err
 	}
 
-	sd := serviceDelete{Name: sn, Force: *force}
+	sd := ServiceDelete{Name: sn, Force: *force}
 	_, _, err = readBody(cli.call("DELETE", "/services/"+serviceID, sd, nil))
 
 	return err
@@ -350,7 +351,7 @@ func (cli *NetworkCli) CmdServiceAttach(chain string, args ...string) error {
 		return err
 	}
 
-	nc := serviceAttach{SandboxID: sandboxID, Aliases: flAlias.GetAll()}
+	nc := ServiceAttach{SandboxID: sandboxID, Aliases: flAlias.GetAll()}
 
 	_, _, err = readBody(cli.call("POST", "/services/"+serviceID+"/backend", nc, nil))
 

client/types.go

@@ -1,6 +1,10 @@
 package client
 
-import "github.com/docker/libnetwork/types"
+import (
+	"net"
+
+	"github.com/docker/libnetwork/types"
+)
 
 /***********
  Resources
@@ -48,23 +52,24 @@ type networkCreate struct {
 	NetworkOpts map[string]string `json:"network_opts"`
 }
 
-// serviceCreate represents the body of the "publish service" http request message
-type serviceCreate struct {
+// ServiceCreate represents the body of the "publish service" http request message
+type ServiceCreate struct {
 	Name      string   `json:"name"`
 	MyAliases []string `json:"my_aliases"`
 	Network   string   `json:"network_name"`
 }
 
-// serviceDelete represents the body of the "unpublish service" http request message
-type serviceDelete struct {
+// ServiceDelete represents the body of the "unpublish service" http request message
+type ServiceDelete struct {
 	Name  string `json:"name"`
 	Force bool   `json:"force"`
 }
 
-// serviceAttach represents the expected body of the "attach/detach sandbox to/from service" http request messages
-type serviceAttach struct {
-	SandboxID string   `json:"sandbox_id"`
-	Aliases   []string `json:"aliases"`
+// ServiceAttach represents the expected body of the "attach/detach sandbox to/from service" http request messages
+type ServiceAttach struct {
+	SandboxID  string   `json:"sandbox_id"`
+	Aliases    []string `json:"aliases"`
+	SandboxKey string   `json:"sandbox_key"`
 }
 
 // SandboxCreate is the body of the "post /sandboxes" http request message
@@ -76,6 +81,7 @@ type SandboxCreate struct {
 	ResolvConfPath    string                `json:"resolv_conf_path"`
 	DNS               []string              `json:"dns"`
 	ExtraHosts        []extraHost           `json:"extra_hosts"`
+	UseExternalKey    bool                  `json:"use_external_key"`
 	UseDefaultSandbox bool                  `json:"use_default_sandbox"`
 	ExposedPorts      []types.TransportPort `json:"exposed_ports"`
 	PortMapping       []types.PortBinding   `json:"port_mapping"`
@@ -94,3 +100,13 @@ type sandboxParentUpdate struct {
 	Name        string `json:"name"`
 	Address     string `json:"address"`
 }
+
+// endpointInfo contants the endpoint info for http response message on endpoint creation
+type EndpointInfo struct {
+	ID          string           `json:"id"`
+	Address     net.IPNet        `json:"address"`
+	AddressIPv6 net.IPNet        `json:"address_ipv6"`
+	MacAddress  net.HardwareAddr `json:"mac_address"`
+	Gateway     net.IP           `json:"gateway"`
+	GatewayIPv6 net.IP           `json:"gateway_ipv6"`
+}

cmd/dnet/dnet.go

@@ -447,7 +447,7 @@ func (d *dnetConnection) httpCall(method, path string, data interface{}, headers
 
 	req.URL.Host = d.addr
 	req.URL.Scheme = "http"
-
+	fmt.Printf("Requesting http: %+v",req)
 	httpClient := &http.Client{}
 	resp, err := httpClient.Do(req)
 	statusCode := -1

cni/main.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/version"
+	"github.com/docker/libnetwork/pkg/cniapi"
+	log "github.com/sirupsen/logrus"
+)
+
+func cmdAdd(args *skel.CmdArgs) error {
+	libClient := cniapi.NewLibNetCniClient()
+	result, err := libClient.SetupPod(args)
+	if err != nil {
+		return fmt.Errorf("Failed to setup Pod , %v", err)
+	}
+	return types.PrintResult(result, version.Current())
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+	libClient := cniapi.NewLibNetCniClient()
+	if err := libClient.TearDownPod(args); err != nil {
+		return fmt.Errorf("Failed to tear down pod, %v", err)
+	}
+	return nil
+}
+
+func main() {
+	log.Infof("Starting Libnetwork CNI plugin")
+	skel.PluginMain(cmdAdd, cmdDel, version.PluginSupports("", "0.1.0", "0.2.0", version.Current()))
+}