From bba9a065e81cf72030be0a85be0ea41596387319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 29 May 2014 18:44:49 +0200 Subject: [PATCH] Feature #2858: Add AR wizard --- .../OpenNebulaJSON/VirtualNetworkJSON.rb | 5 +- src/sunstone/public/js/opennebula.js | 2 +- src/sunstone/public/js/plugins/vnets-tab.js | 81 +++++++++++++++++-- 3 files changed, 81 insertions(+), 7 deletions(-) diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb index 73d321dd04..4d5f2f0f13 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb @@ -89,7 +89,10 @@ module OpenNebulaJSON end def add_ar(params=Hash.new) - super(params['ar_template_raw']) + template_json = params['ar_template'] + template = template_to_str(template_json) + + super(template) end def update_ar(params=Hash.new) diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 82dfdc0e51..d1b40be2f9 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -782,7 +782,7 @@ var OpenNebula = { action_obj); }, "add_ar" : function(params){ - var action_obj = {"ar_template_raw" : params.data.extra_param }; + var action_obj = {"ar_template" : params.data.extra_param }; OpenNebula.Action.simple_action(params, OpenNebula.Network.resource, "add_ar", diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 6cac3d453b..b8b13887db 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -721,8 +721,17 @@ function printLeases(vn_info){ \ \ \ - \ - \ + '; + + if (Config.isTabActionEnabled("vnets-tab", "Network.add_ar")) { + html += + '
\ + \ +
'; + } + + html += + '\ '; // TODO: Add other well known attributes, like DNS, GATEWAY... @@ -776,8 +785,6 @@ function printLeases(vn_info){ '; // TODO: extra ar config attributes - - // TODO: add AR } html += '\ @@ -981,7 +988,8 @@ function setupCreateVNetDialog() { } var description = $('#DESCRIPTION',dialog).val(); - var network_json = {"name" : name, "description" : description}; + if (network_addr.length) + var network_json = {"name" : name, "description" : description}; var network_mode = $('select#network_mode',dialog).val(); var bridge = $('#bridge',dialog).val(); @@ -1301,8 +1309,69 @@ function setupLeasesOps(){ return false; }); } + + if (Config.isTabActionEnabled("vnets-tab", "Network.add_ar")) { + $('button#add_ar_button').live("click",function(){ + var id = $(this).parents('form').attr('vnid'); + + popUpAddAR(id); + + return false; + }); + } } +function popUpAddAR(id){ + $('#vnet_id',$add_ar_dialog).text(id); + $add_ar_dialog.foundation().foundation('reveal', 'open'); +} + +function setupAddARDialog(){ + dialogs_context.append('
'); + $add_ar_dialog = $('#add_ar_dialog',dialogs_context); + var dialog = $add_ar_dialog; + + dialog.html('
\ +
\ +

'+tr("Add a new Address Range")+'

\ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
' + + generate_ar_tab_content("add_ar") + + '\ + ×\ +
') + + // TODO: max-height? + + dialog.addClass("reveal-modal large max-height").attr("data-reveal", ""); + setupTips(dialog); + + setup_ar_tab_content(dialog, "add_ar") + + $('#add_ar_form',dialog).submit(function(){ + var vnet_id = $('#vnet_id', this).text(); + var data = retrieve_ar_tab_data(this); + + var obj = {AR: data} + Sunstone.runAction('Network.add_ar', vnet_id, obj); + + $add_ar_dialog.foundation('reveal', 'close') + return false; + }); +}; + //The DOM is ready and the ready() from sunstone.js //has been executed at this point. $(document).ready(function(){ @@ -1333,6 +1402,8 @@ $(document).ready(function(){ setupCreateVNetDialog(); setupLeasesOps(); + setupAddARDialog(); + initCheckAllBoxes(dataTable_vNetworks); tableCheckboxesListener(dataTable_vNetworks); infoListener(dataTable_vNetworks,'Network.show');