move containerIf out of core

Author: Vipin Jain

core/core.go

@@ -106,24 +106,3 @@ type StateDriver interface {
 		unmarshal func([]byte, interface{}) error) error
 	ClearState(key string) error
 }
-
-type ContainerEpContext struct {
-	NewContName  string
-	CurrContName string
-	InterfaceId  string
-	IpAddress    string
-	SubnetLen    uint
-	DefaultGw    string
-}
-
-type ContainerIf interface {
-	// Container driver provides a mechanism to interface with container
-	// runtime to handle events create, start, die, stop, pause, etc.
-	Driver
-	Init(config *Config) error
-	Deinit()
-	AttachEndpoint(ctx *ContainerEpContext) error
-	DetachEndpoint(ctx *ContainerEpContext) error
-	GetContainerId(contName string) string
-	GetContainerName(contName string) (string, error)
-}

crt/crt.go

@@ -20,12 +20,12 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/contiv/netplugin/core"
-	"github.com/contiv/netplugin/crt/docker"
+	"github.com/contiv/netplugin/crtclient"
+	"github.com/contiv/netplugin/crtclient/docker"
 )
 
 type Crt struct {
-	ContainerIf core.ContainerIf
+	ContainerIf crtclient.ContainerIf
 }
 
 type CrtConfig struct {
@@ -46,20 +46,12 @@ var ContainerIfRegistry = map[string]ContainerIfTypes{
 	},
 }
 
