weizhouapache commented on a change in pull request #5769:
URL: https://github.com/apache/cloudstack/pull/5769#discussion_r767808912
##########
File path: server/src/main/java/com/cloud/network/NetworkServiceImpl.java
##########
@@ -1853,25 +1871,55 @@ public Network doInTransaction(TransactionStatus
status) throws InsufficientCapa
if (isSystem == null || !isSystem) {
if (!permittedAccounts.isEmpty()) {
- //get account level networks
-
networksToReturn.addAll(listAccountSpecificNetworks(buildNetworkSearchCriteria(sb,
keyword, id, isSystem, zoneId, guestIpType, trafficType, physicalNetworkId,
networkOfferingId,
- aclType, skipProjectNetworks, restartRequired,
specifyIpRanges, vpcId, tags, display, vlanId, associatedNetworkId),
searchFilter, permittedAccounts));
- //get domain level networks
- if (domainId != null) {
+ if (Network.NetworkFilter.account.equals(networkFilter) ||
Network.NetworkFilter.accountdomain.equals(networkFilter) ||
Network.NetworkFilter.all.equals(networkFilter)) {
+ //get account level networks
Review comment:
@DaanHoogland good point, will change it
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
