Mike Kolesnik has uploaded a new change for review. Change subject: core: GetVdsInterfacesByVds use IdQueryParameters ......................................................................
core: GetVdsInterfacesByVds use IdQueryParameters No need for specific parameters class, use the generic one instead. Change-Id: I9fe32ea90123d1b09f793e5b248d1b64cb5d0bbb Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java 7 files changed, 33 insertions(+), 35 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/10665/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java index c59e66c..e06bd19 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterHelper.java @@ -13,7 +13,7 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkStatus; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.interfaces.SearchType; -import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.SearchParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; @@ -61,7 +61,7 @@ List<VdsNetworkInterface> interfaces = (List<VdsNetworkInterface>) Backend .getInstance() .runInternalQuery(VdcQueryType.GetVdsInterfacesByVdsId, - new GetVdsByVdsIdParameters(vds.getId())).getReturnValue(); + new IdQueryParameters(vds.getId())).getReturnValue(); VdsNetworkInterface iface = LinqUtils.firstOrNull(interfaces, new Predicate<VdsNetworkInterface>() { @Override public boolean eval(VdsNetworkInterface i) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java index 9a23a55..6e6ace3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java @@ -10,12 +10,12 @@ import org.ovirt.engine.core.common.businessentities.VdsStatic; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; -public class GetVdsInterfacesByVdsIdQuery<P extends GetVdsByVdsIdParameters> extends QueriesCommandBase<P> { +public class GetVdsInterfacesByVdsIdQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { public GetVdsInterfacesByVdsIdQuery(P parameters) { super(parameters); } @@ -23,7 +23,7 @@ @Override protected void executeQueryCommand() { final List<VdsNetworkInterface> list = getDbFacade().getInterfaceDao() - .getAllInterfacesForVds(getParameters().getVdsId(), getUserID(), getParameters().isFiltered()); + .getAllInterfacesForVds(getParameters().getId(), getUserID(), getParameters().isFiltered()); // 1. here we return all interfaces (eth0, eth1, eth2) - the first // condition @@ -46,7 +46,7 @@ List<VdsNetworkInterface> interfaces = new ArrayList<VdsNetworkInterface>(list.size()); if (!list.isEmpty()) { - VdsStatic vdsStatic = getDbFacade().getVdsStaticDao().get(getParameters().getVdsId()); + VdsStatic vdsStatic = getDbFacade().getVdsStaticDao().get(getParameters().getId()); Map<String, Network> networks = Entities.entitiesByName( getDbFacade().getNetworkDao().getAllForCluster(vdsStatic.getvds_group_id())); for (final VdsNetworkInterface i : list) { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java index 58d7c2d..6920906 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java @@ -150,7 +150,7 @@ } protected List<VdsNetworkInterface> getCollection() { - return getBackendCollection(VdcQueryType.GetVdsInterfacesByVdsId, new GetVdsByVdsIdParameters(asGuid(hostId))); + return getBackendCollection(VdcQueryType.GetVdsInterfacesByVdsId, new IdQueryParameters(asGuid(hostId))); } protected List<VdsNetworkInterface> getCollection(List<VdsNetworkInterface> collection) { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java index 912d753..ce63fd9 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java @@ -80,8 +80,8 @@ public void testGetNotFound() throws Exception { setUriInfo(setUpBasicUriExpectations()); setUpEntityQueryExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, new ArrayList<VdsNetworkInterface>()); control.replay(); @@ -198,13 +198,13 @@ model2.setNetworkName(null); model1.setVdsId(GUIDS[0]); setUpGetEntityExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, asList(model1)); setUpGetEntityExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, asList(model2)); HostNIC hostNicModel = getHostNicModel(1); @@ -310,8 +310,8 @@ int i=0; while (times-- > 0) { setUpGetEntityExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, asList(getModel(i))); i += 1; @@ -395,8 +395,8 @@ action.getNetwork().setId(NETWORK_GUID.toString()); setUriInfo(setUpBasicUriExpectations()); setUpEntityQueryExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, new ArrayList<VdsNetworkInterface>()); control.replay(); @@ -436,8 +436,8 @@ List<VdsNetworkInterface> ifaces = new ArrayList<VdsNetworkInterface>(); ifaces.add(entity); setUpEntityQueryExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, ifaces); control.replay(); @@ -460,8 +460,8 @@ protected void setUpEntityQueryExpectations() throws Exception { setUpEntityQueryExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, setUpInterfaces()); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java index 70d272c..fbcc890 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java @@ -110,8 +110,8 @@ true, null, VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, setUpInterfaces()); @@ -177,8 +177,8 @@ @Test public void testGetNotFound() throws Exception { setUpEntityQueryExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, new ArrayList<VdsNetworkInterface>()); control.replay(); @@ -208,8 +208,8 @@ @Test public void testRemoveNonExistant() throws Exception{ setUpEntityQueryExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, new LinkedList<VdsNetworkInterface>()); control.replay(); @@ -327,8 +327,8 @@ protected void setUpEntityQueryExpectations(int times, Object failure) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, setUpInterfaces()); } @@ -349,8 +349,8 @@ assert(query.equals("")); setUpEntityQueryExpectations(VdcQueryType.GetVdsInterfacesByVdsId, - GetVdsByVdsIdParameters.class, - new String[] { "VdsId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { PARENT_GUID }, setUpInterfaces(), failure); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java index c79e0fe..e879f0e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java @@ -20,7 +20,6 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.queries.ConfigurationValues; -import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -413,7 +412,7 @@ } }; - GetVdsByVdsIdParameters tempVar = new GetVdsByVdsIdParameters(getEntity().getId()); + IdQueryParameters tempVar = new IdQueryParameters(getEntity().getId()); tempVar.setRefresh(getIsQueryFirstTime()); Frontend.RunQuery(VdcQueryType.GetVdsInterfacesByVdsId, tempVar, _asyncQuery); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index 21aaed6..2204cc6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -14,7 +14,6 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -707,7 +706,7 @@ }; VDS vds = (VDS) getEntity(); - GetVdsByVdsIdParameters params = new GetVdsByVdsIdParameters(vds.getId()); + IdQueryParameters params = new IdQueryParameters(vds.getId()); params.setRefresh(false); Frontend.RunQuery(VdcQueryType.GetVdsInterfacesByVdsId, params, asyncQuery); } -- To view, visit http://gerrit.ovirt.org/10665 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fe32ea90123d1b09f793e5b248d1b64cb5d0bbb 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
