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 2022/08/18 11:19:44 UTC
[GitHub] [cloudstack] shwstppr opened a new pull request, #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
shwstppr opened a new pull request, #6655:
URL: https://github.com/apache/cloudstack/pull/6655
### Description
Fixes #6648
If any of the VLAN from the given range is not found in the database (`cloud.op_dc_vnet_alloc`) then an InvalidParameterValueException will be thrown.
Also, fixes account check.
### Types of changes
- [ ] 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)
### Feature/Enhancement Scale or Bug Severity
#### Feature/Enhancement Scale
- [ ] Major
- [ ] Minor
#### Bug Severity
- [ ] BLOCKER
- [ ] Critical
- [ ] Major
- [ ] Minor
- [ ] Trivial
### Screenshots (if appropriate):
### How Has This Been Tested?
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to -->
<!-- see how your change affects other areas of the code, etc. -->
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document -->
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1219377753
UI build: :heavy_check_mark:
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6655 (SL-JID-2182)
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1223430558
<b>Trillian test result (tid-4747)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46181 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6655-t4747-kvm-centos7.zip
Smoke tests completed. 100 look OK, 1 have errors
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_02_upgrade_kubernetes_cluster | `Failure` | 521.07 | test_kubernetes_clusters.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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a diff in pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on code in PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#discussion_r949049084
##########
server/src/main/java/com/cloud/network/NetworkServiceImpl.java:
##########
@@ -4068,16 +4068,15 @@ public GuestVlanRange dedicateGuestVlanRange(DedicateGuestVlanRangeCmd cmd) {
}
}
- // Verify guest vlans in the range don't belong to a network of a different account
for (int i = startVlan; i <= endVlan; i++) {
- List<DataCenterVnetVO> allocatedVlans = _dcVnetDao.listAllocatedVnetsInRange(physicalNetwork.getDataCenterId(), physicalNetwork.getId(), startVlan, endVlan);
- if (allocatedVlans != null && !allocatedVlans.isEmpty()) {
- for (DataCenterVnetVO allocatedVlan : allocatedVlans) {
- if (allocatedVlan.getAccountId() != vlanOwner.getAccountId()) {
- throw new InvalidParameterValueException("Guest vlan from this range " + allocatedVlan.getVnet() + " is allocated to a different account."
- + " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account ");
- }
- }
+ List<DataCenterVnetVO> dataCenterVnet = _dcVnetDao.findVnet(physicalNetwork.getDataCenterId(), physicalNetworkId, Integer.toString(i));
+ if (CollectionUtils.isEmpty(dataCenterVnet)) {
+ throw new InvalidParameterValueException(String.format("Guest vlan %d from this range %s is not present in the system for physical network ID: %s", i, vlan, physicalNetwork.getUuid()));
+ }
+ // Verify guest vlans in the range don't belong to a network of a different account
+ if (dataCenterVnet.get(0).getAccountId() != null && dataCenterVnet.get(0).getAccountId() != vlanOwner.getAccountId()) {
+ throw new InvalidParameterValueException("Guest vlan from this range " + dataCenterVnet.get(0).getVnet() + " is allocated to a different account."
+ + " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account ");
Review Comment:
can you extract to a `verifyGuestVlan()` (or `verifyGuestVlans()` when including the loop in the extraction)?
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr closed pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
shwstppr closed pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
URL: https://github.com/apache/cloudstack/pull/6655
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222291573
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 4038
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] weizhouapache commented on a diff in pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
weizhouapache commented on code in PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#discussion_r949022463
##########
server/src/main/java/com/cloud/network/NetworkServiceImpl.java:
##########
@@ -4068,16 +4068,15 @@ public GuestVlanRange dedicateGuestVlanRange(DedicateGuestVlanRangeCmd cmd) {
}
}
- // Verify guest vlans in the range don't belong to a network of a different account
for (int i = startVlan; i <= endVlan; i++) {
- List<DataCenterVnetVO> allocatedVlans = _dcVnetDao.listAllocatedVnetsInRange(physicalNetwork.getDataCenterId(), physicalNetwork.getId(), startVlan, endVlan);
- if (allocatedVlans != null && !allocatedVlans.isEmpty()) {
- for (DataCenterVnetVO allocatedVlan : allocatedVlans) {
- if (allocatedVlan.getAccountId() != vlanOwner.getAccountId()) {
- throw new InvalidParameterValueException("Guest vlan from this range " + allocatedVlan.getVnet() + " is allocated to a different account."
- + " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account ");
- }
- }
+ List<DataCenterVnetVO> dataCenterVnet = _dcVnetDao.findVnet(physicalNetwork.getDataCenterId(), physicalNetworkId, Integer.toString(i));
+ if (CollectionUtils.isEmpty(dataCenterVnet)) {
+ throw new InvalidParameterValueException(String.format("Guest vlan %d from this range %s is present in the system for physical network ID: %s", i, vlan, physicalNetwork.getUuid()));
+ }
+ // Verify guest vlans in the range don't belong to a network of a different account
+ if (dataCenterVnet.get(0).getAccountId() != vlanOwner.getAccountId()) {
Review Comment:
findVnet returns vlans including the allocated and unallocated.
if vnet is not allocated, the accountId is null, can it be dedicated ?
##########
server/src/main/java/com/cloud/network/NetworkServiceImpl.java:
##########
@@ -4068,16 +4068,15 @@ public GuestVlanRange dedicateGuestVlanRange(DedicateGuestVlanRangeCmd cmd) {
}
}
- // Verify guest vlans in the range don't belong to a network of a different account
for (int i = startVlan; i <= endVlan; i++) {
- List<DataCenterVnetVO> allocatedVlans = _dcVnetDao.listAllocatedVnetsInRange(physicalNetwork.getDataCenterId(), physicalNetwork.getId(), startVlan, endVlan);
- if (allocatedVlans != null && !allocatedVlans.isEmpty()) {
- for (DataCenterVnetVO allocatedVlan : allocatedVlans) {
- if (allocatedVlan.getAccountId() != vlanOwner.getAccountId()) {
- throw new InvalidParameterValueException("Guest vlan from this range " + allocatedVlan.getVnet() + " is allocated to a different account."
- + " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account ");
- }
- }
+ List<DataCenterVnetVO> dataCenterVnet = _dcVnetDao.findVnet(physicalNetwork.getDataCenterId(), physicalNetworkId, Integer.toString(i));
+ if (CollectionUtils.isEmpty(dataCenterVnet)) {
+ throw new InvalidParameterValueException(String.format("Guest vlan %d from this range %s is present in the system for physical network ID: %s", i, vlan, physicalNetwork.getUuid()));
Review Comment:
is present or is not present ?
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222021500
UI build: :heavy_check_mark:
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6655 (SL-JID-2195)
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222014087
@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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222225140
@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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222222352
@acs-robot a Jenkins job has been kicked to build UI QA env. 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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222084013
@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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222131028
Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 4034
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on a diff in pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
shwstppr commented on code in PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#discussion_r951146348
##########
server/src/main/java/com/cloud/network/NetworkServiceImpl.java:
##########
@@ -4068,16 +4068,15 @@ public GuestVlanRange dedicateGuestVlanRange(DedicateGuestVlanRangeCmd cmd) {
}
}
- // Verify guest vlans in the range don't belong to a network of a different account
for (int i = startVlan; i <= endVlan; i++) {
- List<DataCenterVnetVO> allocatedVlans = _dcVnetDao.listAllocatedVnetsInRange(physicalNetwork.getDataCenterId(), physicalNetwork.getId(), startVlan, endVlan);
- if (allocatedVlans != null && !allocatedVlans.isEmpty()) {
- for (DataCenterVnetVO allocatedVlan : allocatedVlans) {
- if (allocatedVlan.getAccountId() != vlanOwner.getAccountId()) {
- throw new InvalidParameterValueException("Guest vlan from this range " + allocatedVlan.getVnet() + " is allocated to a different account."
- + " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account ");
- }
- }
+ List<DataCenterVnetVO> dataCenterVnet = _dcVnetDao.findVnet(physicalNetwork.getDataCenterId(), physicalNetworkId, Integer.toString(i));
+ if (CollectionUtils.isEmpty(dataCenterVnet)) {
+ throw new InvalidParameterValueException(String.format("Guest vlan %d from this range %s is not present in the system for physical network ID: %s", i, vlan, physicalNetwork.getUuid()));
+ }
+ // Verify guest vlans in the range don't belong to a network of a different account
+ if (dataCenterVnet.get(0).getAccountId() != null && dataCenterVnet.get(0).getAccountId() != vlanOwner.getAccountId()) {
+ throw new InvalidParameterValueException("Guest vlan from this range " + dataCenterVnet.get(0).getVnet() + " is allocated to a different account."
+ + " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account ");
Review Comment:
@DaanHoogland done
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] acs-robot commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
acs-robot commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1219372415
Found UI changes, kicking a new UI QA build
@blueorangutan ui
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] codecov[bot] commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
codecov[bot] commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222353783
# [Codecov](https://codecov.io/gh/apache/cloudstack/pull/6655?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#6655](https://codecov.io/gh/apache/cloudstack/pull/6655?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (8e19aa4) into [4.17](https://codecov.io/gh/apache/cloudstack/commit/ef2997c4a880b10f47458114b8c7bfcc556f4648?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (ef2997c) will **decrease** coverage by `0.00%`.
> The diff coverage is `0.00%`.
```diff
@@ Coverage Diff @@
## 4.17 #6655 +/- ##
============================================
- Coverage 5.86% 5.86% -0.01%
Complexity 3918 3918
============================================
Files 2451 2451
Lines 242263 242279 +16
Branches 37909 37910 +1
============================================
Hits 14207 14207
- Misses 226486 226502 +16
Partials 1570 1570
```
| [Impacted Files](https://codecov.io/gh/apache/cloudstack/pull/6655?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [...ain/java/com/cloud/network/NetworkServiceImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6655/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL25ldHdvcmsvTmV0d29ya1NlcnZpY2VJbXBsLmphdmE=) | `0.00% <0.00%> (ø)` | |
| [.../src/main/java/com/cloud/vm/UserVmManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6655/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL3ZtL1VzZXJWbU1hbmFnZXJJbXBsLmphdmE=) | `0.00% <0.00%> (ø)` | |
| [...java/com/cloud/tags/TaggedResourceManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6655/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL3RhZ3MvVGFnZ2VkUmVzb3VyY2VNYW5hZ2VySW1wbC5qYXZh) | `0.00% <0.00%> (ø)` | |
| [...ava/com/cloud/upgrade/dao/Upgrade41610to41700.java](https://codecov.io/gh/apache/cloudstack/pull/6655/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC91cGdyYWRlL2Rhby9VcGdyYWRlNDE2MTB0bzQxNzAwLmphdmE=) | `4.44% <0.00%> (ø)` | |
:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1219408927
UI build: :heavy_check_mark:
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6655 (SL-JID-2183)
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr merged pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
shwstppr merged PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] acs-robot commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
acs-robot commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222221923
Found UI changes, kicking a new UI QA build
@blueorangutan ui
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] acs-robot commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
acs-robot commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222014276
Found UI changes, kicking a new UI QA build
@blueorangutan ui
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1219372682
@acs-robot a Jenkins job has been kicked to build UI QA env. 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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] acs-robot commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
acs-robot commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1219403322
Found UI changes, kicking a new UI QA build
@blueorangutan ui
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] sonarcloud[bot] commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222277518
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6655)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6655&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6655&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6655&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6655&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6655&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6655&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6655&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6655&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6655&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6655&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6655&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6655&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6655&metric=new_coverage&view=list) [0.0% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6655&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6655&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6655&metric=new_duplicated_lines_density&view=list)
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222317802
@shwstppr 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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222316884
@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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222084927
@shwstppr a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. 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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222015005
@acs-robot a Jenkins job has been kicked to build UI QA env. 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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222229976
UI build: :heavy_check_mark:
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6655 (SL-JID-2199)
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1222225598
@shwstppr a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. 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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on a diff in pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
shwstppr commented on code in PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#discussion_r949037715
##########
server/src/main/java/com/cloud/network/NetworkServiceImpl.java:
##########
@@ -4068,16 +4068,15 @@ public GuestVlanRange dedicateGuestVlanRange(DedicateGuestVlanRangeCmd cmd) {
}
}
- // Verify guest vlans in the range don't belong to a network of a different account
for (int i = startVlan; i <= endVlan; i++) {
- List<DataCenterVnetVO> allocatedVlans = _dcVnetDao.listAllocatedVnetsInRange(physicalNetwork.getDataCenterId(), physicalNetwork.getId(), startVlan, endVlan);
- if (allocatedVlans != null && !allocatedVlans.isEmpty()) {
- for (DataCenterVnetVO allocatedVlan : allocatedVlans) {
- if (allocatedVlan.getAccountId() != vlanOwner.getAccountId()) {
- throw new InvalidParameterValueException("Guest vlan from this range " + allocatedVlan.getVnet() + " is allocated to a different account."
- + " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account ");
- }
- }
+ List<DataCenterVnetVO> dataCenterVnet = _dcVnetDao.findVnet(physicalNetwork.getDataCenterId(), physicalNetworkId, Integer.toString(i));
+ if (CollectionUtils.isEmpty(dataCenterVnet)) {
+ throw new InvalidParameterValueException(String.format("Guest vlan %d from this range %s is present in the system for physical network ID: %s", i, vlan, physicalNetwork.getUuid()));
Review Comment:
@weizhouapache fixed
##########
server/src/main/java/com/cloud/network/NetworkServiceImpl.java:
##########
@@ -4068,16 +4068,15 @@ public GuestVlanRange dedicateGuestVlanRange(DedicateGuestVlanRangeCmd cmd) {
}
}
- // Verify guest vlans in the range don't belong to a network of a different account
for (int i = startVlan; i <= endVlan; i++) {
- List<DataCenterVnetVO> allocatedVlans = _dcVnetDao.listAllocatedVnetsInRange(physicalNetwork.getDataCenterId(), physicalNetwork.getId(), startVlan, endVlan);
- if (allocatedVlans != null && !allocatedVlans.isEmpty()) {
- for (DataCenterVnetVO allocatedVlan : allocatedVlans) {
- if (allocatedVlan.getAccountId() != vlanOwner.getAccountId()) {
- throw new InvalidParameterValueException("Guest vlan from this range " + allocatedVlan.getVnet() + " is allocated to a different account."
- + " Can only dedicate a range which has no allocated vlans or has vlans allocated to the same account ");
- }
- }
+ List<DataCenterVnetVO> dataCenterVnet = _dcVnetDao.findVnet(physicalNetwork.getDataCenterId(), physicalNetworkId, Integer.toString(i));
+ if (CollectionUtils.isEmpty(dataCenterVnet)) {
+ throw new InvalidParameterValueException(String.format("Guest vlan %d from this range %s is present in the system for physical network ID: %s", i, vlan, physicalNetwork.getUuid()));
+ }
+ // Verify guest vlans in the range don't belong to a network of a different account
+ if (dataCenterVnet.get(0).getAccountId() != vlanOwner.getAccountId()) {
Review Comment:
@weizhouapache added check
--
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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6655: server: fix error when dedicatingguestvlanrange for physical nw without vlan range
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6655:
URL: https://github.com/apache/cloudstack/pull/6655#issuecomment-1219403963
@acs-robot a Jenkins job has been kicked to build UI QA env. 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.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org