Liran Zelkha has uploaded a new change for review. Change subject: core: Fix failed unit test for http://gerrit.ovirt.org/#/c/26068 ......................................................................
core: Fix failed unit test for http://gerrit.ovirt.org/#/c/26068 Patch http://gerrit.ovirt.org/#/c/26068 caused a failed dao unit test This patch fixes it. Change-Id: I741dbca28732fc27bd90c9598a040f4a969e9cb0 Signed-off-by: [email protected] <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsStaticByNameQuery.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java M packaging/dbscripts/vds_sp.sql 4 files changed, 28 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/26533/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsStaticByNameQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsStaticByNameQuery.java index e3afe0e..6f03ba3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsStaticByNameQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsStaticByNameQuery.java @@ -10,7 +10,7 @@ @Override protected void executeQueryCommand() { - VdsStatic vds = getDbFacade().getVdsStaticDao().getByHostName(getParameters().getName()); + VdsStatic vds = getDbFacade().getVdsStaticDao().getByVdsName(getParameters().getName()); getQueryReturnValue().setReturnValue(vds); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java index d24b406..2648018 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java @@ -21,8 +21,15 @@ VdsStatic getByHostName(String hostname); /** + * Retrieves the instance for the given vds name. + * @param vdsName + * the vds name + * @return the instance + */ + VdsStatic getByVdsName(String vdsName); + + /** * Finds all instances with the given ip address. - * * @param address * the ip address * @return the list of instances diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java index 007d85b..80d74cf 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java @@ -163,4 +163,12 @@ } } + @Override + public VdsStatic getByVdsName(String vdsName) { + return getCallsHandler().executeRead("GetVdsStaticByVdsName", + VdsStaticRowMapper.instance, + getCustomMapSqlParameterSource() + .addValue("host_name", vdsName)); + } + } diff --git a/packaging/dbscripts/vds_sp.sql b/packaging/dbscripts/vds_sp.sql index c5e06e6..4781b71 100644 --- a/packaging/dbscripts/vds_sp.sql +++ b/packaging/dbscripts/vds_sp.sql @@ -554,12 +554,22 @@ BEGIN RETURN QUERY SELECT vds_static.* FROM vds_static - WHERE vds_name = v_host_name; + WHERE host_name = v_host_name; RETURN; END; $procedure$ LANGUAGE plpgsql; +Create or replace FUNCTION GetVdsStaticByVdsName(v_host_name VARCHAR(255)) RETURNS SETOF vds_static STABLE + AS $procedure$ +BEGIN +RETURN QUERY SELECT vds_static.* + FROM vds_static + WHERE vds_name = v_host_name; + + RETURN; +END; $procedure$ +LANGUAGE plpgsql; -- To view, visit http://gerrit.ovirt.org/26533 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I741dbca28732fc27bd90c9598a040f4a969e9cb0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