-type ContainerEpContext struct {
-	NewContName  string
-	CurrContName string
-	InterfaceId  string
-	IpAddress    string
-	SubnetLen    uint
-	DefaultGw    string
-}
-
-func (c *Crt) AttachEndpoint(contEpContext *core.ContainerEpContext) error {
+func (c *Crt) AttachEndpoint(
+	contEpContext *crtclient.ContainerEpContext) error {
 	return c.ContainerIf.AttachEndpoint(contEpContext)
 }
 
-func (c *Crt) DetachEndpoint(contEpContext *core.ContainerEpContext) error {
+func (c *Crt) DetachEndpoint(contEpContext *crtclient.ContainerEpContext) error {
 	return c.ContainerIf.DetachEndpoint(contEpContext)
 }
 
@@ -94,10 +86,10 @@ func (c *Crt) Init(configStr string) error {
 		return err
 	}
 
-	config := &core.Config{V: crtConfig}
+	config := &crtclient.Config{V: crtConfig}
 	crtType := ContainerIfRegistry[cfg.Crt.Type].CrtType
 	crtif := reflect.New(crtType).Interface()
-	c.ContainerIf = crtif.(core.ContainerIf)
+	c.ContainerIf = crtif.(crtclient.ContainerIf)
 	err = c.ContainerIf.Init(config)
 	if err != nil {
 		return err

crtclient/crtclient.go

@@ -0,0 +1,41 @@
+/***
+Copyright 2014 Cisco Systems Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package crtclient
+
+// container runtime client interface implementations
+
+type Config struct {
+	// Config object parsed from a json styled config
+	V interface{}
+}
+
+type ContainerEpContext struct {
+	NewContName  string
+	CurrContName string
+	InterfaceId  string
+	IpAddress    string
+	SubnetLen    uint
+	DefaultGw    string
+}
+
+type ContainerIf interface {
+	Init(config *Config) error
+	Deinit()
+	AttachEndpoint(ctx *ContainerEpContext) error
+	DetachEndpoint(ctx *ContainerEpContext) error
+	GetContainerId(contName string) string
+	GetContainerName(contName string) (string, error)
+}

crt/docker/docker.go crtclient/docker/docker.go

@@ -25,7 +25,7 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/contiv/netplugin/core"
+	"github.com/contiv/netplugin/crtclient"
 	"github.com/vishvananda/netlink"
 	// "github.com/vishvananda/netns"
 )
@@ -40,15 +40,15 @@ type Docker struct {
 	Client *dockerclient.DockerClient
 }
 
-func (d *Docker) Init(config *core.Config) error {
+func (d *Docker) Init(config *crtclient.Config) error {
 	if config == nil {
 		return errors.New("null config!")
 	}
 
 	cfg, ok := config.V.(*DockerConfig)
 
 	if !ok {
-		return &core.Error{Desc: "Invalid config type passed!"}
+		return errors.New("Invalid config type passed!")
 	}
 
 	if cfg.Docker.Socket == "" {
@@ -157,7 +157,7 @@ func (d *Docker) cleanupNetns(contName string) error {
 }
 
 /*
-func (d *Docker) configureIfAddress(ctx *core.ContainerEpContext) error {
+func (d *Docker) configureIfAddress(ctx *crtclient.ContainerEpContext) error {
 
 	log.Printf("configuring ip: addr -%s/%d- on if %s for container %s\n",
 		ctx.IpAddress, ctx.SubnetLen, ctx.InterfaceId, ctx.NewContName)
@@ -232,7 +232,7 @@ func (d *Docker) configureIfAddress(ctx *core.ContainerEpContext) error {
 	return err
 }
 */
-func (d *Docker) configureIfAddress(ctx *core.ContainerEpContext) error {
+func (d *Docker) configureIfAddress(ctx *crtclient.ContainerEpContext) error {
 
 	log.Printf("configuring ip: addr -%s/%d- on if %s for container %s\n",
 		ctx.IpAddress, ctx.SubnetLen, ctx.InterfaceId, ctx.NewContName)
@@ -272,7 +272,7 @@ func (d *Docker) configureIfAddress(ctx *core.ContainerEpContext) error {
 
 // performs funtion to configure the network access and policies
 // before the container becomes active
-func (d *Docker) AttachEndpoint(ctx *core.ContainerEpContext) error {
+func (d *Docker) AttachEndpoint(ctx *crtclient.ContainerEpContext) error {
 
 	err := d.moveIfToContainer(ctx.InterfaceId, ctx.NewContName)
 	if err != nil {
@@ -293,7 +293,7 @@ func (d *Docker) AttachEndpoint(ctx *core.ContainerEpContext) error {
 }
 
 // uninstall the policies and configuration during container attach
-func (d *Docker) DetachEndpoint(ctx *core.ContainerEpContext) error {
+func (d *Docker) DetachEndpoint(ctx *crtclient.ContainerEpContext) error {
 	var err error
 
 	// log.Printf("Detached called for container %s with %s interface\n",

netd.go

@@ -25,7 +25,8 @@ import (
 
 	"github.com/contiv/netplugin/core"
 	"github.com/contiv/netplugin/crt"
-	"github.com/contiv/netplugin/crt/docker"
+	"github.com/contiv/netplugin/crtclient"
+	"github.com/contiv/netplugin/crtclient/docker"
 	"github.com/contiv/netplugin/drivers"
 	"github.com/contiv/netplugin/gstate"
 	"github.com/contiv/netplugin/netutils"
@@ -192,8 +193,8 @@ func processNetEvent(netPlugin *plugin.NetPlugin, key, preValue string,
 }
 
 func getEndpointContainerContext(state *core.StateDriver, epId string) (
-	*core.ContainerEpContext, error) {
-	var epCtx core.ContainerEpContext
+	*crtclient.ContainerEpContext, error) {
+	var epCtx crtclient.ContainerEpContext
 	var err error
 
 	epCfg := &drivers.OvsCfgEndpointState{StateDriver: *state}
@@ -224,16 +225,16 @@ func getEndpointContainerContext(state *core.StateDriver, epId string) (
 }
 
 func getContainerEpContextByContName(state *core.StateDriver, contName string) (
-	epCtxs []core.ContainerEpContext, err error) {
-	var epCtx *core.ContainerEpContext
+	epCtxs []crtclient.ContainerEpContext, err error) {
+	var epCtx *crtclient.ContainerEpContext
 
 	contName = strings.TrimPrefix(contName, "/")
 	epCfgs, err := drivers.ReadAllEpsCfg(state)
 	if err != nil {
 		return
 	}
 
-	epCtxs = make([]core.ContainerEpContext, len(epCfgs))
+	epCtxs = make([]crtclient.ContainerEpContext, len(epCfgs))
 	idx := 0
 	for _, epCfg := range epCfgs {
 		if epCfg.ContName != contName {
@@ -386,7 +387,7 @@ func handleEtcdEvents(netPlugin *plugin.NetPlugin, crt *crt.Crt,
 func handleContainerStart(netPlugin *plugin.NetPlugin, crt *crt.Crt,
 	contId string) error {
 	var err error
-	var epContexts []core.ContainerEpContext
+	var epContexts []crtclient.ContainerEpContext
 
 	contName, err := crt.GetContainerName(contId)
 	if err != nil {