Federico Simoncelli has uploaded a new change for review. Change subject: [WIP] Allow to attach V1 and V2 data domains to a DC 3.1 ......................................................................
[WIP] Allow to attach V1 and V2 data domains to a DC 3.1 RHBZ: 844367 Signed-off-by: Federico Simoncelli <[email protected]> Change-Id: I2424b80ba914f3d83ec99f442970bc103232563a --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java 3 files changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/7445/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java index 88b08bb..02c034b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AttachStorageDomainToPoolCommand.java @@ -40,6 +40,7 @@ @Override protected void executeCommand() { + // WIP: here somewhere we must set the storage domain format to the dc sd format if (getStorageDomain() != null) { if (getStoragePool().getstatus() == StoragePoolStatus.Uninitialized) { StoragePoolWithStoragesParameter parameters = new StoragePoolWithStoragesParameter(getStoragePool(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java index 760850a..99cbb9b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java @@ -322,11 +322,7 @@ Set<StorageFormatType> supportedFormatsSet = getSupportedStorageFormatSet(storagePool.getcompatibility_version()); if (supportedFormatsSet.contains(storageDomain.getStorageFormat())) { - if (storagePool.getStoragePoolFormatType() == null - || storagePool.getStoragePoolFormatType() == storageDomain.getStorageFormat()) { - return true; - } - + return true; } addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_FORMAT_ILLEGAL); getReturnValue().getCanDoActionMessages().add( diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java index fe3ffe8..a353b28 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java @@ -335,7 +335,6 @@ ArrayList<storage_domains> list = (ArrayList<storage_domains>) result; ArrayList<EntityModel> models = new ArrayList<EntityModel>(); boolean addToList; - Version version3_0 = new Version(3, 0); ArrayList<storage_domains> items = dcStorageModel.getItems() != null ? new ArrayList<storage_domains>(Linq.<storage_domains> Cast(dcStorageModel.getItems())) : new ArrayList<storage_domains>(); @@ -356,7 +355,7 @@ if (a.getStorageStaticData().getStorageFormat() != StorageFormatType.V1 && dcStorageModel.getEntity() .getcompatibility_version() - .compareTo(version3_0) <= 0) + .compareTo(Version.v3_0) <= 0) { continue; } @@ -367,6 +366,16 @@ { addToList = true; } + else if (dcStorageModel.getEntity().getcompatibility_version().compareTo(Version.v3_1) >= 0) + { + // if DC is >= 3.1 we support upgrading + if (a.getStorageStaticData().getStorageFormat() == StorageFormatType.V1 + || a.getStorageStaticData().getStorageFormat() == StorageFormatType.V2) + { + addToList = true; + } + } + } else if (dcStorageModel.getStorageDomainType() == StorageDomainType.ImportExport && a.getstorage_domain_shared_status() == StorageDomainSharedStatus.Unattached) -- To view, visit http://gerrit.ovirt.org/7445 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2424b80ba914f3d83ec99f442970bc103232563a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
