diff --git a/components/engine/CONTRIBUTING.md b/components/engine/CONTRIBUTING.md index c45ae3376b..daefdadaed 100644 --- a/components/engine/CONTRIBUTING.md +++ b/components/engine/CONTRIBUTING.md @@ -8,7 +8,7 @@ process](docs/contributing/). This page contains information about reporting issues as well as some tips and guidelines useful to experienced open source contributors. Finally, make sure -you read our [community guidelines](#docker-community-guidelines) before you +you read our [community guidelines](#moby-community-guidelines) before you start participating. ## Topics @@ -17,7 +17,7 @@ start participating. * [Design and Cleanup Proposals](#design-and-cleanup-proposals) * [Reporting Issues](#reporting-other-issues) * [Quick Contribution Tips and Guidelines](#quick-contribution-tips-and-guidelines) -* [Community Guidelines](#docker-community-guidelines) +* [Community Guidelines](#moby-community-guidelines) ## Reporting security issues diff --git a/components/engine/integration/network/service_test.go b/components/engine/integration/network/service_test.go index a15b0384c7..d926045b72 100644 --- a/components/engine/integration/network/service_test.go +++ b/components/engine/integration/network/service_test.go @@ -9,6 +9,7 @@ import ( swarmtypes "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/client" + "github.com/docker/docker/integration/internal/network" "github.com/docker/docker/integration/internal/swarm" "github.com/docker/docker/internal/test/daemon" "gotest.tools/assert" @@ -66,24 +67,18 @@ func TestDaemonDefaultNetworkPools(t *testing.T) { // Create a bridge network and verify its subnet is the second default pool name := "elango" - networkCreate := types.NetworkCreate{ - CheckDuplicate: false, - } - networkCreate.Driver = "bridge" - _, err = cli.NetworkCreate(context.Background(), name, networkCreate) - assert.NilError(t, err) + network.CreateNoError(t, context.Background(), cli, name, + network.WithDriver("bridge"), + ) out, err = cli.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) assert.NilError(t, err) assert.Equal(t, out.IPAM.Config[0].Subnet, "175.33.0.0/24") // Create a bridge network and verify its subnet is the third default pool name = "saanvi" - networkCreate = types.NetworkCreate{ - CheckDuplicate: false, - } - networkCreate.Driver = "bridge" - _, err = cli.NetworkCreate(context.Background(), name, networkCreate) - assert.NilError(t, err) + network.CreateNoError(t, context.Background(), cli, name, + network.WithDriver("bridge"), + ) out, err = cli.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) assert.NilError(t, err) assert.Equal(t, out.IPAM.Config[0].Subnet, "175.33.1.0/24") @@ -105,12 +100,9 @@ func TestDaemonRestartWithExistingNetwork(t *testing.T) { // Create a bridge network name := "elango" - networkCreate := types.NetworkCreate{ - CheckDuplicate: false, - } - networkCreate.Driver = "bridge" - _, err = cli.NetworkCreate(context.Background(), name, networkCreate) - assert.NilError(t, err) + network.CreateNoError(t, context.Background(), cli, name, + network.WithDriver("bridge"), + ) out, err := cli.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) assert.NilError(t, err) networkip := out.IPAM.Config[0].Subnet @@ -140,24 +132,18 @@ func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) { // Create a bridge network name := "elango" - networkCreate := types.NetworkCreate{ - CheckDuplicate: false, - } - networkCreate.Driver = "bridge" - _, err = cli.NetworkCreate(context.Background(), name, networkCreate) - assert.NilError(t, err) + network.CreateNoError(t, context.Background(), cli, name, + network.WithDriver("bridge"), + ) out, err := cli.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) assert.NilError(t, err) networkip := out.IPAM.Config[0].Subnet // Create a bridge network name = "sthira" - networkCreate = types.NetworkCreate{ - CheckDuplicate: false, - } - networkCreate.Driver = "bridge" - _, err = cli.NetworkCreate(context.Background(), name, networkCreate) - assert.NilError(t, err) + network.CreateNoError(t, context.Background(), cli, name, + network.WithDriver("bridge"), + ) out, err = cli.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) assert.NilError(t, err) networkip2 := out.IPAM.Config[0].Subnet @@ -169,12 +155,9 @@ func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) { // Create a bridge network name = "saanvi" - networkCreate = types.NetworkCreate{ - CheckDuplicate: false, - } - networkCreate.Driver = "bridge" - _, err = cli.NetworkCreate(context.Background(), name, networkCreate) - assert.NilError(t, err) + network.CreateNoError(t, context.Background(), cli, name, + network.WithDriver("bridge"), + ) out1, err := cli.NetworkInspect(context.Background(), name, types.NetworkInspectOptions{}) assert.NilError(t, err)