Federico Simoncelli has uploaded a new change for review.
Change subject: frontend: refactor domain version in StorageModel
......................................................................
frontend: refactor domain version in StorageModel
Change-Id: If562b12569f271bc710bfa666946abac6fcb293c
Signed-off-by: Federico Simoncelli <fsimo...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
1 file changed, 17 insertions(+), 46 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/19310/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
index d2385f1..3a830c9 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
@@ -604,56 +604,29 @@
ArrayList<StorageFormatType> formats = new
ArrayList<StorageFormatType>();
- if (dataCenter != null && getSelectedItem() != null)
- {
- if (!dataCenter.getId().equals(UnassignedDataCenterId))
- {
- getFormat().setIsChangable(false);
-
+ if (dataCenter != null && getSelectedItem() != null) {
+ if (!dataCenter.getId().equals(UnassignedDataCenterId)) {
// If data center has format defined and the selected-item
role is Data, choose it.
if (dataCenter.getStoragePoolFormatType() != null
&& getSelectedItem().getRole().isDataDomain()) {
formats.add(dataCenter.getStoragePoolFormatType());
- selectItem = dataCenter.getStoragePoolFormatType();
}
- // If selected-item role is ISO or Export, add only the 'V1'
option.
- // (*** Note that currently both ISO and Export can be only
NFS, so theoretically they are covered by
- // the next "else if..." condition; however, just in case we
will support non-NFS ISO/Export in the
- // future
- // and in order to make the code more explicit, it is here.
***)
- else if ((getSelectedItem().getRole() == StorageDomainType.ISO
- || getSelectedItem().getRole() ==
StorageDomainType.ImportExport))
- {
- formats.add(StorageFormatType.V1);
- }
- else if ((getSelectedItem().getType() == StorageType.NFS
- || getSelectedItem().getType() == StorageType.LOCALFS)
- &&
(dataCenter.getcompatibility_version().compareTo(Version.v3_1) < 0))
- {
- formats.add(StorageFormatType.V1);
- }
- else if (getSelectedItem().getType().isBlockDomain()
- &&
dataCenter.getcompatibility_version().compareTo(Version.v3_0) < 0)
- {
- formats.add(StorageFormatType.V1);
- }
- else if (getSelectedItem().getType().isBlockDomain()
- &&
dataCenter.getcompatibility_version().compareTo(Version.v3_0) == 0)
- {
- formats.add(StorageFormatType.V2);
- selectItem = StorageFormatType.V2;
- }
- else if
(dataCenter.getcompatibility_version().compareTo(Version.v3_1) >= 0)
- {
- formats.add(StorageFormatType.V3);
- selectItem = StorageFormatType.V3;
+ // If we reach here, that means that the domain is either ISO
or EXPORT
+ else {
+ if (getStorage() != null) {
+ formats.add(getStorage().getStorageFormat())
+ }
+ else {
+ formats.add(StorageFormatType.V1);
+ if (getSelectedItem().getRole() ==
StorageDomainType.ImportExport
+ &&
dataCenter.getcompatibility_version().compareTo(Version.v3_1) >= 0) {
+ formats.add(StorageFormatType.V3);
+ }
}
}
- else // Unassigned DC:
- {
+ else { // Unassigned DC:
if ((getSelectedItem().getRole() == StorageDomainType.ISO
- || getSelectedItem().getRole() ==
StorageDomainType.ImportExport))
- {
+ || getSelectedItem().getRole() ==
StorageDomainType.ImportExport)) {
// ISO/Export domains should not be available for '(none)'
DC
return;
}
@@ -663,18 +636,16 @@
formats.add(StorageFormatType.V1);
if ((getSelectedItem().getType() == StorageType.FCP ||
getSelectedItem().getType() == StorageType.ISCSI)
- && getSelectedItem().getRole() ==
StorageDomainType.Data)
- {
+ && getSelectedItem().getRole() ==
StorageDomainType.Data) {
formats.add(StorageFormatType.V2);
}
formats.add(StorageFormatType.V3);
- selectItem = StorageFormatType.V3;
}
}
getFormat().setItems(formats);
- getFormat().setSelectedItem(selectItem);
+ getFormat().setSelectedItem(formats.get(formats.size()-1));
}
private void updateItemsAvailability()
--
To view, visit http://gerrit.ovirt.org/19310
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If562b12569f271bc710bfa666946abac6fcb293c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimo...@redhat.com>
Gerrit-Reviewer: Ayal Baron <aba...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
