Asaf Shakarchi has uploaded a new change for review. Change subject: webadmin: Filter Non-Operational DCs when adding new domain ......................................................................
webadmin: Filter Non-Operational DCs when adding new domain Filter Data Centers which their status is Non-Operational In the UI level when adding new storage domains. Change-Id: I8848c8bbd419b93e2e9ae1be5ebfd91baf28ed7e Bug-Url: https://bugzilla.redhat.com/841148 Signed-off-by: Asaf Shakarchi <a...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java 2 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/9678/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index 9ca9c52..1029121 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -13,6 +13,7 @@ import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType; import org.ovirt.engine.core.common.businessentities.DiskImage; +import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.common.businessentities.NetworkInterface; import org.ovirt.engine.core.common.businessentities.ServerCpu; import org.ovirt.engine.core.common.businessentities.Snapshot; @@ -28,7 +29,6 @@ import org.ovirt.engine.core.common.businessentities.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VolumeType; -import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.businessentities.vm_pools; @@ -1113,6 +1113,22 @@ } } + public final static class DataCenterNotStatusPredicate implements IPredicate<storage_pool> + { + private StoragePoolStatus status = StoragePoolStatus.values()[0]; + + public DataCenterNotStatusPredicate(StoragePoolStatus status) + { + this.status = status; + } + + @Override + public boolean Match(storage_pool source) + { + return source.getstatus() != status; + } + } + public final static class CanDoActionSucceedPredicate implements IPredicate<VdcReturnValueBase> { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java index 8f42a3f..e910ef1 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; +import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.compat.Event; import org.ovirt.engine.core.compat.EventArgs; @@ -40,7 +41,7 @@ public List<storage_pool> FilterDataCenter(List<storage_pool> source) { - return source; + return Linq.ToList(Linq.Where(source, new Linq.DataCenterNotStatusPredicate(StoragePoolStatus.NotOperational))); } public void UpdateItemsAvailability() -- To view, visit http://gerrit.ovirt.org/9678 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8848c8bbd419b93e2e9ae1be5ebfd91baf28ed7e 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
