From ca4fd31dffb8ce1605dd6d50a4be47bc47044e08 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 13 Dec 2012 10:37:16 +0100 Subject: [PATCH] feature #1664: Add ssh and network context checkboxes --- .../public/js/plugins/templates-tab.js | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 6910c4a2db..6270e796a7 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -2374,7 +2374,7 @@ function setupCreateTemplateDialog(){ ''+ '
'+ ''+tr("Network")+''+ - ''+ tr("Add Network contextualization")+ + ''+ tr("Add Network contextualization")+ '
'+ '
'+ ''+tr("Custom CONTEXT")+''+ @@ -3328,6 +3328,10 @@ function setupCreateTemplateDialog(){ } }); + // + // CONTEXT + // + vm_json["CONTEXT"] = {}; $('#context_table tr', $('div#context_tab')).each(function(){ if ($('#KEY', $(this)).val()) { @@ -3335,6 +3339,34 @@ function setupCreateTemplateDialog(){ } }); + if ($("#ssh_context", $('div#context_tab')).is(":checked")) { + var public_key = $("#ssh_puclic_key", $('div#context_tab')).val(); + if (public_key){ + vm_json["CONTEXT"]["SSH_PUBLIC_KEY"] = public_key; + } + else { + vm_json["CONTEXT"]["SSH_PUBLIC_KEY"] = '$USER[SSH_PUBLIC_KEY]'; + } + }; + + if ($("#network_context", $('div#context_tab')).is(":checked")) { + var nic_id = 1; + + $.each(vm_json["NIC"], function(){ + var vnet_id = this["NETWORK_ID"] + var eth_str = "ETH"+nic_id+"_" + var net_str = 'NETWORK_ID=\\"'+ vnet_id +'\\"' + + vm_json["CONTEXT"][eth_str+"IP"] = "$NIC[IP,"+ net_str +"]"; + vm_json["CONTEXT"][eth_str+"NETWORK"] = "$NIC[NETWORK,"+ net_str +"]"; + vm_json["CONTEXT"][eth_str+"MASK"] = "$NIC[MASK,"+ net_str +"]"; + vm_json["CONTEXT"][eth_str+"GATEWAY"] = "$NIC[GATEWAY,"+ net_str +"]"; + vm_json["CONTEXT"][eth_str+"DNS"] = "$NIC[DNS,"+ net_str +"]"; + + nic_id++; + }); + }; + addSectionJSON(vm_json,$('div#placement_tab .requirements',dialog)); console.log(vm_json)