@@ -136,6 +136,21 @@ func ServiceWithName(name string) ServiceSpecOpt {

 	}

 }

+// ServiceWithNetwork sets the network of the service

+func ServiceWithNetwork(network string) ServiceSpecOpt {

+	return func(spec *swarmtypes.ServiceSpec) {

+		spec.TaskTemplate.Networks = append(spec.TaskTemplate.Networks,

+			swarmtypes.NetworkAttachmentConfig{Target: network})

+	}

+}

+

+// ServiceWithEndpoint sets the Endpoint of the service

+func ServiceWithEndpoint(endpoint *swarmtypes.EndpointSpec) ServiceSpecOpt {

+	return func(spec *swarmtypes.ServiceSpec) {

+		spec.EndpointSpec = endpoint

+	}

+}

+

 // GetRunningTasks gets the list of running tasks for a service

 func GetRunningTasks(t *testing.T, d *daemon.Daemon, serviceID string) []swarmtypes.Task {

 	t.Helper()

@@ -35,16 +35,13 @@ func TestInspectNetwork(t *testing.T) {

 	var instances uint64 = 4

 	serviceName := "TestService"

-	// FIXME(vdemeester) consolidate with swarm.CreateService

-	serviceSpec := swarmServiceSpec(serviceName, instances)

-	serviceSpec.TaskTemplate.Networks = append(serviceSpec.TaskTemplate.Networks, swarmtypes.NetworkAttachmentConfig{Target: overlayName})

-	serviceResp, err := client.ServiceCreate(context.Background(), serviceSpec, types.ServiceCreateOptions{

-		QueryRegistry: false,

-	})

-	assert.NilError(t, err)

+	serviceID := swarm.CreateService(t, d,

+		swarm.ServiceWithReplicas(instances),

+		swarm.ServiceWithName(serviceName),

+		swarm.ServiceWithNetwork(overlayName),

+	)

-	serviceID := serviceResp.ID

 	poll.WaitOn(t, serviceRunningTasksCount(client, serviceID, instances), swarm.ServicePoll)

 	_, _, err = client.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{})

@@ -78,12 +75,12 @@ func TestInspectNetwork(t *testing.T) {

 	poll.WaitOn(t, serviceIsRemoved(client, serviceID), swarm.ServicePoll)

 	poll.WaitOn(t, noTasks(client), swarm.ServicePoll)

-	serviceResp, err = client.ServiceCreate(context.Background(), serviceSpec, types.ServiceCreateOptions{

-		QueryRegistry: false,

-	})

-	assert.NilError(t, err)

+	serviceID2 := swarm.CreateService(t, d,

+		swarm.ServiceWithReplicas(instances),

+		swarm.ServiceWithName(serviceName),

+		swarm.ServiceWithNetwork(overlayName),

+	)

-	serviceID2 := serviceResp.ID

 	poll.WaitOn(t, serviceRunningTasksCount(client, serviceID2, instances), swarm.ServicePoll)

 	err = client.ServiceRemove(context.Background(), serviceID2)

@@ -98,25 +95,6 @@ func TestInspectNetwork(t *testing.T) {

 	poll.WaitOn(t, networkIsRemoved(client, overlayID), poll.WithTimeout(1*time.Minute), poll.WithDelay(10*time.Second))

 }

-func swarmServiceSpec(name string, replicas uint64) swarmtypes.ServiceSpec {

-	return swarmtypes.ServiceSpec{

-		Annotations: swarmtypes.Annotations{

-			Name: name,

-		},

-		TaskTemplate: swarmtypes.TaskSpec{

-			ContainerSpec: &swarmtypes.ContainerSpec{

-				Image:   "busybox:latest",

-				Command: []string{"/bin/top"},

-			},

-		},

-		Mode: swarmtypes.ServiceMode{

-			Replicated: &swarmtypes.ReplicatedService{

-				Replicas: &replicas,

-			},

-		},

-	}

-}

-

 func serviceRunningTasksCount(client client.ServiceAPIClient, serviceID string, instances uint64) func(log poll.LogT) poll.Result {

 	return func(log poll.LogT) poll.Result {

 		filter := filters.NewArgs()

@@ -202,18 +202,16 @@ func TestServiceWithPredefinedNetwork(t *testing.T) {

 	hostName := "host"

 	var instances uint64 = 1

 	serviceName := "TestService"

-	serviceSpec := swarmServiceSpec(serviceName, instances)

-	serviceSpec.TaskTemplate.Networks = append(serviceSpec.TaskTemplate.Networks, swarmtypes.NetworkAttachmentConfig{Target: hostName})

-	serviceResp, err := client.ServiceCreate(context.Background(), serviceSpec, types.ServiceCreateOptions{

-		QueryRegistry: false,

-	})

-	assert.NilError(t, err)

+	serviceID := swarm.CreateService(t, d,

+		swarm.ServiceWithReplicas(instances),

+		swarm.ServiceWithName(serviceName),

+		swarm.ServiceWithNetwork(hostName),

+	)

-	serviceID := serviceResp.ID

 	poll.WaitOn(t, serviceRunningCount(client, serviceID, instances), swarm.ServicePoll)

-	_, _, err = client.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{})

+	_, _, err := client.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{})

 	assert.NilError(t, err)

 	err = client.ServiceRemove(context.Background(), serviceID)

@@ -232,26 +230,24 @@ func TestServiceRemoveKeepsIngressNetwork(t *testing.T) {

 	poll.WaitOn(t, swarmIngressReady(client), swarm.NetworkPoll)

 	var instances uint64 = 1

-	serviceSpec := swarmServiceSpec(t.Name()+"-service", instances)

-	serviceSpec.EndpointSpec = &swarmtypes.EndpointSpec{

-		Ports: []swarmtypes.PortConfig{

-			{

-				Protocol:    swarmtypes.PortConfigProtocolTCP,

-				TargetPort:  80,

-				PublishMode: swarmtypes.PortConfigPublishModeIngress,

-			},

-		},

-	}

-	serviceResp, err := client.ServiceCreate(context.Background(), serviceSpec, types.ServiceCreateOptions{

-		QueryRegistry: false,

-	})

-	assert.NilError(t, err)

+	serviceID := swarm.CreateService(t, d,

+		swarm.ServiceWithReplicas(instances),

+		swarm.ServiceWithName(t.Name()+"-service"),

+		swarm.ServiceWithEndpoint(&swarmtypes.EndpointSpec{

+			Ports: []swarmtypes.PortConfig{

+				{

+					Protocol:    swarmtypes.PortConfigProtocolTCP,

+					TargetPort:  80,

+					PublishMode: swarmtypes.PortConfigPublishModeIngress,

+				},

+			},

+		}),

+	)

-	serviceID := serviceResp.ID

 	poll.WaitOn(t, serviceRunningCount(client, serviceID, instances), swarm.ServicePoll)

-	_, _, err = client.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{})

+	_, _, err := client.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{})

 	assert.NilError(t, err)

 	err = client.ServiceRemove(context.Background(), serviceID)