diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index d90197e9f9..6cac3d453b 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -44,118 +44,6 @@ var create_vn_tmpl = \ \
\ -
\ -
\ -
\ - ' + tr("Type") + '\ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ -
\ -
\ - \ -
\ -
\ -
\ -
\ -
\ -
\ -
\ -
\ - \ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ -
\ -
\ - \ - \ -
\ -
\ - \ - \ -
\ -
\ -
\ -
\ -
\ -
\
\
\ \ @@ -175,16 +63,14 @@ var create_vn_tmpl =
\
\
\ -
\ +
\ \ \
\ -
\ -
\ -
\ +
\ \ \
\ @@ -200,6 +86,46 @@ var create_vn_tmpl =
\
\
\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ +
\ +
\ +
\ +
\ + ' + tr("Address Ranges") + '\ +
\ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\
\
\
\ @@ -851,7 +777,7 @@ function printLeases(vn_info){ // TODO: extra ar config attributes - // TODO: add, remove AR + // TODO: add AR } html += '
\ @@ -869,7 +795,6 @@ function printLeases(vn_info){ \
\
'; - } html += @@ -957,61 +882,28 @@ function setupCreateVNetDialog() { dialog.addClass("reveal-modal medium").attr("data-reveal", ""); - //Make the tabs look nice for the creation mode - //$('#vn_tabs',dialog).tabs(); - $('div#ranged',dialog).hide(); - $('div#ranged_ipv6',dialog).hide(); + var number_of_ar = 0; - $('input#site_prefix,label[for="site_prefix"]',$create_vn_dialog).hide(); - $('input#global_prefix,label[for="global_prefix"]',$create_vn_dialog).hide(); + // close icon: removing the tab on click + $(dialog).on("click", "i.remove-tab", function() { + var target = $(this).parent().attr("href"); + var dd = $(this).closest('dd'); + var dl = $(this).closest('dl'); + var content = $(target); - $('input[name="ip_version"]',dialog).change(function(){ - var fixed_ranged = $('input[name="fixed_ranged"]:checked',dialog).val(); + dd.remove(); + content.remove(); - 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(); - - if ( fixed_ranged == "fixed" ){ - $('input#leaseip,label[for="leaseip"]',$create_vn_dialog).show(); - } else { - $('div#ranged',$create_vn_dialog).show(); - $('div#ranged_ipv6',$create_vn_dialog).hide(); + if (dd.attr("class") == 'active') { + $('a', dl.children('dd').last()).click(); } - } 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(); - - if ( fixed_ranged == "fixed" ){ - $('input#leaseip,label[for="leaseip"]',$create_vn_dialog).hide(); - } else { - $('div#ranged',$create_vn_dialog).hide(); - $('div#ranged_ipv6',$create_vn_dialog).show(); - } - } + return false; }); - $('input[name="fixed_ranged"]',dialog).change(function(){ - if (this.id == 'fixed_check') { - $('div#fixed',$create_vn_dialog).show(); - $('div#ranged',$create_vn_dialog).hide(); - $('div#ranged_ipv6',$create_vn_dialog).hide(); - } - else { - $('div#fixed',$create_vn_dialog).hide(); - - if ( $('input[name="ip_version"]:checked',dialog).val() == "ipv4" ){ - $('div#ranged',$create_vn_dialog).show(); - } else { - $('div#ranged_ipv6',$create_vn_dialog).show(); - } - } + $("#vnet_wizard_ar_btn").bind("click", function(){ + add_ar_tab(number_of_ar, dialog); + number_of_ar++; }); $('#network_mode',dialog).change(function(){ @@ -1055,55 +947,6 @@ function setupCreateVNetDialog() { //Initialize shown options $('#network_mode',dialog).trigger("change"); - //$('button',dialog).button(); - - - //When we hit the add lease button... - $('#add_lease',dialog).click(function(){ - var create_form = $('#create_vn_form_easy',$create_vn_dialog); //this is our scope - - //Fetch the interesting values - var lease_ip = ""; - - if ( $('input[name="ip_version"]:checked',dialog).val() == "ipv4" ) { - lease_ip = $('#leaseip',create_form).val(); - } - - var lease_mac = $('#leasemac',create_form).val(); - - //We do not add anything to the list if there is nothing to add - if (!lease_ip.length && !lease_mac.length) { - notifyError(tr("Please provide a lease IP or MAC")); - return false; - }; - - //contains the HTML to be included in the select box. - // The space is used later to parse ip and mac - var lease = ''; - - //We append the HTML into the select box. - $('select#leases',$create_vn_dialog).append(lease); - return false; - }); - - $('#remove_lease', dialog).click(function(){ - $('select#leases :selected',$create_vn_dialog).remove(); - return false; - }); - - $('#custom_pool', dialog).change(function(){ - if ($(this).is(':checked')){ - $('#ip_start', $create_vn_dialog).removeAttr('disabled'); - $('#ip_end', $create_vn_dialog).removeAttr('disabled'); - } - else { - $('#ip_start', $create_vn_dialog).attr('disabled','disabled'); - $('#ip_end', $create_vn_dialog).attr('disabled','disabled'); - }; - }); - - $('#add_custom_var_vnet_button', dialog).click( function(){ var name = $('#custom_var_vnet_name',$create_vn_dialog).val(); @@ -1191,98 +1034,46 @@ function setupCreateVNetDialog() { break; }; - var ip_version = $('input[name="ip_version"]:checked',dialog).val(); - - var type = $('input[name="fixed_ranged"]:checked',dialog).val(); - network_json['type']=type; - //TODO: Name and bridge provided?! - var network_addr = $('#net_address',dialog).val(); var network_mask = $('#net_mask',dialog).val(); var network_dns = $('#net_dns',dialog).val(); var network_gateway = $('#net_gateway',dialog).val(); + if (network_addr.length) + network_json["network_address"] = network_addr; + + if (network_mask.length) + network_json["network_mask"] = network_mask; + if (network_dns.length) network_json["dns"] = network_dns; - if (ip_version == "ipv6") { - var site_prefix = $('#site_prefix',dialog).val(); - var global_prefix = $('#global_prefix',dialog).val(); + if (network_gateway.length) + network_json["gateway"] = network_gateway; - if (site_prefix.length) - network_json["site_prefix"] = site_prefix; + // TODO: gateway 6 in separate input +// if (network_gateway.length) +// network_json["gateway6"] = network_gateway; - if (global_prefix.length) - network_json["global_prefix"] = global_prefix; +/* +Attribute Description +NETWORK_ADDRESS Base network address +NETWORK_MASK Network mask +GATEWAY Router for this network, do not set when the network is not routable +DNS Specific DNS for this network +GATEWAY6 IPv6 router for this network +CONTEXT_FORCE_IPV4 When a vnet is IPv6 the IPv4 is not configured unless this attribute is set +*/ - if (network_gateway.length) - network_json["gateway6"] = network_gateway; + network_json["AR"] = []; - } else { - if (network_addr.length) - network_json["network_address"]=network_addr; + $('.ar_tab',dialog).each(function(){ + hash = retrieve_ar_tab_data(this); - if (network_mask.length) - network_json["network_mask"]=network_mask; - - if (network_gateway.length) - network_json["gateway"] = network_gateway; - } - - if (type == "fixed") { - var leases = $('#leases option', dialog); - var leases_obj=[]; - - //for each specified lease we prepare the JSON object - $.each(leases,function(){ - var lease_str = $(this).val().split(" "); - - if (lease_str[0].length && lease_str[1].length) { - leases_obj.push({"ip": lease_str[0], - "mac": lease_str[1]}); - } else if (lease_str[0].length) { - leases_obj.push({"ip": lease_str[0] }); - } else { - leases_obj.push({"mac": lease_str[1] }); - } - }); - - //and construct the final data for the request - network_json["leases"] = leases_obj; - } - else { //type ranged - - if (ip_version == "ipv4") { - var custom = $('#custom_pool',dialog).is(':checked'); - var ip_start = $('#ip_start',dialog).val(); - var ip_end = $('#ip_end',dialog).val(); - - if (!(ip_start.length && ip_end.length) && !network_addr.length){ - notifyError(tr("There are missing network parameters")); - return false; - }; - - if (custom){ - if (ip_start.length) - network_json["ip_start"] = ip_start; - if (ip_end.length) - network_json["ip_end"] = ip_end; - }; - } else { - var mac_start = $('#mac_start',dialog).val(); - var network_size = $('#net_size',dialog).val(); - - if (! mac_start.length){ - notifyError(tr("MAC Start must be specified")); - return false; - }; - - network_json["mac_start"] = mac_start; - - if (network_size.length) - network_json["network_size"] = network_size; + if (!$.isEmptyObject(hash)) { + network_json["AR"].push(hash); } - }; + }); //Time to add custom attributes $('#custom_var_vnet_box option',$create_vn_dialog).each(function(){ @@ -1329,6 +1120,135 @@ function popUpCreateVnetDialog() { $("input#name",$create_vn_dialog).focus(); } +function add_ar_tab(ar_id, dialog) { + var str_ar_tab_id = 'ar' + ar_id; + + var html_tab_content = '
'+ + generate_ar_tab_content(str_ar_tab_id) + + '
' + + // Append the new div containing the tab and add the tab to the list + var a = $("
"+ + tr("Address Range")+"
" + ).appendTo($("dl#vnet_wizard_ar_tabs", dialog)); + + $(html_tab_content).appendTo($("#vnet_wizard_ar_tabs_content", dialog)); + + $("a", a).trigger("click"); + + var ar_section = $('#' + str_ar_tab_id + 'Tab', dialog); + setup_ar_tab_content(ar_section, str_ar_tab_id); +} + +function generate_ar_tab_content(str_ar_tab_id){ + var html = + '
\ +
\ + \ + \ + \ + \ +
\ +
\ +
\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
\ +
\ + \ + \ +
\ +
\ +
\ +
\ + \ + \ +
\ +
\ + \ + \ +
\ +
'; + + return html; +} + +function setup_ar_tab_content(ar_section, str_ar_tab_id) { + + $('input[name$="ar_type"]',ar_section).change(function(){ + $('div.ar_input', ar_section).hide(); + + switch($(this).val()){ + case "IP4": + $('div.type_ip4', ar_section).show(); + break; + case "IP4_6": + $('div.type_ip4_6', ar_section).show(); + break; + case "IP6": + $('div.type_ip6', ar_section).show(); + break; + case "ETHER": + $('div.type_ether', ar_section).show(); + break; + } + }); + + $('input#'+str_ar_tab_id+'_ar_type_ip4',ar_section).attr('checked', true); + $('input#'+str_ar_tab_id+'_ar_type_ip4',ar_section).change(); + + setupTips(ar_section); +} + +function retrieve_ar_tab_data(ar_section){ + var data = {}; + + var ar_type = $('input[name$="ar_type"]:checked',ar_section).val(); + data["TYPE"] = ar_type; + + var fields = []; + + switch(ar_type){ + case "IP4": + fields = $('div.type_ip4', ar_section).children("input"); + break; + case "IP4_6": + fields = $('div.type_ip4_6', ar_section).children("input"); + break; + case "IP6": + fields = $('div.type_ip6', ar_section).children("input"); + break; + case "ETHER": + fields = $('div.type_ether', ar_section).children("input"); + break; + } + + fields.each(function(){ + var field=$(this); + + if (field.val() != null && field.val().length){ //if has a length + data[field.attr('name')] = field.val(); + } + + }); + + // TODO MANDATORY INPUTS + /* + if (!(ip_start.length && ip_end.length) && !network_addr.length){ + notifyError(tr("There are missing network parameters")); + return false; + }; + */ + + return data +} // Listeners to the add, hold, release, delete leases operations in the // extended information panel. @@ -1346,7 +1266,6 @@ function setupLeasesOps(){ return false; }); - //fixed networks hold lease $('a.hold_lease').live("click",function(){ var lease = $(this).parents('tr').attr('ip'); var id = $(this).parents('form').attr('vnid');