From cb96e4149d748a13d5549bafddba118bc4ac7cd4 Mon Sep 17 00:00:00 2001
From: Arnaud Porterie <arnaud.porterie@docker.com>
Date: Fri, 27 Feb 2015 09:11:53 -0800
Subject: [PATCH] Test coverage

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
---
 libnetwork/drivers/bridge/network.go         |  1 +
 libnetwork/drivers/bridge/setup_ipv4.go      |  6 ++-
 libnetwork/drivers/bridge/setup_ipv6.go      |  7 ++-
 libnetwork/drivers/bridge/setup_ipv6_test.go | 47 ++++++++++++++++++++
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 libnetwork/drivers/bridge/setup_ipv6_test.go

diff --git a/libnetwork/drivers/bridge/network.go b/libnetwork/drivers/bridge/network.go
index 4e73ed5270..039dd00f9b 100644
--- a/libnetwork/drivers/bridge/network.go
+++ b/libnetwork/drivers/bridge/network.go
@@ -11,5 +11,6 @@ func (b *bridgeNetwork) Type() string {
 }
 
 func (b *bridgeNetwork) Link(name string) ([]*libnetwork.Interface, error) {
+	// TODO
 	return nil, nil
 }
diff --git a/libnetwork/drivers/bridge/setup_ipv4.go b/libnetwork/drivers/bridge/setup_ipv4.go
index c37d341bb2..adb5995474 100644
--- a/libnetwork/drivers/bridge/setup_ipv4.go
+++ b/libnetwork/drivers/bridge/setup_ipv4.go
@@ -47,7 +47,11 @@ func SetupBridgeIPv4(i *Interface) error {
 	}
 
 	log.Debugf("Creating bridge interface %q with network %s", i.Config.BridgeName, bridgeIPv4)
-	return netlink.AddrAdd(i.Link, &netlink.Addr{bridgeIPv4, ""})
+	if err := netlink.AddrAdd(i.Link, &netlink.Addr{bridgeIPv4, ""}); err != nil {
+		return fmt.Errorf("Failed to add IPv4 address %s to bridge: %v", bridgeIPv4, err)
+	}
+
+	return nil
 }
 
 func electBridgeIPv4(config *Configuration) (*net.IPNet, error) {
diff --git a/libnetwork/drivers/bridge/setup_ipv6.go b/libnetwork/drivers/bridge/setup_ipv6.go
index ac8642004f..408173ea3e 100644
--- a/libnetwork/drivers/bridge/setup_ipv6.go
+++ b/libnetwork/drivers/bridge/setup_ipv6.go
@@ -28,5 +28,10 @@ func SetupBridgeIPv6(i *Interface) error {
 	if err := ioutil.WriteFile(procFile, []byte{'0', '\n'}, 0644); err != nil {
 		return fmt.Errorf("Unable to enable IPv6 addresses on bridge: %v", err)
 	}
-	return netlink.AddrAdd(i.Link, &netlink.Addr{BridgeIPv6, ""})
+
+	if err := netlink.AddrAdd(i.Link, &netlink.Addr{BridgeIPv6, ""}); err != nil {
+		return fmt.Errorf("Failed to add IPv6 address %s to bridge: %v", BridgeIPv6, err)
+	}
+
+	return nil
 }
diff --git a/libnetwork/drivers/bridge/setup_ipv6_test.go b/libnetwork/drivers/bridge/setup_ipv6_test.go
new file mode 100644
index 0000000000..2578d0bc97
--- /dev/null
+++ b/libnetwork/drivers/bridge/setup_ipv6_test.go
@@ -0,0 +1,47 @@
+package bridge
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"testing"
+
+	"github.com/docker/libnetwork"
+	"github.com/vishvananda/netlink"
+)
+
+func TestSetupIPv6(t *testing.T) {
+	defer libnetwork.SetupTestNetNS(t)()
+
+	br := setupTestInterface(t)
+	if err := SetupBridgeIPv6(br); err != nil {
+		t.Fatalf("Failed to setup bridge IPv6: %v", err)
+	}
+
+	procSetting, err := ioutil.ReadFile(fmt.Sprintf("/proc/sys/net/ipv6/conf/%s/disable_ipv6", br.Config.BridgeName))
+	if err != nil {
+		t.Fatalf("Failed to read disable_ipv6 kernel setting: %v", err)
+	}
+
+	if expected := []byte("0\n"); bytes.Compare(expected, procSetting) != 0 {
+		t.Fatalf("Invalid kernel setting disable_ipv6: expected %q, got %q", string(expected), string(procSetting))
+	}
+
+	addrsv6, err := netlink.AddrList(br.Link, netlink.FAMILY_V6)
+	if err != nil {
+		t.Fatalf("Failed to list device IPv6 addresses: %v", err)
+	}
+
+	var found bool
+	for _, addr := range addrsv6 {
+		if BridgeIPv6Str == addr.IPNet.String() {
+			found = true
+			break
+		}
+	}
+
+	if !found {
+		t.Fatalf("Bridge device does not have requested IPv6 address %v", BridgeIPv6Str)
+	}
+
+}