Mike Kolesnik has uploaded a new change for review. Change subject: core: GetVdsGroupsAndNetworksByNetworkId use IdQueryParameters ......................................................................
core: GetVdsGroupsAndNetworksByNetworkId use IdQueryParameters No need for specific parameters class, use the generic one instead. Change-Id: Iea59d41fff163229b57e55a7ecff2cad085f75e3 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQueryTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java 3 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/10660/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQuery.java index 88b0bbe..a7735af 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQuery.java @@ -10,14 +10,14 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.common.businessentities.network.NetworkClusterId; -import org.ovirt.engine.core.common.queries.NetworkIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.utils.PairQueryable; /** * A query to retrieve all VDSGroup-NetworkCluster pairs in the Storage Pool of the given Network. In case the Network * is not assigned to a VDSGroup, the VDSGroup is paired with null. */ -public class GetVdsGroupsAndNetworksByNetworkIdQuery<P extends NetworkIdParameters> extends QueriesCommandBase<P> { +public class GetVdsGroupsAndNetworksByNetworkIdQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { public GetVdsGroupsAndNetworksByNetworkIdQuery(P parameters) { super(parameters); } @@ -27,19 +27,19 @@ List<PairQueryable<VDSGroup, NetworkCluster>> networkClusterPairs = new ArrayList<PairQueryable<VDSGroup, NetworkCluster>>(); - Network network = getDbFacade().getNetworkDao().get(getParameters().getNetworkId()); + Network network = getDbFacade().getNetworkDao().get(getParameters().getId()); if (network != null && network.getDataCenterId() != null) { List<VDSGroup> vdsGroups = getDbFacade().getVdsGroupDao() .getAllForStoragePool(network.getDataCenterId().getValue()); List<NetworkCluster> networkClusters = getDbFacade().getNetworkClusterDao() - .getAllForNetwork(getParameters().getNetworkId()); + .getAllForNetwork(getParameters().getId()); final Map<NetworkClusterId, NetworkCluster> networkClustersById = Entities.businessEntitiesById(networkClusters); for (VDSGroup vdsGroup : vdsGroups) { networkClusterPairs.add(new PairQueryable<VDSGroup, NetworkCluster>(vdsGroup, - networkClustersById.get(new NetworkClusterId(vdsGroup.getId(), getParameters().getNetworkId())))); + networkClustersById.get(new NetworkClusterId(vdsGroup.getId(), getParameters().getId())))); } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQueryTest.java index 224cbaf..740d25f 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/GetVdsGroupsAndNetworksByNetworkIdQueryTest.java @@ -12,7 +12,7 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; -import org.ovirt.engine.core.common.queries.NetworkIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.utils.PairQueryable; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dao.VdsGroupDAO; @@ -24,8 +24,8 @@ * to the DAO}). The internal workings of the DAO are not tested. */ public class GetVdsGroupsAndNetworksByNetworkIdQueryTest - extends AbstractQueryTest<NetworkIdParameters, - GetVdsGroupsAndNetworksByNetworkIdQuery<NetworkIdParameters>> { + extends AbstractQueryTest<IdQueryParameters, + GetVdsGroupsAndNetworksByNetworkIdQuery<IdQueryParameters>> { private Guid networkId = Guid.NewGuid(); private Guid storagePoolId = Guid.NewGuid(); @@ -37,7 +37,7 @@ @Test public void testExecuteQueryCommand() { // Set up the query parameters - when(params.getNetworkId()).thenReturn(networkId); + when(params.getId()).thenReturn(networkId); network.setId(networkId); network.setDataCenterId(storagePoolId); @@ -54,7 +54,7 @@ List<PairQueryable<VDSGroup, NetworkCluster>> expected = Collections.singletonList(networkClusterPair); // Run the query - GetVdsGroupsAndNetworksByNetworkIdQuery<NetworkIdParameters> query = getQuery(); + GetVdsGroupsAndNetworksByNetworkIdQuery<IdQueryParameters> query = getQuery(); query.executeQueryCommand(); // Assert the result diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java index 9a33406..3959607 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java @@ -12,7 +12,7 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.common.businessentities.network.NetworkView; -import org.ovirt.engine.core.common.queries.NetworkIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.common.utils.PairQueryable; @@ -231,9 +231,9 @@ } }; - NetworkIdParameters networkIdParams = new NetworkIdParameters(getEntity().getId()); - networkIdParams.setRefresh(getIsQueryFirstTime()); - Frontend.RunQuery(VdcQueryType.GetVdsGroupsAndNetworksByNetworkId, networkIdParams, asyncQuery); + IdQueryParameters params = new IdQueryParameters(getEntity().getId()); + params.setRefresh(getIsQueryFirstTime()); + Frontend.RunQuery(VdcQueryType.GetVdsGroupsAndNetworksByNetworkId, params, asyncQuery); } @Override -- To view, visit http://gerrit.ovirt.org/10660 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea59d41fff163229b57e55a7ecff2cad085f75e3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
