You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2020/08/19 08:07:17 UTC
[GitHub] [cloudstack] rhtyd opened a new pull request #4274: engine: honour bypass VLAN id/range for L2 networks
rhtyd opened a new pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274
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).
## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [x] 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)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-677593298
@Spaceman1984 can you review and test this, thnx
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-676208724
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd merged pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
rhtyd merged pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-676122585
Packaging result: ✔centos7 ✖centos8 ✔debian. JID-1786
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-676068866
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-675921973
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-675964992
Packaging result: ✔centos7 ✖centos8 ✔debian. JID-1785
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-676210197
@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-676823479
<b>Trillian test result (tid-2516)</b>
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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-676067349
@DaanHoogland thnx, addressed fix
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-675974420
@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-675921310
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#discussion_r472909329
##########
File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
##########
@@ -2529,7 +2529,7 @@ public Network doInTransaction(final TransactionStatus status) {
* @param ntwkOff network offering
*/
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);
Review comment:
the condition is getting more complex this way. would
```suggestion
return bypassVlanOverlapCheck && (ntwkOff.getGuestType() != GuestType.Isolated || isPrivateNetwork);
```
be a good alternative?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#discussion_r472910416
##########
File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
##########
@@ -2529,7 +2529,7 @@ public Network doInTransaction(final TransactionStatus status) {
* @param ntwkOff network offering
*/
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);
Review comment:
Yes that works as well
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-675972793
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4274: engine: honour bypass VLAN id/range for L2 networks
Posted by GitBox <gi...@apache.org>.
Spaceman1984 commented on pull request #4274:
URL: https://github.com/apache/cloudstack/pull/4274#issuecomment-679045031
Tested, LGTM
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org