Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return macvlan object in /network REST API response #10919

Merged
merged 1 commit into from
Jul 15, 2021
Merged

Return macvlan object in /network REST API response #10919

merged 1 commit into from
Jul 15, 2021

Conversation

vikas-goel
Copy link
Contributor

@vikas-goel vikas-goel commented Jul 13, 2021

Fixes: #10266

Signed-off-by: Vikas Goel [email protected]

@openshift-ci openshift-ci bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 13, 2021
@vikas-goel
Copy link
Contributor Author

@Luap99 ,
Please review this PR

@vikas-goel
Copy link
Contributor Author

/auto-cc

@rhatdan
Copy link
Member

rhatdan commented Jul 13, 2021

/approve
@mheon PTAL

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 13, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan, vikas-goel

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 13, 2021
@mheon
Copy link
Member

mheon commented Jul 13, 2021

LGTM but I think we need a review from @baude before merge

@vikas-goel
Copy link
Contributor Author

/assign @Luap99

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM but the test not, you are testing the libpod endpoint and your code fixes a bug in the docker compat api. The test should call the compat api.

@vikas-goel
Copy link
Contributor Author

vikas-goel commented Jul 14, 2021

Code LGTM but the test not, you are testing the libpod endpoint and your code fixes a bug in the docker compat api. The test should call the compat api.

Sure, @Luap99. Will the following be sufficient?

t GET networks/macvlan1 200
length=1

@Luap99
Copy link
Member

Luap99 commented Jul 14, 2021

t GET networks/macvlan1 200
length=1

yes but you should check the name at least not only length

@vikas-goel
Copy link
Contributor Author

vikas-goel commented Jul 14, 2021

t GET networks/macvlan1 200
length=1

yes but you should check the name at least not only length

Ok. I will add to it.
.Name=macvlan1

@baude
Copy link
Member

baude commented Jul 14, 2021

/check-dco

@vikas-goel
Copy link
Contributor Author

vikas-goel commented Jul 14, 2021

The test for this PR change is passing.

[+0067s] ok 664 [35-networks] GET libpod/networks/macvlan1/json : status=200
[+0067s] ok 665 [35-networks] GET libpod/networks/macvlan1/json : .name=macvlan1
[+0067s] ok 666 [35-networks] GET networks/macvlan1 : status=200
[+0067s] ok 667 [35-networks] GET networks/macvlan1 : .Name=macvlan1
[+0067s] ok 668 [35-networks] DELETE libpod/networks/macvlan1 : status=200
[+0067s] ok 669 [35-networks] DELETE libpod/networks/macvlan1 : .[0].Name ('macvlan1') ~ macvlan1
[+0067s] ok 670 [35-networks] DELETE libpod/networks/macvlan1 : .[0].Err=null

The two test suites APIv2 test on fedora-34 and compose test on fedora-34 (root) failing for unrelated reasons. How can we overcome the failures?

@Luap99
Copy link
Member

Luap99 commented Jul 14, 2021

I restarted the failing tests.

@TomSweeneyRedHat
Copy link
Member

@vikas-goel thanks for the work on this. @edsantiago is the below a known flake we're chasing?

[+0217s] Traceback (most recent call last):
[+0217s]   File "/var/tmp/go/src/github.com/containers/podman/test/python/docker/compat/test_containers.py", line 253, in test_mount_preexisting_dir
[+0217s]     self.assertTrue(out.startswith(b'1042:1043'), "assert correct uid/gid")
[+0217s] AssertionError: False is not true : assert correct uid/gid

@edsantiago
Copy link
Member

@TomSweeneyRedHat yes, "false is not true" is one of the flakes I've been seeing a lot of. I haven't filed an issue for it because the error message is so annoying. I've restarted the test.

@vikas-goel
Copy link
Contributor Author

@Luap99 ,
The PR has all the suggestions incorporated, the approval and the checks passing.

@Luap99
Copy link
Member

Luap99 commented Jul 15, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2021
@Luap99
Copy link
Member

Luap99 commented Jul 15, 2021

Thanks @vikas-goel

@openshift-merge-robot openshift-merge-robot merged commit 1568247 into containers:main Jul 15, 2021
@mheon
Copy link
Member

mheon commented Jul 15, 2021

@Luap99 @baude PTAL and merge

@Luap99
Copy link
Member

Luap99 commented Jul 15, 2021

@Luap99 @baude PTAL and merge

@mheon I already merged this one!

@mheon
Copy link
Member

mheon commented Jul 15, 2021

What I get for commenting without refreshing the page. Thanks!

@vikas-goel
Copy link
Contributor Author

Thank you all.

@vikas-goel vikas-goel deleted the macvlan branch July 16, 2021 01:44
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman REST API fails for macvlan network
8 participants