@@ -311,7 +311,7 @@ func init() {

 type DockerSwarmSuite struct {

 	server      *httptest.Server

 	ds          *DockerSuite

-	daemons     []*daemon.Swarm

+	daemons     []*daemon.Daemon

 	daemonsLock sync.Mutex // protect access to daemons

 	portIndex   int

 }

@@ -328,14 +328,10 @@ func (s *DockerSwarmSuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, SameHostDaemon)

 }

-func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemon.Swarm {

-	d := &daemon.Swarm{

-		Daemon: daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-			Experimental: testEnv.DaemonInfo.ExperimentalBuild,

-		}),

-		Port: defaultSwarmPort + s.portIndex,

-	}

-	d.ListenAddr = fmt.Sprintf("0.0.0.0:%d", d.Port)

+func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemon.Daemon {

+	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

+		Experimental: testEnv.DaemonInfo.ExperimentalBuild,

+	}, testdaemon.WithSwarmPort(defaultSwarmPort+s.portIndex))

 	args := []string{"--iptables=false", "--swarm-default-advertise-addr=lo"} // avoid networking conflicts

 	d.StartWithBusybox(c, args...)

@@ -346,12 +342,12 @@ func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemo

 			if manager {

 				token = tokens.Manager

 			}

-			c.Assert(d.Join(swarm.JoinRequest{

-				RemoteAddrs: []string{s.daemons[0].ListenAddr},

+			d.SwarmJoin(c, swarm.JoinRequest{

+				RemoteAddrs: []string{s.daemons[0].SwarmListenAddr()},

 				JoinToken:   token,

-			}), check.IsNil)

+			})

 		} else {

-			c.Assert(d.Init(swarm.InitRequest{}), check.IsNil)

+			d.SwarmInit(c, swarm.InitRequest{})

 		}

 	}

