Moti Asayag has uploaded a new change for review.
Change subject: engine: Change GetNetworksByStoragePoolIdQuery parameter
......................................................................
engine: Change GetNetworksByStoragePoolIdQuery parameter
There is no need to use the StorageDomainAndPoolQueryParameters
as the parameters class of the query, since in this context only
the data-center id is relevant.
Change-Id: I7baad720ef06f625d26f764c0b3f81bb82ed5e40
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNetworksByStoragePoolIdQuery.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworkResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResourceTest.java
4 files changed, 32 insertions(+), 33 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/22441/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNetworksByStoragePoolIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNetworksByStoragePoolIdQuery.java
index 8ec93db..ca0d09b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNetworksByStoragePoolIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNetworksByStoragePoolIdQuery.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.bll;
-import
org.ovirt.engine.core.common.queries.StorageDomainAndPoolQueryParameters;
+import org.ovirt.engine.core.common.queries.IdQueryParameters;
-public class GetNetworksByStoragePoolIdQuery<P extends
StorageDomainAndPoolQueryParameters>
+public class GetNetworksByStoragePoolIdQuery<P extends IdQueryParameters>
extends QueriesCommandBase<P> {
public GetNetworksByStoragePoolIdQuery(P parameters) {
super(parameters);
@@ -10,10 +10,8 @@
@Override
protected void executeQueryCommand() {
- getQueryReturnValue().setReturnValue(
- getDbFacade().getNetworkDao().getAllForDataCenter(
- getParameters().getStoragePoolId(),
- getUserID(),
- getParameters().isFiltered()));
+
getQueryReturnValue().setReturnValue(getDbFacade().getNetworkDao().getAllForDataCenter(getParameters().getId(),
+ getUserID(),
+ getParameters().isFiltered()));
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResource.java
index 0d1deb9..25d42f7 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResource.java
@@ -2,14 +2,15 @@
import java.util.List;
-import javax.ws.rs.core.Response;
-import org.ovirt.engine.api.model.DataCenter;
+import javax.ws.rs.core.Response;
+
+import org.ovirt.engine.api.model.DataCenter;
import org.ovirt.engine.api.model.Network;
import org.ovirt.engine.api.model.Networks;
import org.ovirt.engine.api.resource.NetworkResource;
import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters;
-import
org.ovirt.engine.core.common.queries.StorageDomainAndPoolQueryParameters;
+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 +54,7 @@
@Override
protected VdcQueryParametersBase getQueryParameters() {
- return new StorageDomainAndPoolQueryParameters(Guid.Empty,
dataCenterId);
+ return new IdQueryParameters(dataCenterId);
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworkResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworkResourceTest.java
index b5b5ec9..19f7530 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworkResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworkResourceTest.java
@@ -1,18 +1,18 @@
package org.ovirt.engine.api.restapi.resource;
+import static
org.ovirt.engine.api.restapi.resource.AbstractBackendNetworksResourceTest.getModel;
+
import java.util.ArrayList;
+
import javax.ws.rs.WebApplicationException;
import org.junit.Test;
-
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.StorageDomainAndPoolQueryParameters;
+import org.ovirt.engine.core.common.action.VdcActionType;
+import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
-
-import static
org.ovirt.engine.api.restapi.resource.AbstractBackendNetworksResourceTest.getModel;
public class BackendDataCenterNetworkResourceTest
extends
AbstractBackendNetworkResourceTest<BackendDataCenterNetworkResource> {
@@ -39,8 +39,8 @@
public void testGetNotFound() throws Exception {
setUriInfo(setUpBasicUriExpectations());
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
- StorageDomainAndPoolQueryParameters.class,
- new String[] { "StoragePoolId" },
+ IdQueryParameters.class,
+ new String[] { "Id" },
new Object[] { dataCenterId },
new
ArrayList<org.ovirt.engine.core.common.businessentities.network.Network>());
control.replay();
@@ -65,8 +65,8 @@
public void testUpdateNotFound() throws Exception {
setUriInfo(setUpBasicUriExpectations());
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
- StorageDomainAndPoolQueryParameters.class,
- new String[] { "StoragePoolId" },
+ IdQueryParameters.class,
+ new String[] { "Id" },
new Object[] { dataCenterId },
new
ArrayList<org.ovirt.engine.core.common.businessentities.network.Network>());
control.replay();
@@ -139,8 +139,8 @@
protected void setUpEntityQueryExpectations(int times) throws Exception {
while (times-- > 0) {
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
-
StorageDomainAndPoolQueryParameters.class,
- new String[] { "StoragePoolId" },
+ IdQueryParameters.class,
+ new String[] { "Id" },
new Object[] { dataCenterId },
getEntityList());
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResourceTest.java
index 0375d3f..b0a2abb 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterNetworksResourceTest.java
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.StoragePool;
-import
org.ovirt.engine.core.common.queries.StorageDomainAndPoolQueryParameters;
+import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -30,8 +30,8 @@
@Test
public void testRemoveNotFound() throws Exception {
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
- StorageDomainAndPoolQueryParameters.class,
- new String[] { "StoragePoolId" },
+ IdQueryParameters.class,
+ new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
new
ArrayList<org.ovirt.engine.core.common.businessentities.network.Network>());
control.replay();
@@ -58,8 +58,8 @@
@Test
public void testRemoveNonExistant() throws Exception{
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
- StorageDomainAndPoolQueryParameters.class,
- new String[] { "StoragePoolId" },
+ IdQueryParameters.class,
+ new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
new
LinkedList<org.ovirt.engine.core.common.businessentities.network.Network>(),
null);
@@ -111,8 +111,8 @@
true,
null, //GUIDS[0],
VdcQueryType.GetNetworksByStoragePoolId,
- StorageDomainAndPoolQueryParameters.class,
- new String[] { "StoragePoolId" },
+ IdQueryParameters.class,
+ new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
asList(getEntity(0)));
Network model = getModel(0);
@@ -175,8 +175,8 @@
@Override
protected void setUpQueryExpectations(String query, Object failure) throws
Exception {
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
-
StorageDomainAndPoolQueryParameters.class,
- new String[] { "StoragePoolId" },
+ IdQueryParameters.class,
+ new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
getEntityList(),
failure);
@@ -187,8 +187,8 @@
protected void setUpEntityQueryExpectations(int times, Object failure)
throws Exception {
while (times-- > 0) {
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
-
StorageDomainAndPoolQueryParameters.class,
- new String[] { "StoragePoolId" },
+ IdQueryParameters.class,
+ new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
getEntityList(),
failure);
--
To view, visit http://gerrit.ovirt.org/22441
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7baad720ef06f625d26f764c0b3f81bb82ed5e40
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
