@@ -1,7 +1,5 @@

 package swarm

-import "github.com/moby/moby/api/types/filters"

-

 // Node represents a node.

 type Node struct {

 	ID string

@@ -140,11 +138,6 @@ type Topology struct {

 	Segments map[string]string `json:",omitempty"`

 }

-// NodeListOptions holds parameters to list nodes with.

-type NodeListOptions struct {

-	Filters filters.Args

-}

-

 // NodeRemoveOptions holds parameters to remove nodes with.

 type NodeRemoveOptions struct {

 	Force bool

@@ -141,7 +141,7 @@ type NetworkAPIClient interface {

 // NodeAPIClient defines API client methods for the nodes

 type NodeAPIClient interface {

 	NodeInspectWithRaw(ctx context.Context, nodeID string) (swarm.Node, []byte, error)

-	NodeList(ctx context.Context, options swarm.NodeListOptions) ([]swarm.Node, error)

+	NodeList(ctx context.Context, options NodeListOptions) ([]swarm.Node, error)

 	NodeRemove(ctx context.Context, nodeID string, options swarm.NodeRemoveOptions) error

 	NodeUpdate(ctx context.Context, nodeID string, version swarm.Version, node swarm.NodeSpec) error

 }

@@ -10,7 +10,7 @@ import (

 )

 // NodeList returns the list of nodes.

-func (cli *Client) NodeList(ctx context.Context, options swarm.NodeListOptions) ([]swarm.Node, error) {

+func (cli *Client) NodeList(ctx context.Context, options NodeListOptions) ([]swarm.Node, error) {

 	query := url.Values{}

 	if options.Filters.Len() > 0 {

@@ -22,7 +22,7 @@ func TestNodeListError(t *testing.T) {

 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),

 	}

-	_, err := client.NodeList(context.Background(), swarm.NodeListOptions{})

+	_, err := client.NodeList(context.Background(), NodeListOptions{})

 	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))

 }

@@ -30,17 +30,17 @@ func TestNodeList(t *testing.T) {

 	const expectedURL = "/nodes"

 	listCases := []struct {

-		options             swarm.NodeListOptions

+		options             NodeListOptions

 		expectedQueryParams map[string]string

 	}{

 		{

-			options: swarm.NodeListOptions{},

+			options: NodeListOptions{},

 			expectedQueryParams: map[string]string{

 				"filters": "",

 			},

 		},

 		{

-			options: swarm.NodeListOptions{

+			options: NodeListOptions{

 				Filters: filters.NewArgs(

 					filters.Arg("label", "label1"),

 					filters.Arg("label", "label2"),

new file mode 100644

@@ -0,0 +1,8 @@

+package client

+

+import "github.com/moby/moby/api/types/filters"

+

+// NodeListOptions holds parameters to list nodes with.

+type NodeListOptions struct {

+	Filters filters.Args

+}

@@ -5,13 +5,14 @@ import (

 	types "github.com/moby/moby/api/types/swarm"

 	"github.com/moby/moby/v2/daemon/cluster/convert"

+	"github.com/moby/moby/v2/daemon/server/swarmbackend"

 	"github.com/moby/moby/v2/errdefs"

 	swarmapi "github.com/moby/swarmkit/v2/api"

 	"google.golang.org/grpc"

 )

 // GetNodes returns a list of all nodes known to a cluster.

-func (c *Cluster) GetNodes(options types.NodeListOptions) ([]types.Node, error) {

+func (c *Cluster) GetNodes(options swarmbackend.NodeListOptions) ([]types.Node, error) {

 	c.mu.RLock()

 	defer c.mu.RUnlock()

@@ -24,7 +24,7 @@ type Backend interface {

 	UpdateService(string, uint64, swarm.ServiceSpec, swarm.ServiceUpdateOptions, bool) (*swarm.ServiceUpdateResponse, error)

 	RemoveService(string) error

 	ServiceLogs(context.Context, *backend.LogSelector, *container.LogsOptions) (<-chan *backend.LogMessage, error)

-	GetNodes(swarm.NodeListOptions) ([]swarm.Node, error)

+	GetNodes(swarmbackend.NodeListOptions) ([]swarm.Node, error)

 	GetNode(string) (swarm.Node, error)

 	UpdateNode(string, uint64, swarm.NodeSpec) error

 	RemoveNode(string, bool) error

@@ -314,7 +314,7 @@ func (sr *swarmRouter) getNodes(ctx context.Context, w http.ResponseWriter, r *h

 		return err

 	}

-	nodes, err := sr.backend.GetNodes(types.NodeListOptions{Filters: filter})

+	nodes, err := sr.backend.GetNodes(swarmbackend.NodeListOptions{Filters: filter})

 	if err != nil {

 		log.G(ctx).WithContext(ctx).WithError(err).Debug("Error getting nodes")

 		return err

@@ -5,3 +5,7 @@ import "github.com/moby/moby/api/types/filters"

 type ConfigListOptions struct {

 	Filters filters.Args

 }

+

+type NodeListOptions struct {

+	Filters filters.Args

+}

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

 	cerrdefs "github.com/containerd/errdefs"

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

 	"github.com/moby/moby/api/types/swarm"

+	"github.com/moby/moby/client"

 	"gotest.tools/v3/assert"

 )

@@ -178,7 +179,7 @@ func (d *Daemon) CheckLeader(ctx context.Context) func(t *testing.T) (any, strin

 		errList := "could not get node list"

-		ls, err := cli.NodeList(ctx, swarm.NodeListOptions{})

+		ls, err := cli.NodeList(ctx, client.NodeListOptions{})

 		if err != nil {

 			return err, errList

 		}

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

 	"time"

 	"github.com/moby/moby/api/types/swarm"

+	"github.com/moby/moby/client"

 	"gotest.tools/v3/assert"

 )

@@ -73,7 +74,7 @@ func (d *Daemon) ListNodes(ctx context.Context, t testing.TB) []swarm.Node {

 	cli := d.NewClientT(t)

 	defer cli.Close()

-	nodes, err := cli.NodeList(ctx, swarm.NodeListOptions{})

+	nodes, err := cli.NodeList(ctx, client.NodeListOptions{})

 	assert.NilError(t, err)

 	return nodes

@@ -1,7 +1,5 @@

 package swarm

-import "github.com/moby/moby/api/types/filters"

-

 // Node represents a node.

 type Node struct {

 	ID string

@@ -140,11 +138,6 @@ type Topology struct {

 	Segments map[string]string `json:",omitempty"`

 }

-// NodeListOptions holds parameters to list nodes with.

-type NodeListOptions struct {

-	Filters filters.Args

-}

-

 // NodeRemoveOptions holds parameters to remove nodes with.

 type NodeRemoveOptions struct {

 	Force bool

@@ -141,7 +141,7 @@ type NetworkAPIClient interface {

 // NodeAPIClient defines API client methods for the nodes

 type NodeAPIClient interface {

 	NodeInspectWithRaw(ctx context.Context, nodeID string) (swarm.Node, []byte, error)

-	NodeList(ctx context.Context, options swarm.NodeListOptions) ([]swarm.Node, error)

+	NodeList(ctx context.Context, options NodeListOptions) ([]swarm.Node, error)

 	NodeRemove(ctx context.Context, nodeID string, options swarm.NodeRemoveOptions) error

 	NodeUpdate(ctx context.Context, nodeID string, version swarm.Version, node swarm.NodeSpec) error

 }

@@ -10,7 +10,7 @@ import (

 )

 // NodeList returns the list of nodes.

-func (cli *Client) NodeList(ctx context.Context, options swarm.NodeListOptions) ([]swarm.Node, error) {

+func (cli *Client) NodeList(ctx context.Context, options NodeListOptions) ([]swarm.Node, error) {

 	query := url.Values{}

 	if options.Filters.Len() > 0 {

new file mode 100644

@@ -0,0 +1,8 @@

+package client

+

+import "github.com/moby/moby/api/types/filters"

+

+// NodeListOptions holds parameters to list nodes with.

+type NodeListOptions struct {

+	Filters filters.Args

+}