Mike Kolesnik has uploaded a new change for review. Change subject: core: GetVdsWith/outNetwork use IdQueryParameters ......................................................................
core: GetVdsWith/outNetwork use IdQueryParameters No need for specific parameters class, use the generic one instead. Change-Id: Idf2d1b49773fef46d83b97a2ae0bd95d55e810d4 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQueryTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java 5 files changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/10663/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQuery.java index a52bc9a..b7f45c0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQuery.java @@ -8,14 +8,14 @@ import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -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 Host-Network Interface pairs that the given Network is attached to. */ -public class GetVdsAndNetworkInterfacesByNetworkIdQuery<P extends NetworkIdParameters> extends QueriesCommandBase<P> { +public class GetVdsAndNetworkInterfacesByNetworkIdQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { public GetVdsAndNetworkInterfacesByNetworkIdQuery(P parameters) { super(parameters); @@ -24,9 +24,9 @@ @Override protected void executeQueryCommand() { List<VDS> vdsList = getDbFacade().getVdsDao() - .getAllForNetwork(getParameters().getNetworkId()); + .getAllForNetwork(getParameters().getId()); List<VdsNetworkInterface> vdsNetworkInterfaceList = getDbFacade().getInterfaceDao() - .getVdsInterfacesByNetworkId(getParameters().getNetworkId()); + .getVdsInterfacesByNetworkId(getParameters().getId()); final Map<Guid, VDS> vdsById = Entities.businessEntitiesById(vdsList); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQuery.java index 3344cba..d0b3d87 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQuery.java @@ -1,13 +1,13 @@ package org.ovirt.engine.core.bll.network.host; import org.ovirt.engine.core.bll.QueriesCommandBase; -import org.ovirt.engine.core.common.queries.NetworkIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; /** * A query to retrieve all Hosts that the given Network is not attached to, while the Network is assigned to their * Cluster */ -public class GetVdsWithoutNetworkQuery<P extends NetworkIdParameters> extends QueriesCommandBase<P> { +public class GetVdsWithoutNetworkQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { public GetVdsWithoutNetworkQuery(P parameters) { super(parameters); } @@ -15,6 +15,6 @@ @Override protected void executeQueryCommand() { getQueryReturnValue().setReturnValue(getDbFacade().getVdsDao() - .getAllWithoutNetwork(getParameters().getNetworkId())); + .getAllWithoutNetwork(getParameters().getId())); } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java index 85947ea..5511fd5 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsAndNetworkInterfacesByNetworkIdQueryTest.java @@ -11,7 +11,7 @@ import org.ovirt.engine.core.bll.AbstractQueryTest; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -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.VdsDAO; @@ -22,8 +22,8 @@ * delegates properly to the DAO}). The internal workings of the DAO are not tested. */ public class GetVdsAndNetworkInterfacesByNetworkIdQueryTest - extends AbstractQueryTest<NetworkIdParameters, - GetVdsAndNetworkInterfacesByNetworkIdQuery<NetworkIdParameters>> { + extends AbstractQueryTest<IdQueryParameters, + GetVdsAndNetworkInterfacesByNetworkIdQuery<IdQueryParameters>> { private Guid networkId = Guid.NewGuid(); private VDS vds = new VDS(); @@ -32,7 +32,7 @@ @Test public void testExecuteQueryCommand() { // Set up the query parameters - when(params.getNetworkId()).thenReturn(networkId); + when(params.getId()).thenReturn(networkId); setupVdsDao(); setupVdsNetworkInterfaceDao(); @@ -42,7 +42,7 @@ List<PairQueryable<VdsNetworkInterface, VDS>> expected = Collections.singletonList(vdsInterfaceVdsPair); // Run the query - GetVdsAndNetworkInterfacesByNetworkIdQuery<NetworkIdParameters> query = getQuery(); + GetVdsAndNetworkInterfacesByNetworkIdQuery<IdQueryParameters> query = getQuery(); query.executeQueryCommand(); // Assert the result diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQueryTest.java index 15e1463..eab92b3 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetVdsWithoutNetworkQueryTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.ovirt.engine.core.bll.AbstractQueryTest; import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.queries.NetworkIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dao.VdsDAO; @@ -19,14 +19,14 @@ * the DAO}). The internal workings of the DAO are not tested. */ public class GetVdsWithoutNetworkQueryTest - extends AbstractQueryTest<NetworkIdParameters, - GetVdsWithoutNetworkQuery<NetworkIdParameters>> { + extends AbstractQueryTest<IdQueryParameters, + GetVdsWithoutNetworkQuery<IdQueryParameters>> { @Test public void testExecuteQueryCommand() { // Set up the query parameters Guid networkId = Guid.NewGuid(); - when(params.getNetworkId()).thenReturn(networkId); + when(params.getId()).thenReturn(networkId); // Set up the DAOs VDS vds = new VDS(); @@ -36,7 +36,7 @@ when(getDbFacadeMockInstance().getVdsDao()).thenReturn(vdsDaoMock); // Run the query - GetVdsWithoutNetworkQuery<NetworkIdParameters> query = getQuery(); + GetVdsWithoutNetworkQuery<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/NetworkHostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java index 8720a4a..a19fffe 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java @@ -8,7 +8,7 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.network.NetworkView; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -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; @@ -81,13 +81,13 @@ } }; - NetworkIdParameters networkIdParams = new NetworkIdParameters(getEntity().getId()); - networkIdParams.setRefresh(getIsQueryFirstTime()); + IdQueryParameters params = new IdQueryParameters(getEntity().getId()); + params.setRefresh(getIsQueryFirstTime()); if (NetworkHostFilter.unattached.equals(getViewFilterType())) { - Frontend.RunQuery(VdcQueryType.GetVdsWithoutNetwork, networkIdParams, asyncQuery); + Frontend.RunQuery(VdcQueryType.GetVdsWithoutNetwork, params, asyncQuery); } else if (NetworkHostFilter.attached.equals(getViewFilterType())) { - Frontend.RunQuery(VdcQueryType.GetVdsAndNetworkInterfacesByNetworkId, networkIdParams, asyncQuery); + Frontend.RunQuery(VdcQueryType.GetVdsAndNetworkInterfacesByNetworkId, params, asyncQuery); } setIsQueryFirstTime(false); -- To view, visit http://gerrit.ovirt.org/10663 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf2d1b49773fef46d83b97a2ae0bd95d55e810d4 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
