vpc: add bypassvlanoverlapcheck parameter when create private gateway by ustcweizhou · Pull Request #3899 · apache/cloudstack

ustcweizhou · Feb 20, 2020

Description

The vlan of private gateways in VPCs should not be same. In some edge cases, vlan of private gateways are same (for example in test_privategw_acl.py).

Similar as shared network, add bypassvlanoverlapcheck parameter when create private gateway.

This also fixes #3859 .
the root cause is #3859 (comment)

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)

Screenshots (if appropriate):

How Has This Been Tested?

Run test_privategw_acl.py several times, no failure any more.

ustcweizhou · Feb 20, 2020

@rhtyd this is the fix for trillian test

DaanHoogland · Feb 20, 2020

@blueorangutan package

blueorangutan · Feb 20, 2020

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

blueorangutan · Feb 20, 2020

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-923

DaanHoogland · Feb 20, 2020

@blueorangutan test

blueorangutan · Feb 20, 2020

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

blueorangutan · Feb 21, 2020

Trillian test result (tid-1069)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 28691 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3899-t1069-kvm-centos7.zip
Smoke tests completed. 80 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

yadvr · Feb 21, 2020

@DaanHoogland @andrijapanicsb cc @PaulAngus @borisstoyanov @nvazquez - need more eye to ensure this does not cause any regression
@blueorangutan test centos7 vmware-65u2

blueorangutan · Feb 21, 2020

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

blueorangutan · Feb 21, 2020

Trillian test result (tid-1077)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 30030 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3899-t1077-vmware-65u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 77 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

DaanHoogland · Feb 21, 2020

@blueorangutan test centos7 xenserver-71

blueorangutan · Feb 21, 2020

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + xenserver-71) has been kicked to run smoke tests

blueorangutan · Feb 22, 2020

Trillian test result (tid-1081)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 30244 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3899-t1081-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py
Smoke tests completed. 79 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_scale_vm	`Failure`	18.52	test_scale_vm.py

DaanHoogland · Feb 22, 2020

this is a lot of code change for a little functional change, what I've seen so far looks good, but I do want to take an hour or so later to go through it line by line. If others test extensively that fina as well, by me.
(@rhtyd @weizhouapache @andrijapanicsb)

weizhouapache · Feb 22, 2020

this is a lot of code change for a little functional change, what I've seen so far looks good, but I do want to take an hour or so later to go through it line by line. If others test extensively that fina as well, by me.
(@rhtyd @weizhouapache @andrijapanicsb)

@DaanHoogland
there are actually two main changes which are not independent.
(1) add vpcid in method getPrivateNetwork.
(2) add bypassvlanoverlapcheck parameter when create private gateway

in test_privategw_acl.py, it tests the vm connectivity between two VPCs. The two VPCs connect each time by private gateways. The two private gateways have same cidr/vlan, but different gateway (gateway of private gateway in a VPC is the ip attached on another VPC).
in method getPrivateNetwork, the private gateways with same cidr/vlan are mapped to the same isolated network, so one of them has wrong gateway. That's why many trillian test failed.

Therefore I add vpcid to method getPrivateNetwork so they are mapped to different network (with correct gateway). It has another issue that they use same vlan, so I have to add bypassvlanoverlapcheck parameter.

DaanHoogland

code lgtm

…che#3899)

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>

* engine: honour bypass VLAN id/range for L2 networks 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). Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * Update NetworkOrchestrator.java

vpc: add bypassvlanoverlapcheck parameter when create private gateway

47cddf3

svenvogel added component:vpc type:bug type:enhancement labels Feb 20, 2020

yadvr added this to the 4.15.0.0 milestone Feb 21, 2020

yadvr modified the milestones: 4.15.0.0, 4.14.0.0 Feb 21, 2020

DaanHoogland self-requested a review February 21, 2020 08:33

DaanHoogland approved these changes Feb 23, 2020

View reviewed changes

DaanHoogland merged commit ce89423 into apache:master Feb 23, 2020

ggoodrich-ipp pushed a commit to ippathways/cloudstack that referenced this pull request Feb 24, 2020

vpc: add bypassvlanoverlapcheck parameter when create private g… (apa…

6a16d89

…che#3899)

ustcweizhou added a commit to ustcweizhou/cloudstack that referenced this pull request Feb 28, 2020

vpc: add bypassvlanoverlapcheck parameter when create private g… (apa…

547a160

…che#3899)

yadvr mentioned this pull request Jun 8, 2020

[BUG] Check and fix bypassvlanoverlapcheck for VPC private gw apache/cloudstack-primate#403

Closed

yadvr mentioned this pull request Aug 19, 2020

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

Merged

5 tasks

Search code, repositories, users, issues, pull requests...

Conversation

ustcweizhou commented Feb 20, 2020

Description

Types of changes

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

ustcweizhou commented Feb 20, 2020

Uh oh!

DaanHoogland commented Feb 20, 2020

Uh oh!

blueorangutan commented Feb 20, 2020

Uh oh!

blueorangutan commented Feb 20, 2020

Uh oh!

DaanHoogland commented Feb 20, 2020

Uh oh!

blueorangutan commented Feb 20, 2020

Uh oh!

blueorangutan commented Feb 21, 2020

Uh oh!

yadvr commented Feb 21, 2020

Uh oh!

blueorangutan commented Feb 21, 2020

Uh oh!

blueorangutan commented Feb 21, 2020

Uh oh!

DaanHoogland commented Feb 21, 2020

Uh oh!

blueorangutan commented Feb 21, 2020

Uh oh!

blueorangutan commented Feb 22, 2020

Uh oh!

DaanHoogland commented Feb 22, 2020

Uh oh!

weizhouapache commented Feb 22, 2020

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants