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/09/19 06:42:51 UTC
[GitHub] [cloudstack] shwstppr opened a new pull request, #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
shwstppr opened a new pull request, #6748:
URL: https://github.com/apache/cloudstack/pull/6748
### Description
Fixes #6745
### 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] sonarcloud[bot] commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1366554928
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6748)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [1 Code Smell](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list) [4.5% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1347969638
@DaanHoogland 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] GutoVeronezi commented on a diff in pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
GutoVeronezi commented on code in PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#discussion_r1047592431
##########
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java:
##########
@@ -6614,25 +6614,26 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
ListIterator<NetworkOfferingJoinVO> it = offerings.listIterator();
while (it.hasNext()) {
NetworkOfferingJoinVO offering = it.next();
- if (StringUtils.isNotEmpty(offering.getDomainId())) {
- boolean toRemove = false;
- String[] domainIdsArray = offering.getDomainId().split(",");
- for (String domainIdString : domainIdsArray) {
- Long dId = Long.valueOf(domainIdString.trim());
- if (caller.getType() != Account.Type.ADMIN &&
- !_domainDao.isChildDomain(dId, caller.getDomainId())) {
- toRemove = true;
- break;
- }
- if (domainId != null && !_domainDao.isChildDomain(dId, domainId)) {
- toRemove = true;
- break;
- }
+ if (StringUtils.isEmpty(offering.getDomainId())) {
+ continue;
+ }
+ boolean toRemove = true;
+ String[] domainIdsArray = offering.getDomainId().split(",");
+ for (String domainIdString : domainIdsArray) {
+ Long dId = Long.valueOf(domainIdString.trim());
+ if (caller.getType() != Account.Type.ADMIN &&
+ _domainDao.isChildDomain(dId, caller.getDomainId())) {
+ toRemove = false;
+ break;
}
- if (toRemove) {
- it.remove();
+ if (domainId != null && _domainDao.isChildDomain(dId, domainId)) {
+ toRemove = false;
Review Comment:
We could call `it.remove()` here instead of creating a variable and having to verify it later.
##########
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java:
##########
@@ -730,20 +730,21 @@ public Pair<List<? extends VpcOffering>, Integer> listVpcOfferings(ListVPCOfferi
ListIterator<VpcOfferingJoinVO> it = offerings.listIterator();
while (it.hasNext()) {
VpcOfferingJoinVO offering = it.next();
- if(org.apache.commons.lang3.StringUtils.isNotEmpty(offering.getDomainId())) {
- boolean toRemove = true;
- String[] domainIdsArray = offering.getDomainId().split(",");
- for (String domainIdString : domainIdsArray) {
- Long dId = Long.valueOf(domainIdString.trim());
- if (domainDao.isChildDomain(dId, caller.getDomainId())) {
- toRemove = false;
- break;
- }
- }
- if (toRemove) {
- it.remove();
+ if(org.apache.commons.lang3.StringUtils.isEmpty(offering.getDomainId())) {
+ continue;
+ }
+ boolean toRemove = true;
+ String[] domainIdsArray = offering.getDomainId().split(",");
+ for (String domainIdString : domainIdsArray) {
+ Long dId = Long.valueOf(domainIdString.trim());
+ if (domainDao.isChildDomain(dId, caller.getDomainId())) {
+ toRemove = false;
Review Comment:
We could call it.remove() here instead of creating a variable and having to verify it later.
##########
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java:
##########
@@ -730,20 +730,21 @@ public Pair<List<? extends VpcOffering>, Integer> listVpcOfferings(ListVPCOfferi
ListIterator<VpcOfferingJoinVO> it = offerings.listIterator();
while (it.hasNext()) {
VpcOfferingJoinVO offering = it.next();
- if(org.apache.commons.lang3.StringUtils.isNotEmpty(offering.getDomainId())) {
- boolean toRemove = true;
- String[] domainIdsArray = offering.getDomainId().split(",");
- for (String domainIdString : domainIdsArray) {
- Long dId = Long.valueOf(domainIdString.trim());
- if (domainDao.isChildDomain(dId, caller.getDomainId())) {
- toRemove = false;
- break;
- }
- }
- if (toRemove) {
- it.remove();
+ if(org.apache.commons.lang3.StringUtils.isEmpty(offering.getDomainId())) {
Review Comment:
```suggestion
if (org.apache.commons.lang3.StringUtils.isEmpty(offering.getDomainId())) {
```
##########
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java:
##########
@@ -6614,25 +6614,26 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
ListIterator<NetworkOfferingJoinVO> it = offerings.listIterator();
while (it.hasNext()) {
NetworkOfferingJoinVO offering = it.next();
- if (StringUtils.isNotEmpty(offering.getDomainId())) {
- boolean toRemove = false;
- String[] domainIdsArray = offering.getDomainId().split(",");
- for (String domainIdString : domainIdsArray) {
- Long dId = Long.valueOf(domainIdString.trim());
- if (caller.getType() != Account.Type.ADMIN &&
- !_domainDao.isChildDomain(dId, caller.getDomainId())) {
- toRemove = true;
- break;
- }
- if (domainId != null && !_domainDao.isChildDomain(dId, domainId)) {
- toRemove = true;
- break;
- }
+ if (StringUtils.isEmpty(offering.getDomainId())) {
+ continue;
+ }
+ boolean toRemove = true;
+ String[] domainIdsArray = offering.getDomainId().split(",");
+ for (String domainIdString : domainIdsArray) {
+ Long dId = Long.valueOf(domainIdString.trim());
+ if (caller.getType() != Account.Type.ADMIN &&
+ _domainDao.isChildDomain(dId, caller.getDomainId())) {
+ toRemove = false;
Review Comment:
We could call `it.remove()` here instead of creating a variable and having to verify it later.
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398281438
Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: el9 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 5346
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1381691199
@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] DaanHoogland commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398435724
@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] DaanHoogland merged pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland merged PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398392072
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6748)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list) [5.9% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&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] shwstppr commented on a diff in pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "shwstppr (via GitHub)" <gi...@apache.org>.
shwstppr commented on code in PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#discussion_r1083883721
##########
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java:
##########
@@ -715,11 +716,22 @@ public Pair<List<? extends VpcOffering>, Integer> listVpcOfferings(ListVPCOfferi
final String state = cmd.getState();
final Long startIndex = cmd.getStartIndex();
final Long pageSizeVal = cmd.getPageSizeVal();
+ final Long domainId = cmd.getDomainId();
final Long zoneId = cmd.getZoneId();
final Filter searchFilter = new Filter(VpcOfferingJoinVO.class, "sortKey", QueryService.SortKeyAscending.value(), null, null);
searchFilter.addOrderBy(VpcOfferingJoinVO.class, "id", true);
final SearchCriteria<VpcOfferingJoinVO> sc = vpcOfferingJoinDao.createSearchCriteria();
+ if (domainId != null) {
+ Domain domain = _entityMgr.findById(Domain.class, domainId);
+ if (domain == null) {
+ throw new InvalidParameterValueException("Unable to find the domain by id=" + domainId);
+ }
+ if (!domainDao.isChildDomain(caller.getDomainId(), domainId)) {
+ throw new InvalidParameterValueException(String.format("Unable to list VPC offerings for domain: %s as caller does not have access for it", domain.getUuid()));
+ }
+ }
Review Comment:
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] shwstppr commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1376861532
@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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1349388835
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_multiplication_x: suse15. SL-JID 4901
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "shwstppr (via GitHub)" <gi...@apache.org>.
shwstppr commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1400122788
@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] DaanHoogland commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398222419
@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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398241494
@DaanHoogland refactor to use DomainManagerImpl is failing build with unit test failures in `CreateNetworkOfferingTest`. I don't have a solution for it right now
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398315098
@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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
shwstppr commented on code in PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#discussion_r1066920238
##########
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java:
##########
@@ -730,20 +730,21 @@ public Pair<List<? extends VpcOffering>, Integer> listVpcOfferings(ListVPCOfferi
ListIterator<VpcOfferingJoinVO> it = offerings.listIterator();
while (it.hasNext()) {
VpcOfferingJoinVO offering = it.next();
- if(org.apache.commons.lang3.StringUtils.isNotEmpty(offering.getDomainId())) {
- boolean toRemove = true;
- String[] domainIdsArray = offering.getDomainId().split(",");
- for (String domainIdString : domainIdsArray) {
- Long dId = Long.valueOf(domainIdString.trim());
- if (domainDao.isChildDomain(dId, caller.getDomainId())) {
- toRemove = false;
- break;
- }
- }
- if (toRemove) {
- it.remove();
+ if(org.apache.commons.lang3.StringUtils.isEmpty(offering.getDomainId())) {
+ continue;
+ }
+ boolean toRemove = true;
+ String[] domainIdsArray = offering.getDomainId().split(",");
+ for (String domainIdString : domainIdsArray) {
+ Long dId = Long.valueOf(domainIdString.trim());
+ if (domainDao.isChildDomain(dId, caller.getDomainId())) {
+ toRemove = false;
Review Comment:
done
##########
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java:
##########
@@ -730,20 +730,21 @@ public Pair<List<? extends VpcOffering>, Integer> listVpcOfferings(ListVPCOfferi
ListIterator<VpcOfferingJoinVO> it = offerings.listIterator();
while (it.hasNext()) {
VpcOfferingJoinVO offering = it.next();
- if(org.apache.commons.lang3.StringUtils.isNotEmpty(offering.getDomainId())) {
- boolean toRemove = true;
- String[] domainIdsArray = offering.getDomainId().split(",");
- for (String domainIdString : domainIdsArray) {
- Long dId = Long.valueOf(domainIdString.trim());
- if (domainDao.isChildDomain(dId, caller.getDomainId())) {
- toRemove = false;
- break;
- }
- }
- if (toRemove) {
- it.remove();
+ if(org.apache.commons.lang3.StringUtils.isEmpty(offering.getDomainId())) {
Review Comment:
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] DaanHoogland commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1347968242
@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] sonarcloud[bot] commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1250683641
Kudos, SonarCloud Quality Gate passed! [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6748)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list) [9.8% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&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] shwstppr commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1381690497
@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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1376862107
@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 pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398314215
@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] sonarcloud[bot] commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by sonarcloud.
sonarcloud[bot] commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1400193030
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6748)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list) [5.8% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&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] shwstppr commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1350597869
Not ready. Need to test after latest commit
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on code in PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#discussion_r1069261131
##########
server/src/main/java/com/cloud/user/DomainManager.java:
##########
@@ -51,4 +51,6 @@ public interface DomainManager extends DomainService {
public static final String MESSAGE_ADD_DOMAIN_EVENT = "Message.AddDomain.Event";
public static final String MESSAGE_PRE_REMOVE_DOMAIN_EVENT = "Message.PreRemoveDomain.Event";
public static final String MESSAGE_REMOVE_DOMAIN_EVENT = "Message.RemoveDomain.Event";
+
+ boolean domainIdListContainsAccessibleDomain(String domainIdList, Account caller, Long domainId);
Review Comment:
:+1:
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
shwstppr commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1381699513
@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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1250628721
@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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1400123621
@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] DaanHoogland commented on a diff in pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#discussion_r1083764684
##########
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java:
##########
@@ -715,11 +716,22 @@ public Pair<List<? extends VpcOffering>, Integer> listVpcOfferings(ListVPCOfferi
final String state = cmd.getState();
final Long startIndex = cmd.getStartIndex();
final Long pageSizeVal = cmd.getPageSizeVal();
+ final Long domainId = cmd.getDomainId();
final Long zoneId = cmd.getZoneId();
final Filter searchFilter = new Filter(VpcOfferingJoinVO.class, "sortKey", QueryService.SortKeyAscending.value(), null, null);
searchFilter.addOrderBy(VpcOfferingJoinVO.class, "id", true);
final SearchCriteria<VpcOfferingJoinVO> sc = vpcOfferingJoinDao.createSearchCriteria();
+ if (domainId != null) {
+ Domain domain = _entityMgr.findById(Domain.class, domainId);
+ if (domain == null) {
+ throw new InvalidParameterValueException("Unable to find the domain by id=" + domainId);
+ }
+ if (!domainDao.isChildDomain(caller.getDomainId(), domainId)) {
+ throw new InvalidParameterValueException(String.format("Unable to list VPC offerings for domain: %s as caller does not have access for it", domain.getUuid()));
+ }
+ }
Review Comment:
can this go in a separate `verifyDomainId()`, please?
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1399157407
<b>Trillian test result (tid-5928)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44332 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6748-t5928-kvm-centos7.zip
Smoke tests completed. 107 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1400193053
@DaanHoogland 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] blueorangutan commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1400190961
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 5373
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
acs-robot commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1250627844
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1250632184
UI build: :heavy_check_mark:
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6748 (SL-JID-2379)
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1381757574
Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: el9 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 5264
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1376918980
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 5221
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1401204689
<b>Trillian test result (tid-5956)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 45713 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6748-t5956-kvm-centos7.zip
Smoke tests completed. 106 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_08_upgrade_kubernetes_ha_cluster | `Failure` | 578.42 | 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] sonarcloud[bot] commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
sonarcloud[bot] commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1381552258
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6748)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6748&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6748&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list) [5.9% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6748&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] shwstppr commented on a diff in pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
shwstppr commented on code in PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#discussion_r1066920037
##########
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java:
##########
@@ -6614,25 +6614,26 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
ListIterator<NetworkOfferingJoinVO> it = offerings.listIterator();
while (it.hasNext()) {
NetworkOfferingJoinVO offering = it.next();
- if (StringUtils.isNotEmpty(offering.getDomainId())) {
- boolean toRemove = false;
- String[] domainIdsArray = offering.getDomainId().split(",");
- for (String domainIdString : domainIdsArray) {
- Long dId = Long.valueOf(domainIdString.trim());
- if (caller.getType() != Account.Type.ADMIN &&
- !_domainDao.isChildDomain(dId, caller.getDomainId())) {
- toRemove = true;
- break;
- }
- if (domainId != null && !_domainDao.isChildDomain(dId, domainId)) {
- toRemove = true;
- break;
- }
+ if (StringUtils.isEmpty(offering.getDomainId())) {
+ continue;
+ }
+ boolean toRemove = true;
+ String[] domainIdsArray = offering.getDomainId().split(",");
+ for (String domainIdString : domainIdsArray) {
+ Long dId = Long.valueOf(domainIdString.trim());
+ if (caller.getType() != Account.Type.ADMIN &&
+ _domainDao.isChildDomain(dId, caller.getDomainId())) {
+ toRemove = false;
Review Comment:
done
##########
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java:
##########
@@ -6614,25 +6614,26 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
ListIterator<NetworkOfferingJoinVO> it = offerings.listIterator();
while (it.hasNext()) {
NetworkOfferingJoinVO offering = it.next();
- if (StringUtils.isNotEmpty(offering.getDomainId())) {
- boolean toRemove = false;
- String[] domainIdsArray = offering.getDomainId().split(",");
- for (String domainIdString : domainIdsArray) {
- Long dId = Long.valueOf(domainIdString.trim());
- if (caller.getType() != Account.Type.ADMIN &&
- !_domainDao.isChildDomain(dId, caller.getDomainId())) {
- toRemove = true;
- break;
- }
- if (domainId != null && !_domainDao.isChildDomain(dId, domainId)) {
- toRemove = true;
- break;
- }
+ if (StringUtils.isEmpty(offering.getDomainId())) {
+ continue;
+ }
+ boolean toRemove = true;
+ String[] domainIdsArray = offering.getDomainId().split(",");
+ for (String domainIdString : domainIdsArray) {
+ Long dId = Long.valueOf(domainIdString.trim());
+ if (caller.getType() != Account.Type.ADMIN &&
+ _domainDao.isChildDomain(dId, caller.getDomainId())) {
+ toRemove = false;
+ break;
}
- if (toRemove) {
- it.remove();
+ if (domainId != null && _domainDao.isChildDomain(dId, domainId)) {
+ toRemove = false;
Review Comment:
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] blueorangutan commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1381699996
@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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398376595
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 5351
--
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 #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398436875
@DaanHoogland 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] blueorangutan commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1398223347
@DaanHoogland 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] DaanHoogland commented on a diff in pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#discussion_r1083764684
##########
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java:
##########
@@ -715,11 +716,22 @@ public Pair<List<? extends VpcOffering>, Integer> listVpcOfferings(ListVPCOfferi
final String state = cmd.getState();
final Long startIndex = cmd.getStartIndex();
final Long pageSizeVal = cmd.getPageSizeVal();
+ final Long domainId = cmd.getDomainId();
final Long zoneId = cmd.getZoneId();
final Filter searchFilter = new Filter(VpcOfferingJoinVO.class, "sortKey", QueryService.SortKeyAscending.value(), null, null);
searchFilter.addOrderBy(VpcOfferingJoinVO.class, "id", true);
final SearchCriteria<VpcOfferingJoinVO> sc = vpcOfferingJoinDao.createSearchCriteria();
+ if (domainId != null) {
+ Domain domain = _entityMgr.findById(Domain.class, domainId);
+ if (domain == null) {
+ throw new InvalidParameterValueException("Unable to find the domain by id=" + domainId);
+ }
+ if (!domainDao.isChildDomain(caller.getDomainId(), domainId)) {
+ throw new InvalidParameterValueException(String.format("Unable to list VPC offerings for domain: %s as caller does not have access for it", domain.getUuid()));
+ }
+ }
Review Comment:
@shwstppr , can this go in a separate `verifyDomainId()`, please?
--
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 pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1400192313
@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] codecov[bot] commented on pull request #6748: server: fix listnetworkofferings with domain, refactor listvpofferings
Posted by GitBox <gi...@apache.org>.
codecov[bot] commented on PR #6748:
URL: https://github.com/apache/cloudstack/pull/6748#issuecomment-1250730890
# [Codecov](https://codecov.io/gh/apache/cloudstack/pull/6748?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 [#6748](https://codecov.io/gh/apache/cloudstack/pull/6748?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (ea56088) into [main](https://codecov.io/gh/apache/cloudstack/commit/c3d6f42dd9d2acf9ae85fa42c5532225c2c232b4?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (c3d6f42) will **increase** coverage by `0.08%`.
> The diff coverage is `23.80%`.
```diff
@@ Coverage Diff @@
## main #6748 +/- ##
============================================
+ Coverage 10.34% 10.42% +0.08%
- Complexity 6611 6705 +94
============================================
Files 2451 2458 +7
Lines 242338 243248 +910
Branches 37923 38067 +144
============================================
+ Hits 25064 25366 +302
- Misses 214187 214707 +520
- Partials 3087 3175 +88
```
| [Impacted Files](https://codecov.io/gh/apache/cloudstack/pull/6748?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/vpc/VpcManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL25ldHdvcmsvdnBjL1ZwY01hbmFnZXJJbXBsLmphdmE=) | `4.12% <0.00%> (+0.71%)` | :arrow_up: |
| [.../cloud/configuration/ConfigurationManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL2NvbmZpZ3VyYXRpb24vQ29uZmlndXJhdGlvbk1hbmFnZXJJbXBsLmphdmE=) | `11.23% <38.46%> (+0.38%)` | :arrow_up: |
| [.../cloudstack/api/response/ApiDiscoveryResponse.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-cGx1Z2lucy9hcGkvZGlzY292ZXJ5L3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9jbG91ZHN0YWNrL2FwaS9yZXNwb25zZS9BcGlEaXNjb3ZlcnlSZXNwb25zZS5qYXZh) | `0.00% <0.00%> (-100.00%)` | :arrow_down: |
| [.../cloudstack/api/response/ApiParameterResponse.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-cGx1Z2lucy9hcGkvZGlzY292ZXJ5L3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9jbG91ZHN0YWNrL2FwaS9yZXNwb25zZS9BcGlQYXJhbWV0ZXJSZXNwb25zZS5qYXZh) | `0.00% <0.00%> (-100.00%)` | :arrow_down: |
| [...e/cloudstack/api/response/ApiResponseResponse.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-cGx1Z2lucy9hcGkvZGlzY292ZXJ5L3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9jbG91ZHN0YWNrL2FwaS9yZXNwb25zZS9BcGlSZXNwb25zZVJlc3BvbnNlLmphdmE=) | `0.00% <0.00%> (-80.00%)` | :arrow_down: |
| [.../cloudstack/discovery/ApiDiscoveryServiceImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-cGx1Z2lucy9hcGkvZGlzY292ZXJ5L3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9jbG91ZHN0YWNrL2Rpc2NvdmVyeS9BcGlEaXNjb3ZlcnlTZXJ2aWNlSW1wbC5qYXZh) | `13.93% <0.00%> (-55.25%)` | :arrow_down: |
| [...rc/main/java/com/cloud/storage/StorageManager.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-ZW5naW5lL2NvbXBvbmVudHMtYXBpL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL3N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuamF2YQ==) | `76.92% <0.00%> (-23.08%)` | :arrow_down: |
| [.../cloudstack/ratelimit/ApiRateLimitServiceImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-cGx1Z2lucy9hcGkvcmF0ZS1saW1pdC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvY2xvdWRzdGFjay9yYXRlbGltaXQvQXBpUmF0ZUxpbWl0U2VydmljZUltcGwuamF2YQ==) | `68.88% <0.00%> (-4.45%)` | :arrow_down: |
| [.../main/java/com/cloud/hypervisor/XenServerGuru.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-cGx1Z2lucy9oeXBlcnZpc29ycy94ZW5zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vY2xvdWQvaHlwZXJ2aXNvci9YZW5TZXJ2ZXJHdXJ1LmphdmE=) | `46.39% <0.00%> (-2.03%)` | :arrow_down: |
| [...rc/main/java/org/apache/cloudstack/acl/RoleVO.java](https://codecov.io/gh/apache/cloudstack/pull/6748/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-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvY2xvdWRzdGFjay9hY2wvUm9sZVZPLmphdmE=) | `53.57% <0.00%> (-1.99%)` | :arrow_down: |
| ... and [90 more](https://codecov.io/gh/apache/cloudstack/pull/6748/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
: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