Liron Ar has uploaded a new change for review. Change subject: tmp ......................................................................
tmp Change-Id: If9d525a64ed2602f6792b3b3fbed5e91e0823804 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SnapshotMapper.java 3 files changed, 26 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/17570/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResource.java index 4f5ef11..26ef4d9 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResource.java @@ -1,11 +1,11 @@ package org.ovirt.engine.api.restapi.resource; +import static org.ovirt.engine.api.restapi.resource.BackendSnapshotsResource.SUB_COLLECTIONS; + import javax.ws.rs.core.Response; import org.ovirt.engine.api.model.Action; -import org.ovirt.engine.api.model.Configuration; import org.ovirt.engine.api.model.ConfigurationType; -import org.ovirt.engine.api.model.Initialization; import org.ovirt.engine.api.model.Snapshot; import org.ovirt.engine.api.resource.ActionResource; import org.ovirt.engine.api.resource.CreationResource; @@ -13,6 +13,7 @@ import org.ovirt.engine.api.resource.SnapshotDisksResource; import org.ovirt.engine.api.resource.SnapshotNicsResource; import org.ovirt.engine.api.resource.SnapshotResource; +import org.ovirt.engine.api.restapi.types.SnapshotMapper; import org.ovirt.engine.core.common.action.RestoreAllSnapshotsParameters; import org.ovirt.engine.core.common.action.TryBackToAllSnapshotsOfVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -20,8 +21,6 @@ import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; - -import static org.ovirt.engine.api.restapi.resource.BackendSnapshotsResource.SUB_COLLECTIONS; public class BackendSnapshotResource extends AbstractBackendActionableResource<Snapshot, org.ovirt.engine.core.common.businessentities.Snapshot> implements SnapshotResource { @@ -148,11 +147,9 @@ VdcQueryReturnValue queryReturnValue = runQuery(VdcQueryType.GetVmOvfConfigurationBySnapshot, new IdQueryParameters(guid)); + if (queryReturnValue.getSucceeded() && queryReturnValue.getReturnValue() != null) { - model.setInitialization(new Initialization()); - model.getInitialization().setConfiguration(new Configuration()); - model.getInitialization().getConfiguration().setData((String)queryReturnValue.getReturnValue()); - model.getInitialization().getConfiguration().setType(ConfigurationType.OVF.name()); + return SnapshotMapper.initSnapshotConfiguration((String)queryReturnValue.getReturnValue(), ConfigurationType.OVF, model); } return model; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResourceTest.java index 797b288..a547a9e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResourceTest.java @@ -12,6 +12,7 @@ import org.junit.Before; import org.junit.Test; import org.ovirt.engine.api.model.Action; +import org.ovirt.engine.api.model.ConfigurationType; import org.ovirt.engine.api.model.CreationStatus; import org.ovirt.engine.api.model.Snapshot; import org.ovirt.engine.core.common.action.RestoreAllSnapshotsParameters; @@ -59,16 +60,21 @@ public void testGetWithPopulate() throws Exception { List<String> populates = new ArrayList<String>(); populates.add("true"); + String ovfData = "data"; expect(httpHeaders.getRequestHeader(BackendResource.POPULATE)).andReturn(populates).anyTimes(); setUriInfo(setUpBasicUriExpectations()); setUpGetEntityExpectations(asList(getEntity(1))); setUpEntityQueryExpectations(VdcQueryType.GetVmOvfConfigurationBySnapshot, IdQueryParameters.class, - new String[] { "Id" }, - new Object[] { SNAPSHOT_ID }, - new String()); + new String[]{"Id"}, + new Object[]{SNAPSHOT_ID}, + ovfData); control.replay(); - verifyModel(resource.get(), 1); + Snapshot snapshot = resource.get(); + verifyModel(snapshot, 1); + assertNotNull(snapshot.getInitialization()); + assertEquals(ovfData, snapshot.getInitialization().getConfiguration().getData()); + assertEquals(ConfigurationType.OVF.value(), snapshot.getInitialization().getConfiguration().getType()); } @Test diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SnapshotMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SnapshotMapper.java index a890b2b..1231c0b 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SnapshotMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SnapshotMapper.java @@ -1,5 +1,8 @@ package org.ovirt.engine.api.restapi.types; +import org.ovirt.engine.api.model.Configuration; +import org.ovirt.engine.api.model.ConfigurationType; +import org.ovirt.engine.api.model.Initialization; import org.ovirt.engine.api.model.Snapshot; import org.ovirt.engine.api.model.SnapshotStatus; import org.ovirt.engine.api.model.SnapshotType; @@ -62,4 +65,12 @@ VmMapper.map(entity, template); return template; } + + public static Snapshot initSnapshotConfiguration(String configuration, ConfigurationType type, Snapshot snapshot) { + snapshot.setInitialization(new Initialization()); + snapshot.getInitialization().setConfiguration(new Configuration()); + snapshot.getInitialization().getConfiguration().setData(configuration); + snapshot.getInitialization().getConfiguration().setType(type.value()); + return snapshot; + } } -- To view, visit http://gerrit.ovirt.org/17570 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9d525a64ed2602f6792b3b3fbed5e91e0823804 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
