FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

engine: honour bypass VLAN id/range for L2 networks by yadvr · Pull Request #4274 · apache/cloudstack · GitHub

  1. apache
  2. cloudstack

Repository navigation

engine: honour bypass VLAN id/range for L2 networks - #4274

Merged
yadvr merged 2 commits into
apache:4.14from
shapeblue:l2-bypass-check-regression-fix
Aug 25, 2020
ConversationCommits (2)ChecksFiles changed
Merged

engine: honour bypass VLAN id/range for L2 networks#4274
yadvr merged 2 commits into
apache:4.14from
shapeblue:l2-bypass-check-regression-fix

Conversation

yadvr commented Aug 19, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Commit e894238d904a9c49c1140371f612a51d251efc1 (#3899) allowed private
gateways to bypass vlan check while refactoring it did not cover the
case for L2 but only shared network. This fix will re-enable honouring
the bypass vlan check option for L2 guest network (in addition to the
Shared networks).

Fixes #4273

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

engine: honour bypass VLAN id/range for L2 networks
de84c1c 
Commit e894238d904a9c49c1140371f612a51d251efc1 (apache#3899) allowed private
gateways to bypass vlan check while refactoring it did not cover the
case for L2 but only shared network. This fix will re-enable honouring
the bypass vlan check option for L2 guest network (in addition to the
Shared networks).

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
yadvr added this to the 4.14.1.0 milestone Aug 19, 2020

yadvr commented Aug 19, 2020

Copy link
Copy Markdown
Member Author

@blueorangutan package

blueorangutan commented Aug 19, 2020

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan commented Aug 19, 2020

Copy link
Copy Markdown

Packaging result: ✔centos7 ✖centos8 ✔debian. JID-1785

yadvr commented Aug 19, 2020

Copy link
Copy Markdown
Member Author

@blueorangutan test

blueorangutan commented Aug 19, 2020

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

wido approved these changes Aug 19, 2020
View reviewed changes

wido left a comment

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

DaanHoogland approved these changes Aug 19, 2020
View reviewed changes

DaanHoogland left a comment

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

lgtm, pending testing

Comment thread ...hestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java Outdated
*/
private boolean hasGuestBypassVlanOverlapCheck(final boolean bypassVlanOverlapCheck, final NetworkOfferingVO ntwkOff, final boolean isPrivateNetwork) {
return bypassVlanOverlapCheck && (ntwkOff.getGuestType() == GuestType.Shared || isPrivateNetwork);
return bypassVlanOverlapCheck && (ntwkOff.getGuestType() == GuestType.Shared || ntwkOff.getGuestType() == GuestType.L2 || isPrivateNetwork);

DaanHoogland Aug 19, 2020

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

the condition is getting more complex this way. would

Suggested change
return bypassVlanOverlapCheck && (ntwkOff.getGuestType() == GuestType.Shared || ntwkOff.getGuestType() == GuestType.L2 || isPrivateNetwork);
return bypassVlanOverlapCheck && (ntwkOff.getGuestType() != GuestType.Isolated || isPrivateNetwork);

be a good alternative?

yadvr Aug 19, 2020

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Yes that works as well

yadvr commented Aug 19, 2020

Copy link
Copy Markdown
Member Author

@DaanHoogland thnx, addressed fix
@blueorangutan package

blueorangutan commented Aug 19, 2020

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan commented Aug 19, 2020

Copy link
Copy Markdown

Packaging result: ✔centos7 ✖centos8 ✔debian. JID-1786

yadvr commented Aug 19, 2020

Copy link
Copy Markdown
Member Author

@blueorangutan test

blueorangutan commented Aug 19, 2020

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan commented Aug 20, 2020

Copy link
Copy Markdown

Trillian test result (tid-2516)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 42910 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4274-t2516-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_supported_versions.py
Intermittent failure detected: /marvin/tests/smoke/test_password_server.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 82 look OK, 1 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_01_add_delete_kubernetes_supported_version Error 1807.61 test_kubernetes_supported_versions.py

yadvr commented Aug 20, 2020

Copy link
Copy Markdown
Member Author

@Spaceman1984 can you review and test this, thnx

Spaceman1984 commented Aug 24, 2020

Copy link
Copy Markdown
Contributor

Tested, LGTM

GabrielBrascher approved these changes Aug 24, 2020
View reviewed changes

GabrielBrascher left a comment

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Code LGTM

davidjumani approved these changes Aug 25, 2020
View reviewed changes

davidjumani left a comment •
edited
Loading

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Tested LGTM

yadvr merged commit 9c7c22e into apache:4.14 Aug 25, 2020
yadvr mentioned this pull request Aug 25, 2020
Closed
This file contains hidden or 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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

wido wido approved these changes
DaanHoogland DaanHoogland approved these changes
GabrielBrascher GabrielBrascher approved these changes
davidjumani davidjumani approved these changes
weizhouapache Awaiting requested review from weizhouapache

Assignees

No one assigned

Labels

component:networking Severity:Critical Critical bug type:bug

Projects

None yet

Milestone

4.14.1.0

Development

Successfully merging this pull request may close these issues.

7 participants

Back | FazBrowse Home | New Git URL