Mike Kolesnik has uploaded a new change for review. Change subject: core: GetVmTemplatesAndNetworkInterfaces use IdQueryParameters ......................................................................
core: GetVmTemplatesAndNetworkInterfaces use IdQueryParameters No need for specific parameters class, use the generic one instead. Change-Id: I738bdb7a0fab3559c74a58d9acf6188df9682c3b Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQueryTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java 3 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/10667/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery.java index ac44243..9c3c029 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery.java @@ -8,14 +8,14 @@ import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; -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; /** * A query to retrieve all VmTemplate-Network Interface pairs that the given Network is attached to. */ -public class GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery<P extends NetworkIdParameters> extends QueriesCommandBase<P> { +public class GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { public GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery(P parameters) { super(parameters); } @@ -23,9 +23,9 @@ @Override protected void executeQueryCommand() { List<VmTemplate> vmTemplateList = getDbFacade().getVmTemplateDao() - .getAllForNetwork(getParameters().getNetworkId()); + .getAllForNetwork(getParameters().getId()); List<VmNetworkInterface> vmNetworkInterfaceList = getDbFacade().getVmNetworkInterfaceDao() - .getAllForTemplatesByNetwork(getParameters().getNetworkId()); + .getAllForTemplatesByNetwork(getParameters().getId()); final Map<Guid, VmTemplate> vmTemplatesById = Entities.businessEntitiesById(vmTemplateList); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQueryTest.java index f99b2aa..d9f5804 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetVmTemplatesAndNetworkInterfacesByNetworkIdQueryTest.java @@ -11,7 +11,7 @@ import org.ovirt.engine.core.bll.AbstractQueryTest; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; -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.VmTemplateDAO; @@ -22,8 +22,8 @@ * delegates properly to the DAO}). The internal workings of the DAO are not tested. */ public class GetVmTemplatesAndNetworkInterfacesByNetworkIdQueryTest -extends AbstractQueryTest<NetworkIdParameters, -GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery<NetworkIdParameters>> { + extends AbstractQueryTest<IdQueryParameters, + GetVmTemplatesAndNetworkInterfacesByNetworkIdQuery<IdQueryParameters>> { private Guid networkId = Guid.NewGuid(); private Guid vmTemplateId = Guid.NewGuid(); @@ -33,7 +33,7 @@ @Test public void testExecuteQueryCommand() { // Setup the query parameters - when(params.getNetworkId()).thenReturn(networkId); + when(params.getId()).thenReturn(networkId); vmTemplate.setId(vmTemplateId); vmNetworkInterface.setVmTemplateId(vmTemplateId); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java index 10fae5b..d38dbfb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java @@ -8,7 +8,7 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.network.NetworkView; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; -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; @@ -122,10 +122,10 @@ } }; - NetworkIdParameters networkIdParams = new NetworkIdParameters(getEntity().getId()); - networkIdParams.setRefresh(getIsQueryFirstTime()); + IdQueryParameters params = new IdQueryParameters(getEntity().getId()); + params.setRefresh(getIsQueryFirstTime()); - Frontend.RunQuery(VdcQueryType.GetVmTemplatesAndNetworkInterfacesByNetworkId, networkIdParams, asyncQuery); + Frontend.RunQuery(VdcQueryType.GetVmTemplatesAndNetworkInterfacesByNetworkId, params, asyncQuery); } @Override -- To view, visit http://gerrit.ovirt.org/10667 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I738bdb7a0fab3559c74a58d9acf6188df9682c3b 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
