Moti Asayag has uploaded a new change for review.
Change subject: engine: Rename GetNetworksByStoragePoolIdQuery
......................................................................
engine: Rename GetNetworksByStoragePoolIdQuery
The query is renamed to GetNetworksByDataCenterIdQuery.
Change-Id: Ieaa2c9e86adbbc65c1ca673923a97277c678caf3
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
R
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNetworksByDataCenterIdQuery.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.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
5 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/22443/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/GetNetworksByDataCenterIdQuery.java
similarity index 76%
rename from
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNetworksByStoragePoolIdQuery.java
rename to
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNetworksByDataCenterIdQuery.java
index ca0d09b..bd85813 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/GetNetworksByDataCenterIdQuery.java
@@ -2,9 +2,9 @@
import org.ovirt.engine.core.common.queries.IdQueryParameters;
-public class GetNetworksByStoragePoolIdQuery<P extends IdQueryParameters>
+public class GetNetworksByDataCenterIdQuery<P extends IdQueryParameters>
extends QueriesCommandBase<P> {
- public GetNetworksByStoragePoolIdQuery(P parameters) {
+ public GetNetworksByDataCenterIdQuery(P parameters) {
super(parameters);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
index 90d154d..d8f4b98 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
@@ -47,7 +47,7 @@
GetVdsFreeBondsByVdsId,
GetAllNetworks(VdcQueryAuthType.User),
GetAllNetworksByClusterId(VdcQueryAuthType.User),
- GetNetworksByStoragePoolId(VdcQueryAuthType.User),
+ GetNetworksByDataCenterId(VdcQueryAuthType.User),
GetManagementInterfaceAddressByVmId(VdcQueryAuthType.User),
// Vm Network
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 25d42f7..353bc5b 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
@@ -20,7 +20,7 @@
protected Guid dataCenterId;
public BackendDataCenterNetworksResource(String dataCenterId) {
- super(VdcQueryType.GetNetworksByStoragePoolId);
+ super(VdcQueryType.GetNetworksByDataCenterId);
this.dataCenterId = asGuid(dataCenterId);
}
@@ -49,7 +49,7 @@
}
protected
List<org.ovirt.engine.core.common.businessentities.network.Network>
getNetworks() {
- return getBackendCollection(VdcQueryType.GetNetworksByStoragePoolId,
getQueryParameters());
+ return getBackendCollection(VdcQueryType.GetNetworksByDataCenterId,
getQueryParameters());
}
@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 19f7530..1b9cd95 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
@@ -38,7 +38,7 @@
@Test
public void testGetNotFound() throws Exception {
setUriInfo(setUpBasicUriExpectations());
- setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
+ setUpEntityQueryExpectations(VdcQueryType.GetNetworksByDataCenterId,
IdQueryParameters.class,
new String[] { "Id" },
new Object[] { dataCenterId },
@@ -64,7 +64,7 @@
@Test
public void testUpdateNotFound() throws Exception {
setUriInfo(setUpBasicUriExpectations());
- setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
+ setUpEntityQueryExpectations(VdcQueryType.GetNetworksByDataCenterId,
IdQueryParameters.class,
new String[] { "Id" },
new Object[] { dataCenterId },
@@ -138,7 +138,7 @@
protected void setUpEntityQueryExpectations(int times) throws Exception {
while (times-- > 0) {
-
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
+
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByDataCenterId,
IdQueryParameters.class,
new String[] { "Id" },
new Object[] { dataCenterId },
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 b0a2abb..7852920 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
@@ -29,7 +29,7 @@
@Test
public void testRemoveNotFound() throws Exception {
- setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
+ setUpEntityQueryExpectations(VdcQueryType.GetNetworksByDataCenterId,
IdQueryParameters.class,
new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
@@ -57,7 +57,7 @@
@Test
public void testRemoveNonExistant() throws Exception{
- setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
+ setUpEntityQueryExpectations(VdcQueryType.GetNetworksByDataCenterId,
IdQueryParameters.class,
new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
@@ -110,7 +110,7 @@
true,
true,
null, //GUIDS[0],
- VdcQueryType.GetNetworksByStoragePoolId,
+ VdcQueryType.GetNetworksByDataCenterId,
IdQueryParameters.class,
new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
@@ -174,7 +174,7 @@
@Override
protected void setUpQueryExpectations(String query, Object failure) throws
Exception {
- setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
+ setUpEntityQueryExpectations(VdcQueryType.GetNetworksByDataCenterId,
IdQueryParameters.class,
new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
@@ -186,7 +186,7 @@
@Override
protected void setUpEntityQueryExpectations(int times, Object failure)
throws Exception {
while (times-- > 0) {
-
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByStoragePoolId,
+
setUpEntityQueryExpectations(VdcQueryType.GetNetworksByDataCenterId,
IdQueryParameters.class,
new String[] { "Id" },
new Object[] { DATA_CENTER_ID },
--
To view, visit http://gerrit.ovirt.org/22443
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaa2c9e86adbbc65c1ca673923a97277c678caf3
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
