Allon Mureinik has uploaded a new change for review.
Change subject: LSM UI Workaround
......................................................................
LSM UI Workaround
Change-Id: Ieeebca6f627187a5080b9461ee67506b52e8b11c
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
4 files changed, 28 insertions(+), 24 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/8449/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
index c35df4c..7b637a0 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java
@@ -3,15 +3,15 @@
import java.util.ArrayList;
import java.util.Collections;
-import org.ovirt.engine.core.common.action.MoveOrCopyImageGroupParameters;
+import org.ovirt.engine.core.common.action.LiveMigrateDiskParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum;
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;
import org.ovirt.engine.core.common.businessentities.ImageOperation;
import org.ovirt.engine.core.common.businessentities.Quota;
+import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum;
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.compat.Guid;
@@ -287,13 +287,14 @@
sourceStorageDomainGuid,
destStorageDomainGuid,
disk,
- imageOperation);
+ imageOperation,
+ null);
}
}
StartProgress(null);
- Frontend.RunMultipleAction(VdcActionType.MoveOrCopyDisk, parameters,
+ Frontend.RunMultipleAction(VdcActionType.LiveMigrateDisk, parameters,
new IFrontendMultipleActionAsyncCallback() {
@Override
public void Executed(FrontendMultipleActionAsyncResult
result) {
@@ -309,14 +310,16 @@
Guid sourceStorageDomainGuid,
Guid destStorageDomainGuid,
DiskImage disk,
- ImageOperation imageOperation) {
- MoveOrCopyImageGroupParameters diskParameters =
- new MoveOrCopyImageGroupParameters(disk.getImageId(),
- sourceStorageDomainGuid,
- destStorageDomainGuid,
- imageOperation);
- diskParameters.setQuotaId(disk.getQuotaId());
-
+ ImageOperation imageOperation,
+ Guid vmId) {
+ // MoveOrCopyImageGroupParameters diskParameters =
+ // new MoveOrCopyImageGroupParameters(disk.getImageId(),
+ // sourceStorageDomainGuid,
+ // destStorageDomainGuid,
+ // imageOperation);
+ // diskParameters.setQuotaId(disk.getQuotaId());
+ LiveMigrateDiskParameters diskParameters =
+ new LiveMigrateDiskParameters(disk.getImageId(),
sourceStorageDomainGuid, destStorageDomainGuid, vmId);
parameters.add(diskParameters);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java
index 38d7028..e5246a5 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java
@@ -114,7 +114,8 @@
Guid.Empty,
storageDomain.getId(),
(DiskImage) diskModel.getDisk(),
- ImageOperation.Copy);
+ ImageOperation.Copy,
+ diskModel.getVmId());
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java
index 44fb550..6d8b29c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java
@@ -97,7 +97,8 @@
Guid.Empty,
selectedStorageDomain.getId(),
(DiskImage) diskModel.getDisk(),
- ImageOperation.Move);
+ ImageOperation.Move,
+ diskModel.getVmId());
}
}
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 11355ab..1732b81 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
@@ -967,17 +967,16 @@
ArrayList<Disk> disks =
getSelectedItems() != null ? Linq.<Disk>
Cast(getSelectedItems()) : new ArrayList<Disk>();
- for (Disk disk : disks)
- {
- if (disk.getDiskStorageType() == DiskStorageType.LUN ||
- ((DiskImage) disk).getimageStatus() != ImageStatus.OK ||
- (!isVmDown() && disk.getPlugged()))
- {
- return false;
- }
- }
+ for (Disk disk : disks)
+ {
+ if (disk.getDiskStorageType() == DiskStorageType.LUN ||
+ ((DiskImage) disk).getimageStatus() != ImageStatus.OK)
+ {
+ return false;
+ }
+ }
- return true;
+ return true;
}
private boolean isRemoveCommandAvailable() {
--
To view, visit http://gerrit.ovirt.org/8449
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieeebca6f627187a5080b9461ee67506b52e8b11c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
