Daniel Erez has uploaded a new change for review. Change subject: webadmin: move new disk logic to NewDiskModel ......................................................................
webadmin: move new disk logic to NewDiskModel Move logic relevant only for new disk from AbstractDiskModel to NewDiskModel. Change-Id: If6bd49b1c513eb06d33a765738d5fd2587a88b13 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java 2 files changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/13874/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java index 73fa59b..5e17d8a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java @@ -8,7 +8,6 @@ import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DiskInterface; -import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.core.common.businessentities.LunDisk; import org.ovirt.engine.core.common.businessentities.PropagateErrors; import org.ovirt.engine.core.common.businessentities.Quota; @@ -680,18 +679,10 @@ if (getQuota().getIsAvailable() && getQuota().getSelectedItem() != null) { diskImage.setQuotaId(((Quota) getQuota().getSelectedItem()).getId()); } - diskImage.setSizeInGigabytes(Integer.parseInt(getSize().getEntity().toString())); - diskImage.setVolumeType((VolumeType) getVolumeType().getSelectedItem()); - diskImage.setvolumeFormat(getVolumeFormat()); - setDisk(diskImage); } else { LunDisk lunDisk = getLunDisk(); - LUNs luns = (LUNs) getSanStorageModel().getAddedLuns().get(0).getEntity(); - luns.setLunType((StorageType) getStorageType().getSelectedItem()); - lunDisk.setLun(luns); - setDisk(lunDisk); } 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 6592559..9ba0a81 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 @@ -8,10 +8,12 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DiskInterface; +import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.core.common.businessentities.LunDisk; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.StorageDomain; +import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.ui.frontend.AsyncQuery; @@ -157,6 +159,25 @@ } super.onSave(); + + boolean isInternal = (Boolean) getIsInternal().getEntity(); + if (isInternal) { + DiskImage diskImage = (DiskImage) getDisk(); + diskImage.setSizeInGigabytes(Integer.parseInt(getSize().getEntity().toString())); + diskImage.setVolumeType((VolumeType) getVolumeType().getSelectedItem()); + diskImage.setvolumeFormat(getVolumeFormat()); + + setDisk(diskImage); + } + else { + LunDisk lunDisk = (LunDisk) getDisk(); + LUNs luns = (LUNs) getSanStorageModel().getAddedLuns().get(0).getEntity(); + luns.setLunType((StorageType) getStorageType().getSelectedItem()); + lunDisk.setLun(luns); + + setDisk(lunDisk); + } + StartProgress(null); AddDiskParameters parameters = new AddDiskParameters(getVmId(), getDisk()); -- To view, visit http://gerrit.ovirt.org/13874 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6bd49b1c513eb06d33a765738d5fd2587a88b13 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
