[Engine-patches] Change in ovirt-engine[master]: webadmin: show only the relevant networks in new/edit cluste...

[yzaspits]

Yevgeny Zaspitsky has uploaded a new change for review.

Change subject: webadmin: show only the relevant networks in new/edit cluster 
dialog
......................................................................

webadmin: show only the relevant networks in new/edit cluster dialog

Show potentialy valid management networks in new/edit cluster dialog.

Change-Id: Ifdc7353b5b908a6acdcb3f4b5ae38102d5645bb6
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/IscsiBondModel.java
3 files changed, 18 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/38043/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index e589089..080ac88 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -2611,15 +2611,15 @@
     }
 
     public void getAllDataCenterNetworks(AsyncQuery aQuery, Guid 
storagePoolId) {
-        aQuery.converterCallback = new IAsyncConverter() {
-            @Override
-            public Object Convert(Object source, AsyncQuery _asyncQuery)
-            {
-                return source != null ? (ArrayList<Network>) source : new 
ArrayList<Network>();
-            }
-        };
+        aQuery.converterCallback = new ListAsyncConverter();
         IdQueryParameters params = new IdQueryParameters(storagePoolId);
         
Frontend.getInstance().runQuery(VdcQueryType.GetNetworksByDataCenterId, params, 
aQuery);
+    }
+
+    public void getManagementNetworkCandidates(AsyncQuery aQuery, Guid 
storagePoolId) {
+        aQuery.converterCallback = new ListAsyncConverter();
+        IdQueryParameters params = new IdQueryParameters(storagePoolId);
+        
Frontend.getInstance().runQuery(VdcQueryType.GetManagementNetworkCandidates, 
params, aQuery);
     }
 
     public void getStorageConnectionsByDataCenterIdAndStorageType(AsyncQuery 
aQuery,
@@ -3975,4 +3975,11 @@
             return source;
         }
     }
+
+    private static class ListAsyncConverter implements IAsyncConverter {
+        @Override
+        public Object Convert(Object source, AsyncQuery _asyncQuery) {
+            return source != null ? source : new ArrayList();
+        }
+    }
 }
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
index cd9c760..7aa5039 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
@@ -1423,7 +1423,7 @@
                 }
             }
         });
-        
AsyncDataProvider.getInstance().getAllDataCenterNetworks(getAllDataCenterNetworksQuery,
 dataCenterId);
+        
AsyncDataProvider.getInstance().getManagementNetworkCandidates(getAllDataCenterNetworksQuery,
 dataCenterId);
     }
 
     @Override
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/IscsiBondModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/IscsiBondModel.java
index b99e890..af60e0e 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/IscsiBondModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/IscsiBondModel.java
@@ -70,10 +70,10 @@
         AsyncDataProvider.getInstance().getAllDataCenterNetworks(new 
AsyncQuery(this, new INewAsyncCallback() {
             @Override
             public void onSuccess(Object target, Object returnValue) {
-                ArrayList<Network> selected = new ArrayList<Network>();
-                ArrayList<Network> networks = (ArrayList<Network>) returnValue;
+                List<Network> selected = new ArrayList<>();
+                List<Network> networks = (List<Network>) returnValue;
                 Set<Guid> iscsiBonded = isBondExist() ?
-                        new HashSet<Guid>(getIscsiBond().getNetworkIds()) : 
Collections.<Guid>emptySet();
+                        new HashSet<>(getIscsiBond().getNetworkIds()) : 
Collections.<Guid>emptySet();
 
                 for (Network network : networks) {
                     if (iscsiBonded.contains(network.getId())) {


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

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