From 84049931c5d3da638f14facac2990b8ab9de7276 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Thu, 15 Oct 2015 22:16:40 -0700 Subject: [PATCH] Explicitly set namepsace for ipamutils.ElectInterface Signed-off-by: Alessandro Boch --- drivers/bridge/bridge_test.go | 3 +++ ipamutils/utils_linux.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/bridge/bridge_test.go b/drivers/bridge/bridge_test.go index b7677ee..9aafe85 100644 --- a/drivers/bridge/bridge_test.go +++ b/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 { diff --git a/ipamutils/utils_linux.go b/ipamutils/utils_linux.go index d8c9eb8..9706cf3 100644 --- a/ipamutils/utils_linux.go +++ b/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)