Skip to content

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

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
yadvr merged 2 commits into from
Aug 25, 2020
Merged

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

yadvr merged 2 commits into from
Aug 25, 2020

Conversation

@yadvr
Copy link
Member

@yadvr yadvr commented Aug 19, 2020 •
edited
Loading

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)

@yadvr
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 yadvr added this to the 4.14.1.0 milestone Aug 19, 2020
@yadvr
Copy link
Member Author

yadvr commented Aug 19, 2020

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Aug 19, 2020

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

@blueorangutan
Copy link

blueorangutan commented Aug 19, 2020

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

@yadvr
Copy link
Member Author

yadvr commented Aug 19, 2020

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Aug 19, 2020

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

wido
wido approved these changes Aug 19, 2020
View reviewed changes
Copy link
Contributor

@wido wido left a comment

Choose a reason for hiding this comment

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

LGTM

DaanHoogland
DaanHoogland approved these changes Aug 19, 2020
View reviewed changes
Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

lgtm, pending testing

...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);
Copy link
Contributor

@DaanHoogland DaanHoogland Aug 19, 2020

Choose a reason for hiding this comment

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

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?

Copy link
Member Author

@yadvr yadvr Aug 19, 2020

Choose a reason for hiding this comment

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

Yes that works as well

@yadvr
Copy link
Member Author

yadvr commented Aug 19, 2020

@DaanHoogland thnx, addressed fix
@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Aug 19, 2020

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

@blueorangutan
Copy link

blueorangutan commented Aug 19, 2020

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

@yadvr
Copy link
Member Author

yadvr commented Aug 19, 2020

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Aug 19, 2020

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

@blueorangutan
Copy link

blueorangutan commented Aug 20, 2020

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
Copy link
Member Author

yadvr commented Aug 20, 2020

@Spaceman1984 can you review and test this, thnx

@Spaceman1984
Copy link
Contributor

Spaceman1984 commented Aug 24, 2020

Tested, LGTM

GabrielBrascher
GabrielBrascher approved these changes Aug 24, 2020
View reviewed changes
Copy link
Member

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

davidjumani
davidjumani approved these changes Aug 25, 2020
View reviewed changes
Copy link
Contributor

@davidjumani davidjumani left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Tested LGTM

@yadvr yadvr merged commit 9c7c22e into apache:4.14 Aug 25, 2020
@yadvr yadvr mentioned this pull request Aug 25, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wido wido wido approved these changes

@DaanHoogland DaanHoogland DaanHoogland approved these changes

@GabrielBrascher GabrielBrascher GabrielBrascher approved these changes

@davidjumani davidjumani davidjumani approved these changes

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

@yadvr @blueorangutan @Spaceman1984 @wido @DaanHoogland @GabrielBrascher @davidjumani