Liron Ar has uploaded a new change for review.
Change subject: core: DetachDiskFromVm - redundant checks and ctor usage
......................................................................
core: DetachDiskFromVm - redundant checks and ctor usage
When executing DetachDiskFromVm command, the used parameters c'tor was
always called with true for "isPlugUnplug" property.
That means that the relevant checks within the command where always
relevant to that value only.
This patch removes the unneeded CDA check and move the callers of the
command to use the two parameters c'tor.
Change-Id: I48536a5baf4851c68f6d7053e4751d53a54f56a1
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
3 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/21208/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
index f73d42f..4141d71 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
@@ -51,16 +51,9 @@
}
}
- if (vmDevice.getIsPlugged()) {
- if (retValue && Boolean.TRUE.equals(getParameters().isPlugUnPlug())
- && getVm().getStatus() != VMStatus.Down) {
+ if (retValue && vmDevice.getIsPlugged()) {
+ if (getVm().getStatus() != VMStatus.Down) {
retValue = isInterfaceSupportedForPlugUnPlug(disk);
- }
-
- if (retValue &&
Boolean.FALSE.equals(getParameters().isPlugUnPlug())
- && getVm().getStatus() != VMStatus.Down) {
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_DOWN);
- retValue = false;
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java
index 9e3da53..d69b7a5 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java
@@ -74,7 +74,7 @@
getEntity(id); //verifies that entity exists, returns 404 otherwise.
if (action.isSetDetach() && action.isDetach()) {
return performAction(VdcActionType.DetachDiskFromVm,
- new AttachDettachVmDiskParameters(parentId,
Guid.createGuidFromStringDefaultEmpty(id), true));
+ new AttachDettachVmDiskParameters(parentId,
Guid.createGuidFromStringDefaultEmpty(id)));
} else {
return remove(id);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
index bc76f23..c7005c7 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
@@ -434,7 +434,7 @@
Disk disk = (Disk) item;
VdcActionParametersBase parameters = removeDisk ?
new RemoveDiskParameters(disk.getId()) :
- new AttachDettachVmDiskParameters(vm.getId(),
disk.getId(), true);
+ new AttachDettachVmDiskParameters(vm.getId(),
disk.getId());
paramerterList.add(parameters);
}
--
To view, visit http://gerrit.ovirt.org/21208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48536a5baf4851c68f6d7053e4751d53a54f56a1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Ar <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
