Skip to content

[backport 18.03] Adding a check for subnet pool overlap #2190

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.

Sign up for GitHub

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

Jump to bottom
Merged
fcrisciani merged 3 commits into from
Jun 18, 2018
Merged

[backport 18.03] Adding a check for subnet pool overlap #2190

fcrisciani merged 3 commits into from
Jun 18, 2018

Conversation

@abhi
Copy link
Contributor

@abhi abhi commented Jun 18, 2018

Backport PRs: #2148 and #2189

abhi added 3 commits June 18, 2018 13:28
@abhi
Add check for overlapping subnets
6c48c37 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
(cherry picked from commit 8579c5d)
@abhi
fixing test cases
788504b 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
(cherry picked from commit e65fabd)
@abhi
Fixing the unit test for overlapping subnet
658ebd8 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
(cherry picked from commit a496037)
@codecov-io
Copy link

codecov-io commented Jun 18, 2018

Codecov Report

❗ No coverage uploaded for pull request base (bump_18.03@557bac2). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff              @@
##             bump_18.03    #2190   +/-   ##
=============================================
  Coverage              ?   40.53%           
=============================================
  Files                 ?      139           
  Lines                 ?    22487           
  Branches              ?        0           
=============================================
  Hits                  ?     9116           
  Misses                ?    12040           
  Partials              ?     1331
Impacted Files Coverage Δ
ipam/structures.go 86.31% <100%> (ø)

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 557bac2...658ebd8. Read the comment docs.

fcrisciani
fcrisciani approved these changes Jun 18, 2018
View reviewed changes
Copy link

@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

@fcrisciani fcrisciani merged commit 45b5da6 into moby:bump_18.03 Jun 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@fcrisciani fcrisciani fcrisciani approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@abhi @codecov-io @fcrisciani