server: consistent behaviour for list apis with project=-1

Fixes #9602
Fixes #11517

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

@@ -2557,12 +2557,12 @@ public Pair<List<? extends Network>, Integer> searchForNetworks(ListNetworksCmd
             SearchCriteria<NetworkVO> sc = createNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, guestIpType, trafficType,
                     physicalNetworkId, networkOfferingId, null, restartRequired, specifyIpRanges,
                     vpcId, tags, display, vlanId, associatedNetworkId);
-            addProjectNetworksConditionToSearch(sc, true);
+            addProjectNetworksConditionToSearch(sc, true, null);
             result = _networksDao.searchAndCount(sc, searchFilter);
         } else {
             SearchCriteria<NetworkVO> additionalSC = _networksDao.createSearchCriteria();
 
-            addAccountSpecificNetworksToSearch(additionalSC, sb, networkFilter, skipProjectNetworks, permittedAccounts, path, isRecursive);
+            addAccountSpecificNetworksToSearch(additionalSC, sb, networkFilter, skipProjectNetworks, permittedAccounts, path, isRecursive, projectId);
             addDomainSpecificNetworksToSearch(additionalSC, sb, networkFilter, permittedAccounts, domainId, path, isRecursive);
             addSharedNetworksToSearch(additionalSC, sb, networkFilter, permittedAccounts, path, isRecursive);
 
@@ -2622,7 +2622,7 @@ public Pair<List<? extends Network>, Integer> searchForNetworks(ListNetworksCmd
 
     private void addAccountSpecificNetworksToSearch(SearchCriteria<NetworkVO> additionalSC, SearchBuilder<NetworkVO> sb,
                                                     Network.NetworkFilter networkFilter, boolean skipProjectNetworks,
-                                                    List<Long> permittedAccounts, String path, boolean isRecursive) {
+                                                    List<Long> permittedAccounts, String path, boolean isRecursive, Long projectId) {
         if (!Arrays.asList(Network.NetworkFilter.Account, Network.NetworkFilter.AccountDomain, Network.NetworkFilter.All).contains(networkFilter)) {
             return;
         }
@@ -2641,7 +2641,7 @@ private void addAccountSpecificNetworksToSearch(SearchCriteria<NetworkVO> additi
         } else {
             accountSC.addAnd("accountId", SearchCriteria.Op.IN, permittedAccounts.toArray());
         }
-        addProjectNetworksConditionToSearch(accountSC, skipProjectNetworks);
+        addProjectNetworksConditionToSearch(accountSC, skipProjectNetworks, projectId);
         additionalSC.addOr("id", SearchCriteria.Op.SC, accountSC);
     }
 
@@ -2785,7 +2785,7 @@ private void addDomainLevelNetworksToSearch(SearchCriteria<NetworkVO> additional
             SearchCriteria<NetworkVO> domainSC = sb.create();
             domainSC.addAnd("id", SearchCriteria.Op.IN, networkIds.toArray());
             domainSC.addAnd("aclType", SearchCriteria.Op.EQ, ACLType.Domain.toString());
-            addProjectNetworksConditionToSearch(domainSC, true);
+            addProjectNetworksConditionToSearch(domainSC, true, null);
             additionalSC.addOr("id", SearchCriteria.Op.SC, domainSC);
         }
     }
@@ -2813,13 +2813,17 @@ private void addDomainNetworksByDomainPathToSearch(SearchCriteria<NetworkVO> add
             SearchCriteria<NetworkVO> domainSC = sb.create();
             domainSC.addAnd("id", SearchCriteria.Op.IN, networkIds.toArray());
             domainSC.addAnd("aclType", SearchCriteria.Op.EQ, ACLType.Domain.toString());
-            addProjectNetworksConditionToSearch(domainSC, true);
+            addProjectNetworksConditionToSearch(domainSC, true, null);
             additionalSC.addOr("id", SearchCriteria.Op.SC, domainSC);
         }
     }
 
