shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Merge pull request #280 from juanmont/feature-4913-47

Browse Source 
F #4913 Changed fields and labels to import the vnets
This commit is contained in:
Jaime Melis 2017-04-26 14:45:42 +02:00 committed by GitHub
commit 566935f3b0
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/sunstone/public/app/utils/vcenter/networks.js
View File

@ -188,29 +188,19 @@ define(function(require) {
break;
case 'IP6_STATIC':
net_form_str =
'<div class="large-6 medium-6 columns">' +
'<label>' + Locale.tr("Global Prefix") +
'<input type="text" class="six_global_net" placeholder="' + Locale.tr("Optional") + '"/>' +
'</label>' +
'</div>' +
'<div class="large-4 medium-6 columns">' +
'<label>' + Locale.tr("MAC") +
'<input type="text" class="eth_mac_net" placeholder="' + Locale.tr("Optional") + '"/>' +
'</label>' +
'</div>' +
'<div class="large-6 medium-6 columns end">' +
'<label>' + Locale.tr("ULA Prefix") +
'<input type="text" class="six_ula_net" placeholder="' + Locale.tr("Optional") + '"/>' +
'</label>' +
'</div>'+
'<div class="large-6 medium-6 columns end">' +
'<label>' + Locale.tr("IPv6 for the address") +
'<label>' + Locale.tr("IPv6 address") +
'<input type="text" class="six_static_net"/>' +
'</label>' +
'</div>'+'<div class="large-4 medium-6 columns end">' +
'<label>' + Locale.tr("Prefix length") +
'<input type="text" class="six_prefix_net"/>' +
'</label>' +
'</div>'+
'<div class="large-6 medium-6 columns end">' +
'<label>' + Locale.tr("MAC") +
'<input type="text" class="eth_mac_net" placeholder="' + Locale.tr("Optional") + '"/>' +
'</label>' +
'</div>';
break;
}
@ -281,20 +271,12 @@ define(function(require) {
break;
case 'IP6_STATIC':
var mac = $('.six_mac_net', row_context).val();
var gp = $('.six_global_net', row_context).val();
var ula = $('.six_mac_net', row_context).val();
var ip6_static = $('.six_static_net', row_context).val();
var prefix = $('.six_prefix_net', row_context).val();
if (mac) {
ar_array.push("MAC=" + mac);
}
if (gp) {
ar_array.push("GLOBAL_PREFIX=" + gp);
}
if (ula) {
ar_array.push("ULA_PREFIX=" + ula);
}
if (ip6_static) {
ar_array.push("IP6=" + ip6_static);
}