[Engine-patches] Change in ovirt-engine[master]: webadmin: avoid sending an empty ManageNetworkClusteers command

[yzaspits]

Yevgeny Zaspitsky has uploaded a new change for review.

Change subject: webadmin: avoid sending an empty ManageNetworkClusteers command
......................................................................

webadmin: avoid sending an empty ManageNetworkClusteers command

Avoid sending an empty ManageNetworkClusteers command if user choose
not to attach the new network to a cluster.

Change-Id: If0744c499a6034c92aad1072daa7442e51a7d984
Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java
1 file changed, 19 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/38209/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java
index 802c630..280a357 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java
@@ -171,8 +171,21 @@
             return;
         }
 
-        Guid networkId = getNetwork().getId() == null ? networkGuid : 
getNetwork().getId();
-        List<NetworkCluster> networkAttachments = new ArrayList<>();
+        attachNetworkToClusters(networkGuid);
+
+        ProviderNetwork providedBy = getNetwork().getProvidedBy();
+        if (getExport().getEntity() && getCreateSubnet().getEntity() && 
providedBy != null) {
+            getSubnetModel().setExternalNetwork(providedBy);
+            getSubnetModel().flush();
+
+            Frontend.getInstance().runAction(VdcActionType.AddSubnetToProvider,
+                    new 
AddExternalSubnetParameters(getSubnetModel().getSubnet(), 
providedBy.getProviderId(), providedBy.getExternalId()));
+        }
+    }
+
+    private void attachNetworkToClusters(Guid networkGuid) {
+        final Guid networkId = getNetwork().getId() == null ? networkGuid : 
getNetwork().getId();
+        final List<NetworkCluster> networkAttachments = new ArrayList<>();
 
         for (NetworkClusterModel networkClusterModel : getClustersToAttach()) {
             // Init default NetworkCluster values (required, display, status)
@@ -183,17 +196,10 @@
             networkAttachments.add(networkCluster);
         }
 
-        Frontend.getInstance().runAction(
-                VdcActionType.ManageNetworkClusters,
-                new ManageNetworkClustersParameters(networkAttachments));
-
-        ProviderNetwork providedBy = getNetwork().getProvidedBy();
-        if (getExport().getEntity() && getCreateSubnet().getEntity() && 
providedBy != null) {
-            getSubnetModel().setExternalNetwork(providedBy);
-            getSubnetModel().flush();
-
-            Frontend.getInstance().runAction(VdcActionType.AddSubnetToProvider,
-                    new 
AddExternalSubnetParameters(getSubnetModel().getSubnet(), 
providedBy.getProviderId(), providedBy.getExternalId()));
+        if (!networkAttachments.isEmpty()) {
+            Frontend.getInstance().runAction(
+                    VdcActionType.ManageNetworkClusters,
+                    new ManageNetworkClustersParameters(networkAttachments));
         }
     }
 


-- 
To view, visit https://gerrit.ovirt.org/38209
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0744c499a6034c92aad1072daa7442e51a7d984
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