-    private void addProjectNetworksConditionToSearch(SearchCriteria<NetworkVO> sc, boolean skipProjectNetworks) {
-        sc.getJoin("account").addAnd("type", skipProjectNetworks ? Op.NEQ : Op.EQ, Account.Type.PROJECT);
+    protected void addProjectNetworksConditionToSearch(SearchCriteria<NetworkVO> sc, boolean skipProjectNetworks, Long projectId) {
+        if (!skipProjectNetworks && projectId == -1) {
+            sc.getJoin("account").addAnd("type", Op.NNULL);
+        } else {
+            sc.getJoin("account").addAnd("type", skipProjectNetworks ? Op.NEQ : Op.EQ, Account.Type.PROJECT);
+        }
         sc.addAnd("id", Op.SC, sc.getJoin("account"));
     }
 
@@ -2829,7 +2833,7 @@ private void addSharedNetworksByAccountsToSearch(SearchCriteria<NetworkVO> addit
         if (!sharedNetworkIds.isEmpty()) {
             SearchCriteria<NetworkVO> ssc = sb.create();
             ssc.addAnd("id", SearchCriteria.Op.IN, sharedNetworkIds.toArray());
-            addProjectNetworksConditionToSearch(ssc, true);
+            addProjectNetworksConditionToSearch(ssc, true, null);
             additionalSC.addOr("id", SearchCriteria.Op.SC, ssc);
         }
     }
@@ -2859,7 +2863,7 @@ private void addSharedNetworksByDomainPathToSearch(SearchCriteria<NetworkVO> add
             if (!sharedNetworkIds.isEmpty()) {
                 SearchCriteria<NetworkVO> ssc = sb.create();
                 ssc.addAnd("id", SearchCriteria.Op.IN, sharedNetworkIds.toArray());
-                addProjectNetworksConditionToSearch(ssc, true);
+                addProjectNetworksConditionToSearch(ssc, true, null);
                 additionalSC.addOr("id", SearchCriteria.Op.SC, ssc);
             }
         }

server/src/test/java/com/cloud/network/NetworkServiceImplTest.java

@@ -114,6 +114,7 @@
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.db.EntityManager;
+import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.Ip;
 import com.cloud.vm.DomainRouterVO;
@@ -1299,4 +1300,34 @@ public void testGetIpAddressesFromIps() {
             Assert.assertEquals("Mac address is not valid: invalid-mac", e.getMessage());
         }
     }
+
+    @Test
+    public void addProjectNetworksConditionToSearch_includesProjectNetworksWhenNotSkipped() {
+        SearchCriteria<NetworkVO> sc = Mockito.mock(SearchCriteria.class);
+        SearchCriteria accountJoin = Mockito.mock(SearchCriteria.class);
+        Mockito.when(sc.getJoin("account")).thenReturn(accountJoin);
+        service.addProjectNetworksConditionToSearch(sc, false, -1L);
+        Mockito.verify(accountJoin).addAnd("type", SearchCriteria.Op.NNULL);
+        Mockito.verify(sc).addAnd("id", SearchCriteria.Op.SC, accountJoin);
+    }
+
+    @Test
+    public void addProjectNetworksConditionToSearch_excludesProjectNetworksWhenSkipped() {
+        SearchCriteria<NetworkVO> sc = Mockito.mock(SearchCriteria.class);
+        SearchCriteria accountJoin = Mockito.mock(SearchCriteria.class);
+        Mockito.when(sc.getJoin("account")).thenReturn(accountJoin);
+        service.addProjectNetworksConditionToSearch(sc, true, -1L);
+        Mockito.verify(accountJoin).addAnd("type", SearchCriteria.Op.NEQ, Account.Type.PROJECT);
+        Mockito.verify(sc).addAnd("id", SearchCriteria.Op.SC, accountJoin);
+    }
+
+    @Test
+    public void addProjectNetworksConditionToSearch_includesSpecificProjectWhenProjectIdProvided() {
+        SearchCriteria<NetworkVO> sc = Mockito.mock(SearchCriteria.class);
+        SearchCriteria accountJoin = Mockito.mock(SearchCriteria.class);
+        Mockito.when(sc.getJoin("account")).thenReturn(accountJoin);
+        service.addProjectNetworksConditionToSearch(sc, false, 123L);
+        Mockito.verify(accountJoin).addAnd("type", SearchCriteria.Op.EQ, Account.Type.PROJECT);
+        Mockito.verify(sc).addAnd("id", SearchCriteria.Op.SC, accountJoin);
+    }
 }