Vered Volansky has uploaded a new change for review.
Change subject: core: cleanup - Fix typo in class name
......................................................................
core: cleanup - Fix typo in class name
Changed AttachDettachVmDiskParameters to AttachDetachVmDiskParameters.
Double-t in detach is misspelled.
Change-Id: I2b91c5754da60a5faca23b692baf3894b90962de
Signed-off-by: Vered Volansky <vvola...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachDetachVmDiskParameters.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
9 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/27653/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
index c6eff29..b0b3c02 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
@@ -12,7 +12,7 @@
import org.ovirt.engine.core.bll.validator.StorageDomainValidator;
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
-import org.ovirt.engine.core.common.action.AttachDettachVmDiskParameters;
+import org.ovirt.engine.core.common.action.AttachDetachVmDiskParameters;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
import org.ovirt.engine.core.common.businessentities.Disk;
import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType;
@@ -36,7 +36,7 @@
import org.ovirt.engine.core.compat.Guid;
@LockIdNameAttribute
-public class AttachDiskToVmCommand<T extends AttachDettachVmDiskParameters>
extends AbstractDiskVmCommand<T> {
+public class AttachDiskToVmCommand<T extends AttachDetachVmDiskParameters>
extends AbstractDiskVmCommand<T> {
private List<PermissionSubject> permsList = null;
private Disk disk;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
index 59c8201..ca0914a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
@@ -4,7 +4,7 @@
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.bll.utils.VmDeviceUtils;
import org.ovirt.engine.core.common.VdcObjectType;
-import org.ovirt.engine.core.common.action.AttachDettachVmDiskParameters;
+import org.ovirt.engine.core.common.action.AttachDetachVmDiskParameters;
import org.ovirt.engine.core.common.action.CloneVmParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.Disk;
@@ -176,7 +176,7 @@
private void attachDisk(Disk disk) {
getBackend().runInternalAction(
VdcActionType.AttachDiskToVm,
- new AttachDettachVmDiskParameters(
+ new AttachDetachVmDiskParameters(
getParameters().getNewVmGuid(),
disk.getId(),
disk.getPlugged(),
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 82c8a62..abbe2f6 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
@@ -3,7 +3,7 @@
import org.ovirt.engine.core.bll.utils.VmDeviceUtils;
import org.ovirt.engine.core.bll.validator.LocalizedVmStatus;
import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.AttachDettachVmDiskParameters;
+import org.ovirt.engine.core.common.action.AttachDetachVmDiskParameters;
import org.ovirt.engine.core.common.businessentities.Disk;
import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType;
import org.ovirt.engine.core.common.businessentities.DiskImage;
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.compat.Guid;
-public class DetachDiskFromVmCommand<T extends AttachDettachVmDiskParameters>
extends AbstractDiskVmCommand<T> {
+public class DetachDiskFromVmCommand<T extends AttachDetachVmDiskParameters>
extends AbstractDiskVmCommand<T> {
private Disk disk;
private VmDevice vmDevice;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java
index 5958830..065f7fa 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java
@@ -7,7 +7,7 @@
import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.AttachDettachVmDiskParameters;
+import org.ovirt.engine.core.common.action.AttachDetachVmDiskParameters;
import org.ovirt.engine.core.common.action.ImportVmParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
@@ -70,7 +70,7 @@
private AuditLogType attemptToAttachDisksToImportedVm(Collection<Disk>
disks){
List<String> failedDisks = new LinkedList<>();
for (Disk disk : disks) {
- AttachDettachVmDiskParameters params = new
AttachDettachVmDiskParameters(getVm().getId(),
+ AttachDetachVmDiskParameters params = new
AttachDetachVmDiskParameters(getVm().getId(),
disk.getId(), disk.getPlugged(), disk.getReadOnly());
VdcReturnValueBase returnVal =
getBackend().runInternalAction(VdcActionType.AttachDiskToVm, params);
if (!returnVal.getSucceeded()) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachDettachVmDiskParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachDetachVmDiskParameters.java
similarity index 75%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachDettachVmDiskParameters.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachDetachVmDiskParameters.java
index fbbaee4..28d4d23 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachDettachVmDiskParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachDetachVmDiskParameters.java
@@ -4,20 +4,20 @@
import org.ovirt.engine.core.common.asynctasks.EntityInfo;
import org.ovirt.engine.core.compat.Guid;
-public class AttachDettachVmDiskParameters extends
VmDiskOperationParameterBase {
+public class AttachDetachVmDiskParameters extends VmDiskOperationParameterBase
{
private static final long serialVersionUID = 5640716432695539552L;
private boolean isPlugUnPlug;
private boolean isReadOnly;
- public AttachDettachVmDiskParameters() {
+ public AttachDetachVmDiskParameters() {
}
- public AttachDettachVmDiskParameters(Guid vmId, Guid diskId) {
+ public AttachDetachVmDiskParameters(Guid vmId, Guid diskId) {
this(vmId, diskId, true, false);
}
- public AttachDettachVmDiskParameters(Guid vmId, Guid diskId, boolean
isPlugUnPlug, boolean isReadOnly) {
+ public AttachDetachVmDiskParameters(Guid vmId, Guid diskId, boolean
isPlugUnPlug, boolean isReadOnly) {
super(vmId, null);
setEntityInfo(new EntityInfo(VdcObjectType.Disk, diskId));
this.isPlugUnPlug = isPlugUnPlug;
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 e446466..936d7a3 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
@@ -23,7 +23,7 @@
import org.ovirt.engine.api.restapi.resource.utils.DiskResourceUtils;
import org.ovirt.engine.api.utils.LinkHelper;
import org.ovirt.engine.core.common.action.AddDiskParameters;
-import org.ovirt.engine.core.common.action.AttachDettachVmDiskParameters;
+import org.ovirt.engine.core.common.action.AttachDetachVmDiskParameters;
import org.ovirt.engine.core.common.action.RemoveDiskParameters;
import org.ovirt.engine.core.common.action.UpdateVmDiskParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
@@ -75,7 +75,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)));
+ new AttachDetachVmDiskParameters(parentId,
Guid.createGuidFromStringDefaultEmpty(id)));
} else {
return remove(id);
}
@@ -209,7 +209,7 @@
private Response attachDiskToVm(Disk disk) {
boolean isDiskActive =
BooleanUtils.toBooleanDefaultIfNull(disk.isActive(), false);
boolean isDiskReadOnly =
BooleanUtils.toBooleanDefaultIfNull(disk.isReadOnly(), false);
- AttachDettachVmDiskParameters params = new
AttachDettachVmDiskParameters(parentId,
+ AttachDetachVmDiskParameters params = new
AttachDetachVmDiskParameters(parentId,
Guid.createGuidFromStringDefaultEmpty(disk.getId()),
isDiskActive, isDiskReadOnly);
if (disk.isSetSnapshot()) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java
index 7880abd..7cc468a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java
@@ -18,7 +18,7 @@
import org.ovirt.engine.api.resource.VmDiskResource;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.AddDiskParameters;
-import org.ovirt.engine.core.common.action.AttachDettachVmDiskParameters;
+import org.ovirt.engine.core.common.action.AttachDetachVmDiskParameters;
import org.ovirt.engine.core.common.action.RemoveDiskParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.asynctasks.EntityInfo;
@@ -131,7 +131,7 @@
new Object[] { PARENT_ID },
getEntityList());
setUpActionExpectations (VdcActionType.AttachDiskToVm,
- AttachDettachVmDiskParameters.class,
+ AttachDetachVmDiskParameters.class,
new String[] { "VmId", "EntityInfo" },
new Object[] { PARENT_ID, new EntityInfo(VdcObjectType.Disk,
DISK_ID) },
true,
@@ -157,7 +157,7 @@
new Object[] { PARENT_ID },
getEntityList());
setUpActionExpectations (VdcActionType.AttachDiskToVm,
- AttachDettachVmDiskParameters.class,
+ AttachDetachVmDiskParameters.class,
new String[] { "VmId", "EntityInfo", "SnapshotId" },
new Object[] { PARENT_ID, new EntityInfo(VdcObjectType.Disk,
DISK_ID), snapshotId },
true,
@@ -170,7 +170,7 @@
public void testDetachDisk() throws Exception {
setUpGetEntityExpectations();
setUriInfo(setUpActionExpectations(VdcActionType.DetachDiskFromVm,
- AttachDettachVmDiskParameters.class,
+ AttachDetachVmDiskParameters.class,
new String[] { "VmId", "EntityInfo"
},
new Object[] { PARENT_ID, new
EntityInfo(VdcObjectType.Disk, DISK_ID) },
true,
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java
index bd757a6..b6609b4 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import org.ovirt.engine.core.common.action.AddDiskParameters;
-import org.ovirt.engine.core.common.action.AttachDettachVmDiskParameters;
+import org.ovirt.engine.core.common.action.AttachDetachVmDiskParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.DiskImage;
@@ -90,7 +90,7 @@
DiskModel disk = disksToAttach.get(i).getEntity();
// Disk is attached to VM as read only or not, null is applicable
only for floating disks
// but this is not a case here.
- AttachDettachVmDiskParameters parameters = new
AttachDettachVmDiskParameters(
+ AttachDetachVmDiskParameters parameters = new
AttachDetachVmDiskParameters(
getVm().getId(), disk.getDisk().getId(),
getIsPlugged().getEntity(),
Boolean.TRUE.equals(disk.getDisk().getReadOnly()));
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 a823209..c3ecab7 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
@@ -7,7 +7,7 @@
import java.util.List;
import org.ovirt.engine.core.common.VdcActionUtils;
-import org.ovirt.engine.core.common.action.AttachDettachVmDiskParameters;
+import org.ovirt.engine.core.common.action.AttachDetachVmDiskParameters;
import org.ovirt.engine.core.common.action.ChangeQuotaParameters;
import org.ovirt.engine.core.common.action.GetDiskAlignmentParameters;
import org.ovirt.engine.core.common.action.HotPlugDiskToVmParameters;
@@ -426,7 +426,7 @@
Disk disk = (Disk) item;
VdcActionParametersBase parameters = removeDisk ?
new RemoveDiskParameters(disk.getId()) :
- new AttachDettachVmDiskParameters(vm.getId(),
disk.getId());
+ new AttachDetachVmDiskParameters(vm.getId(), disk.getId());
paramerterList.add(parameters);
}
--
To view, visit http://gerrit.ovirt.org/27653
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b91c5754da60a5faca23b692baf3894b90962de
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvola...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
