@@ -165,13 +165,13 @@ func (c *controller) handleKeyChange(keys []*types.EncryptionKey) error {

 		a.networkDB.SetKey(added)

 	}

-	key, tag, err := c.getPrimaryKeyTag(subsysGossip)

+	key, _, err := c.getPrimaryKeyTag(subsysGossip)

 	if err != nil {

 		return err

 	}

 	a.networkDB.SetPrimaryKey(key)

-	key, tag, err = c.getPrimaryKeyTag(subsysIPSec)

+	key, tag, err := c.getPrimaryKeyTag(subsysIPSec)

 	if err != nil {

 		return err

 	}

@@ -914,6 +914,9 @@ func TestAttachDetachBackend(t *testing.T) {

 	cid := "abcdefghi"

 	sbox, err := c.NewSandbox(cid)

+	if err != nil {

+		t.Fatal(err)

+	}

 	sid := sbox.ID()

 	defer sbox.Delete()

@@ -1280,6 +1283,9 @@ func TestJoinLeave(t *testing.T) {

 	cid := "abcdefghi"

 	sb, err := c.NewSandbox(cid)

+	if err != nil {

+		t.Fatal(err)

+	}

 	defer sb.Delete()

 	jl := endpointJoin{SandboxID: sb.ID()}

@@ -13,7 +13,7 @@ var (

 )

 func init() {

-	flag.Bool([]string{"#hp", "#-halp"}, false, "display the halp")

+	flag.Bool([]string{"#hp", "#-help"}, false, "display the help")

 	flag.BoolVar(&b, []string{"b", "#bal", "#bol", "-bal"}, false, "a simple bool")

 	flag.BoolVar(&b, []string{"g", "#gil"}, false, "a simple bool")

 	flag.BoolVar(&b2, []string{"#-bool"}, false, "a simple bool")

@@ -22,7 +22,7 @@ type SetMatrix interface {

 	// returns true if the mapping was deleted, false otherwise

 	// returns also the number of endpoints associated to the IP

 	Remove(key string, value interface{}) (bool, int)

-	// Cardinality returns the number of elements in the set of a specfic key

+	// Cardinality returns the number of elements in the set of a specific key

 	// returns false if the key is not in the map

 	Cardinality(key string) (int, bool)

 	// String returns the string version of the set, empty otherwise

@@ -1014,7 +1014,7 @@ func (c *controller) NetworkByID(id string) (Network, error) {

 }

 // NewSandbox creates a new sandbox for the passed container id

-func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (sBox Sandbox, err error) {

+func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (Sandbox, error) {

 	if containerID == "" {

 		return nil, types.BadRequestErrorf("invalid container ID")

 	}

@@ -1054,7 +1054,6 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s

 			extDNS:             []extDNSEntry{},

 		}

 	}

-	sBox = sb

 	heap.Init(&sb.endpoints)

@@ -1073,6 +1072,8 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s

 		sb.id = "ingress_sbox"

 	}

 	c.Unlock()

+

+	var err error

 	defer func() {

 		if err != nil {

 			c.Lock()

@@ -101,6 +101,9 @@ func TestAtomicKVObjectFlatKey(t *testing.T) {

 	// Get the Object using GetObject, then set again.

 	newObj := dummyObject{}

 	err = store.GetObject(Key(expected.Key()...), &newObj)

+	if err != nil {

+		t.Fatal(err)

+	}

 	assert.True(t, newObj.Exists())

 	err = store.PutObjectAtomic(&n)

 	if err != nil {

@@ -670,7 +670,7 @@ func (n *network) initSandbox(restore bool) error {

 	// In the restore case network sandbox already exist; but we don't know

 	// what epoch number it was created with. It has to be retrieved by

 	// searching the net namespaces.

-	key := ""

+	var key string

 	if restore {

 		key = osl.GenerateKey("-" + n.id)

 	} else {

@@ -872,15 +872,10 @@ func (n *network) Value() []byte {

 		netJSON = append(netJSON, sj)

 	}

-	b, err := json.Marshal(netJSON)

-	if err != nil {

-		return []byte{}

-	}

-

 	m["secure"] = n.secure

 	m["subnets"] = netJSON

 	m["mtu"] = n.mtu

-	b, err = json.Marshal(m)

+	b, err := json.Marshal(m)

 	if err != nil {

 		return []byte{}

 	}

@@ -457,7 +457,7 @@ func (n *network) initSandbox(restore bool) error {

 	// In the restore case network sandbox already exist; but we don't know

 	// what epoch number it was created with. It has to be retrieved by

 	// searching the net namespaces.

-	key := ""

+	var key string

 	if restore {

 		key = osl.GenerateKey("-" + n.id)

 	} else {

@@ -570,15 +570,10 @@ func (n *network) Value() []byte {

 		netJSON = append(netJSON, sj)

 	}

-	b, err := json.Marshal(netJSON)

-	if err != nil {

-		return []byte{}

-	}

-

 	m["secure"] = n.secure

 	m["subnets"] = netJSON

 	m["mtu"] = n.mtu

-	b, err = json.Marshal(m)

+	b, err := json.Marshal(m)

 	if err != nil {

 		return []byte{}

 	}

@@ -324,6 +324,9 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d

 	}

 	n, err := d.getNetwork(id)

+	if err != nil {

+		return err

+	}

 	n.created = true

 	return d.storeUpdate(config)

 }

@@ -530,7 +533,13 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,

 	}

 	epOption, err := parseEndpointOptions(epOptions)

+	if err != nil {

+		return err

+	}

 	epConnectivity, err := parseEndpointConnectivity(epOptions)

+	if err != nil {

+		return err

+	}

 	macAddress := ifInfo.MacAddress()

 	// Use the macaddress if it was provided

@@ -448,7 +448,7 @@ func (a *Allocator) RequestAddress(poolID string, prefAddress net.IP, opts map[s

 	c := p

 	for c.Range != nil {

 		k = c.ParentKey

-		c, ok = aSpace.subnets[k]

+		c = aSpace.subnets[k]

 	}

 	aSpace.Unlock()

@@ -262,7 +262,7 @@ func TestAddSubnets(t *testing.T) {

 		t.Fatal("returned different pool id for same sub pool requests")

 	}

-	pid, _, _, err = a.RequestPool(localAddressSpace, "10.20.2.0/24", "", nil, false)

+	_, _, _, err = a.RequestPool(localAddressSpace, "10.20.2.0/24", "", nil, false)

 	if err == nil {

 		t.Fatal("Failed to detect overlapping subnets")

 	}

@@ -296,7 +296,6 @@ func TestAddReleasePoolID(t *testing.T) {

 		t.Fatal(err)

 	}

-	subnets := aSpace.subnets

 	pid0, _, _, err := a.RequestPool(localAddressSpace, "10.0.0.0/8", "", nil, false)

 	if err != nil {

 		t.Fatal("Unexpected failure in adding pool")

@@ -310,7 +309,7 @@ func TestAddReleasePoolID(t *testing.T) {

 		t.Fatal(err)

 	}

-	subnets = aSpace.subnets

+	subnets := aSpace.subnets

 	if subnets[k0].RefCount != 1 {

 		t.Fatalf("Unexpected ref count for %s: %d", k0, subnets[k0].RefCount)

@@ -9,7 +9,7 @@ type Response struct {

 	Error string

 }

-// IsSuccess returns wheter the plugin response is successful

+// IsSuccess returns whether the plugin response is successful

 func (r *Response) IsSuccess() bool {

 	return r.Error == ""

 }

@@ -20,6 +20,9 @@ func TestReloaded(t *testing.T) {

 	var fwdChain *ChainInfo

 	fwdChain, err = NewChain("FWD", Filter, false)

+	if err != nil {

+		t.Fatal(err)

+	}

 	bridgeName := "lo"

 	err = ProgramChain(fwdChain, bridgeName, false, true)

@@ -22,12 +22,18 @@ func TestNewChain(t *testing.T) {

 	bridgeName = "lo"

 	natChain, err = NewChain(chainName, Nat, false)

+	if err != nil {

+		t.Fatal(err)

+	}

 	err = ProgramChain(natChain, bridgeName, false, true)

 	if err != nil {

 		t.Fatal(err)

 	}

 	filterChain, err = NewChain(chainName, Filter, false)

+	if err != nil {

+		t.Fatal(err)

+	}

 	err = ProgramChain(filterChain, bridgeName, false, true)

 	if err != nil {

 		t.Fatal(err)

@@ -446,6 +446,9 @@ func TestIpamReleaseOnNetDriverFailures(t *testing.T) {

 	}

 	cfgOptions, err := OptionBoltdbWithRandomDBFile()

+	if err != nil {

+		t.Fatal(err)

+	}

 	c, err := New(cfgOptions...)

 	if err != nil {

 		t.Fatal(err)

@@ -1904,7 +1904,7 @@ func (n *network) ResolveIP(ip string) string {

 		return ""

 	}

 	// NOTE it is possible to have more than one element in the Set, this will happen

-	// because of interleave of diffent events from differnt sources (local container create vs

+	// because of interleave of different events from different sources (local container create vs

 	// network db notifications)

 	// In such cases the resolution will be based on the first element of the set, and can vary

 	// during the system stabilitation

@@ -7,6 +7,7 @@ package osl

 func GC() {

 }

+// GetSandboxForExternalKey returns sandbox object for the supplied path

 func GetSandboxForExternalKey(path string, key string) (Sandbox, error) {

 	return nil, nil

 }

@@ -75,6 +75,9 @@ func TestReuseReleasedPort(t *testing.T) {

 	if err != nil {

 		t.Fatal(err)

 	}

+	if port != 5000 {

+		t.Fatalf("Expected port 5000 got %d", port)

+	}

 }

 func TestReleaseUnreadledPort(t *testing.T) {

@@ -89,7 +92,7 @@ func TestReleaseUnreadledPort(t *testing.T) {

 		t.Fatalf("Expected port 5000 got %d", port)

 	}

-	port, err = p.RequestPort(defaultIP, "tcp", 5000)

+	_, err = p.RequestPort(defaultIP, "tcp", 5000)

 	switch err.(type) {

 	case ErrPortAlreadyAllocated:

@@ -520,7 +520,7 @@ func writePortsToFile(ports []*PortConfig) (string, error) {

 	}

 	defer f.Close()

-	buf, err := proto.Marshal(&EndpointRecord{

+	buf, _ := proto.Marshal(&EndpointRecord{

 		IngressPorts: ports,

 	})

@@ -1,5 +1,3 @@

-// +build solaris

-

 package testutils

 import (

@@ -1,5 +1,3 @@

-// +build windows

-

 package testutils

 import (