@@ -38,10 +38,8 @@ type Config struct {

 // New returns a Daemon instance to be used for testing.

 // This will create a directory such as d123456789 in the folder specified by $DOCKER_INTEGRATION_DAEMON_DEST or $DEST.

 // The daemon will not automatically start.

-func New(t testingT, dockerBinary string, dockerdBinary string, config Config) *Daemon {

-	ops := []func(*daemon.Daemon){

-		daemon.WithDockerdBinary(dockerdBinary),

-	}

+func New(t testingT, dockerBinary string, dockerdBinary string, config Config, ops ...func(*daemon.Daemon)) *Daemon {

+	ops = append(ops, daemon.WithDockerdBinary(dockerdBinary))

 	if config.Experimental {

 		ops = append(ops, daemon.WithExperimental)

 	}

@@ -150,6 +148,21 @@ func (d *Daemon) WaitRun(contID string) error {

 	return WaitInspectWithArgs(d.dockerBinary, contID, "{{.State.Running}}", "true", 10*time.Second, args...)

 }

+// CmdRetryOutOfSequence tries the specified command against the current daemon for 10 times

+func (d *Daemon) CmdRetryOutOfSequence(args ...string) (string, error) {

+	for i := 0; ; i++ {

+		out, err := d.Cmd(args...)

+		if err != nil {

+			if strings.Contains(out, "update out of sequence") {

+				if i < 10 {

+					continue

+				}

+			}

+		}

+		return out, err

+	}

+}

+

 // WaitInspectWithArgs waits for the specified expression to be equals to the specified expected string in the given time.

 // Deprecated: use cli.WaitCmd instead

 func WaitInspectWithArgs(dockerBinary, name, expr, expected string, timeout time.Duration, arg ...string) error {

@@ -3,7 +3,6 @@ package daemon // import "github.com/docker/docker/integration-cli/daemon"

 import (

 	"fmt"

 	"strings"

-	"time"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/filters"

@@ -12,178 +11,12 @@ import (

 	"github.com/docker/docker/integration-cli/checker"

 	"github.com/go-check/check"

 	"github.com/gotestyourself/gotestyourself/assert"

-	"github.com/pkg/errors"

 	"golang.org/x/net/context"

 )

-// Swarm is a test daemon with helpers for participating in a swarm.

-type Swarm struct {

-	*Daemon

-	swarm.Info

-	Port       int

-	ListenAddr string

-}

-

-// Init initializes a new swarm cluster.

-func (d *Swarm) Init(req swarm.InitRequest) error {

-	if req.ListenAddr == "" {

-		req.ListenAddr = d.ListenAddr

-	}

-	cli, err := d.NewClient()

-	if err != nil {

-		return fmt.Errorf("initializing swarm: failed to create client %v", err)

-	}

-	defer cli.Close()

-	_, err = cli.SwarmInit(context.Background(), req)

-	if err != nil {

-		return fmt.Errorf("initializing swarm: %v", err)

-	}

-	info, err := d.SwarmInfo()

-	if err != nil {

-		return err

-	}

-	d.Info = info

-	return nil

-}

-

-// Join joins a daemon to an existing cluster.

-func (d *Swarm) Join(req swarm.JoinRequest) error {

-	if req.ListenAddr == "" {

-		req.ListenAddr = d.ListenAddr

-	}

-	cli, err := d.NewClient()

-	if err != nil {

-		return fmt.Errorf("joining swarm: failed to create client %v", err)

-	}

-	defer cli.Close()

-	err = cli.SwarmJoin(context.Background(), req)

-	if err != nil {

-		return fmt.Errorf("joining swarm: %v", err)

-	}

-	info, err := d.SwarmInfo()

-	if err != nil {

-		return err

-	}

-	d.Info = info

-	return nil

-}

-

-// Leave forces daemon to leave current cluster.

-func (d *Swarm) Leave(force bool) error {

-	cli, err := d.NewClient()

-	if err != nil {

-		return fmt.Errorf("leaving swarm: failed to create client %v", err)

-	}

-	defer cli.Close()

-	err = cli.SwarmLeave(context.Background(), force)

-	if err != nil {

-		err = fmt.Errorf("leaving swarm: %v", err)

-	}

-	return err

-}

-

-// SwarmInfo returns the swarm information of the daemon

-func (d *Swarm) SwarmInfo() (swarm.Info, error) {

-	cli, err := d.NewClient()

-	if err != nil {

-		return swarm.Info{}, fmt.Errorf("get swarm info: %v", err)

-	}

-

-	info, err := cli.Info(context.Background())

-	if err != nil {

-		return swarm.Info{}, fmt.Errorf("get swarm info: %v", err)

-	}

-

-	return info.Swarm, nil

-}

-

-// Unlock tries to unlock a locked swarm

-func (d *Swarm) Unlock(req swarm.UnlockRequest) error {

-	cli, err := d.NewClient()

-	if err != nil {

-		return fmt.Errorf("unlocking swarm: failed to create client %v", err)

-	}

-	defer cli.Close()

-	err = cli.SwarmUnlock(context.Background(), req)

-	if err != nil {

-		err = errors.Wrap(err, "unlocking swarm")

-	}

-	return err

-}

-

-// ServiceConstructor defines a swarm service constructor function

-type ServiceConstructor func(*swarm.Service)

-

-// NodeConstructor defines a swarm node constructor

-type NodeConstructor func(*swarm.Node)

-

-// SecretConstructor defines a swarm secret constructor

-type SecretConstructor func(*swarm.Secret)

-

-// ConfigConstructor defines a swarm config constructor

-type ConfigConstructor func(*swarm.Config)

-

-// SpecConstructor defines a swarm spec constructor

-type SpecConstructor func(*swarm.Spec)

-

-// CreateServiceWithOptions creates a swarm service given the specified service constructors

-// and auth config

-func (d *Swarm) CreateServiceWithOptions(c *check.C, opts types.ServiceCreateOptions, f ...ServiceConstructor) string {

-	var service swarm.Service

-	for _, fn := range f {

-		fn(&service)

-	}

-

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)

-	defer cancel()

-

-	res, err := cli.ServiceCreate(ctx, service.Spec, opts)

-	c.Assert(err, checker.IsNil)

-	return res.ID

-}

-

-// CreateService creates a swarm service given the specified service constructor

-func (d *Swarm) CreateService(c *check.C, f ...ServiceConstructor) string {

-	return d.CreateServiceWithOptions(c, types.ServiceCreateOptions{}, f...)

-}

-

-// GetService returns the swarm service corresponding to the specified id

-func (d *Swarm) GetService(c *check.C, id string) *swarm.Service {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	service, _, err := cli.ServiceInspectWithRaw(context.Background(), id, types.ServiceInspectOptions{})

-	c.Assert(err, checker.IsNil)

-	return &service

-}

-

-// GetServiceTasks returns the swarm tasks for the specified service

-func (d *Swarm) GetServiceTasks(c *check.C, service string) []swarm.Task {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	filterArgs := filters.NewArgs()

-	filterArgs.Add("desired-state", "running")

-	filterArgs.Add("service", service)

-

-	options := types.TaskListOptions{

-		Filters: filterArgs,

-	}

-

-	tasks, err := cli.TaskList(context.Background(), options)

-	c.Assert(err, checker.IsNil)

-	return tasks

-}

-

 // CheckServiceTasksInState returns the number of tasks with a matching state,

 // and optional message substring.

-func (d *Swarm) CheckServiceTasksInState(service string, state swarm.TaskState, message string) func(*check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckServiceTasksInState(service string, state swarm.TaskState, message string) func(*check.C) (interface{}, check.CommentInterface) {

 	return func(c *check.C) (interface{}, check.CommentInterface) {

 		tasks := d.GetServiceTasks(c, service)

 		var count int

@@ -200,7 +33,7 @@ func (d *Swarm) CheckServiceTasksInState(service string, state swarm.TaskState,

 // CheckServiceTasksInStateWithError returns the number of tasks with a matching state,

 // and optional message substring.

-func (d *Swarm) CheckServiceTasksInStateWithError(service string, state swarm.TaskState, errorMessage string) func(*check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckServiceTasksInStateWithError(service string, state swarm.TaskState, errorMessage string) func(*check.C) (interface{}, check.CommentInterface) {

 	return func(c *check.C) (interface{}, check.CommentInterface) {

 		tasks := d.GetServiceTasks(c, service)

 		var count int

@@ -216,12 +49,12 @@ func (d *Swarm) CheckServiceTasksInStateWithError(service string, state swarm.Ta

 }

 // CheckServiceRunningTasks returns the number of running tasks for the specified service

-func (d *Swarm) CheckServiceRunningTasks(service string) func(*check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckServiceRunningTasks(service string) func(*check.C) (interface{}, check.CommentInterface) {

 	return d.CheckServiceTasksInState(service, swarm.TaskStateRunning, "")

 }

 // CheckServiceUpdateState returns the current update state for the specified service

-func (d *Swarm) CheckServiceUpdateState(service string) func(*check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckServiceUpdateState(service string) func(*check.C) (interface{}, check.CommentInterface) {

 	return func(c *check.C) (interface{}, check.CommentInterface) {

 		service := d.GetService(c, service)

 		if service.UpdateStatus == nil {

@@ -232,7 +65,7 @@ func (d *Swarm) CheckServiceUpdateState(service string) func(*check.C) (interfac

 }

 // CheckPluginRunning returns the runtime state of the plugin

-func (d *Swarm) CheckPluginRunning(plugin string) func(c *check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckPluginRunning(plugin string) func(c *check.C) (interface{}, check.CommentInterface) {

 	return func(c *check.C) (interface{}, check.CommentInterface) {

 		apiclient, err := d.NewClient()

 		assert.NilError(c, err)

@@ -246,7 +79,7 @@ func (d *Swarm) CheckPluginRunning(plugin string) func(c *check.C) (interface{},

 }

 // CheckPluginImage returns the runtime state of the plugin

-func (d *Swarm) CheckPluginImage(plugin string) func(c *check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckPluginImage(plugin string) func(c *check.C) (interface{}, check.CommentInterface) {

 	return func(c *check.C) (interface{}, check.CommentInterface) {

 		apiclient, err := d.NewClient()

 		assert.NilError(c, err)

@@ -260,7 +93,7 @@ func (d *Swarm) CheckPluginImage(plugin string) func(c *check.C) (interface{}, c

 }

 // CheckServiceTasks returns the number of tasks for the specified service

-func (d *Swarm) CheckServiceTasks(service string) func(*check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckServiceTasks(service string) func(*check.C) (interface{}, check.CommentInterface) {

 	return func(c *check.C) (interface{}, check.CommentInterface) {

 		tasks := d.GetServiceTasks(c, service)

 		return len(tasks), nil

@@ -268,7 +101,7 @@ func (d *Swarm) CheckServiceTasks(service string) func(*check.C) (interface{}, c

 }

 // CheckRunningTaskNetworks returns the number of times each network is referenced from a task.

-func (d *Swarm) CheckRunningTaskNetworks(c *check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckRunningTaskNetworks(c *check.C) (interface{}, check.CommentInterface) {

 	cli, err := d.NewClient()

 	c.Assert(err, checker.IsNil)

 	defer cli.Close()

@@ -293,7 +126,7 @@ func (d *Swarm) CheckRunningTaskNetworks(c *check.C) (interface{}, check.Comment

 }

 // CheckRunningTaskImages returns the times each image is running as a task.

-func (d *Swarm) CheckRunningTaskImages(c *check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckRunningTaskImages(c *check.C) (interface{}, check.CommentInterface) {

 	cli, err := d.NewClient()

 	c.Assert(err, checker.IsNil)

 	defer cli.Close()

@@ -318,7 +151,7 @@ func (d *Swarm) CheckRunningTaskImages(c *check.C) (interface{}, check.CommentIn

 }

 // CheckNodeReadyCount returns the number of ready node on the swarm

-func (d *Swarm) CheckNodeReadyCount(c *check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckNodeReadyCount(c *check.C) (interface{}, check.CommentInterface) {

 	nodes := d.ListNodes(c)

 	var readyCount int

 	for _, node := range nodes {

@@ -329,303 +162,21 @@ func (d *Swarm) CheckNodeReadyCount(c *check.C) (interface{}, check.CommentInter

 	return readyCount, nil

 }

-// GetTask returns the swarm task identified by the specified id

-func (d *Swarm) GetTask(c *check.C, id string) swarm.Task {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	task, _, err := cli.TaskInspectWithRaw(context.Background(), id)

-	c.Assert(err, checker.IsNil)

-	return task

-}

-

-// UpdateService updates a swarm service with the specified service constructor

-func (d *Swarm) UpdateService(c *check.C, service *swarm.Service, f ...ServiceConstructor) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	for _, fn := range f {

-		fn(service)

-	}

-

-	_, err = cli.ServiceUpdate(context.Background(), service.ID, service.Version, service.Spec, types.ServiceUpdateOptions{})

-	c.Assert(err, checker.IsNil)

-}

-

-// RemoveService removes the specified service

-func (d *Swarm) RemoveService(c *check.C, id string) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	err = cli.ServiceRemove(context.Background(), id)

-	c.Assert(err, checker.IsNil)

-}

-

-// GetNode returns a swarm node identified by the specified id

-func (d *Swarm) GetNode(c *check.C, id string) *swarm.Node {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	node, _, err := cli.NodeInspectWithRaw(context.Background(), id)

-	c.Assert(err, checker.IsNil)

-	c.Assert(node.ID, checker.Equals, id)

-	return &node

-}

-

-// RemoveNode removes the specified node

-func (d *Swarm) RemoveNode(c *check.C, id string, force bool) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	options := types.NodeRemoveOptions{

-		Force: force,

-	}

-	err = cli.NodeRemove(context.Background(), id, options)

-	c.Assert(err, checker.IsNil)

-}

-

-// UpdateNode updates a swarm node with the specified node constructor

-func (d *Swarm) UpdateNode(c *check.C, id string, f ...NodeConstructor) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	for i := 0; ; i++ {

-		node := d.GetNode(c, id)

-		for _, fn := range f {

-			fn(node)

-		}

-

-		err = cli.NodeUpdate(context.Background(), node.ID, node.Version, node.Spec)

-		if i < 10 && err != nil && strings.Contains(err.Error(), "update out of sequence") {

-			time.Sleep(100 * time.Millisecond)

-			continue

-		}

-		c.Assert(err, checker.IsNil)

-		return

-	}

-}

-

-// ListNodes returns the list of the current swarm nodes

-func (d *Swarm) ListNodes(c *check.C) []swarm.Node {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	nodes, err := cli.NodeList(context.Background(), types.NodeListOptions{})

-	c.Assert(err, checker.IsNil)

-

-	return nodes

-}

-

-// ListServices returns the list of the current swarm services

-func (d *Swarm) ListServices(c *check.C) []swarm.Service {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	services, err := cli.ServiceList(context.Background(), types.ServiceListOptions{})

-	c.Assert(err, checker.IsNil)

-	return services

-}

-

-// CreateSecret creates a secret given the specified spec

-func (d *Swarm) CreateSecret(c *check.C, secretSpec swarm.SecretSpec) string {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	scr, err := cli.SecretCreate(context.Background(), secretSpec)

-	c.Assert(err, checker.IsNil)

-

-	return scr.ID

-}

-

-// ListSecrets returns the list of the current swarm secrets

-func (d *Swarm) ListSecrets(c *check.C) []swarm.Secret {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	secrets, err := cli.SecretList(context.Background(), types.SecretListOptions{})

-	c.Assert(err, checker.IsNil)

-	return secrets

-}

-

-// GetSecret returns a swarm secret identified by the specified id

-func (d *Swarm) GetSecret(c *check.C, id string) *swarm.Secret {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	secret, _, err := cli.SecretInspectWithRaw(context.Background(), id)

-	c.Assert(err, checker.IsNil)

-	return &secret

-}

-

-// DeleteSecret removes the swarm secret identified by the specified id

-func (d *Swarm) DeleteSecret(c *check.C, id string) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	err = cli.SecretRemove(context.Background(), id)

-	c.Assert(err, checker.IsNil)

-}

-

-// UpdateSecret updates the swarm secret identified by the specified id

-// Currently, only label update is supported.

-func (d *Swarm) UpdateSecret(c *check.C, id string, f ...SecretConstructor) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	secret := d.GetSecret(c, id)

-	for _, fn := range f {

-		fn(secret)

-	}

-

-	err = cli.SecretUpdate(context.Background(), secret.ID, secret.Version, secret.Spec)

-

-	c.Assert(err, checker.IsNil)

-}

-

-// CreateConfig creates a config given the specified spec

-func (d *Swarm) CreateConfig(c *check.C, configSpec swarm.ConfigSpec) string {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	scr, err := cli.ConfigCreate(context.Background(), configSpec)

-	c.Assert(err, checker.IsNil)

-	return scr.ID

-}

-

-// ListConfigs returns the list of the current swarm configs

-func (d *Swarm) ListConfigs(c *check.C) []swarm.Config {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	configs, err := cli.ConfigList(context.Background(), types.ConfigListOptions{})

-	c.Assert(err, checker.IsNil)

-	return configs

-}

-

-// GetConfig returns a swarm config identified by the specified id

-func (d *Swarm) GetConfig(c *check.C, id string) *swarm.Config {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	config, _, err := cli.ConfigInspectWithRaw(context.Background(), id)

-	c.Assert(err, checker.IsNil)

-	return &config

-}

-

-// DeleteConfig removes the swarm config identified by the specified id

-func (d *Swarm) DeleteConfig(c *check.C, id string) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	err = cli.ConfigRemove(context.Background(), id)

-	c.Assert(err, checker.IsNil)

-}

-

-// UpdateConfig updates the swarm config identified by the specified id

-// Currently, only label update is supported.

-func (d *Swarm) UpdateConfig(c *check.C, id string, f ...ConfigConstructor) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	config := d.GetConfig(c, id)

-	for _, fn := range f {

-		fn(config)

-	}

-

-	err = cli.ConfigUpdate(context.Background(), config.ID, config.Version, config.Spec)

-	c.Assert(err, checker.IsNil)

-}

-

-// GetSwarm returns the current swarm object

-func (d *Swarm) GetSwarm(c *check.C) swarm.Swarm {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	sw, err := cli.SwarmInspect(context.Background())

-	c.Assert(err, checker.IsNil)

-	return sw

-}

-

-// UpdateSwarm updates the current swarm object with the specified spec constructors

-func (d *Swarm) UpdateSwarm(c *check.C, f ...SpecConstructor) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	sw := d.GetSwarm(c)

-	for _, fn := range f {

-		fn(&sw.Spec)

-	}

-

-	err = cli.SwarmUpdate(context.Background(), sw.Version, sw.Spec, swarm.UpdateFlags{})

-	c.Assert(err, checker.IsNil)

-}

-

-// RotateTokens update the swarm to rotate tokens

-func (d *Swarm) RotateTokens(c *check.C) {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	sw, err := cli.SwarmInspect(context.Background())

-	c.Assert(err, checker.IsNil)

-

-	flags := swarm.UpdateFlags{

-		RotateManagerToken: true,

-		RotateWorkerToken:  true,

-	}

-

-	err = cli.SwarmUpdate(context.Background(), sw.Version, sw.Spec, flags)

-	c.Assert(err, checker.IsNil)

-}

-

-// JoinTokens returns the current swarm join tokens

-func (d *Swarm) JoinTokens(c *check.C) swarm.JoinTokens {

-	cli, err := d.NewClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	sw, err := cli.SwarmInspect(context.Background())

-	c.Assert(err, checker.IsNil)

-	return sw.JoinTokens

-}

-

 // CheckLocalNodeState returns the current swarm node state

-func (d *Swarm) CheckLocalNodeState(c *check.C) (interface{}, check.CommentInterface) {

-	info, err := d.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+func (d *Daemon) CheckLocalNodeState(c *check.C) (interface{}, check.CommentInterface) {

+	info := d.SwarmInfo(c)

 	return info.LocalNodeState, nil

 }

 // CheckControlAvailable returns the current swarm control available

-func (d *Swarm) CheckControlAvailable(c *check.C) (interface{}, check.CommentInterface) {

-	info, err := d.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+func (d *Daemon) CheckControlAvailable(c *check.C) (interface{}, check.CommentInterface) {

+	info := d.SwarmInfo(c)

 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)

 	return info.ControlAvailable, nil

 }

 // CheckLeader returns whether there is a leader on the swarm or not

-func (d *Swarm) CheckLeader(c *check.C) (interface{}, check.CommentInterface) {

+func (d *Daemon) CheckLeader(c *check.C) (interface{}, check.CommentInterface) {

 	cli, err := d.NewClient()

 	c.Assert(err, checker.IsNil)

 	defer cli.Close()

@@ -5,11 +5,11 @@ import (

 	"github.com/go-check/check"

 )

-func (s *DockerSwarmSuite) getDaemon(c *check.C, nodeID string) *daemon.Swarm {

+func (s *DockerSwarmSuite) getDaemon(c *check.C, nodeID string) *daemon.Daemon {

 	s.daemonsLock.Lock()

 	defer s.daemonsLock.Unlock()

 	for _, d := range s.daemons {

-		if d.NodeID == nodeID {

+		if d.NodeID() == nodeID {

 			return d

 		}

 	}

@@ -21,8 +21,8 @@ func (s *DockerSwarmSuite) TestAPISwarmListNodes(c *check.C) {

 loop0:

 	for _, n := range nodes {

-		for _, d := range []*daemon.Swarm{d1, d2, d3} {

-			if n.ID == d.NodeID {

+		for _, d := range []*daemon.Daemon{d1, d2, d3} {

+			if n.ID == d.NodeID() {

 				continue loop0

 			}

 		}

@@ -53,8 +53,7 @@ func (s *DockerSwarmSuite) TestAPISwarmNodeRemove(c *check.C) {

 	c.Assert(len(nodes), checker.Equals, 3, check.Commentf("nodes: %#v", nodes))

 	// Getting the info so we can take the NodeID

-	d2Info, err := d2.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+	d2Info := d2.SwarmInfo(c)

 	// forceful removal of d2 should work

 	d1.RemoveNode(c, d2Info.NodeID, true)

@@ -88,14 +87,14 @@ func (s *DockerSwarmSuite) TestAPISwarmNodeDrainPause(c *check.C) {

 	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.CheckActiveContainerCount, d2.CheckActiveContainerCount), checker.Equals, instances)

 	// drain d2, all containers should move to d1

-	d1.UpdateNode(c, d2.NodeID, func(n *swarm.Node) {

+	d1.UpdateNode(c, d2.NodeID(), func(n *swarm.Node) {

 		n.Spec.Availability = swarm.NodeAvailabilityDrain

 	})

 	waitAndAssert(c, defaultReconciliationTimeout, d1.CheckActiveContainerCount, checker.Equals, instances)

 	waitAndAssert(c, defaultReconciliationTimeout, d2.CheckActiveContainerCount, checker.Equals, 0)

 	// set d2 back to active

-	d1.UpdateNode(c, d2.NodeID, func(n *swarm.Node) {

+	d1.UpdateNode(c, d2.NodeID(), func(n *swarm.Node) {

 		n.Spec.Availability = swarm.NodeAvailabilityActive

 	})

@@ -115,7 +114,7 @@ func (s *DockerSwarmSuite) TestAPISwarmNodeDrainPause(c *check.C) {

 	d2ContainerCount := len(d2.ActiveContainers())

 	// set d2 to paused, scale service up, only d1 gets new tasks

-	d1.UpdateNode(c, d2.NodeID, func(n *swarm.Node) {

+	d1.UpdateNode(c, d2.NodeID(), func(n *swarm.Node) {

 		n.Spec.Availability = swarm.NodeAvailabilityPause

 	})

@@ -15,12 +15,13 @@ import (

 	"github.com/docker/docker/integration-cli/checker"

 	"github.com/docker/docker/integration-cli/daemon"

 	"github.com/docker/docker/integration-cli/fixtures/plugin"

+	testdaemon "github.com/docker/docker/internal/test/daemon"

 	"github.com/go-check/check"

 	"golang.org/x/net/context"

 	"golang.org/x/sys/unix"

 )

-func setPortConfig(portConfig []swarm.PortConfig) daemon.ServiceConstructor {

+func setPortConfig(portConfig []swarm.PortConfig) testdaemon.ServiceConstructor {

 	return func(s *swarm.Service) {

 		if s.Spec.EndpointSpec == nil {

 			s.Spec.EndpointSpec = &swarm.EndpointSpec{}

@@ -140,7 +141,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesCreateGlobal(c *check.C) {

 func (s *DockerSwarmSuite) TestAPISwarmServicesUpdate(c *check.C) {

 	const nodeCount = 3

-	var daemons [nodeCount]*daemon.Swarm

+	var daemons [nodeCount]*daemon.Daemon

 	for i := 0; i < nodeCount; i++ {

 		daemons[i] = s.AddDaemon(c, true, i == 0)

 	}

@@ -309,7 +310,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesUpdateStartFirst(c *check.C) {

 func (s *DockerSwarmSuite) TestAPISwarmServicesFailedUpdate(c *check.C) {

 	const nodeCount = 3

-	var daemons [nodeCount]*daemon.Swarm

+	var daemons [nodeCount]*daemon.Daemon

 	for i := 0; i < nodeCount; i++ {

 		daemons[i] = s.AddDaemon(c, true, i == 0)

 	}

@@ -349,7 +350,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesFailedUpdate(c *check.C) {

 func (s *DockerSwarmSuite) TestAPISwarmServiceConstraintRole(c *check.C) {

 	const nodeCount = 3

-	var daemons [nodeCount]*daemon.Swarm

+	var daemons [nodeCount]*daemon.Daemon

 	for i := 0; i < nodeCount; i++ {

 		daemons[i] = s.AddDaemon(c, true, i == 0)

 	}

@@ -401,7 +402,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServiceConstraintRole(c *check.C) {

 func (s *DockerSwarmSuite) TestAPISwarmServiceConstraintLabel(c *check.C) {

 	const nodeCount = 3

-	var daemons [nodeCount]*daemon.Swarm

+	var daemons [nodeCount]*daemon.Daemon

 	for i := 0; i < nodeCount; i++ {

 		daemons[i] = s.AddDaemon(c, true, i == 0)

 	}

@@ -496,7 +497,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServiceConstraintLabel(c *check.C) {

 func (s *DockerSwarmSuite) TestAPISwarmServicePlacementPrefs(c *check.C) {

 	const nodeCount = 3

-	var daemons [nodeCount]*daemon.Swarm

+	var daemons [nodeCount]*daemon.Daemon

 	for i := 0; i < nodeCount; i++ {

 		daemons[i] = s.AddDaemon(c, true, i == 0)

 	}

@@ -551,9 +552,9 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesStateReporting(c *check.C) {

 	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.CheckActiveContainerCount, d2.CheckActiveContainerCount, d3.CheckActiveContainerCount), checker.Equals, instances)

-	getContainers := func() map[string]*daemon.Swarm {

-		m := make(map[string]*daemon.Swarm)

-		for _, d := range []*daemon.Swarm{d1, d2, d3} {

+	getContainers := func() map[string]*daemon.Daemon {

+		m := make(map[string]*daemon.Daemon)

+		for _, d := range []*daemon.Daemon{d1, d2, d3} {

 			for _, id := range d.ActiveContainers() {

 				m[id] = d

 			}

@@ -23,6 +23,7 @@ import (

 	"github.com/docker/docker/integration-cli/checker"

 	"github.com/docker/docker/integration-cli/daemon"

 	"github.com/docker/docker/integration-cli/request"

+	testdaemon "github.com/docker/docker/internal/test/daemon"

 	"github.com/docker/swarmkit/ca"

 	"github.com/go-check/check"

 	"github.com/gotestyourself/gotestyourself/assert"

@@ -35,30 +36,30 @@ var defaultReconciliationTimeout = 30 * time.Second

 func (s *DockerSwarmSuite) TestAPISwarmInit(c *check.C) {

 	// todo: should find a better way to verify that components are running than /info

 	d1 := s.AddDaemon(c, true, true)

-	info, err := d1.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+	info := d1.SwarmInfo(c)

 	c.Assert(info.ControlAvailable, checker.True)

 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)

 	c.Assert(info.Cluster.RootRotationInProgress, checker.False)

 	d2 := s.AddDaemon(c, true, false)

-	info, err = d2.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+	info = d2.SwarmInfo(c)

 	c.Assert(info.ControlAvailable, checker.False)

 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)

 	// Leaving cluster

-	c.Assert(d2.Leave(false), checker.IsNil)

+	c.Assert(d2.SwarmLeave(false), checker.IsNil)

-	info, err = d2.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+	info = d2.SwarmInfo(c)

 	c.Assert(info.ControlAvailable, checker.False)

 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)

-	c.Assert(d2.Join(swarm.JoinRequest{JoinToken: d1.JoinTokens(c).Worker, RemoteAddrs: []string{d1.ListenAddr}}), checker.IsNil)

+	d2.SwarmJoin(c, swarm.JoinRequest{

+		ListenAddr:  d1.SwarmListenAddr(),

+		JoinToken:   d1.JoinTokens(c).Worker,

+		RemoteAddrs: []string{d1.SwarmListenAddr()},

+	})

-	info, err = d2.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+	info = d2.SwarmInfo(c)

 	c.Assert(info.ControlAvailable, checker.False)

 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)

@@ -69,93 +70,100 @@ func (s *DockerSwarmSuite) TestAPISwarmInit(c *check.C) {

 	d1.Start(c)

 	d2.Start(c)

-	info, err = d1.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+	info = d1.SwarmInfo(c)

 	c.Assert(info.ControlAvailable, checker.True)

 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)

-	info, err = d2.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+	info = d2.SwarmInfo(c)

 	c.Assert(info.ControlAvailable, checker.False)

 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)

 }

 func (s *DockerSwarmSuite) TestAPISwarmJoinToken(c *check.C) {

 	d1 := s.AddDaemon(c, false, false)

-	c.Assert(d1.Init(swarm.InitRequest{}), checker.IsNil)

+	d1.SwarmInit(c, swarm.InitRequest{})

 	// todo: error message differs depending if some components of token are valid

 	d2 := s.AddDaemon(c, false, false)

-	err := d2.Join(swarm.JoinRequest{RemoteAddrs: []string{d1.ListenAddr}})

+	c2 := d2.NewClientT(c)

+	err := c2.SwarmJoin(context.Background(), swarm.JoinRequest{

+		ListenAddr:  d2.SwarmListenAddr(),

+		RemoteAddrs: []string{d1.SwarmListenAddr()},

+	})

 	c.Assert(err, checker.NotNil)

 	c.Assert(err.Error(), checker.Contains, "join token is necessary")

-	info, err := d2.SwarmInfo()

-	c.Assert(err, checker.IsNil)

+	info := d2.SwarmInfo(c)

 	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)

-	err = d2.Join(swarm.JoinRequest{JoinToken: "foobaz", RemoteAddrs: []string{d1.ListenAddr}})

+	err = c2.SwarmJoin(context.Background(), swarm.JoinRequest{

+		ListenAddr:  d2.SwarmListenAddr(),

+		JoinToken:   "foobaz",