Skip to content

Migrate test-integration-cli experimental ipvlan test to integration #36722

Merged
thaJeztah merged 3 commits intomoby:masterfrom
vdemeester:network-ipvlan-test-migration
Apr 11, 2018
Merged

Migrate test-integration-cli experimental ipvlan test to integration #36722
thaJeztah merged 3 commits intomoby:masterfrom
vdemeester:network-ipvlan-test-migration

Conversation

@vdemeester
Copy link
Copy Markdown
Member

@vdemeester vdemeester commented Mar 28, 2018

Build on top of #36697, only the second commit (007b7f7) should be reviewed 👼

All Ipvlan related test on DockerSuite and DockerNetworkSuite
are migrated to ipvlan_test.go.

The end goal being to remove the experimental builds.

It also refactors macvlan tests a bit (quicker) and it put macvlan and ipvlan tests on there own folder in order to be isolated and have quick "suite).

cc @fcrisciani @selansen

🦁

Signed-off-by: Vincent Demeester vincent@sbr.pm

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 29, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@59d5608). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #36722   +/-   ##
=========================================
  Coverage          ?   34.92%           
=========================================
  Files             ?      614           
  Lines             ?    45644           
  Branches          ?        0           
=========================================
  Hits              ?    15943           
  Misses            ?    27607           
  Partials          ?     2094

@vdemeester vdemeester force-pushed the network-ipvlan-test-migration branch 4 times, most recently from 398e75b to 5a4dacc Compare March 29, 2018 13:11
@vdemeester
Copy link
Copy Markdown
Member Author

Updated to do a bit more than just ipvlan migration. It also refactors macvlan tests a bit (quicker) and it put macvlan and ipvlan tests on there own folder in order to be isolated and have quick "suite).

@fcrisciani
Copy link
Copy Markdown
Contributor

@ctelfer can you take a look too?

Copy link
Copy Markdown
Contributor

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

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

high level I guess looks good

Copy link
Copy Markdown
Contributor

@ctelfer ctelfer left a comment

Choose a reason for hiding this comment

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

Sorry it has taken a while to get through the code. LGTM overall. Just one comment about a cleanup function.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This says delete a network interface, but these iptables commands wipe every rule in the nat & filter tables of the entire system (or at least namespace). Is this intended? Might consider updating the name if so.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@ctelfer oh interesting… I took what was previously here so the behavior doesn't change from previous tests. cc @mavenugo to get more insight 👼

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

As discussed on slack: these tests set up a new daemon, so this shouldn't be a problem, but perhaps we can add a TODO to these (as a follow-up)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The problem is these daemons aren't in their own network namespace and it's flushing everything in the main namespace.

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, left some nits/questions but it's ok to address those separately

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Commented on another PR; we should go over the tests and be consistent (either "!= linux" or "== windows").

No need to fix for this PR, as it's a general thing to look at

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Guess this can be removed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Wondering if we should start moving comments like this as custom message (not for this PR)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

As discussed on slack: these tests set up a new daemon, so this shouldn't be a problem, but perhaps we can add a TODO to these (as a follow-up)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should probably be moved somewhere else, as it's not network-specific (may even be another helper like this already)

Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83
Copy link
Copy Markdown
Member

And a conflict now.

@vdemeester
Copy link
Copy Markdown
Member Author

Gonna fix the conflicts and take @thaJeztah comments into account tomorrow morning (Paris time 😉)

All `Ipvlan` related test on `DockerSuite` and `DockerNetworkSuite`
are migrated to `ipvlan_test.go`.

The end goal being to remove the `experimental` builds.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
… making each folder/suites quicker to run

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
@vdemeester vdemeester force-pushed the network-ipvlan-test-migration branch from f4a850b to a3323d2 Compare April 11, 2018 09:15
@vdemeester
Copy link
Copy Markdown
Member Author

Rebased 👼

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants