diff --git a/src/cli/onevcenter b/src/cli/onevcenter index ef9c381019..0b4f6e24d5 100755 --- a/src/cli/onevcenter +++ b/src/cli/onevcenter @@ -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]) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb index 3fd33bd1e9..e12fb7d6d9 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb @@ -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