Muli Salem has uploaded a new change for review. Change subject: engine: Ordering Networks by Name (#855886) ......................................................................
engine: Ordering Networks by Name (#855886) This patch changes the underlying query of NetworkDAO.getAllForCluster to return a list ordered by network name, to be presented that way in the client. Change-Id: I309c66afb9785226c9cbb9d753175504fd3203fe Bug-Url: https://bugzilla.redhat.com/855886 Signed-off-by: Muli Salem <msa...@redhat.com> --- M backend/manager/dbscripts/network_sp.sql M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkDAOTest.java 2 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/9573/1 diff --git a/backend/manager/dbscripts/network_sp.sql b/backend/manager/dbscripts/network_sp.sql index 38a52ad..41277d8 100644 --- a/backend/manager/dbscripts/network_sp.sql +++ b/backend/manager/dbscripts/network_sp.sql @@ -167,13 +167,11 @@ FROM network INNER JOIN network_cluster ON network.id = network_cluster.network_id - where network_cluster.cluster_id = v_id - AND (NOT v_is_filtered OR EXISTS (SELECT 1 + WHERE network_cluster.cluster_id = v_id + AND (NOT v_is_filtered OR EXISTS (SELECT 1 FROM user_vds_groups_permissions_view - WHERE user_id = v_user_id AND entity_id = v_id)); - - - + WHERE user_id = v_user_id AND entity_id = v_id)) + ORDER BY network.name; END; $procedure$ LANGUAGE plpgsql; diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkDAOTest.java index 7e252ec..e31aa62 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkDAOTest.java @@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.List; @@ -133,6 +134,19 @@ private static void assertGetAllForClusterResult(List<Network> result) { assertNotNull(result); assertFalse(result.isEmpty()); + assertIsSorted(result); + } + + private static void assertIsSorted(List<Network> result) { + Network previous = null; + for (Network network : result) { + if (previous != null && network.getName().compareTo(previous.getName()) < 0) { + fail(String.format("List of networks is not ordered by network name, %s came before %s.", + previous.getName(), + network.getName())); + } + previous = network; + } } /** -- To view, visit http://gerrit.ovirt.org/9573 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I309c66afb9785226c9cbb9d753175504fd3203fe Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <msa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
