Yevgeny Zaspitsky has uploaded a new change for review.
Change subject: restapi: update REST API code to pass the new parameter class
......................................................................
restapi: update REST API code to pass the new parameter class
update REST API code to pass AddVdsGroupOperationParameters class.
Change-Id: Ifd281bc6d480315b75746d3e34c2c407fee4ee2b
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
4 files changed, 13 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/33415/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
index 3e5950c..061a02a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
@@ -10,8 +10,8 @@
import org.ovirt.engine.api.model.Clusters;
import org.ovirt.engine.api.resource.ClusterResource;
import org.ovirt.engine.api.resource.ClustersResource;
+import org.ovirt.engine.core.common.action.AddVdsGroupOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.action.VdsGroupOperationParameters;
import org.ovirt.engine.core.common.action.VdsGroupParametersBase;
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
@@ -77,7 +77,7 @@
StoragePool pool = getStoragePool(cluster.getDataCenter(), this);
VDSGroup entity = map(cluster, map(pool));
return performCreate(VdcActionType.AddVdsGroup,
- new VdsGroupOperationParameters(entity),
+ new AddVdsGroupOperationParameters(entity),
new QueryIdResolver<Guid>(VdcQueryType.GetVdsGroupById,
IdQueryParameters.class));
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResource.java
index 10efe1a..607db70 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResource.java
@@ -10,8 +10,8 @@
import org.ovirt.engine.api.model.Clusters;
import org.ovirt.engine.api.model.DataCenter;
import org.ovirt.engine.api.resource.ClusterResource;
+import org.ovirt.engine.core.common.action.AddVdsGroupOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.action.VdsGroupOperationParameters;
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
@@ -52,7 +52,7 @@
StoragePool pool = getStoragePool(cluster.getDataCenter(), this);
VDSGroup entity = map(cluster, map(pool));
return performCreate(VdcActionType.AddVdsGroup,
- new VdsGroupOperationParameters(entity),
+ new AddVdsGroupOperationParameters(entity),
new QueryIdResolver<Guid>(VdcQueryType.GetVdsGroupById,
IdQueryParameters.class));
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
index a90e78a..737223c 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClustersResourceTest.java
@@ -12,8 +12,8 @@
import org.ovirt.engine.api.model.Cluster;
import org.ovirt.engine.api.model.DataCenter;
import org.ovirt.engine.api.model.Version;
+import org.ovirt.engine.core.common.action.AddVdsGroupOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.action.VdsGroupOperationParameters;
import org.ovirt.engine.core.common.action.VdsGroupParametersBase;
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
@@ -104,7 +104,7 @@
setUpStoragePool(-1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- VdsGroupOperationParameters.class,
+ AddVdsGroupOperationParameters.class,
new String[] {
"VdsGroup.compatibility_version" },
new Object[] { new
org.ovirt.engine.core.compat.Version(2, 2) },
true,
@@ -135,7 +135,7 @@
setUpStoragePool(-1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- VdsGroupOperationParameters.class,
+ AddVdsGroupOperationParameters.class,
new String[] {
"VdsGroup.compatibility_version" },
new Object[] { new
org.ovirt.engine.core.compat.Version(2, 3) },
true,
@@ -178,7 +178,7 @@
setUpStoragePool(-1));
setUriInfo(setUpActionExpectations(VdcActionType.AddVdsGroup,
- VdsGroupOperationParameters.class,
+
AddVdsGroupOperationParameters.class,
new String[] {},
new Object[] {},
canDo,
@@ -205,7 +205,7 @@
setUpStoragePool(1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- VdsGroupOperationParameters.class,
+ AddVdsGroupOperationParameters.class,
new String[] {},
new Object[] {},
true,
@@ -245,7 +245,7 @@
setUpStoragePool(1));
setUriInfo(setUpActionExpectations(VdcActionType.AddVdsGroup,
- VdsGroupOperationParameters.class,
+
AddVdsGroupOperationParameters.class,
new String[] {},
new Object[] {},
canDo,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
index b5212a0..742b0de 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClustersResourceTest.java
@@ -13,6 +13,7 @@
import org.ovirt.engine.api.model.Cluster;
import org.ovirt.engine.api.model.DataCenter;
import org.ovirt.engine.api.model.Version;
+import org.ovirt.engine.core.common.action.AddVdsGroupOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdsGroupOperationParameters;
import org.ovirt.engine.core.common.action.VdsGroupParametersBase;
@@ -113,7 +114,7 @@
setUpStoragePool(-1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- VdsGroupOperationParameters.class,
+ AddVdsGroupOperationParameters.class,
new String[] {
"VdsGroup.compatibility_version" },
new Object[] { new
org.ovirt.engine.core.compat.Version(2, 2) },
true,
@@ -144,7 +145,7 @@
setUpStoragePool(-1));
setUpCreationExpectations(VdcActionType.AddVdsGroup,
- VdsGroupOperationParameters.class,
+ AddVdsGroupOperationParameters.class,
new String[] {
"VdsGroup.compatibility_version" },
new Object[] { new
org.ovirt.engine.core.compat.Version(2, 3) },
true,
--
To view, visit http://gerrit.ovirt.org/33415
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd281bc6d480315b75746d3e34c2c407fee4ee2b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
