From 3e11ddc4d9fe776776d8d7318e2b60e714357e46 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Fri, 14 Oct 2016 08:34:06 -0700 Subject: [PATCH] Change vxlan-id start-idx to 4096 To make it consistent with windows and linux workers Signed-off-by: Madhu Venugopal Fixed build breaks Signed-off-by: msabansal --- libnetwork/drivers/overlay/ovmanager/ovmanager.go | 2 +- libnetwork/drivers/overlay/ovmanager/ovmanager_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libnetwork/drivers/overlay/ovmanager/ovmanager.go b/libnetwork/drivers/overlay/ovmanager/ovmanager.go index 78a586e08e..7b5caff0c8 100644 --- a/libnetwork/drivers/overlay/ovmanager/ovmanager.go +++ b/libnetwork/drivers/overlay/ovmanager/ovmanager.go @@ -18,7 +18,7 @@ import ( const ( networkType = "overlay" - vxlanIDStart = 256 + vxlanIDStart = 4096 vxlanIDEnd = (1 << 24) - 1 ) diff --git a/libnetwork/drivers/overlay/ovmanager/ovmanager_test.go b/libnetwork/drivers/overlay/ovmanager/ovmanager_test.go index f6d5921de5..b16fdb1cbd 100644 --- a/libnetwork/drivers/overlay/ovmanager/ovmanager_test.go +++ b/libnetwork/drivers/overlay/ovmanager/ovmanager_test.go @@ -70,7 +70,7 @@ func TestNetworkAllocateUserDefinedVNIs(t *testing.T) { options := make(map[string]string) // Intentionally add mode vnis than subnets - options[netlabel.OverlayVxlanIDList] = fmt.Sprintf("%d,%d,%d", 256, 257, 258) + options[netlabel.OverlayVxlanIDList] = fmt.Sprintf("%d,%d,%d", vxlanIDStart, vxlanIDStart+1, vxlanIDStart+2) vals, err := d.NetworkAllocate("testnetwork", options, ipamData, nil) require.NoError(t, err) @@ -81,7 +81,7 @@ func TestNetworkAllocateUserDefinedVNIs(t *testing.T) { // We should only get exactly the same number of vnis as // subnets. No more, no less, even if we passed more vnis. assert.Equal(t, 2, len(strings.Split(vxlanIDs, ","))) - assert.Equal(t, fmt.Sprintf("%d,%d", 256, 257), vxlanIDs) + assert.Equal(t, fmt.Sprintf("%d,%d", vxlanIDStart, vxlanIDStart+1), vxlanIDs) err = d.NetworkFree("testnetwork") require.NoError(t, err)