From dee7dbfa0c44ad2b50e7cca768b724a7875d39a9 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Thu, 27 Nov 2014 19:21:10 +0100 Subject: [PATCH] Feature #3306: Add Distributed Network support for vCenter Add VLAN retrieval --- src/cli/onevcenter | 26 +++-- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 105 ++++++++++++++---- 2 files changed, 103 insertions(+), 28 deletions(-) diff --git a/src/cli/onevcenter b/src/cli/onevcenter index 82bbdbca0a..9529c10f89 100755 --- a/src/cli/onevcenter +++ b/src/cli/onevcenter @@ -258,13 +258,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do end tmps.each{ |n| - STDOUT.print "\n * Network found:\n"\ - " - Name : #{n[:name]}\n"\ - " Import this Network [y/n]? " + print_str = "\n * Network found:\n"\ + " - Name : #{n[:name]}\n"\ + " - Type : #{n[:type]}\n" + print_str += " - VLAN ID : #{n[:vlan]}\n" if n[:vlan] + print_str += " Import this Network [y/n]? " + + STDOUT.print print_str next if STDIN.gets.strip.downcase != 'y' - STDOUT.print " How many VMs are you planning to fit [255]? " + STDOUT.print " How many VMs are you planning"\ + " to fit into this network [255]? " size = STDIN.gets.strip @@ -273,11 +278,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do one_vn = ::OpenNebula::VirtualNetwork.new( ::OpenNebula::Template.build_xml, vc.one) - vnet_template = "NAME=\"#{n[:name]}\"\n" + - "BRIDGE=\"#{n[:name]}\"\n" + - "AR=[\n" + - " TYPE = \"ETHER\"\n," + - " SIZE = \"#{size.to_i}\"\n]" + vnet_template = "NAME=\"#{n[:name]}\"\n" + + "BRIDGE=\"#{n[:name]}\"\n" + + "VCENTER_TYPE=\"#{n[:type]}\"" + + "AR=[\n" + + " TYPE = \"ETHER\"\n," + + " SIZE = \"#{size.to_i}\"\n]" + + vnet_template += "VLAN=\"YES\"\nVLAN_ID=#{n[:vlan]}" if n[:vlan] rc = one_vn.allocate(vnet_template) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 6262e64a74..706d566be4 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -129,7 +129,7 @@ class VIClient ######################################################################## # Initialize a VIConnection based just on the VIM parameters. The - # OpenNebula client is also initilialize + # OpenNebula client is also initilialized ######################################################################## def self.new_connection(user_opts) @@ -166,6 +166,23 @@ class VIClient end end + ######################################################################## + # Searches the associated vmFolder of the DataCenter for the current + # connection. Returns a RbVmomi::VIM::VirtualMachine or nil if not found + # @param vm_name [String] the UUID of the VM or VM Template + ######################################################################## + def find_vm(vm_name) + vms = get_entities(@dc.vmFolder, 'VirtualMachine') + + return vms.find do |v| + begin + v.name == vm_name + rescue ManagedObjectNotFound + false + end + end + end + ######################################################################## # Builds a hash with the DataCenter / ClusterComputeResource hierarchy # for this VCenter. @@ -220,7 +237,8 @@ class VIClient end ######################################################################## - # Builds a hash with the Datacenter / CCR Networks for this VCenter + # Builds a hash with the Datacenter / CCR (Distributed)Networks + # for this VCenter # @return [Hash] in the form # { dc_name [String] => Networks [Array] } ######################################################################## @@ -230,23 +248,50 @@ class VIClient datacenters = get_entities(@root, 'Datacenter') datacenters.each { |dc| - networks = get_entities(dc.networkFolder, 'Network') - + networks = get_entities(dc.networkFolder, 'Network' ) one_nets = [] networks.each { |n| - - one_nets << { - :name => n.name, - :bridge => n.name - } + one_nets << {:name => n.name, + :bridge => n.name, + :type => "Port Group"} } vcenter_networks[dc.name] = one_nets + + networks = get_entities(dc.networkFolder, + 'DistributedVirtualPortgroup' ) + one_nets = [] + + networks.each { |n| + one_net = {:name => n.name, + :bridge => n.name, + :type=> "Distributed Port Group"} + + vlan = n.config.defaultPortConfig.vlan.vlanId + + if vlan != 0 + if vlan.is_a? Array + vlan_str = "" + vlan.each{|v| + vlan_str += v.start + ".." + v.end + "," + } + vlan_str.chop! + else + vlan_str = vlan.to_s + end + + one_net[:vlan] = vlan_str + end + + one_nets << one_net + } + + vcenter_networks[dc.name] += one_nets } return vcenter_networks - end + end def self.translate_hostname(hostname) host_pool = OpenNebula::HostPool.new(::OpenNebula::Client.new()) @@ -849,7 +894,9 @@ private # Returns the spec to reconfig a VM and add a NIC ######################################################################## def self.calculate_addnic_spec(vm, mac, bridge, model) + model = model.nil? ? nil : model.downcase network = vm.runtime.host.network.select{|n| n.name==bridge} + backing = nil if network.empty? raise "Network #{bridge} not found in host #{vm.runtime.host.name}" @@ -865,8 +912,6 @@ private end } - model = model.nil? ? nil : model.downcase - nic_card = case model when "virtuale1000" RbVmomi::VIM::VirtualE1000 @@ -886,9 +931,19 @@ private RbVmomi::VIM::VirtualE1000 end - backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo( - :deviceName => bridge, - :network => network) + if network.class == RbVmomi::VIM::Network + backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo( + :deviceName => bridge, + :network => network) + else + port = RbVmomi::VIM::DistributedVirtualSwitchPortConnection( + :switchUuid => + network.config.distributedVirtualSwitch.uuid, + :portgroupKey => network.key) + backing = + RbVmomi::VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo( + :port => port) + end return {:operation => :add, :device => nic_card.new( @@ -949,10 +1004,22 @@ private :powerOn => false, :template => false) - vm = vc_template.CloneVM_Task( - :folder => vc_template.parent, - :name => "one-#{vmid}", - :spec => clone_spec).wait_for_completion + begin + vm = vc_template.CloneVM_Task( + :folder => vc_template.parent, + :name => "one-#{vmid}", + :spec => clone_spec).wait_for_completion + rescue Exception => e + if e.message.start_with?('DuplicateName') + vm = connection.find_vm("one-#{vmid}") + vm.Destroy_Task.wait_for_completion + vm = vc_template.CloneVM_Task( + :folder => vc_template.parent, + :name => "one-#{vmid}", + :spec => clone_spec).wait_for_completion + end + end + vm_uuid = vm.config.uuid