Skip to content

Added OutboundNAT policy support for Windows#2070

Merged
fcrisciani merged 1 commit intomoby:masterfrom
nwoodmsft:master
Feb 7, 2018
Merged

Added OutboundNAT policy support for Windows#2070
fcrisciani merged 1 commit intomoby:masterfrom
nwoodmsft:master

Conversation

@nwoodmsft
Copy link
Copy Markdown
Contributor

This change adds support for OutboundNAT policy to the Windows driver passed via a generic option.

@GordonTheTurtle
Copy link
Copy Markdown

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "master" git@github.com:nwoodmsft/libnetwork.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

…options

Signed-off-by: Nick Wood <nwood@microsoft.com>
@codecov-io
Copy link
Copy Markdown

codecov-io commented Feb 6, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #2070   +/-   ##
=========================================
  Coverage          ?   40.51%           
=========================================
  Files             ?      138           
  Lines             ?    22172           
  Branches          ?        0           
=========================================
  Hits              ?     8983           
  Misses            ?    11872           
  Partials          ?     1317

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 20dd462...6681c02. Read the comment docs.

@pradipd
Copy link
Copy Markdown
Contributor

pradipd commented Feb 7, 2018

LGTM

@pradipd
Copy link
Copy Markdown
Contributor

pradipd commented Feb 7, 2018

ping @fcrisciani @mavenugo ; Flavio, Madhu, can you review please? Note that this change affects windows only.

@fcrisciani fcrisciani requested a review from ddebroy February 7, 2018 18:04
Copy link
Copy Markdown

@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.

LGTM

Copy link
Copy Markdown
Contributor

@ddebroy ddebroy left a comment

Choose a reason for hiding this comment

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

LGTM overall with one suggestion.

}
config.VSID = uint(vsid)
case EnableOutboundNat:
if system.GetOSVersion().Build <= 16236 {
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.

Can the build number 16236 be defined as a global constant? It seems to be used at a couple of places.

@fcrisciani
Copy link
Copy Markdown

Comment can be addressed in a separate Pr, merging this one

@fcrisciani fcrisciani merged commit c592ee4 into moby:master Feb 7, 2018
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Apr 8, 2019
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070), and

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparissons to match RS3 (and up), or
disable the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Apr 8, 2019
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070), and

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparissons to match RS3 (and up), or
disable the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Apr 8, 2019
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070)

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparisons to match RS3 (and up), or disable
the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Apr 12, 2019
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070)

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparisons to match RS3 (and up), or disable
the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Apr 25, 2019
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070)

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparisons to match RS3 (and up), or disable
the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Apr 25, 2019
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070)

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparisons to match RS3 (and up), or disable
the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Jun 25, 2019
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070)

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparisons to match RS3 (and up), or disable
the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Jun 25, 2019
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070)

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparisons to match RS3 (and up), or disable
the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Nov 25, 2019
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070)

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparisons to match RS3 (and up), or disable
the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/libnetwork that referenced this pull request Apr 7, 2021
This replaces the hard-coded build numbers with constants that
are now defined in hcsshim.

Note that build 16236 is not defined in the package, and may
be referring to RS2 (which was a client-only release).

Checks for this version were added in commits;

a9db5c5 (moby#1900), and
6681c02 (moby#2070)

In a9db5c5, it is described
that the intent was to allow these options only in Windows RS3
so I changed the comparisons to match RS3 (and up), or disable
the option on anything older than RS3.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants