Yevgeny Zaspitsky has uploaded a new change for review. Change subject: engine: Add getManagementNetworks to NetworkDao ......................................................................
engine: Add getManagementNetworks to NetworkDao Add getManagementNetworks method to NetworkDao and GetAllManagementNetworksByDataCenterId stored procedure. Change-Id: I967abeb41bfc086962cdcc3c3878e16cbaa4636b Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDao.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java M packaging/dbscripts/network_sp.sql 4 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/33252/9 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDao.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDao.java index 6e1716b..308e07b 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDao.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDao.java @@ -146,4 +146,14 @@ * @return the management {@link Network} */ Network getManagementNetwork(Guid clusterId); + + /** + * Retrieves the management networks for the given DC. + * + * @param dataCenterId + * the data center the network is belongs to + * + * @return the management {@link Network}s + */ + List<Network> getManagementNetworks(Guid dataCenterId); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java index 8941ea6..a990a77 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkDaoDbFacadeImpl.java @@ -142,6 +142,13 @@ } @Override + public List<Network> getManagementNetworks(Guid dataCenterId) { + return getCallsHandler().executeReadList("GetAllManagementNetworksByDataCenterId", + NetworkRowMapper.instance, + getCustomMapSqlParameterSource().addValue("data_center_id", dataCenterId)); + } + + @Override protected MapSqlParameterSource createIdParameterMapper(Guid id) { return getCustomMapSqlParameterSource().addValue("id", id); } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java index 76f341c..616c3be 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java @@ -27,6 +27,7 @@ private static final String EXISTING_NETWORK_NAME1 = "engine"; private static final String EXISTING_NETWORK_NAME2 = "engine3"; private static final int NUM_OF_NETWORKS = 7; + private static final int NUM_OF_MANAGEMENT_NETWORKS = 1; private static final String NETWORK_LABEL = "lbl1"; @Override @@ -99,6 +100,16 @@ } /** + * Ensures that all management networks are returned. + */ + @Test + public void testGetManagementNetworks() { + List<Network> result = dao.getManagementNetworks(datacenter); + + assertEquals(NUM_OF_MANAGEMENT_NETWORKS, result.size()); + } + + /** * Ensures that all networks are returned. */ @Test diff --git a/packaging/dbscripts/network_sp.sql b/packaging/dbscripts/network_sp.sql index 3c10734..4f3fd35 100644 --- a/packaging/dbscripts/network_sp.sql +++ b/packaging/dbscripts/network_sp.sql @@ -1039,6 +1039,20 @@ LANGUAGE plpgsql; +Create or replace FUNCTION GetAllManagementNetworksByDataCenterId(v_data_center_id UUID) +RETURNS SETOF network STABLE + AS $procedure$ +BEGIN + RETURN QUERY + SELECT network.* + FROM network + JOIN network_cluster ON network.id = network_cluster.network_id + JOIN vds_groups ON network_cluster.cluster_id = vds_groups.vds_group_id + WHERE vds_groups.storage_pool_id = v_data_center_id + AND network_cluster.management; + +END; $procedure$ +LANGUAGE plpgsql; -- To view, visit http://gerrit.ovirt.org/33252 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I967abeb41bfc086962cdcc3c3878e16cbaa4636b Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: Alona Kaplan <[email protected]> Gerrit-Reviewer: Eli Mesika <[email protected]> Gerrit-Reviewer: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
