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

[derez]

Daniel Erez has uploaded a new change for review.

Change subject: webadmin: enable import data domains
......................................................................

webadmin: enable import data domains

Change-Id: I8fab33f28995a59849341541d85b6758de82a34b
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, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/28833/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 5545815..a2dfc10 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
@@ -97,6 +97,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 baa2bc3..ebb3d78 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;
@@ -34,6 +35,7 @@
         super.updateItemsAvailability();
 
         StoragePool dataCenter = getModel().getDataCenter().getSelectedItem();
+        updateAvailableItemsByDatacenter(dataCenter);
 
         for (IStorageModel item : Linq.<IStorageModel> 
cast(getModel().getItems()))
         {
@@ -74,6 +76,19 @@
         }
     }
 
+    private void updateAvailableItemsByDatacenter(StoragePool datacenter) {
+        if (datacenter == null) {
+            return;
+        }
+
+        boolean ovfStoreOnAnyDomainEnabled = (Boolean) 
AsyncDataProvider.getConfigValuePreConverted(
+                ConfigurationValues.OvfStoreOnAnyDomain, 
datacenter.getcompatibility_version().getValue());
+
+        if (ovfStoreOnAnyDomainEnabled) {
+            
getModel().getItems().addAll(AsyncDataProvider.getDataStorageModels());
+        }
+    }
+
     public void postUpdateItemsAvailability(IStorageModel item, boolean 
isNoStorageAttached)
     {
         Model model = (Model) item;
@@ -112,6 +127,10 @@
             return true;
         }
 
+        if (item.getRole() == StorageDomainType.Data && !isLocalStorage(item)) 
{
+            return true;
+        }
+
         return false;
     }
 }


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

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