Merge pull request #661 from aboch/gr

Explicitly set namepsace for ipamutils.ElectInterface

libnetwork/drivers/bridge/bridge_test.go

@@ -218,6 +218,9 @@ func TestCreateMultipleNetworks(t *testing.T) {
 		t.Fatalf("Failed to create bridge: %v", err)
 	}
 
+	// Verify the network isolation rules are installed, each network subnet should appear 2 times
+	verifyV4INCEntries(d.networks, 2, t)
+
 	config3 := &networkConfiguration{BridgeName: "net_test_3"}
 	genericOption[netlabel.GenericData] = config3
 	if err := d.CreateNetwork("3", genericOption, getIPv4Data(t), nil); err != nil {

libnetwork/ipamutils/utils_linux.go

@@ -6,6 +6,7 @@ import (
 	"net"
 
 	"github.com/docker/libnetwork/netutils"
+	"github.com/docker/libnetwork/osl"
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/vishvananda/netlink"
 )
@@ -21,6 +22,8 @@ func ElectInterfaceAddresses(name string) (*net.IPNet, []*net.IPNet, error) {
 		err    error
 	)
 
+	defer osl.InitOSContext()()
+
 	link, _ := netlink.LinkByName(name)
 	if link != nil {
 		v4addr, err := netlink.AddrList(link, netlink.FAMILY_V4)