Mike Kolesnik has uploaded a new change for review. Change subject: core: GetAllNetworksQuery use IdQueryParameters ......................................................................
core: GetAllNetworksQuery use IdQueryParameters No need for specific parameters class, use the generic one instead. Change-Id: I368a52d2b36f3e6308ca55281633753a68e31c0c Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetAllNetworksQuery.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllNetworkQueryParamenters.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.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/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.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 backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworkResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java 13 files changed, 39 insertions(+), 65 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/10661/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetAllNetworksQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetAllNetworksQuery.java index b9fc119..94b2597 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetAllNetworksQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetAllNetworksQuery.java @@ -1,22 +1,22 @@ package org.ovirt.engine.core.bll.network.dc; import org.ovirt.engine.core.bll.QueriesCommandBase; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.compat.Guid; -public class GetAllNetworksQuery<P extends GetAllNetworkQueryParamenters> extends QueriesCommandBase<P> { +public class GetAllNetworksQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { public GetAllNetworksQuery(P parameters) { super(parameters); } @Override protected void executeQueryCommand() { - if (getParameters().getStoragePoolId() == null - || getParameters().getStoragePoolId().equals(Guid.Empty)) { + if (getParameters().getId() == null + || getParameters().getId().equals(Guid.Empty)) { getQueryReturnValue().setReturnValue(getDbFacade().getNetworkDao().getAll(getUserID(), getParameters().isFiltered())); } else { getQueryReturnValue().setReturnValue( - getDbFacade().getNetworkDao().getAllForDataCenter(getParameters().getStoragePoolId(), + getDbFacade().getNetworkDao().getAllForDataCenter(getParameters().getId(), getUserID(), getParameters().isFiltered())); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllNetworkQueryParamenters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllNetworkQueryParamenters.java deleted file mode 100644 index 33ed7a2..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllNetworkQueryParamenters.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ovirt.engine.core.common.queries; - -import org.ovirt.engine.core.compat.*; - -public class GetAllNetworkQueryParamenters extends VdcQueryParametersBase { - private static final long serialVersionUID = 272929658978296731L; - - public GetAllNetworkQueryParamenters(Guid storagePoolId) { - _storagePoolId = storagePoolId; - } - - private Guid _storagePoolId = new Guid(); - - public Guid getStoragePoolId() { - return _storagePoolId; - } - - public GetAllNetworkQueryParamenters() { - } -} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java index 5340419..404d969 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java @@ -12,7 +12,6 @@ import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VDSGroup; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; import org.ovirt.engine.core.common.queries.GetVdsGroupByIdParameters; import org.ovirt.engine.core.common.queries.GetVdsGroupByVdsGroupIdParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; @@ -82,7 +81,7 @@ private String getNetworkId(String networkName, String clusterId) { NGuid dataCenterId = getEntity(VDSGroup.class, VdcQueryType.GetVdsGroupById, new GetVdsGroupByIdParameters(asGuid(clusterId)), null).getStoragePoolId(); - GetAllNetworkQueryParamenters params = new GetAllNetworkQueryParamenters(asGuid(dataCenterId)); + IdQueryParameters params = new IdQueryParameters(asGuid(dataCenterId)); List<org.ovirt.engine.core.common.businessentities.network.Network> networks = getBackendCollection(VdcQueryType.GetAllNetworks, params); for (org.ovirt.engine.core.common.businessentities.network.Network nw: networks) { if (nw.getName().equals(networkName)) { 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 35f319a..58d7c2d 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 @@ -32,7 +32,6 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -256,7 +255,7 @@ for (org.ovirt.engine.core.common.businessentities.network.Network entity : getBackendCollection(org.ovirt.engine.core.common.businessentities.network.Network.class, VdcQueryType.GetAllNetworks, - new GetAllNetworkQueryParamenters(Guid.Empty))) { + new IdQueryParameters(Guid.Empty))) { if ((id != null && id.equals(entity.getId().toString())) || (name != null && name.equals(entity.getName()))) { return entity; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java index 6459394..3198589 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java @@ -11,7 +11,7 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.interfaces.SearchType; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; @@ -53,7 +53,7 @@ @Override protected VdcQueryParametersBase getQueryParameters() { - return new GetAllNetworkQueryParamenters(Guid.Empty); + return new IdQueryParameters(Guid.Empty); } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java index bb71ccf..06d38a0 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java @@ -12,7 +12,6 @@ import org.ovirt.engine.core.common.action.AttachNetworkToVdsGroupParameter; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VDSGroup; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; import org.ovirt.engine.core.common.queries.GetVdsGroupByIdParameters; import org.ovirt.engine.core.common.queries.GetVdsGroupByVdsGroupIdParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; @@ -202,8 +201,8 @@ protected void setUpGetNetworksByDataCenterExpectations(int times, Object failure) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { GUIDS[2] }, getEntityList(), failure); 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 3eb3d2d..912d753 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 @@ -30,7 +30,6 @@ import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkStatistics; import org.ovirt.engine.core.common.queries.GetAllChildVlanInterfacesQueryParameters; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -366,8 +365,8 @@ } setUpEntityQueryExpectations(VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, asList(getNetwork())); 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 33dc994..70d272c 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 @@ -32,7 +32,6 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkStatistics; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; import org.ovirt.engine.core.common.queries.GetVdsByVdsIdParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -338,8 +337,8 @@ protected void setUpNetworkQueryExpectations(int times) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, asList(getNetwork())); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworkResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworkResourceTest.java index 27c901f..fbe8ba9 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworkResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworkResourceTest.java @@ -8,7 +8,7 @@ import org.ovirt.engine.api.model.Network; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; @@ -36,8 +36,8 @@ public void testGetNotFound() throws Exception { setUriInfo(setUpBasicUriExpectations()); setUpEntityQueryExpectations(VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, new ArrayList<org.ovirt.engine.core.common.businessentities.network.Network>()); control.replay(); @@ -62,8 +62,8 @@ public void testUpdateNotFound() throws Exception { setUriInfo(setUpBasicUriExpectations()); setUpEntityQueryExpectations(VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, new ArrayList<org.ovirt.engine.core.common.businessentities.network.Network>()); control.replay(); @@ -136,8 +136,8 @@ protected void setUpEntityQueryExpectations(int times) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, getEntityList()); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResourceTest.java index e279c75..73bc896 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResourceTest.java @@ -17,7 +17,7 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.interfaces.SearchType; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; @@ -33,8 +33,8 @@ @Test public void testRemoveNotFound() throws Exception { setUpEntityQueryExpectations(VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, new ArrayList<org.ovirt.engine.core.common.businessentities.network.Network>()); control.replay(); @@ -61,8 +61,8 @@ @Test public void testRemoveNonExistant() throws Exception{ setUpEntityQueryExpectations(VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, new LinkedList<org.ovirt.engine.core.common.businessentities.network.Network>(), null); @@ -114,8 +114,8 @@ true, null, //GUIDS[0], VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, asList(getEntity(0))); Network model = getModel(0); @@ -143,8 +143,8 @@ true, null, //GUIDS[0], VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, asList(getEntity(0))); Network model = getModel(0); @@ -215,8 +215,8 @@ protected void setUpEntityQueryExpectations(int times, Object failure) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetAllNetworks, - GetAllNetworkQueryParamenters.class, - new String[] { "StoragePoolId" }, + IdQueryParameters.class, + new String[] { "Id" }, new Object[] { Guid.Empty }, getEntityList(), failure); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 707fda4..7a20eb6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -60,7 +60,6 @@ import org.ovirt.engine.core.common.queries.GetAllDisksByVmIdParameters; import org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters; import org.ovirt.engine.core.common.queries.GetAllImagesListByStoragePoolIdParameters; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; import org.ovirt.engine.core.common.queries.GetAllServerCpuListParameters; import org.ovirt.engine.core.common.queries.GetAllVdsByStoragePoolParameters; import org.ovirt.engine.core.common.queries.GetAvailableClusterVersionsByStoragePoolParameters; @@ -1429,7 +1428,7 @@ } }; - Frontend.RunQuery(VdcQueryType.GetAllNetworks, new GetAllNetworkQueryParamenters(dataCenterId), aQuery); + Frontend.RunQuery(VdcQueryType.GetAllNetworks, new IdQueryParameters(dataCenterId), aQuery); } public static void GetISOStorageDomainList(AsyncQuery aQuery) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java index 85995df..0d82d83 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java @@ -13,7 +13,7 @@ import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.mode.ApplicationMode; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.StoragePoolQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; @@ -277,7 +277,7 @@ for (storage_pool dataCenter : systemTreeModel.getDataCenters()) { queryTypeList.add(VdcQueryType.GetAllNetworks); - queryParamList.add(new GetAllNetworkQueryParamenters(dataCenter.getId())); + queryParamList.add(new IdQueryParameters(dataCenter.getId())); } Frontend.RunMultipleQueries(queryTypeList, queryParamList, new IFrontendMultipleQueryAsyncCallback() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java index e167c11..b3f9c1f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java @@ -7,7 +7,7 @@ import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.queries.ConfigurationValues; -import org.ovirt.engine.core.common.queries.GetAllNetworkQueryParamenters; +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.compat.StringHelper; @@ -125,7 +125,7 @@ } }; - GetAllNetworkQueryParamenters tempVar = new GetAllNetworkQueryParamenters(getEntity().getId()); + IdQueryParameters tempVar = new IdQueryParameters(getEntity().getId()); tempVar.setRefresh(getIsQueryFirstTime()); Frontend.RunQuery(VdcQueryType.GetAllNetworks, tempVar, _asyncQuery); } @@ -136,7 +136,7 @@ super.AsyncSearch(); setAsyncResult(Frontend.RegisterQuery(VdcQueryType.GetAllNetworks, - new GetAllNetworkQueryParamenters(getEntity().getId()))); + new IdQueryParameters(getEntity().getId()))); setItems(getAsyncResult().getData()); } -- To view, visit http://gerrit.ovirt.org/10661 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I368a52d2b36f3e6308ca55281633753a68e31c0c 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
