Yair Zaslavsky has uploaded a new change for review. Change subject: [WIP] core: implementing VmInterfaceDAO.getAll() ......................................................................
[WIP] core: implementing VmInterfaceDAO.getAll() This change exposes GetAllFromvm_interface psql function to the proper Dao This change also changes the type return from the psql function to conform to other get functions. This is a first patch in a series of patches regarding initialization and handling of MacPoolManager Bug-Url: https://bugzilla.redhat.com/885441 Change-Id: I142198d2059cf109be3859f255621e6ceca8581a Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/dbscripts/network_sp.sql M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAOTest.java 4 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/10185/1 diff --git a/backend/manager/dbscripts/network_sp.sql b/backend/manager/dbscripts/network_sp.sql index 6481bfa..6a3ca86 100644 --- a/backend/manager/dbscripts/network_sp.sql +++ b/backend/manager/dbscripts/network_sp.sql @@ -475,11 +475,11 @@ -Create or replace FUNCTION GetAllFromvm_interface() RETURNS SETOF vm_interface +Create or replace FUNCTION GetAllFromvm_interface() RETURNS SETOF vm_interface_view AS $procedure$ BEGIN RETURN QUERY SELECT * - FROM vm_interface; + FROM vm_interface_view; END; $procedure$ LANGUAGE plpgsql; diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java index 5ed06cf..20dcb7a 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAODbFacadeImpl.java @@ -4,7 +4,6 @@ import java.sql.SQLException; import java.util.List; -import org.apache.commons.lang.NotImplementedException; import org.ovirt.engine.core.common.businessentities.InterfaceComparerByMAC; import org.ovirt.engine.core.common.businessentities.InterfaceStatus; import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; @@ -122,7 +121,7 @@ @Override public List<VmNetworkInterface> getAll() { - throw new NotImplementedException(); + return getCallsHandler().executeReadList("GetAllFromvm_interface", mapper, getCustomMapSqlParameterSource()); } @Override diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java index e9e90fa..fd303be 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java @@ -270,4 +270,6 @@ * </ul> */ protected static final Guid VDS_NETWORK_INTERFACE = new Guid("ba31682e-6ae7-4f9d-8c6f-04c93acca9db"); + + public static final int NUMBER_OF_VM_INTERFACES = 1; } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAOTest.java index 3c0eb61..4e2190a 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmNetworkInterfaceDAOTest.java @@ -8,7 +8,6 @@ import java.util.List; -import org.apache.commons.lang.NotImplementedException; import org.junit.Test; import org.ovirt.engine.core.common.businessentities.VmDevice; import org.ovirt.engine.core.common.businessentities.VmDeviceId; @@ -247,9 +246,11 @@ assertNotNull(dao.get(FixturesTool.VM_NETWORK_INTERFACE)); } - @Test(expected = NotImplementedException.class) + @Test public void testGetAll() throws Exception { - dao.getAll(); + List<VmNetworkInterface> interfaces = dao.getAll(); + assertNotNull(interfaces); + assertEquals(FixturesTool.NUMBER_OF_VM_INTERFACES, interfaces.size()); } @Test -- To view, visit http://gerrit.ovirt.org/10185 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I142198d2059cf109be3859f255621e6ceca8581a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
