apiv2 /containers/json limit differ from docker-api #7739
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zhangguanzhang
force-pushed
the
apiv2-containers-limit
branch
6 times, most recently
from
7ece211 to
1e9ef7b
Compare
zhangguanzhang
changed the title
zhangguanzhang
changed the title
edsantiago
suggested changes
Sep 23, 2020
test/apiv2/20-containers.at
Outdated
| t GET containers/json?limit=0 200 \ | ||
| .[0].Id~[0-9a-f]\\{64\\} | ||
|
|
||
| t POST containers/${cid}/stop 204 |
|
Friendly amendment? Defer deletion of the previous container; this way we test a multi-container diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
index d635702e4..60ebe2820 100644
--- a/test/apiv2/20-containers.at
+++ b/test/apiv2/20-containers.at
@@ -176,26 +176,27 @@ t GET containers/$cid/json 200 \
.Config.Cmd='[]' \
.Path="echo" \
.Args[0]="param1"
-t DELETE containers/$cid 204
# create a running container for after
t POST containers/create '"Image":"'$IMAGE'","Entrypoint":["top"]' 201 \
.Id~[0-9a-f]\\{64\\}
-cid=$(jq -r '.Id' <<<"$output")
-t GET containers/$cid/json 200 \
+cid_top=$(jq -r '.Id' <<<"$output")
+t GET containers/$cid_top/json 200 \
.Config.Entrypoint[0]="top" \
.Config.Cmd='[]' \
.Path="top"
-t POST containers/${cid}/start '' 204
+t POST containers/${cid_top}/start '' 204
# make sure the container is running
-t GET containers/$cid/json 200 \
+t GET containers/$cid_top/json 200 \
.State.Status="running"
# 0 means unlimited, need same with docker
-t GET containers/json?limit=0 200 \
- .[0].Id~[0-9a-f]\\{64\\}
+t GET 'containers/json?limit=0&all=1' 200 \
+ .[0].Id~[0-9a-f]\\{64\\} \
+ .[1].Id~[0-9a-f]\\{64\\}
-t POST containers/${cid}/stop 204
+t POST containers/${cid_top}/stop '' 204
+t DELETE containers/$cid_top 204
t DELETE containers/$cid 204
# vim: filetype=sh |
zhangguanzhang
force-pushed
the
apiv2-containers-limit
branch
2 times, most recently
from
031d4a1 to
7075362
Compare
zhangguanzhang
changed the title
|
done |
zhangguanzhang
force-pushed
the
apiv2-containers-limit
branch
from
7075362 to
3312ae1
Compare
|
LGTM |
edsantiago
reviewed
Sep 23, 2020
| // 0 means unlimited, need same with docker | ||
| if query.Limit == 0 { | ||
| query.Limit = -1 | ||
| } | ||
| if _, found := r.URL.Query()["limit"]; found && query.Limit != -1 { |
There was a problem hiding this comment.
Looking this over with more time, would it make more sense to change this line instead, to && query.Limit > 0 ?
zhangguanzhang
force-pushed
the
apiv2-containers-limit
branch
from
3312ae1 to
23f6142
Compare
Signed-off-by: zhangguanzhang <[email protected]>
zhangguanzhang
force-pushed
the
apiv2-containers-limit
branch
from
23f6142 to
873989f
Compare
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rhatdan, zhangguanzhang The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #7722
Signed-off-by: zhangguanzhang [email protected]