add container runtime unit tests

Author: Vipin Jain

crt/crt.go

@@ -18,7 +18,6 @@ package crt
 import (
 	"encoding/json"
 	"errors"
-	"log"
 	"reflect"
 
 	"github.com/contiv/netplugin/core"
@@ -72,6 +71,10 @@ 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{}
@@ -80,8 +83,6 @@ func (c *Crt) Init(configStr string) error {
 		return err
 	}
 
-	log.Printf("container runtime %s \n", cfg.Crt.Type)
-
 	if _, ok := ContainerIfRegistry[cfg.Crt.Type]; !ok {
 		return errors.New("unregistered container run time")
 	}
@@ -92,7 +93,6 @@ func (c *Crt) Init(configStr string) error {
 	if err != nil {
 		return err
 	}
-	log.Printf("got crt config %v \n", crtConfig)
 
 	config := &core.Config{V: crtConfig}
 	crtType := ContainerIfRegistry[cfg.Crt.Type].CrtType

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

crt/docker/docker.go

@@ -42,7 +42,7 @@ type Docker struct {
 
 func (d *Docker) Init(config *core.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.(*DockerConfig)
@@ -51,6 +51,10 @@ func (d *Docker) Init(config *core.Config) error {
 		return &core.Error{Desc: "Invalid config type passed!"}
 	}
 
+	if cfg.Docker.Socket == "" {
+		return errors.New(fmt.Sprintf("Invalid arguments. cfg: %v", config))
+	}
+
 	// TODO: ADD TLS support
 	d.Client, _ = dockerclient.NewDockerClient(cfg.Docker.Socket, nil)
 

plugin/netplugin_test.go

@@ -177,52 +177,3 @@ func TestNetPluginInitInvalidConfigMissingNetworkDriver(t *testing.T) {
 	}
 	defer func() { plugin.Deinit() }()
 }
-
-func TestNetPluginInitInvalidConfigMissingContainerDriverName(t *testing.T) {
-	configStr := `{
-                    "drivers" : {
-                       "network": "ovs",
-                       "endpoint": "ovs",
-                       "state": "etcd"
-                    },
-                    "ovs" : {
-                       "dbip": "127.0.0.1",
-                       "dbport": 6640
-                    },
-                    "etcd" : {
-                        "machines": ["http://1.0.0.1:4001"]
-                    },
-                    "docker" : {
-                        "socket" : "unix:///var/run/docker.sock"
-                    }
-                  }`
-	plugin := NetPlugin{}
-	err := plugin.Init(configStr)
-	if err == nil {
-		t.Fatalf("plugin init failed: Error: %s", err)
-	}
-}
-
-func TestNetPluginInitInvalidConfigMissingContainerDriver(t *testing.T) {
-	configStr := `{
-                    "drivers" : {
-                       "network": "ovs",
-                       "endpoint": "ovs",
-                       "state": "etcd",
-                       "container": "docker"
-                    },
-                    "ovs" : {
-                       "dbip": "127.0.0.1",
-                       "dbport": 6640
-                    },
-                    "etcd" : {
-                        "machines": ["http://1.0.0.1:4001"]
-                    }
-                  }`
-	plugin := NetPlugin{}
-	err := plugin.Init(configStr)
-	if err != nil {
-		t.Fatalf("plugin init failed: Error: %s", err)
-	}
-	defer func() { plugin.Deinit() }()
-}

scripts/unittests

@@ -11,6 +11,7 @@ run_in_vagrant=false
 test_packages="github.com/contiv/netplugin/drivers \
     github.com/contiv/netplugin/plugin \
     github.com/contiv/netplugin/netutils \
+    github.com/contiv/netplugin/crt \
     github.com/contiv/netplugin/gstate"
 
 while [ "${#}" -gt 0 ]