This is an automated email from the ASF dual-hosted git repository. bstoyanov pushed a commit to branch revert-12184-fix-delete-traffic-type-not-filtering-physical-network-ii in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 0ff7a9d30f61633ce8312eaf9a1a222aa0e41269 Author: Boris Stoyanov - a.k.a Bobby <[email protected]> AuthorDate: Thu Jan 29 14:51:49 2026 +0200 Revert "Fix query filter and units tests (#12184)" This reverts commit 8c2a0308165173812d146d835bf31c3e515daff4. --- .../java/com/cloud/network/dao/NetworkDaoImpl.java | 2 +- .../com/cloud/network/dao/NetworkDaoImplTest.java | 31 +++++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java index 4e8b6204f72..8066b89b4b9 100644 --- a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java @@ -598,7 +598,7 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long>implements Ne 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); } diff --git a/engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java b/engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java index a78eab568af..ab5f4352105 100644 --- a/engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java +++ b/engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java @@ -22,6 +22,7 @@ package com.cloud.network.dao; 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; @@ -29,6 +30,7 @@ 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(); + } } }
