Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 94b0eb83ec into abb8e9b78a

This commit is contained in:
ehsan-salamati 2024-10-21 19:03:12 +01:00 committed by GitHub
parent abb8e9b78a 94b0eb83ec
commit 6cf72341df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 82 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/command/node/client_test.go
View File

@ -13,6 +13,7 @@ type fakeClient struct {
client.Client
infoFunc func() (system.Info, error)
nodeInspectFunc func() (swarm.Node, []byte, error)
nodeInspectFuncWithArgs func(string) (swarm.Node, []byte, error)
nodeListFunc func() ([]swarm.Node, error)
nodeRemoveFunc func() error
nodeUpdateFunc func(nodeID string, version swarm.Version, node swarm.NodeSpec) error
@ -21,10 +22,15 @@ type fakeClient struct {
serviceInspectFunc func(ctx context.Context, serviceID string, opts types.ServiceInspectOptions) (swarm.Service, []byte, error)
}
func (cli *fakeClient) NodeInspectWithRaw(context.Context, string) (swarm.Node, []byte, error) {
func (cli *fakeClient) NodeInspectWithRaw(ctx context.Context, nodeRef string) (swarm.Node, []byte, error) {
if cli.nodeInspectFunc != nil {
return cli.nodeInspectFunc()
}
if cli.nodeInspectFuncWithArgs != nil {
return cli.nodeInspectFuncWithArgs(nodeRef)
}
return swarm.Node{}, []byte{}, nil
}

2
cli/command/node/ps.go
View File

@ -74,7 +74,7 @@ func runPs(ctx context.Context, dockerCli command.Cli, options psOptions) error
continue
}
filter := options.filter.Value()
filter := options.filter.Value().Clone()
filter.Add("node", node.ID)
nodeTasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter})

48
cli/command/node/ps_test.go
View File

@ -73,6 +73,7 @@ func TestNodePs(t *testing.T) {
flags map[string]string
infoFunc func() (system.Info, error)
nodeInspectFunc func() (swarm.Node, []byte, error)
nodeInspectFuncWithArgs func(string) (swarm.Node, []byte, error)
taskListFunc func(options types.TaskListOptions) ([]swarm.Task, error)
taskInspectFunc func(taskID string) (swarm.Task, []byte, error)
serviceInspectFunc func(ctx context.Context, serviceID string, opts types.ServiceInspectOptions) (swarm.Service, []byte, error)
@ -132,6 +133,51 @@ func TestNodePs(t *testing.T) {
}, []byte{}, nil
},
},
{
name: "multiple-nodes-no-duplicates",
args: []string{"nodeID1", "nodeID2"},
nodeInspectFuncWithArgs: func(nodeRef string) (swarm.Node, []byte, error) {
switch nodeRef {
case "nodeID1":
return *builders.Node(builders.NodeID("nodeID1")), []byte{}, nil
case "nodeID2":
return *builders.Node(builders.NodeID("nodeID2")), []byte{}, nil
default:
return swarm.Node{}, []byte{}, errors.Errorf("unexpected nodeRef %q", nodeRef)
}
},
taskListFunc: func(options types.TaskListOptions) ([]swarm.Task, error) {
nodeFilter := options.Filters.Get("node")[0]
switch nodeFilter {
case "nodeID1":
return []swarm.Task{
*builders.Task(builders.TaskID("taskID1"), builders.TaskServiceID("service1"), builders.TaskNodeID("nodeID1"),
builders.WithStatus(builders.Timestamp(time.Now().Add(-2*time.Hour)), builders.TaskState(swarm.TaskStateRunning))),
*builders.Task(builders.TaskID("taskID2"), builders.TaskServiceID("service2"), builders.TaskNodeID("nodeID1"),
builders.WithStatus(builders.Timestamp(time.Now().Add(-3*time.Hour)), builders.TaskState(swarm.TaskStateRunning))),
}, nil
case "nodeID2":
return []swarm.Task{
*builders.Task(builders.TaskID("taskID3"), builders.TaskServiceID("service3"), builders.TaskNodeID("nodeID2"),
builders.WithStatus(builders.Timestamp(time.Now().Add(-2*time.Hour)), builders.TaskState(swarm.TaskStateRunning))),
*builders.Task(builders.TaskID("taskID4"), builders.TaskServiceID("service4"), builders.TaskNodeID("nodeID2"),
builders.WithStatus(builders.Timestamp(time.Now().Add(-3*time.Hour)), builders.TaskState(swarm.TaskStateRunning))),
}, nil
default:
return []swarm.Task{}, nil
}
},
serviceInspectFunc: func(ctx context.Context, serviceID string, opts types.ServiceInspectOptions) (swarm.Service, []byte, error) {
return swarm.Service{
ID: serviceID,
Spec: swarm.ServiceSpec{
Annotations: swarm.Annotations{
Name: serviceID,
},
},
}, []byte{}, nil
},
},
}
for _, tc := range testCases {
tc := tc
@ -139,10 +185,12 @@ func TestNodePs(t *testing.T) {
cli := test.NewFakeCli(&fakeClient{
infoFunc: tc.infoFunc,
nodeInspectFunc: tc.nodeInspectFunc,
nodeInspectFuncWithArgs: tc.nodeInspectFuncWithArgs,
taskInspectFunc: tc.taskInspectFunc,
taskListFunc: tc.taskListFunc,
serviceInspectFunc: tc.serviceInspectFunc,
})
cmd := newPsCommand(cli)
cmd.SetArgs(tc.args)
for key, value := range tc.flags {

5
cli/command/node/testdata/node-ps.multiple-nodes-no-duplicates.golden vendored Normal file
View File

@ -0,0 +1,5 @@
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS
taskID1 service1.1 myimage:mytag defaultNodeName Ready Running 2 hours ago
taskID2 service2.1 myimage:mytag defaultNodeName Ready Running 3 hours ago
taskID3 service3.1 myimage:mytag defaultNodeName Ready Running 2 hours ago
taskID4 service4.1 myimage:mytag defaultNodeName Ready Running 3 hours ago