Asaf Shakarchi has uploaded a new change for review. Change subject: webadmin: Allow attaching v2 domains for v3 pool (#856166) ......................................................................
webadmin: Allow attaching v2 domains for v3 pool (#856166) https://bugzilla.redhat.com/856166 Allow attaching v2 domains for version 3 pool. Change-Id: I58a765eb1b5d122d06111e2151325110096c1623 Signed-off-by: Asaf Shakarchi <a...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/8091/1 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 4f387da..23abb84 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 @@ -1,5 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.datacenters; +import java.util.ArrayList; + import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.action.DetachStorageDomainFromPoolParameters; import org.ovirt.engine.core.common.action.RemoveStorageDomainParameters; @@ -35,8 +37,6 @@ import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; - -import java.util.ArrayList; @SuppressWarnings("unused") public class DataCenterStorageListModel extends SearchableListModel @@ -351,14 +351,21 @@ { if (dcStorageModel.getEntity().getStoragePoolFormatType() == null) { - // compat logic: in case its not v1 and the version is less than 3.0 - continue. - if (a.getStorageStaticData().getStorageFormat() != StorageFormatType.V1 + // skip V3 format for DC ver <= 3 + if (a.getStorageStaticData().getStorageFormat() == StorageFormatType.V3 && dcStorageModel.getEntity() .getcompatibility_version() - .compareTo(Version.v3_0) <= 0) - { + .compareTo(Version.v3_0) <= 0) { continue; } + // skip V2 format for DC <= 2.2 + else if (a.getStorageStaticData().getStorageFormat() == StorageFormatType.V2 + && dcStorageModel.getEntity() + .getcompatibility_version() + .compareTo(Version.v2_2) <= 0) { + continue; + } + addToList = true; } else if (dcStorageModel.getEntity().getStoragePoolFormatType() == a.getStorageStaticData() -- To view, visit http://gerrit.ovirt.org/8091 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58a765eb1b5d122d06111e2151325110096c1623 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Asaf Shakarchi <a...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
