Add Sunstone support for vCenter networks with defined VLANs

This commit is contained in:
Tino Vazquez committed 2015-03-06 16:49:30 +01:00
1 parent aa87e0b919
commit 6cb4dc2d50
1 file changed
+21 -2
+21 -2
View File
@@ -1322,7 +1322,19 @@ function fillVCenterNetworks(opts) {
'</div>').appendTo($(".content", opts.container))
} else {
$.each(networks, function(id, network){
var netname = network.name.replace(" ","_");
var netname = network.name.replace(" ","_");
var vlan_info = ""
if (network.vlan)
{
var vlan_info = '<div class="vlan_info">' +
'<div class="large-4 columns">'+
'<label>' + tr("VLAN") +
'<input type="text" class="vlaninfo" value="'+network.vlan+'" disabled/>' +
'</label>'+
'</div>'+
'</div>';
}
var trow = $('<div class="vcenter_network">' +
'<div class="row">' +
@@ -1353,7 +1365,8 @@ function fillVCenterNetworks(opts) {
'<input type="text" class="eth_mac_net" placeholder="'+tr("Optional")+'"/>' +
'</label>'+
'</div>'+
'</div>'+
'</div>'+
vlan_info +
'<div class="large-12 columns vcenter_network_response">'+
'</div>'+
'</div>' +
@@ -1809,6 +1822,12 @@ function setupCreateHostDialog(){
network_tmpl += ar_array.join(",\n")
network_tmpl += "]"
if($(".vlaninfo", network_context))
{
network_tmpl += "VLAN=\"YES\"\n";
network_tmpl += "VLAN_ID="+$(".vlaninfo", network_context).val()+"\n";
}
var vnet_json = {
"vnet": {
"vnet_raw": network_tmpl