kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Change vxlan-id start-idx to 4096

Browse source 
To make it consistent with windows and linux workers

Signed-off-by: Madhu Venugopal <madhu@docker.com>

Fixed build breaks

Signed-off-by: msabansal <sabansal@microsoft.com>
This commit is contained in:
Madhu Venugopal 2016-10-14 08:34:06 -07:00 • committed by msabansal
parent d1b012d97a
commit 3e11ddc4d9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/drivers/overlay/ovmanager/ovmanager.go
View file

@ -18,7 +18,7 @@ import (
const (
networkType = "overlay"
vxlanIDStart = 256
vxlanIDStart = 4096
vxlanIDEnd = (1 << 24) - 1
)

4
libnetwork/drivers/overlay/ovmanager/ovmanager_test.go
View file

@ -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)