From a91df654028006e29911dc6fc3a6816248b7a6dd Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Mon, 29 Apr 2019 15:39:55 -0400 Subject: [PATCH] fix tests from introducing new struct fields --- api/compose_test.go | 6 ++-- api/tasks_test.go | 2 +- nomad/structs/diff_test.go | 32 ++++++++++++++++++++ nomad/structs/funcs_test.go | 14 ++++----- nomad/structs/network_test.go | 56 +++++++++++++++++------------------ nomad/structs/structs.go | 2 +- nomad/structs/structs_test.go | 50 +++++++++++++++---------------- 7 files changed, 97 insertions(+), 65 deletions(-) diff --git a/api/compose_test.go b/api/compose_test.go index 1157fcb07..a6cc16b40 100644 --- a/api/compose_test.go +++ b/api/compose_test.go @@ -20,7 +20,7 @@ func TestCompose(t *testing.T) { { CIDR: "0.0.0.0/0", MBits: intToPtr(100), - ReservedPorts: []Port{{"", 80}, {"", 443}}, + ReservedPorts: []Port{{"", 80, 0}, {"", 443, 0}}, }, }, }) @@ -111,8 +111,8 @@ func TestCompose(t *testing.T) { CIDR: "0.0.0.0/0", MBits: intToPtr(100), ReservedPorts: []Port{ - {"", 80}, - {"", 443}, + {"", 80, 0}, + {"", 443, 0}, }, }, }, diff --git a/api/tasks_test.go b/api/tasks_test.go index 0d5b6dc79..d2f6e7f62 100644 --- a/api/tasks_test.go +++ b/api/tasks_test.go @@ -269,7 +269,7 @@ func TestTask_Require(t *testing.T) { { CIDR: "0.0.0.0/0", MBits: intToPtr(100), - ReservedPorts: []Port{{"", 80}, {"", 443}}, + ReservedPorts: []Port{{"", 80, 0}, {"", 443, 0}}, }, }, } diff --git a/nomad/structs/diff_test.go b/nomad/structs/diff_test.go index dbdd83c7f..3c3d97500 100644 --- a/nomad/structs/diff_test.go +++ b/nomad/structs/diff_test.go @@ -3317,6 +3317,7 @@ func TestTaskDiff(t *testing.T) { DynamicPorts: []Port{ { Label: "bar", + To: 8080, }, }, }, @@ -3340,6 +3341,7 @@ func TestTaskDiff(t *testing.T) { DynamicPorts: []Port{ { Label: "baz", + To: 8081, }, }, }, @@ -3375,6 +3377,12 @@ func TestTaskDiff(t *testing.T) { Old: "", New: "foo", }, + { + Type: DiffTypeAdded, + Name: "To", + Old: "", + New: "0", + }, { Type: DiffTypeAdded, Name: "Value", @@ -3393,6 +3401,12 @@ func TestTaskDiff(t *testing.T) { Old: "", New: "baz", }, + { + Type: DiffTypeAdded, + Name: "To", + Old: "", + New: "8081", + }, }, }, }, @@ -3419,6 +3433,12 @@ func TestTaskDiff(t *testing.T) { Old: "foo", New: "", }, + { + Type: DiffTypeDeleted, + Name: "To", + Old: "0", + New: "", + }, { Type: DiffTypeDeleted, Name: "Value", @@ -3437,6 +3457,12 @@ func TestTaskDiff(t *testing.T) { Old: "bar", New: "", }, + { + Type: DiffTypeDeleted, + Name: "To", + Old: "8080", + New: "", + }, }, }, }, @@ -3879,6 +3905,12 @@ func TestTaskDiff(t *testing.T) { Old: "boom_port", New: "boom_port", }, + { + Type: DiffTypeNone, + Name: "boom.To", + Old: "0", + New: "0", + }, { Type: DiffTypeNone, Name: "boom.Value", diff --git a/nomad/structs/funcs_test.go b/nomad/structs/funcs_test.go index 486440e63..b01ce5e63 100644 --- a/nomad/structs/funcs_test.go +++ b/nomad/structs/funcs_test.go @@ -108,7 +108,7 @@ func TestAllocsFit_PortsOvercommitted_Old(t *testing.T) { Device: "eth0", IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"main", 8000}}, + ReservedPorts: []Port{{"main", 8000, 80}}, }, }, }, @@ -160,7 +160,7 @@ func TestAllocsFit_Old(t *testing.T) { Device: "eth0", IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"main", 80}}, + ReservedPorts: []Port{{"main", 80, 0}}, }, }, }, @@ -176,7 +176,7 @@ func TestAllocsFit_Old(t *testing.T) { Device: "eth0", IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"main", 8000}}, + ReservedPorts: []Port{{"main", 8000, 80}}, }, }, }, @@ -227,7 +227,7 @@ func TestAllocsFit_TerminalAlloc_Old(t *testing.T) { Device: "eth0", IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"main", 80}}, + ReservedPorts: []Port{{"main", 80, 0}}, }, }, }, @@ -243,7 +243,7 @@ func TestAllocsFit_TerminalAlloc_Old(t *testing.T) { Device: "eth0", IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"main", 8000}}, + ReservedPorts: []Port{{"main", 8000, 0}}, }, }, }, @@ -323,7 +323,7 @@ func TestAllocsFit(t *testing.T) { Device: "eth0", IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"main", 8000}}, + ReservedPorts: []Port{{"main", 8000, 0}}, }, }, }, @@ -407,7 +407,7 @@ func TestAllocsFit_TerminalAlloc(t *testing.T) { Device: "eth0", IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"main", 8000}}, + ReservedPorts: []Port{{"main", 8000, 80}}, }, }, }, diff --git a/nomad/structs/network_test.go b/nomad/structs/network_test.go index 4f16b3b5e..1806f9482 100644 --- a/nomad/structs/network_test.go +++ b/nomad/structs/network_test.go @@ -15,7 +15,7 @@ func TestNetworkIndex_Overcommitted(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 505, - ReservedPorts: []Port{{"one", 8000}, {"two", 9000}}, + ReservedPorts: []Port{{"one", 8000, 0}, {"two", 9000, 0}}, } collide := idx.AddReserved(reserved) if collide { @@ -96,7 +96,7 @@ func TestNetworkIndex_AddAllocs(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 20, - ReservedPorts: []Port{{"one", 8000}, {"two", 9000}}, + ReservedPorts: []Port{{"one", 8000, 0}, {"two", 9000, 0}}, }, }, }, @@ -112,7 +112,7 @@ func TestNetworkIndex_AddAllocs(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 50, - ReservedPorts: []Port{{"one", 10000}}, + ReservedPorts: []Port{{"one", 10000, 0}}, }, }, }, @@ -146,7 +146,7 @@ func TestNetworkIndex_AddReserved(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 20, - ReservedPorts: []Port{{"one", 8000}, {"two", 9000}}, + ReservedPorts: []Port{{"one", 8000, 0}, {"two", 9000, 0}}, } collide := idx.AddReserved(reserved) if collide { @@ -224,7 +224,7 @@ func TestNetworkIndex_AssignNetwork(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 20, - ReservedPorts: []Port{{"one", 8000}, {"two", 9000}}, + ReservedPorts: []Port{{"one", 8000, 0}, {"two", 9000, 0}}, }, }, }, @@ -238,7 +238,7 @@ func TestNetworkIndex_AssignNetwork(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 50, - ReservedPorts: []Port{{"main", 10000}}, + ReservedPorts: []Port{{"main", 10000, 0}}, }, }, }, @@ -249,7 +249,7 @@ func TestNetworkIndex_AssignNetwork(t *testing.T) { // Ask for a reserved port ask := &NetworkResource{ - ReservedPorts: []Port{{"main", 8000}}, + ReservedPorts: []Port{{"main", 8000, 0}}, } offer, err := idx.AssignNetwork(ask) if err != nil { @@ -261,14 +261,14 @@ func TestNetworkIndex_AssignNetwork(t *testing.T) { if offer.IP != "192.168.0.101" { t.Fatalf("bad: %#v", offer) } - rp := Port{"main", 8000} + rp := Port{"main", 8000, 0} if len(offer.ReservedPorts) != 1 || offer.ReservedPorts[0] != rp { t.Fatalf("bad: %#v", offer) } // Ask for dynamic ports ask = &NetworkResource{ - DynamicPorts: []Port{{"http", 0}, {"https", 0}, {"admin", 0}}, + DynamicPorts: []Port{{"http", 0, 80}, {"https", 0, 443}, {"admin", 0, 8080}}, } offer, err = idx.AssignNetwork(ask) if err != nil { @@ -291,8 +291,8 @@ func TestNetworkIndex_AssignNetwork(t *testing.T) { // Ask for reserved + dynamic ports ask = &NetworkResource{ - ReservedPorts: []Port{{"main", 2345}}, - DynamicPorts: []Port{{"http", 0}, {"https", 0}, {"admin", 0}}, + ReservedPorts: []Port{{"main", 2345, 0}}, + DynamicPorts: []Port{{"http", 0, 80}, {"https", 0, 443}, {"admin", 0, 8080}}, } offer, err = idx.AssignNetwork(ask) if err != nil { @@ -305,7 +305,7 @@ func TestNetworkIndex_AssignNetwork(t *testing.T) { t.Fatalf("bad: %#v", offer) } - rp = Port{"main", 2345} + rp = Port{"main", 2345, 0} if len(offer.ReservedPorts) != 1 || offer.ReservedPorts[0] != rp { t.Fatalf("bad: %#v", offer) } @@ -350,7 +350,7 @@ func TestNetworkIndex_AssignNetwork_Dynamic_Contention(t *testing.T) { // Ask for dynamic ports ask := &NetworkResource{ - DynamicPorts: []Port{{"http", 0}}, + DynamicPorts: []Port{{"http", 0, 80}}, } offer, err := idx.AssignNetwork(ask) if err != nil { @@ -379,7 +379,7 @@ func TestNetworkIndex_Overcommitted_Old(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 505, - ReservedPorts: []Port{{"one", 8000}, {"two", 9000}}, + ReservedPorts: []Port{{"one", 8000, 0}, {"two", 9000, 0}}, } collide := idx.AddReserved(reserved) if collide { @@ -431,7 +431,7 @@ func TestNetworkIndex_SetNode_Old(t *testing.T) { { Device: "eth0", IP: "192.168.0.100", - ReservedPorts: []Port{{"ssh", 22}}, + ReservedPorts: []Port{{"ssh", 22, 0}}, MBits: 1, }, }, @@ -468,7 +468,7 @@ func TestNetworkIndex_AddAllocs_Old(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 20, - ReservedPorts: []Port{{"one", 8000}, {"two", 9000}}, + ReservedPorts: []Port{{"one", 8000, 0}, {"two", 9000, 0}}, }, }, }, @@ -482,7 +482,7 @@ func TestNetworkIndex_AddAllocs_Old(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 50, - ReservedPorts: []Port{{"one", 10000}}, + ReservedPorts: []Port{{"one", 10000, 0}}, }, }, }, @@ -526,7 +526,7 @@ func TestNetworkIndex_yieldIP_Old(t *testing.T) { { Device: "eth0", IP: "192.168.0.100", - ReservedPorts: []Port{{"ssh", 22}}, + ReservedPorts: []Port{{"ssh", 22, 0}}, MBits: 1, }, }, @@ -565,7 +565,7 @@ func TestNetworkIndex_AssignNetwork_Old(t *testing.T) { { Device: "eth0", IP: "192.168.0.100", - ReservedPorts: []Port{{"ssh", 22}}, + ReservedPorts: []Port{{"ssh", 22, 0}}, MBits: 1, }, }, @@ -582,7 +582,7 @@ func TestNetworkIndex_AssignNetwork_Old(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 20, - ReservedPorts: []Port{{"one", 8000}, {"two", 9000}}, + ReservedPorts: []Port{{"one", 8000, 0}, {"two", 9000, 0}}, }, }, }, @@ -596,7 +596,7 @@ func TestNetworkIndex_AssignNetwork_Old(t *testing.T) { Device: "eth0", IP: "192.168.0.100", MBits: 50, - ReservedPorts: []Port{{"main", 10000}}, + ReservedPorts: []Port{{"main", 10000, 0}}, }, }, }, @@ -607,7 +607,7 @@ func TestNetworkIndex_AssignNetwork_Old(t *testing.T) { // Ask for a reserved port ask := &NetworkResource{ - ReservedPorts: []Port{{"main", 8000}}, + ReservedPorts: []Port{{"main", 8000, 0}}, } offer, err := idx.AssignNetwork(ask) if err != nil { @@ -619,14 +619,14 @@ func TestNetworkIndex_AssignNetwork_Old(t *testing.T) { if offer.IP != "192.168.0.101" { t.Fatalf("bad: %#v", offer) } - rp := Port{"main", 8000} + rp := Port{"main", 8000, 0} if len(offer.ReservedPorts) != 1 || offer.ReservedPorts[0] != rp { t.Fatalf("bad: %#v", offer) } // Ask for dynamic ports ask = &NetworkResource{ - DynamicPorts: []Port{{"http", 0}, {"https", 0}, {"admin", 0}}, + DynamicPorts: []Port{{"http", 0, 80}, {"https", 0, 443}, {"admin", 0, 8080}}, } offer, err = idx.AssignNetwork(ask) if err != nil { @@ -649,8 +649,8 @@ func TestNetworkIndex_AssignNetwork_Old(t *testing.T) { // Ask for reserved + dynamic ports ask = &NetworkResource{ - ReservedPorts: []Port{{"main", 2345}}, - DynamicPorts: []Port{{"http", 0}, {"https", 0}, {"admin", 0}}, + ReservedPorts: []Port{{"main", 2345, 0}}, + DynamicPorts: []Port{{"http", 0, 80}, {"https", 0, 443}, {"admin", 0, 8080}}, } offer, err = idx.AssignNetwork(ask) if err != nil { @@ -663,7 +663,7 @@ func TestNetworkIndex_AssignNetwork_Old(t *testing.T) { t.Fatalf("bad: %#v", offer) } - rp = Port{"main", 2345} + rp = Port{"main", 2345, 0} if len(offer.ReservedPorts) != 1 || offer.ReservedPorts[0] != rp { t.Fatalf("bad: %#v", offer) } @@ -716,7 +716,7 @@ func TestNetworkIndex_AssignNetwork_Dynamic_Contention_Old(t *testing.T) { // Ask for dynamic ports ask := &NetworkResource{ - DynamicPorts: []Port{{"http", 0}}, + DynamicPorts: []Port{{"http", 0, 80}}, } offer, err := idx.AssignNetwork(ask) if err != nil { diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go index f9f0c6b4e..d78a580e3 100644 --- a/nomad/structs/structs.go +++ b/nomad/structs/structs.go @@ -4644,7 +4644,7 @@ type TaskGroup struct { Spreads []*Spread // Networks are the network configuration for the task group. This can be - // overriden in the task. + // overridden in the task. Networks Networks } diff --git a/nomad/structs/structs_test.go b/nomad/structs/structs_test.go index ba34e31ef..3b6b54150 100644 --- a/nomad/structs/structs_test.go +++ b/nomad/structs/structs_test.go @@ -1856,7 +1856,7 @@ func TestResource_Add(t *testing.T) { { CIDR: "10.0.0.0/8", MBits: 100, - ReservedPorts: []Port{{"ssh", 22}}, + ReservedPorts: []Port{{"ssh", 22, 0}}, }, }, } @@ -1868,7 +1868,7 @@ func TestResource_Add(t *testing.T) { { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, }, } @@ -1886,7 +1886,7 @@ func TestResource_Add(t *testing.T) { { CIDR: "10.0.0.0/8", MBits: 150, - ReservedPorts: []Port{{"ssh", 22}, {"web", 80}}, + ReservedPorts: []Port{{"ssh", 22, 0}, {"web", 80, 0}}, }, }, } @@ -1902,7 +1902,7 @@ func TestResource_Add_Network(t *testing.T) { Networks: []*NetworkResource{ { MBits: 50, - DynamicPorts: []Port{{"http", 0}, {"https", 0}}, + DynamicPorts: []Port{{"http", 0, 80}, {"https", 0, 443}}, }, }, } @@ -1910,7 +1910,7 @@ func TestResource_Add_Network(t *testing.T) { Networks: []*NetworkResource{ { MBits: 25, - DynamicPorts: []Port{{"admin", 0}}, + DynamicPorts: []Port{{"admin", 0, 8080}}, }, }, } @@ -1928,7 +1928,7 @@ func TestResource_Add_Network(t *testing.T) { Networks: []*NetworkResource{ { MBits: 75, - DynamicPorts: []Port{{"http", 0}, {"https", 0}, {"admin", 0}}, + DynamicPorts: []Port{{"http", 0, 80}, {"https", 0, 443}, {"admin", 0, 8080}}, }, }, } @@ -1951,7 +1951,7 @@ func TestComparableResources_Subtract(t *testing.T) { { CIDR: "10.0.0.0/8", MBits: 100, - ReservedPorts: []Port{{"ssh", 22}}, + ReservedPorts: []Port{{"ssh", 22, 0}}, }, }, }, @@ -1972,7 +1972,7 @@ func TestComparableResources_Subtract(t *testing.T) { { CIDR: "10.0.0.0/8", MBits: 20, - ReservedPorts: []Port{{"ssh", 22}}, + ReservedPorts: []Port{{"ssh", 22, 0}}, }, }, }, @@ -1994,7 +1994,7 @@ func TestComparableResources_Subtract(t *testing.T) { { CIDR: "10.0.0.0/8", MBits: 100, - ReservedPorts: []Port{{"ssh", 22}}, + ReservedPorts: []Port{{"ssh", 22, 0}}, }, }, }, @@ -4040,12 +4040,12 @@ func TestNetworkResourcesEquals(t *testing.T) { { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, }, true, @@ -4056,12 +4056,12 @@ func TestNetworkResourcesEquals(t *testing.T) { { IP: "10.0.0.0", MBits: 50, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, }, false, @@ -4072,12 +4072,12 @@ func TestNetworkResourcesEquals(t *testing.T) { { IP: "10.0.0.1", MBits: 40, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, }, false, @@ -4088,12 +4088,12 @@ func TestNetworkResourcesEquals(t *testing.T) { { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"web", 80}, {"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}, {"web", 80, 0}}, }, }, false, @@ -4104,7 +4104,7 @@ func TestNetworkResourcesEquals(t *testing.T) { { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, { IP: "10.0.0.1", @@ -4120,12 +4120,12 @@ func TestNetworkResourcesEquals(t *testing.T) { { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"web", 80}}, + ReservedPorts: []Port{{"web", 80, 0}}, }, { IP: "10.0.0.1", MBits: 50, - ReservedPorts: []Port{{"notweb", 80}}, + ReservedPorts: []Port{{"notweb", 80, 0}}, }, }, false, @@ -4136,12 +4136,12 @@ func TestNetworkResourcesEquals(t *testing.T) { { IP: "10.0.0.1", MBits: 50, - DynamicPorts: []Port{{"web", 80}}, + DynamicPorts: []Port{{"web", 80, 0}}, }, { IP: "10.0.0.1", MBits: 50, - DynamicPorts: []Port{{"web", 80}, {"web", 80}}, + DynamicPorts: []Port{{"web", 80, 0}, {"web", 80, 0}}, }, }, false, @@ -4152,7 +4152,7 @@ func TestNetworkResourcesEquals(t *testing.T) { { IP: "10.0.0.1", MBits: 50, - DynamicPorts: []Port{{"web", 80}}, + DynamicPorts: []Port{{"web", 80, 0}}, }, { IP: "10.0.0.1", @@ -4168,12 +4168,12 @@ func TestNetworkResourcesEquals(t *testing.T) { { IP: "10.0.0.1", MBits: 50, - DynamicPorts: []Port{{"web", 80}}, + DynamicPorts: []Port{{"web", 80, 0}}, }, { IP: "10.0.0.1", MBits: 50, - DynamicPorts: []Port{{"notweb", 80}}, + DynamicPorts: []Port{{"notweb", 80, 0}}, }, }, false,