[Engine-patches] Change in ovirt-engine[master]: webadmin: enable import data domains on storage dialog

[mlipchuk]

Hello Daniel Erez,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/29179

to review the following change.

Change subject: webadmin: enable import data domains on storage dialog
......................................................................

webadmin: enable import data domains on storage dialog

<core | restapi | tools | history | engine | userportal | webadmin>: short 
summary under 50 chars

Longer description using lines' length under 72 chars.

With multiple paragraphs if necessary.

Change-Id: Ifa34b5f09242024e330a80e1df417f4cbd0c3e1a
Bug-Url: https://bugzilla.redhat.com/??????
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java
2 files changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/29179/1

diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
index f6c2f85..a882f98 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
@@ -99,6 +99,7 @@
     MultipleGatewaysSupported,
     HostNetworkQosSupported,
     VirtIoScsiEnabled(ConfigAuthType.User),
+    OvfStoreOnAnyDomain,
     SshSoftFencingCommand,
     MemorySnapshotSupported(ConfigAuthType.User),
     MaxAverageNetworkQoSValue,
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java
index 6c00005..7410cc1 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java
@@ -5,6 +5,7 @@
 import org.ovirt.engine.core.common.businessentities.StorageDomainType;
 import org.ovirt.engine.core.common.businessentities.StoragePool;
 import org.ovirt.engine.core.common.businessentities.StoragePoolStatus;
+import org.ovirt.engine.core.common.queries.ConfigurationValues;
 import org.ovirt.engine.ui.frontend.AsyncQuery;
 import org.ovirt.engine.ui.frontend.INewAsyncCallback;
 import org.ovirt.engine.ui.uicommonweb.Linq;
@@ -33,6 +34,7 @@
         super.updateItemsAvailability();
 
         StoragePool dataCenter = getModel().getDataCenter().getSelectedItem();
+
         updateAvailabilityByDatacenter(dataCenter);
 
         for (IStorageModel item : Linq.<IStorageModel> 
cast(getModel().getItems()))
@@ -79,7 +81,22 @@
             return;
         }
 
+        boolean ovfStoreOnAnyDomainEnabled = (Boolean) 
AsyncDataProvider.getConfigValuePreConverted(
+                ConfigurationValues.OvfStoreOnAnyDomain, 
datacenter.getcompatibility_version().getValue());
+        if (ovfStoreOnAnyDomainEnabled && !isItemsContainDataDomains()) {
+            
getModel().getItems().addAll(AsyncDataProvider.getDataStorageModels());
+        }
+
         
getModel().getActivateDomain().setIsAvailable(!StorageModel.UnassignedDataCenterId.equals(datacenter.getId()));
+    }
+
+    private boolean isItemsContainDataDomains() {
+        for (IStorageModel storageModel : getModel().getItems()) {
+            if (storageModel.getRole() == StorageDomainType.Data) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public void postUpdateItemsAvailability(IStorageModel item, boolean 
isNoStorageAttached)
@@ -103,6 +120,11 @@
     }
 
     private boolean isItemSelectable(IStorageModel item, StoragePool 
dataCenter, boolean isNoStorageAttached) {
+        // Allow import of data domains
+        if (item.getRole() == StorageDomainType.Data) {
+            return true;
+        }
+
         // Local SD can be attached to a local DC only
         if (isLocalStorage(item) && !dataCenter.isLocal()) {
             return false;


-- 
To view, visit http://gerrit.ovirt.org/29179
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa34b5f09242024e330a80e1df417f4cbd0c3e1a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
Gerrit-Reviewer: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches