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

B #4685: Change VLAN_ID to VLAN_TAGGED_ID in vCenter

Browse Source
This commit is contained in:
Tino Vazquez 2016-10-05 16:32:16 +02:00
parent d2c9d41b8d
commit 5556cfa7ba
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,7 +261,7 @@ define(function(require) {
var vlaninfo = $(".vlaninfo", row_context).text();
if ( vlaninfo != undefined && vlaninfo != "" ) {
network_tmpl += "\nVLAN_ID=" + vlaninfo + "\n";
network_tmpl += "\nVLAN_TAGGED_ID=" + vlaninfo + "\n";
}
var vnet_json = {

5
src/vmm_mad/remotes/vcenter/vcenter_driver.rb
View File

@ -151,7 +151,7 @@ class VIClient
end
############################################################################
# Initializr the VIClient, and creates an OpenNebula client. The parameters
# Initialize the VIClient, and creates an OpenNebula client. The parameters
# are obtained from the associated OpenNebula host
# @param hid [Integer] The OpenNebula host id with VCenter attributes
############################################################################
@ -513,7 +513,6 @@ class VIClient
"VN_MAD = \"dummy\"\n" \
"VCENTER_TYPE = \"Distributed Port Group\""
default_pc = n.config.defaultPortConfig
has_vlan = false
@ -540,7 +539,7 @@ class VIClient
end
if !vlan_str.empty?
vnet_template << "VLAN_ID=#{vlan_str}\n"
vnet_template << "VLAN_TAGGED_ID=#{vlan_str}\n"
end
one_net = {:name => net_name,