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

Feature #4019: Prefix resources with cluster names on vCenter resource import

Browse Source
This commit is contained in:
Tino Vazquez 2015-10-02 13:55:18 +02:00
parent a1ba03fc74
commit 94959e36e9
2 changed files with 71 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cli/onevcenter
View File

@ -273,6 +273,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
" - Name : #{n[:name]}\n"\
" - Type : #{n[:type]}\n"
print_str += " - VLAN ID : #{n[:vlan]}\n" if n[:vlan]
print_str += " - Cluster : #{n[:cluster]}\n"
print_str += " Import this Network [y/n]? "
STDOUT.print print_str

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

@ -284,10 +284,11 @@ class VIClient
if !tpool["VMTEMPLATE/TEMPLATE/PUBLIC_CLOUD[\
TYPE=\"vcenter\" \
and VM_TEMPLATE=\"#{vi_tmp.vm.config.uuid}\"]"]
hostname = vi_tmp.vm.runtime.host.parent.name
one_tmp << {
:name => vi_tmp.vm.name,
:name => "#{vi_tmp.vm.name} - #{hostname}",
:uuid => vi_tmp.vm.config.uuid,
:host => vi_tmp.vm.runtime.host.parent.name,
:host => hostname,
:one => vi_tmp.to_one
}
end
@ -355,7 +356,7 @@ class VIClient
host_id = name_to_id(container_hostname,hostpool,"HOST")[1]
one_tmp << {
:name => vi_tmp.vm.name,
:name => "#{vi_tmp.vm.name} - #{container_hostname}",
:uuid => vi_tmp.vm.config.uuid,
:host => container_hostname,
:host_id => host_id,
@ -410,69 +411,88 @@ class VIClient
one_nets = []
networks.each { |n|
if !vnpool["VNET[BRIDGE=\"#{n[:name]}\"]/\
TEMPLATE[VCENTER_TYPE=\"Port Group\"]"]
one_nets << {
:name => n.name,
:bridge => n.name,
:type => "Port Group",
:one => "NAME = \"#{n[:name]}\"\n" \
"BRIDGE = \"#{n[:name]}\"\n" \
"VCENTER_TYPE = \"Port Group\""
}
end
# Skip those not in cluster
next if !n[:host][0]
# Networks can be in several cluster, create one per cluster
Array(n[:host][0]).each{ |host_system|
net_name = "#{n.name} - #{host_system.parent.name}"
if !vnpool["VNET[BRIDGE=\"#{n[:name]}\"]/\
TEMPLATE[VCENTER_TYPE=\"Port Group\"]"]
one_nets << {
:name => net_name,
:bridge => n.name,
:cluster => host_system.parent.name,
:type => "Port Group",
:one => "NAME = \"#{n[:name]}\"\n" \
"BRIDGE = \"#{n[:name]}\"\n" \
"VCENTER_TYPE = \"Port Group\""
}
end
}
}
networks = get_entities(dc.networkFolder,
'DistributedVirtualPortgroup' )
networks.each { |n|
if !vnpool["VNET[BRIDGE=\"#{n[:name]}\"]/\
TEMPLATE[VCENTER_TYPE=\"Distributed Port Group\"]"]
vnet_template = "NAME = \"#{n[:name]}\"\n" \
"BRIDGE = \"#{n[:name]}\"\n" \
"VCENTER_TYPE = \"Distributed Port Group\""
# Skip those not in cluster
next if !n[:host][0]
# DistributedVirtualPortgroup can be in several cluster,
# create one per cluster
Array(n[:host][0]).each{ |host_system|
net_name = "#{n.name} - #{n[:host][0].parent.name}"
if !vnpool["VNET[BRIDGE=\"#{n[:name]}\"]/\
TEMPLATE[VCENTER_TYPE=\"Distributed Port Group\"]"]
vnet_template = "NAME = \"#{n[:name]}\"\n" \
"BRIDGE = \"#{n[:name]}\"\n" \
"VCENTER_TYPE = \"Distributed Port Group\""
default_pc = n.config.defaultPortConfig
default_pc = n.config.defaultPortConfig
has_vlan = false
vlan_str = ""
has_vlan = false
vlan_str = ""
if default_pc.methods.include? :vlan
has_vlan = default_pc.vlan.methods.include? :vlanId
end
if default_pc.methods.include? :vlan
has_vlan = default_pc.vlan.methods.include? :vlanId
end
if has_vlan
vlan = n.config.defaultPortConfig.vlan.vlanId
if has_vlan
vlan = n.config.defaultPortConfig.vlan.vlanId
if vlan != 0
if vlan.is_a? Array
vlan.each{|v|
vlan_str += v.start.to_s + ".." +
v.end.to_s + ","
}
vlan_str.chop!
else
vlan_str = vlan.to_s
end
end
end
if vlan != 0
if vlan.is_a? Array
vlan.each{|v|
vlan_str += v.start.to_s + ".." +
v.end.to_s + ","
}
vlan_str.chop!
else
vlan_str = vlan.to_s
end
end
end
if !vlan_str.empty?
vnet_template << "VLAN=\"YES\"\n" \
"VLAN_ID=#{vlan_str}\n"
end
if !vlan_str.empty?
vnet_template << "VLAN=\"YES\"\n" \
"VLAN_ID=#{vlan_str}\n"
end
one_net = {:name => n.name,
:bridge => n.name,
:type => "Distributed Port Group",
:one => vnet_template}
one_net = {:name => net_name,
:bridge => n.name,
:cluster => host_system.parent.name,
:type => "Distributed Port Group",
:one => vnet_template}
one_net[:vlan] = vlan_str if !vlan_str.empty?
one_net[:vlan] = vlan_str if !vlan_str.empty?
one_nets << one_net
end
one_nets << one_net
end
}
}
vcenter_networks[dc.name] = one_nets