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

M #~: Improve list in vcenter (#239)

Browse Source 
Signed-off-by: Carlos Herrera <cherrera@opennebula.io>
This commit is contained in:
Carlos J. Herrera 2020-09-24 12:23:10 -04:00 committed by GitHub
parent 0894a420c9
commit e099655765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/onevcenter
View File

@ -155,6 +155,7 @@ CommandParser::CmdParser.new(ARGV) do
begin
args = helper.parse_opts(options)
args[:filter] = true
args[:short] = true
vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
importer = VCenterDriver::VcImporter
.new_child(helper.client, vi_client, options[:object])
@ -185,6 +186,7 @@ CommandParser::CmdParser.new(ARGV) do
begin
args = helper.parse_opts(options)
args[:filter] = false
args[:short] = true
vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
importer = VCenterDriver::VcImporter
.new_child(helper.client, vi_client, options[:object])

18
src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb
View File

@ -411,6 +411,8 @@ class DatacenterFolder
one_host,
args)
full_process = !args[:short]
# Initialize network hash
network = {}
# Add name to network hash
@ -421,9 +423,11 @@ class DatacenterFolder
# Initialize opts hash used to inject data into one template
opts = {}
# Add network type to network hash
network_type = VCenterDriver::Network.get_network_type(vc_network)
network[vc_network._ref][:network_type] = network_type
if full_process
# Add network type to network hash
network_type = VCenterDriver::Network.get_network_type(vc_network)
network[vc_network._ref][:network_type] = network_type
end
# Determine if the network must be excluded
network[vc_network._ref][:excluded] = exclude_network?(vc_network,
@ -431,6 +435,7 @@ class DatacenterFolder
args)
return nil if network[vc_network._ref][:excluded] == true
if full_process
case network[vc_network._ref][:network_type]
# Distributed PortGroups
when VCenterDriver::Network::NETWORK_TYPE_DPG
@ -466,6 +471,7 @@ class DatacenterFolder
raise 'Unknown network type: ' \
"#{network[vc_network._ref][:network_type]}"
end
end
# Multicluster nets support
network[vc_network._ref][:clusters] = {}
@ -505,6 +511,7 @@ class DatacenterFolder
# Mark network as processed
network[vc_network._ref][:processed] = true
if full_process
# General net_info related to datacenter
opts[:vcenter_uuid] = vcenter_uuid
opts[:vcenter_instance_name] = vcenter_instance_name
@ -516,6 +523,11 @@ class DatacenterFolder
network[vc_network._ref] = \
network[vc_network._ref].merge(VCenterDriver::Network
.to_one_template(opts))
else
network[vc_network._ref][:ref] = vc_network._ref
network[vc_network._ref][:name] = network[vc_network._ref]['name']
end
network
end