Mike Kolesnik has uploaded a new change for review. Change subject: core: GetVmInterfacesByVmId use IdQueryParameters ......................................................................
core: GetVmInterfacesByVmId use IdQueryParameters No need for specific parameters class, use the generic one instead. Change-Id: I21c579d9b1d08dcf39de47ef17e18bed405e7e42 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNicsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResourceTest.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/pools/PoolInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java 11 files changed, 29 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/10668/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQuery.java index 43e030f..b98dc27 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQuery.java @@ -1,9 +1,9 @@ package org.ovirt.engine.core.bll.network.vm; import org.ovirt.engine.core.bll.QueriesCommandBase; -import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; -public class GetVmInterfacesByVmIdQuery<P extends GetVmByVmIdParameters> extends QueriesCommandBase<P> { +public class GetVmInterfacesByVmIdQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { public GetVmInterfacesByVmIdQuery(P parameters) { super(parameters); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java index 1baa6d5..67deaac 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java @@ -6,13 +6,13 @@ import org.junit.Test; import org.ovirt.engine.core.bll.AbstractUserQueryTest; -import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.network.VmNetworkInterfaceDao; /** A test case for {@link GetVmInterfacesByVmIdQuery} */ -public class GetVmInterfacesByVmIdQueryTest extends AbstractUserQueryTest<GetVmByVmIdParameters, GetVmInterfacesByVmIdQuery<GetVmByVmIdParameters> > { +public class GetVmInterfacesByVmIdQueryTest extends AbstractUserQueryTest<IdQueryParameters, GetVmInterfacesByVmIdQuery<IdQueryParameters>> { /** A test that checked that all the parameters are passed properly to the DAO */ @Test @@ -24,7 +24,7 @@ Guid guid = new Guid(); - GetVmByVmIdParameters params = getQueryParameters(); + IdQueryParameters params = getQueryParameters(); when(params.getId()).thenReturn(guid); GetVmInterfacesByVmIdQuery<?> query = getQuery(); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java index 536fd47..cc4b804 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResource.java @@ -40,7 +40,7 @@ public BackendVmNicsResource(Guid parentId) { super(parentId, VdcQueryType.GetVmInterfacesByVmId, - new GetVmByVmIdParameters(parentId), + new IdQueryParameters(parentId), VdcActionType.AddVmInterface, VdcActionType.RemoveVmInterface, VdcActionType.UpdateVmInterface); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNicsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNicsResourceTest.java index da897e3..be61c9b 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNicsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendNicsResourceTest.java @@ -17,6 +17,7 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; public class BackendNicsResourceTest @@ -25,7 +26,7 @@ public BackendNicsResourceTest() { super(new BackendVmNicsResource(PARENT_ID), VdcQueryType.GetVmInterfacesByVmId, - new GetVmByVmIdParameters(PARENT_ID), + new IdQueryParameters(PARENT_ID), "Id"); } @@ -65,7 +66,7 @@ @Test public void testRemoveNonExistant() throws Exception{ setUpEntityQueryExpectations(VdcQueryType.GetVmInterfacesByVmId, - GetVmByVmIdParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, new LinkedList<VmNetworkInterface>()); @@ -122,7 +123,7 @@ true, null, VdcQueryType.GetVmInterfacesByVmId, - GetVmByVmIdParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, asList(getEntity(0))); @@ -212,7 +213,7 @@ protected void setUpEntityQueryExpectations(int times) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetVmInterfacesByVmId, - GetVmByVmIdParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, getEntityList()); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java index fc04293..6734ebf 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicResourceTest.java @@ -64,7 +64,7 @@ public void testGetNotFound() throws Exception { setUriInfo(setUpBasicUriExpectations()); setUpEntityQueryExpectations(VdcQueryType.GetVmInterfacesByVmId, - GetVmByVmIdParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, new ArrayList<VmNetworkInterface>()); @@ -131,7 +131,7 @@ public void testUpdateNotFound() throws Exception { setUriInfo(setUpBasicUriExpectations()); setUpEntityQueryExpectations(VdcQueryType.GetVmInterfacesByVmId, - GetVmByVmIdParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, new ArrayList<VmNetworkInterface>()); @@ -294,7 +294,7 @@ List<VmNetworkInterface> ifaces = new ArrayList<VmNetworkInterface>(); ifaces.add(entity); setUpEntityQueryExpectations(VdcQueryType.GetVmInterfacesByVmId, - GetVmByVmIdParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, ifaces); @@ -360,7 +360,7 @@ protected void setUpEntityQueryExpectations(int times) throws Exception { while (times-- > 0) { setUpEntityQueryExpectations(VdcQueryType.GetVmInterfacesByVmId, - GetVmByVmIdParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, getEntityList()); @@ -374,7 +374,7 @@ protected void setUpGetEntityExpectations(int times, VmNetworkInterface entity) throws Exception { while (times-- > 0) { setUpGetEntityExpectations(VdcQueryType.GetVmInterfacesByVmId, - GetVmByVmIdParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, entity); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResourceTest.java index de28349..3c2fa17 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmNicsResourceTest.java @@ -15,6 +15,7 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; public class BackendVmNicsResourceTest @@ -23,7 +24,7 @@ public BackendVmNicsResourceTest() { super(new BackendVmNicsResource(PARENT_ID), VdcQueryType.GetVmInterfacesByVmId, - new GetVmByVmIdParameters(PARENT_ID), + new IdQueryParameters(PARENT_ID), "Id"); } @@ -103,7 +104,7 @@ true, null, VdcQueryType.GetVmInterfacesByVmId, - GetVmByVmIdParameters.class, + IdQueryParameters.class, new String[] { "Id" }, new Object[] { PARENT_ID }, asList(getEntity(0))); 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 7a20eb6..5da9c5f 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 @@ -1858,7 +1858,7 @@ } }; - Frontend.RunQuery(VdcQueryType.GetVmInterfacesByVmId, new GetVmByVmIdParameters(id), aQuery); + Frontend.RunQuery(VdcQueryType.GetVmInterfacesByVmId, new IdQueryParameters(id), aQuery); } public static void GetVmDiskList(AsyncQuery aQuery, Guid id) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolInterfaceListModel.java index ee8ce20..1515a04 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolInterfaceListModel.java @@ -2,8 +2,8 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.vm_pools; -import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; import org.ovirt.engine.core.common.queries.GetVmdataByPoolIdParameters; +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.ui.frontend.AsyncQuery; @@ -42,7 +42,7 @@ } PoolInterfaceListModel poolInterfaceListModel = (PoolInterfaceListModel) model; poolInterfaceListModel.SyncSearch(VdcQueryType.GetVmInterfacesByVmId, - new GetVmByVmIdParameters(vm.getId())); + new IdQueryParameters(vm.getId())); } } }; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index 49201e7..ec0259b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -35,7 +35,7 @@ import org.ovirt.engine.core.common.businessentities.vm_pools; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllVmPoolsAttachedToUserParameters; -import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -804,7 +804,7 @@ } }; - Frontend.RunQuery(VdcQueryType.GetVmInterfacesByVmId, new GetVmByVmIdParameters(vm.getId()), _asyncQuery2); + Frontend.RunQuery(VdcQueryType.GetVmInterfacesByVmId, new IdQueryParameters(vm.getId()), _asyncQuery2); UICommand tempVar3 = new UICommand("OnRunOnce", this); //$NON-NLS-1$ tempVar3.setTitle(ConstantsManager.getInstance().getConstants().ok()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java index c9ff3ed..3e7bad2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java @@ -10,7 +10,7 @@ import org.ovirt.engine.core.common.businessentities.VmGuestAgentInterface; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.queries.ConfigurationValues; -import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.PropertyChangedEventArgs; import org.ovirt.engine.core.compat.StringHelper; @@ -127,7 +127,7 @@ public void OnSuccess(Object model, Object result) { setGuestAgentData((List<VmGuestAgentInterface>) result); - VmInterfaceListModel.super.SyncSearch(VdcQueryType.GetVmInterfacesByVmId, new GetVmByVmIdParameters(vm.getId())); + VmInterfaceListModel.super.SyncSearch(VdcQueryType.GetVmInterfacesByVmId, new IdQueryParameters(vm.getId())); } }; AsyncDataProvider.getVmGuestAgentInterfacesByVmId(getVmGuestAgentInterfacesByVmIdQuery, vm.getId()); @@ -141,7 +141,7 @@ VM vm = getEntity(); setAsyncResult(Frontend.RegisterQuery(VdcQueryType.GetVmInterfacesByVmId, - new GetVmByVmIdParameters(vm.getId()))); + new IdQueryParameters(vm.getId()))); setItems(getAsyncResult().getData()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index 9409cb8..840a602 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -50,7 +50,7 @@ import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.GetAllDisksByVmIdParameters; -import org.ovirt.engine.core.common.queries.GetVmByVmIdParameters; +import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.SearchParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; @@ -1426,7 +1426,7 @@ } }; - Frontend.RunQuery(VdcQueryType.GetVmInterfacesByVmId, new GetVmByVmIdParameters(vm.getId()), _asyncQuery); + Frontend.RunQuery(VdcQueryType.GetVmInterfacesByVmId, new IdQueryParameters(vm.getId()), _asyncQuery); } private void RunOnceUpdateDomains() -- To view, visit http://gerrit.ovirt.org/10668 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21c579d9b1d08dcf39de47ef17e18bed405e7e42 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
