Maor Lipchuk has uploaded a new change for review. Change subject: core:Force flag should be set from parameters ......................................................................
core:Force flag should be set from parameters When import VM or VM Template, we should set the force flag in the rest, and also set the parameter in the engine before calling MoveOrCopyImageGroupCommand. Change-Id: Ie3a8de587e9a9384a2cf51dc7435967d46d3d9fd Signed-off-by: Maor Lipchuk <[email protected]> Bug-Url: https://bugzilla.redhat.com/876139 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java 4 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/9224/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 8d373c9..b099766 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -556,7 +556,7 @@ p.setParentCommand(getActionType()); p.setUseCopyCollapse(getParameters().getCopyCollapse()); p.setCopyVolumeType(CopyVolumeType.LeafVol); - p.setForceOverride(true); + p.setForceOverride(getParameters().getForceOverride()); p.setSourceDomainId(getParameters().getSourceDomainId()); p.setStoragePoolId(getParameters().getStoragePoolId()); p.setImportEntity(true); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index 5b53afd..523d644 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -293,7 +293,7 @@ tempVar.setVolumeFormat(disk.getvolume_format()); tempVar.setCopyVolumeType(CopyVolumeType.SharedVol); tempVar.setSourceDomainId(getParameters().getSourceDomainId()); - tempVar.setForceOverride(true); + tempVar.setForceOverride(getParameters().getForceOverride()); tempVar.setImportEntity(true); tempVar.setEntityId(disk.getImageId()); for (DiskImage diskImage : getParameters().getVmTemplate().getDiskList()) { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java index 47a2f13..362c6e3 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java @@ -38,6 +38,7 @@ getClusterId(action), getEntity()); params.setImageToDestinationDomainMap(getDiskToDestinationMap(action)); + params.setForceOverride(action.isSetForce() ? action.isForce() : false); if (action.isSetClone()){ params.setImportAsNewEntity(action.isClone()); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java index 6a1bc11..1a8c79d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java @@ -38,6 +38,7 @@ parent.getDataCenterId(destStorageDomainId), getClusterId(action)); params.setImageToDestinationDomainMap(getDiskToDestinationMap(action)); + params.setForceOverride(action.isSetForce() ? action.isForce() : false); if (action.isSetVm() && action.getVm().isSetSnapshots() && action.getVm().getSnapshots().isSetCollapseSnapshots()) { -- To view, visit http://gerrit.ovirt.org/9224 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3a8de587e9a9384a2cf51dc7435967d46d3d9fd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
