From e95c7baa6090fec217b5ef6ec4522fa18e2b72ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 24 Apr 2013 18:33:28 +0200 Subject: [PATCH] Feature #1826: VNet wizard shows N. Address and N. Mask for both ranged and fixed networks --- src/sunstone/public/js/plugins/vnets-tab.js | 67 ++++++++++++--------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 4054f4e5cd..754a0fb322 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -100,6 +100,28 @@ var create_vn_tmpl = \ \ \ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\
\
\
\ @@ -179,28 +201,6 @@ var create_vn_tmpl =
\
\
\ -
\ -
\ -
\ - \ -
\ -
\ - \ -
\ -
\ -
\ -
\ -
\ -
\ - \ -
\ -
\ - \ -
\ -
\ -
\ -
\ -
\
\
\ \ @@ -1093,6 +1093,9 @@ function setupCreateVNetDialog() { var fixed_ranged = $('input[name="fixed_ranged"]:checked',dialog).val(); if (this.id == 'ipv4_check') { + $('input#net_mask,label[for="net_mask"]',$create_vn_dialog).show(); + $('input#net_address,label[for="net_address"]',$create_vn_dialog).show(); + $('input#site_prefix,label[for="site_prefix"]',$create_vn_dialog).hide(); $('input#global_prefix,label[for="global_prefix"]',$create_vn_dialog).hide(); @@ -1103,6 +1106,9 @@ function setupCreateVNetDialog() { $('div#ranged_ipv6',$create_vn_dialog).hide(); } } else { + $('input#net_mask,label[for="net_mask"]',$create_vn_dialog).hide(); + $('input#net_address,label[for="net_address"]',$create_vn_dialog).hide(); + $('input#site_prefix,label[for="site_prefix"]',$create_vn_dialog).show(); $('input#global_prefix,label[for="global_prefix"]',$create_vn_dialog).show(); @@ -1316,6 +1322,9 @@ function setupCreateVNetDialog() { network_json['type']=type; //TODO: Name and bridge provided?! + var network_addr = $('#net_address',dialog).val(); + var network_mask = $('#net_mask',dialog).val(); + if (ip_version == "ipv6") { var site_prefix = $('#site_prefix',dialog).val(); var global_prefix = $('#global_prefix',dialog).val(); @@ -1325,6 +1334,12 @@ function setupCreateVNetDialog() { if (global_prefix.length) network_json["global_prefix"] = global_prefix; + } else { + if (network_addr.length) + network_json["network_address"]=network_addr; + + if (network_mask.length) + network_json["network_mask"]=network_mask; } if (type == "fixed") { @@ -1351,8 +1366,6 @@ function setupCreateVNetDialog() { else { //type ranged if (ip_version == "ipv4") { - var network_addr = $('#net_address',dialog).val(); - var network_mask = $('#net_mask',dialog).val(); var custom = $('#custom_pool',dialog).is(':checked'); var ip_start = $('#ip_start',dialog).val(); var ip_end = $('#ip_end',dialog).val(); @@ -1362,12 +1375,6 @@ function setupCreateVNetDialog() { return false; }; - if (network_addr.length) - network_json["network_address"]=network_addr; - - if (network_mask.length) - network_json["network_mask"]=network_mask; - if (custom){ if (ip_start.length) network_json["ip_start"] = ip_start;