Epif cleanup

core/core.go

@@ -85,9 +85,6 @@ type EndpointDriver interface {
 	CreateEndpoint(id string) error
 	DeleteEndpoint(value string) error
 	MakeEndpointAddress() (*Address, error)
-	GetEndpointContainerContext(id string) (*ContainerEpContext, error)
-	GetContainerEpContextByContName(contName string) ([]ContainerEpContext, error)
-	UpdateContainerId(id string, contId string) error
 }
 
 type StateDriver interface {
@@ -108,24 +105,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 ContainerDriver 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

@@ -0,0 +1,99 @@
+/***
+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 crt
+
+import (
+	"encoding/json"
+	"errors"
+	"reflect"
+
+	"github.com/contiv/netplugin/crtclient"
+	"github.com/contiv/netplugin/crtclient/docker"
+)
+
+type Crt struct {
+	ContainerIf crtclient.ContainerIf
+}
+
+type CrtConfig struct {
+	Crt struct {
+		Type string
+	}
+}
+
+type ContainerIfTypes struct {
+	CrtType       reflect.Type
+	CrtConfigType reflect.Type
+}
+
+var ContainerIfRegistry = map[string]ContainerIfTypes{
+	"docker": ContainerIfTypes{
+		CrtType:       reflect.TypeOf(docker.Docker{}),
+		CrtConfigType: reflect.TypeOf(docker.DockerConfig{}),
+	},
+}
+
+func (c *Crt) AttachEndpoint(
+	contEpContext *crtclient.ContainerEpContext) error {
+	return c.ContainerIf.AttachEndpoint(contEpContext)
+}
+
+func (c *Crt) DetachEndpoint(contEpContext *crtclient.ContainerEpContext) error {
+	return c.ContainerIf.DetachEndpoint(contEpContext)
+}
+
+func (c *Crt) GetContainerId(contName string) string {
+	return c.ContainerIf.GetContainerId(contName)
+}
+
+func (c *Crt) GetContainerName(contId string) (string, error) {
+	return c.ContainerIf.GetContainerName(contId)
+}
+
+func (c *Crt) Deinit() {
+	c.ContainerIf.Deinit()
+}
+
+func (c *Crt) Init(configStr string) error {
+
+	cfg := &CrtConfig{}
+	err := json.Unmarshal([]byte(configStr), cfg)
+	if err != nil {
+		return err
+	}
+
+	if _, ok := ContainerIfRegistry[cfg.Crt.Type]; !ok {
+		return errors.New("unregistered container run time")
+	}
+
+	crtConfigType := ContainerIfRegistry[cfg.Crt.Type].CrtConfigType
+	crtConfig := reflect.New(crtConfigType).Interface()
+	err = json.Unmarshal([]byte(configStr), crtConfig)
+	if err != nil {
+		return err
+	}
+
+	config := &crtclient.Config{V: crtConfig}
+	crtType := ContainerIfRegistry[cfg.Crt.Type].CrtType
+	crtif := reflect.New(crtType).Interface()
+	c.ContainerIf = crtif.(crtclient.ContainerIf)
+	err = c.ContainerIf.Init(config)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

crt/crt_test.go

@@ -0,0 +1,76 @@
+/***
+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 crt
+
+import (
+	"testing"
+)
+
+func TestCrtInit(t *testing.T) {
+	configStr := `{
+                    "docker" : {
+                        "socket" : "unix:///var/run/docker.sock"
+                    },
+                    "crt" : {
+                        "type": "docker"
+                    }
+                  }`
+	crt := Crt{}
+	err := crt.Init(configStr)
+	if err != nil {
+		t.Fatalf("crt init failed: Error: %s", err)
+	}
+	defer func() { crt.Deinit() }()
+}
+
+func TestCrtInitInvalidConfigMissingCrt(t *testing.T) {
+	configStr := `{
+                    "docker" : {
+                        "socket" : "unix:///var/run/docker.sock"
+                    }
+                  }`
+	crt := Crt{}
+	err := crt.Init(configStr)
+	if err == nil {
+		t.Fatalf("crt init succeeded!")
+	}
+}
+
+func TestCrtInitInvalidConfigMissingCrtIf(t *testing.T) {
+	configStr := `{
+                    "crt" : {
+                        "type": "docker"
+                    }
+                  }`
+	crt := Crt{}
+	err := crt.Init(configStr)
+	if err == nil {
+		t.Fatalf("crt init succeeded!")
+	}
+}
+
+func TestCrtInitInvalidConfigInvalidCrt(t *testing.T) {
+	configStr := `{
+                    "crt" : {
+                        "type": "rocket"
+                    }
+                  }`
+	crt := Crt{}
+	err := crt.Init(configStr)
+	if err == nil {
+		t.Fatalf("crt init succeeded!")
+	}
+}

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)
+}

drivers/dockerdriver.go → crtclient/docker/docker.go

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package drivers
+package docker
 
 import (
 	"errors"
@@ -25,30 +25,34 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/contiv/netplugin/core"
+	"github.com/contiv/netplugin/crtclient"
 	"github.com/vishvananda/netlink"
 	// "github.com/vishvananda/netns"
 )
 
-type DockerDriverConfig struct {
+type DockerConfig struct {
 	Docker struct {
 		Socket string
 	}
 }
 
-type DockerDriver struct {
+type Docker struct {
 	Client *dockerclient.DockerClient
 }
 
-func (d *DockerDriver) Init(config *core.Config) error {
+func (d *Docker) Init(config *crtclient.Config) error {
 	if config == nil {
-		return &core.Error{Desc: fmt.Sprintf("Invalid arguments. cfg: %v", config)}
+		return errors.New("null config!")
 	}
 
-	cfg, ok := config.V.(*DockerDriverConfig)
+	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 == "" {
+		return errors.New(fmt.Sprintf("Invalid arguments. cfg: %v", config))
 	}
 
 	// TODO: ADD TLS support
@@ -57,10 +61,10 @@ func (d *DockerDriver) Init(config *core.Config) error {
 	return nil
 }
 
-func (d *DockerDriver) Deinit() {
+func (d *Docker) Deinit() {
 }
 
-func (d *DockerDriver) getContPid(contName string) (string, error) {
+func (d *Docker) getContPid(contName string) (string, error) {
 	contInfo, err := d.Client.InspectContainer(contName)
 	if err != nil {
 		return "", errors.New("couldn't obtain container info")
@@ -93,7 +97,7 @@ func setIfNs(ifname string, pid int) error {
 // Note: most of the work in this function is a temporary workaround for
 // what docker daemon would eventually do; in the meanwhile
 // the essense of the logic is borrowed from pipework
-func (d *DockerDriver) moveIfToContainer(ifId string, contName string) error {
+func (d *Docker) moveIfToContainer(ifId string, contName string) error {
 
 	// log.Printf("Moving interface '%s' into container '%s' \n", ifId, contName)
 
@@ -137,7 +141,7 @@ func (d *DockerDriver) moveIfToContainer(ifId string, contName string) error {
 	return err
 }
 
-func (d *DockerDriver) cleanupNetns(contName string) error {
+func (d *Docker) cleanupNetns(contName string) error {
 	contPid, err := d.getContPid(contName)
 	if err != nil {
 		return err
@@ -153,7 +157,7 @@ func (d *DockerDriver) cleanupNetns(contName string) error {
 }
 
 /*
-func (d *DockerDriver) 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)
@@ -228,7 +232,7 @@ func (d *DockerDriver) configureIfAddress(ctx *core.ContainerEpContext) error {
 	return err
 }
 */
-func (d *DockerDriver) 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)
@@ -268,7 +272,7 @@ func (d *DockerDriver) configureIfAddress(ctx *core.ContainerEpContext) error {
 
 // performs funtion to configure the network access and policies
 // before the container becomes active
-func (d *DockerDriver) AttachEndpoint(ctx *core.ContainerEpContext) error {
+func (d *Docker) AttachEndpoint(ctx *crtclient.ContainerEpContext) error {
 
 	err := d.moveIfToContainer(ctx.InterfaceId, ctx.NewContName)
 	if err != nil {
@@ -289,7 +293,7 @@ func (d *DockerDriver) AttachEndpoint(ctx *core.ContainerEpContext) error {
 }
 
 // uninstall the policies and configuration during container attach
-func (d *DockerDriver) 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",
@@ -303,7 +307,7 @@ func (d *DockerDriver) DetachEndpoint(ctx *core.ContainerEpContext) error {
 	return err
 }
 
-func (d *DockerDriver) GetContainerId(contName string) string {
+func (d *Docker) GetContainerId(contName string) string {
 	contInfo, err := d.Client.InspectContainer(contName)
 	if err != nil {
 		log.Printf("could not get contId for container %s, err '%s' \n",
@@ -319,7 +323,7 @@ func (d *DockerDriver) GetContainerId(contName string) string {
 	return contInfo.Id
 }
 
-func (d *DockerDriver) GetContainerName(contId string) (string, error) {
+func (d *Docker) GetContainerName(contId string) (string, error) {
 	contInfo, err := d.Client.InspectContainer(contId)
 	if err != nil {
 		log.Printf("could not get contName for container %s, err '%s' \n",