From a0eedf34a94fa29b05d317f084df68599f4e0926 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Tue, 7 Feb 2012 18:25:42 +0100
Subject: [PATCH] Bug #1111: Improve constraints when creating a ranged virtual
 network. (cherry picked from commit 22b888e2ebadebbb8acd2149c2da3460f6f782bd)

---
 src/sunstone/public/js/plugins/vnets-tab.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js
index 66856161ce..87a153b4e9 100644
--- a/src/sunstone/public/js/plugins/vnets-tab.js
+++ b/src/sunstone/public/js/plugins/vnets-tab.js
@@ -822,8 +822,8 @@ function setupCreateVNetDialog() {
             var ip_start = $('#ip_start',this).val();
             var ip_end = $('#ip_end',this).val();
 
-            if (!network_addr.length){
-                notifyError(tr("Please provide a network address"));
+            if (!(ip_start.length && ip_end.length) && !network_addr.length){
+                notifyError(tr("There are missing network parameters"));
                 return false;
             };
 
@@ -832,11 +832,15 @@ function setupCreateVNetDialog() {
                 "vnet" : {
                     "type" : "RANGED",
                     "bridge" : bridge,
-                    "network_mask" : network_mask,
-                    "network_address" : network_addr,
                     "name" : name }
             };
 
+            if (network_addr.length)
+                network_json["vnet"]["network_address"]=network_addr;
+
+            if (network_mask.length)
+                network_json["vnet"]["network_mask"]=network_mask;
+
             if (custom){
                 if (ip_start.length)
                     network_json["vnet"]["ip_start"] = ip_start;