DaanHoogland commented on a change in pull request #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service URL: https://github.com/apache/cloudstack/pull/3680#discussion_r364173167
########## File path: server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDaoImpl.java ########## @@ -43,9 +43,12 @@ protected NetworkOfferingJoinDaoImpl() { } @Override - public List<NetworkOfferingJoinVO> findByDomainId(long domainId) { + public List<NetworkOfferingJoinVO> findByDomainId(long domainId, Boolean includeAllDomainOffering) { SearchBuilder<NetworkOfferingJoinVO> sb = createSearchBuilder(); sb.and("domainId", sb.entity().getDomainId(), SearchCriteria.Op.FIND_IN_SET); + if (includeAllDomainOffering) { + sb.or("zId", sb.entity().getZoneId(), SearchCriteria.Op.NULL); + } Review comment: so if we include "all domain offerings" the zone is allowed to be null? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services