Maor Lipchuk has uploaded a new change for review. Change subject: webadmin: Add Cinder Storage Domains as candidates for attach ......................................................................
webadmin: Add Cinder Storage Domains as candidates for attach Add Cinder Storage Domains as candidates for attach to a Data Center Change-Id: Id8972edad4161cb3186b2f6fdb11e016fe685e5a Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Maor Lipchuk <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/39178/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 ca19d5b..510299e 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 @@ -353,13 +353,15 @@ for (StorageDomain a : list) { addToList = false; - - if (!Linq.isSDItemExistInList(items, a.getId()) - && a.getStorageDomainType() == dcStorageModel.getStorageDomainType()) - { - if (dcStorageModel.getStorageDomainType() == StorageDomainType.Data - && a.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached) - { + if (Linq.isSDItemExistInList(items, a.getId()) || + a.getStorageDomainSharedStatus() != StorageDomainSharedStatus.Unattached) { + continue; + } + if (a.getStorageDomainType() == StorageDomainType.Volume) { + addToList = true; + } + else if (a.getStorageDomainType() == dcStorageModel.getStorageDomainType()) { + if (dcStorageModel.getStorageDomainType() == StorageDomainType.Data) { if (dcStorageModel.getEntity().getStoragePoolFormatType() == null) { // skip V3 format for DC ver <= 3 @@ -387,8 +389,7 @@ } } } - else if (dcStorageModel.getStorageDomainType() == StorageDomainType.ImportExport - && a.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached) + else if (dcStorageModel.getStorageDomainType() == StorageDomainType.ImportExport) { addToList = true; } -- To view, visit https://gerrit.ovirt.org/39178 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8972edad4161cb3186b2f6fdb11e016fe685e5a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
