beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

integration: change network.CreateNoError signature to fix linting

Browse source 
Line 30: warning: context.Context should be the first parameter of a function (golint)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit caec45a37f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-06-06 12:00:19 +02:00
parent 235fa0eee8
commit 91757722a9
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
9 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
integration/internal/network/network.go
View file

@ -26,8 +26,7 @@ func Create(ctx context.Context, client client.APIClient, name string, ops ...fu
} }
// CreateNoError creates a network with the specified options and verifies there were no errors // CreateNoError creates a network with the specified options and verifies there were no errors
// nolint: golint func CreateNoError(ctx context.Context, t *testing.T, client client.APIClient, name string, ops ...func(*types.NetworkCreate)) string { // nolint: golint
func CreateNoError(t *testing.T, ctx context.Context, client client.APIClient, name string, ops ...func(*types.NetworkCreate)) string { // nolint: golint
t.Helper() t.Helper()
name, err := createNetwork(ctx, client, name, ops...) name, err := createNetwork(ctx, client, name, ops...)

8
integration/network/delete_test.go
View file

@ -28,9 +28,9 @@ func containsNetwork(nws []types.NetworkResource, networkID string) bool {
// //
// After successful creation, properties of all three networks is returned // After successful creation, properties of all three networks is returned
func createAmbiguousNetworks(t *testing.T, ctx context.Context, client dclient.APIClient) (string, string, string) { // nolint: golint func createAmbiguousNetworks(t *testing.T, ctx context.Context, client dclient.APIClient) (string, string, string) { // nolint: golint
testNet := network.CreateNoError(t, ctx, client, "testNet") testNet := network.CreateNoError(ctx, t, client, "testNet")
idPrefixNet := network.CreateNoError(t, ctx, client, testNet[:12]) idPrefixNet := network.CreateNoError(ctx, t, client, testNet[:12])
fullIDNet := network.CreateNoError(t, ctx, client, testNet) fullIDNet := network.CreateNoError(ctx, t, client, testNet)
nws, err := client.NetworkList(ctx, types.NetworkListOptions{}) nws, err := client.NetworkList(ctx, types.NetworkListOptions{})
assert.NilError(t, err) assert.NilError(t, err)
@ -49,7 +49,7 @@ func TestNetworkCreateDelete(t *testing.T) {
ctx := context.Background() ctx := context.Background()
netName := "testnetwork_" + t.Name() netName := "testnetwork_" + t.Name()
network.CreateNoError(t, ctx, client, netName, network.CreateNoError(ctx, t, client, netName,
network.WithCheckDuplicate(), network.WithCheckDuplicate(),
) )
assert.Check(t, IsNetworkAvailable(client, netName)) assert.Check(t, IsNetworkAvailable(client, netName))

2
integration/network/inspect_test.go
View file

@ -21,7 +21,7 @@ func TestInspectNetwork(t *testing.T) {
defer c.Close() defer c.Close()
networkName := "Overlay" + t.Name() networkName := "Overlay" + t.Name()
overlayID := network.CreateNoError(t, context.Background(), c, networkName, overlayID := network.CreateNoError(context.Background(), t, c, networkName,
network.WithDriver("overlay"), network.WithDriver("overlay"),
network.WithCheckDuplicate(), network.WithCheckDuplicate(),
) )

22
integration/network/ipvlan/ipvlan_test.go
View file

@ -39,7 +39,7 @@ func TestDockerNetworkIpvlanPersistance(t *testing.T) {
// create a network specifying the desired sub-interface name // create a network specifying the desired sub-interface name
netName := "di-persist" netName := "di-persist"
net.CreateNoError(t, context.Background(), c, netName, net.CreateNoError(context.Background(), t, c, netName,
net.WithIPvlan("di-dummy0.70", ""), net.WithIPvlan("di-dummy0.70", ""),
) )
@ -105,7 +105,7 @@ func testIpvlanSubinterface(client dclient.APIClient) func(*testing.T) {
defer n.DeleteInterface(t, master) defer n.DeleteInterface(t, master)
netName := "di-subinterface" netName := "di-subinterface"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithIPvlan("di-dummy0.60", ""), net.WithIPvlan("di-dummy0.60", ""),
) )
assert.Check(t, n.IsNetworkAvailable(client, netName)) assert.Check(t, n.IsNetworkAvailable(client, netName))
@ -130,7 +130,7 @@ func testIpvlanOverlapParent(client dclient.APIClient) func(*testing.T) {
n.CreateVlanInterface(t, master, parent, "30") n.CreateVlanInterface(t, master, parent, "30")
netName := "di-subinterface" netName := "di-subinterface"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithIPvlan(parent, ""), net.WithIPvlan(parent, ""),
) )
assert.Check(t, n.IsNetworkAvailable(client, netName)) assert.Check(t, n.IsNetworkAvailable(client, netName))
@ -147,7 +147,7 @@ func testIpvlanL2NilParent(client dclient.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
// ipvlan l2 mode - dummy parent interface is provisioned dynamically // ipvlan l2 mode - dummy parent interface is provisioned dynamically
netName := "di-nil-parent" netName := "di-nil-parent"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithIPvlan("", ""), net.WithIPvlan("", ""),
) )
assert.Check(t, n.IsNetworkAvailable(client, netName)) assert.Check(t, n.IsNetworkAvailable(client, netName))
@ -164,7 +164,7 @@ func testIpvlanL2NilParent(client dclient.APIClient) func(*testing.T) {
func testIpvlanL2InternalMode(client dclient.APIClient) func(*testing.T) { func testIpvlanL2InternalMode(client dclient.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
netName := "di-internal" netName := "di-internal"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithIPvlan("", ""), net.WithIPvlan("", ""),
net.WithInternal(), net.WithInternal(),
) )
@ -189,7 +189,7 @@ func testIpvlanL2InternalMode(client dclient.APIClient) func(*testing.T) {
func testIpvlanL3NilParent(client dclient.APIClient) func(*testing.T) { func testIpvlanL3NilParent(client dclient.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
netName := "di-nil-parent-l3" netName := "di-nil-parent-l3"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithIPvlan("", "l3"), net.WithIPvlan("", "l3"),
net.WithIPAM("172.28.230.0/24", ""), net.WithIPAM("172.28.230.0/24", ""),
net.WithIPAM("172.28.220.0/24", ""), net.WithIPAM("172.28.220.0/24", ""),
@ -214,7 +214,7 @@ func testIpvlanL3NilParent(client dclient.APIClient) func(*testing.T) {
func testIpvlanL3InternalMode(client dclient.APIClient) func(*testing.T) { func testIpvlanL3InternalMode(client dclient.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
netName := "di-internal-l3" netName := "di-internal-l3"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithIPvlan("", "l3"), net.WithIPvlan("", "l3"),
net.WithInternal(), net.WithInternal(),
net.WithIPAM("172.28.230.0/24", ""), net.WithIPAM("172.28.230.0/24", ""),
@ -247,7 +247,7 @@ func testIpvlanL3InternalMode(client dclient.APIClient) func(*testing.T) {
func testIpvlanL2MultiSubnet(client dclient.APIClient) func(*testing.T) { func testIpvlanL2MultiSubnet(client dclient.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
netName := "dualstackl2" netName := "dualstackl2"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithIPvlan("", ""), net.WithIPvlan("", ""),
net.WithIPv6(), net.WithIPv6(),
net.WithIPAM("172.28.200.0/24", ""), net.WithIPAM("172.28.200.0/24", ""),
@ -314,7 +314,7 @@ func testIpvlanL2MultiSubnet(client dclient.APIClient) func(*testing.T) {
func testIpvlanL3MultiSubnet(client dclient.APIClient) func(*testing.T) { func testIpvlanL3MultiSubnet(client dclient.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
netName := "dualstackl3" netName := "dualstackl3"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithIPvlan("", "l3"), net.WithIPvlan("", "l3"),
net.WithIPv6(), net.WithIPv6(),
net.WithIPAM("172.28.10.0/24", ""), net.WithIPAM("172.28.10.0/24", ""),
@ -383,7 +383,7 @@ func testIpvlanAddressing(client dclient.APIClient) func(*testing.T) {
// Verify ipvlan l2 mode sets the proper default gateway routes via netlink // Verify ipvlan l2 mode sets the proper default gateway routes via netlink
// for either an explicitly set route by the user or inferred via default IPAM // for either an explicitly set route by the user or inferred via default IPAM
netNameL2 := "dualstackl2" netNameL2 := "dualstackl2"
net.CreateNoError(t, context.Background(), client, netNameL2, net.CreateNoError(context.Background(), t, client, netNameL2,
net.WithIPvlan("", "l2"), net.WithIPvlan("", "l2"),
net.WithIPv6(), net.WithIPv6(),
net.WithIPAM("172.28.140.0/24", "172.28.140.254"), net.WithIPAM("172.28.140.0/24", "172.28.140.254"),
@ -406,7 +406,7 @@ func testIpvlanAddressing(client dclient.APIClient) func(*testing.T) {
// Validate ipvlan l3 mode sets the v4 gateway to dev eth0 and disregards any explicit or inferred next-hops // Validate ipvlan l3 mode sets the v4 gateway to dev eth0 and disregards any explicit or inferred next-hops
netNameL3 := "dualstackl3" netNameL3 := "dualstackl3"
net.CreateNoError(t, context.Background(), client, netNameL3, net.CreateNoError(context.Background(), t, client, netNameL3,
net.WithIPvlan("", "l3"), net.WithIPvlan("", "l3"),
net.WithIPv6(), net.WithIPv6(),
net.WithIPAM("172.28.160.0/24", "172.28.160.254"), net.WithIPAM("172.28.160.0/24", "172.28.160.254"),

14
integration/network/macvlan/macvlan_test.go
View file

@ -33,7 +33,7 @@ func TestDockerNetworkMacvlanPersistance(t *testing.T) {
c := d.NewClientT(t) c := d.NewClientT(t)
netName := "dm-persist" netName := "dm-persist"
net.CreateNoError(t, context.Background(), c, netName, net.CreateNoError(context.Background(), t, c, netName,
net.WithMacvlan("dm-dummy0.60"), net.WithMacvlan("dm-dummy0.60"),
) )
assert.Check(t, n.IsNetworkAvailable(c, netName)) assert.Check(t, n.IsNetworkAvailable(c, netName))
@ -86,7 +86,7 @@ func testMacvlanOverlapParent(client client.APIClient) func(*testing.T) {
netName := "dm-subinterface" netName := "dm-subinterface"
parentName := "dm-dummy0.40" parentName := "dm-dummy0.40"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithMacvlan(parentName), net.WithMacvlan(parentName),
) )
assert.Check(t, n.IsNetworkAvailable(client, netName)) assert.Check(t, n.IsNetworkAvailable(client, netName))
@ -116,7 +116,7 @@ func testMacvlanSubinterface(client client.APIClient) func(*testing.T) {
n.CreateVlanInterface(t, master, parentName, "20") n.CreateVlanInterface(t, master, parentName, "20")
netName := "dm-subinterface" netName := "dm-subinterface"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithMacvlan(parentName), net.WithMacvlan(parentName),
) )
assert.Check(t, n.IsNetworkAvailable(client, netName)) assert.Check(t, n.IsNetworkAvailable(client, netName))
@ -135,7 +135,7 @@ func testMacvlanNilParent(client client.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
// macvlan bridge mode - dummy parent interface is provisioned dynamically // macvlan bridge mode - dummy parent interface is provisioned dynamically
netName := "dm-nil-parent" netName := "dm-nil-parent"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithMacvlan(""), net.WithMacvlan(""),
) )
assert.Check(t, n.IsNetworkAvailable(client, netName)) assert.Check(t, n.IsNetworkAvailable(client, netName))
@ -153,7 +153,7 @@ func testMacvlanInternalMode(client client.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
// macvlan bridge mode - dummy parent interface is provisioned dynamically // macvlan bridge mode - dummy parent interface is provisioned dynamically
netName := "dm-internal" netName := "dm-internal"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithMacvlan(""), net.WithMacvlan(""),
net.WithInternal(), net.WithInternal(),
) )
@ -178,7 +178,7 @@ func testMacvlanInternalMode(client client.APIClient) func(*testing.T) {
func testMacvlanMultiSubnet(client client.APIClient) func(*testing.T) { func testMacvlanMultiSubnet(client client.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
netName := "dualstackbridge" netName := "dualstackbridge"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithMacvlan(""), net.WithMacvlan(""),
net.WithIPv6(), net.WithIPv6(),
net.WithIPAM("172.28.100.0/24", ""), net.WithIPAM("172.28.100.0/24", ""),
@ -247,7 +247,7 @@ func testMacvlanAddressing(client client.APIClient) func(*testing.T) {
return func(t *testing.T) { return func(t *testing.T) {
// Ensure the default gateways, next-hops and default dev devices are properly set // Ensure the default gateways, next-hops and default dev devices are properly set
netName := "dualstackbridge" netName := "dualstackbridge"
net.CreateNoError(t, context.Background(), client, netName, net.CreateNoError(context.Background(), t, client, netName,
net.WithMacvlan(""), net.WithMacvlan(""),
net.WithIPv6(), net.WithIPv6(),
net.WithOption("macvlan_mode", "bridge"), net.WithOption("macvlan_mode", "bridge"),

18
integration/network/service_test.go
View file

@ -71,7 +71,7 @@ func TestDaemonDefaultNetworkPools(t *testing.T) {
// Create a bridge network and verify its subnet is the second default pool // Create a bridge network and verify its subnet is the second default pool
name := "elango" + t.Name() name := "elango" + t.Name()
network.CreateNoError(t, context.Background(), c, name, network.CreateNoError(context.Background(), t, c, name,
network.WithDriver("bridge"), network.WithDriver("bridge"),
) )
out, err = c.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) out, err = c.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{})
@ -80,7 +80,7 @@ func TestDaemonDefaultNetworkPools(t *testing.T) {
// Create a bridge network and verify its subnet is the third default pool // Create a bridge network and verify its subnet is the third default pool
name = "saanvi" + t.Name() name = "saanvi" + t.Name()
network.CreateNoError(t, context.Background(), c, name, network.CreateNoError(context.Background(), t, c, name,
network.WithDriver("bridge"), network.WithDriver("bridge"),
) )
out, err = c.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) out, err = c.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{})
@ -103,7 +103,7 @@ func TestDaemonRestartWithExistingNetwork(t *testing.T) {
// Create a bridge network // Create a bridge network
name := "elango" + t.Name() name := "elango" + t.Name()
network.CreateNoError(t, context.Background(), c, name, network.CreateNoError(context.Background(), t, c, name,
network.WithDriver("bridge"), network.WithDriver("bridge"),
) )
@ -136,7 +136,7 @@ func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) {
// Create a bridge network // Create a bridge network
name := "elango" + t.Name() name := "elango" + t.Name()
network.CreateNoError(t, context.Background(), c, name, network.CreateNoError(context.Background(), t, c, name,
network.WithDriver("bridge"), network.WithDriver("bridge"),
) )
@ -147,7 +147,7 @@ func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) {
// Create a bridge network // Create a bridge network
name = "sthira" + t.Name() name = "sthira" + t.Name()
network.CreateNoError(t, context.Background(), c, name, network.CreateNoError(context.Background(), t, c, name,
network.WithDriver("bridge"), network.WithDriver("bridge"),
) )
out, err = c.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) out, err = c.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{})
@ -162,7 +162,7 @@ func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) {
// Create a bridge network // Create a bridge network
name = "saanvi" + t.Name() name = "saanvi" + t.Name()
network.CreateNoError(t, context.Background(), c, name, network.CreateNoError(context.Background(), t, c, name,
network.WithDriver("bridge"), network.WithDriver("bridge"),
) )
out1, err := c.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) out1, err := c.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{})
@ -343,7 +343,7 @@ func TestServiceWithDataPathPortInit(t *testing.T) {
// Create a overlay network // Create a overlay network
name := "saanvisthira" + t.Name() name := "saanvisthira" + t.Name()
network.CreateNoError(t, context.Background(), c, name, network.CreateNoError(context.Background(), t, c, name,
network.WithDriver("overlay")) network.WithDriver("overlay"))
var instances uint64 = 1 var instances uint64 = 1
@ -369,7 +369,7 @@ func TestServiceWithDataPathPortInit(t *testing.T) {
// Create a overlay network // Create a overlay network
name = "saanvisthira" + t.Name() name = "saanvisthira" + t.Name()
network.CreateNoError(t, context.Background(), c, name, network.CreateNoError(context.Background(), t, c, name,
network.WithDriver("overlay")) network.WithDriver("overlay"))
serviceID = swarm.CreateService(t, d, serviceID = swarm.CreateService(t, d,
@ -402,7 +402,7 @@ func TestServiceWithDefaultAddressPoolInit(t *testing.T) {
// Create a overlay network // Create a overlay network
name := "saanvisthira" + t.Name() name := "saanvisthira" + t.Name()
network.CreateNoError(t, context.Background(), cli, name, network.CreateNoError(context.Background(), t, cli, name,
network.WithDriver("overlay")) network.WithDriver("overlay"))
var instances uint64 = 1 var instances uint64 = 1

8
integration/service/create_test.go
View file

@ -84,7 +84,7 @@ func TestCreateServiceMultipleTimes(t *testing.T) {
ctx := context.Background() ctx := context.Background()
overlayName := "overlay1_" + t.Name() overlayName := "overlay1_" + t.Name()
overlayID := network.CreateNoError(t, ctx, client, overlayName, overlayID := network.CreateNoError(ctx, t, client, overlayName,
network.WithCheckDuplicate(), network.WithCheckDuplicate(),
network.WithDriver("overlay"), network.WithDriver("overlay"),
) )
@ -175,11 +175,11 @@ func TestCreateWithDuplicateNetworkNames(t *testing.T) {
ctx := context.Background() ctx := context.Background()
name := "foo_" + t.Name() name := "foo_" + t.Name()
n1 := network.CreateNoError(t, ctx, client, name, network.WithDriver("bridge")) n1 := network.CreateNoError(ctx, t, client, name, network.WithDriver("bridge"))
n2 := network.CreateNoError(t, ctx, client, name, network.WithDriver("bridge")) n2 := network.CreateNoError(ctx, t, client, name, network.WithDriver("bridge"))
// Duplicates with name but with different driver // Duplicates with name but with different driver
n3 := network.CreateNoError(t, ctx, client, name, network.WithDriver("overlay")) n3 := network.CreateNoError(ctx, t, client, name, network.WithDriver("overlay"))
// Create Service with the same name // Create Service with the same name
var instances uint64 = 1 var instances uint64 = 1

2
integration/service/network_test.go
View file

@ -24,7 +24,7 @@ func TestDockerNetworkConnectAlias(t *testing.T) {
ctx := context.Background() ctx := context.Background()
name := t.Name() + "test-alias" name := t.Name() + "test-alias"
net.CreateNoError(t, ctx, client, name, net.CreateNoError(ctx, t, client, name,
net.WithDriver("overlay"), net.WithDriver("overlay"),
net.WithAttachable(), net.WithAttachable(),
) )

2
integration/service/update_test.go
View file

@ -207,7 +207,7 @@ func TestServiceUpdateNetwork(t *testing.T) {
// Create a overlay network // Create a overlay network
testNet := "testNet" + t.Name() testNet := "testNet" + t.Name()
overlayID := network.CreateNoError(t, ctx, cli, testNet, overlayID := network.CreateNoError(ctx, t, cli, testNet,
network.WithDriver("overlay")) network.WithDriver("overlay"))
var instances uint64 = 1 var instances uint64 = 1