Revert "Fix query filter and units tests (#12184)"

This reverts commit 8c2a030.

Author: borisstoyanov

engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java

@@ -598,7 +598,7 @@ public List<NetworkVO> listByPhysicalNetwork(final long physicalNetworkId) {
     public List<NetworkVO> listByPhysicalNetworkTrafficType(final long physicalNetworkId, final TrafficType trafficType) {
         final SearchCriteria<NetworkVO> sc = AllFieldsSearch.create();
         sc.setParameters("trafficType", trafficType);
-        sc.setParameters("physicalNetworkId", physicalNetworkId);
+        sc.setParameters("physicalNetwork", physicalNetworkId);
         return listBy(sc);
     }
 

engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java

@@ -22,13 +22,15 @@
 import com.cloud.network.Networks;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.TransactionLegacy;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
+
 import java.util.List;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -44,21 +46,26 @@ public class NetworkDaoImplTest {
     List<NetworkVO> listNetworkVoMock;
 
     @Test
-    public void listByPhysicalNetworkTrafficTypeTestSetParametersValidation() {
+    public void listByPhysicalNetworkTrafficTypeTestSetParametersValidation() throws Exception {
         NetworkDaoImpl networkDaoImplSpy = Mockito.spy(NetworkDaoImpl.class);
-        networkDaoImplSpy.AllFieldsSearch = searchBuilderNetworkVoMock;
-        Mockito.doReturn(searchCriteriaNetworkVoMock).when(searchBuilderNetworkVoMock).create();
-        Mockito.doNothing().when(searchCriteriaNetworkVoMock).setParameters(Mockito.anyString(), Mockito.any());
-        Mockito.doReturn(listNetworkVoMock).when(networkDaoImplSpy).listBy(Mockito.any(SearchCriteria.class));
+        TransactionLegacy txn = TransactionLegacy.open("runNetworkDaoImplTest");
+        try {
+            networkDaoImplSpy.AllFieldsSearch = searchBuilderNetworkVoMock;
+            Mockito.doReturn(searchCriteriaNetworkVoMock).when(searchBuilderNetworkVoMock).create();
+            Mockito.doNothing().when(searchCriteriaNetworkVoMock).setParameters(Mockito.anyString(), Mockito.any());
+            Mockito.doReturn(listNetworkVoMock).when(networkDaoImplSpy).listBy(Mockito.any(SearchCriteria.class));
 
-        long expectedPhysicalNetwork = 2513l;
+            long expectedPhysicalNetwork = 2513l;
 
-        for (Networks.TrafficType trafficType : Networks.TrafficType.values()) {
-            List<NetworkVO> result = networkDaoImplSpy.listByPhysicalNetworkTrafficType(expectedPhysicalNetwork, trafficType);
-            Assert.assertEquals(listNetworkVoMock, result);
-            Mockito.verify(searchCriteriaNetworkVoMock).setParameters("trafficType", trafficType);
-        }
+            for (Networks.TrafficType trafficType : Networks.TrafficType.values()) {
+                List<NetworkVO> result = networkDaoImplSpy.listByPhysicalNetworkTrafficType(expectedPhysicalNetwork, trafficType);
+                Assert.assertEquals(listNetworkVoMock, result);
+                Mockito.verify(searchCriteriaNetworkVoMock).setParameters("trafficType", trafficType);
+            }
 
-        Mockito.verify(searchCriteriaNetworkVoMock, Mockito.times(Networks.TrafficType.values().length)).setParameters("physicalNetworkId", expectedPhysicalNetwork);
+            Mockito.verify(searchCriteriaNetworkVoMock, Mockito.times(Networks.TrafficType.values().length)).setParameters("physicalNetwork", expectedPhysicalNetwork);
+        } finally {
+            txn.close();
+        }
     }
 }