1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00

Feature #3306: Fix wrong AR template creation

This commit is contained in:
Tino Vazquez 2014-12-12 19:37:45 +01:00 committed by Ruben S. Montero
parent 0c64471753
commit 67c60a5e87

View File

@ -1438,17 +1438,22 @@ function setupCreateHostDialog(){
// Let's build the AR
netname = network_name.replace(" ","_")
type = $('.type_select_'+netname, network_context).val();
ar_str = "\nAR=[TYPE=" + type + ","
type_str = ""
ar_str = "\nAR=["
switch(type) {
case 'ethernet':
type_str = "ETHER";
mac = $('.eth_mac_net_'+netname, network_context).val();
if (mac)
{
ar_str += "MAC=" + mac;
}
break;
case 'ipv4':
type_str = "IP4";
mac = $('.four_mac_net_'+netname, network_context).val();
ip = $('.four_ip_net_'+netname, network_context).val();
if (mac)
@ -1465,6 +1470,7 @@ function setupCreateHostDialog(){
}
break;
case 'ipv6':
type_str = "IP6";
mac = $('.six_mac_net_'+netname, network_context).val();
gp = $('.six_global_net_'+netname, network_context).val();
ula = $('.six_mac_net_'+netname, network_context).val();
@ -1491,8 +1497,15 @@ function setupCreateHostDialog(){
break;
}
comma_or_not = ""
if (ar_str.slice(-1) != "[")
{
comma_or_not = ","
}
network_tmpl = network_tmpl + ar_str + ' SIZE = "'+ network_size +'"]'
ar_str += comma_or_not + "TYPE=" + type_str
network_tmpl = network_tmpl + ar_str + ' ,SIZE = "'+ network_size +'"]'
var vnet_json = {
"vnet": {