From 1d57922e43fc14a8cd64192ceac3529f835d6f2d Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 7 Oct 2015 15:48:35 +0200 Subject: [PATCH] Feature #4019: Add cluster name to resource template name (cherry picked from commit 13012b1e994bd3ca461c3c6fe9348efc4463b4b2) --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index dc40b2d52b..cdf83e1663 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -425,7 +425,7 @@ class VIClient :bridge => n.name, :cluster => host_system.parent.name, :type => "Port Group", - :one => "NAME = \"#{n[:name]}\"\n" \ + :one => "NAME = \"#{net_name}\"\n" \ "BRIDGE = \"#{n[:name]}\"\n" \ "VCENTER_TYPE = \"Port Group\"" } @@ -447,7 +447,7 @@ class VIClient if !vnpool["VNET[BRIDGE=\"#{n[:name]}\"]/\ TEMPLATE[VCENTER_TYPE=\"Distributed Port Group\"]"] - vnet_template = "NAME = \"#{n[:name]}\"\n" \ + vnet_template = "NAME = \"#{net_name}\"\n" \ "BRIDGE = \"#{n[:name]}\"\n" \ "VCENTER_TYPE = \"Distributed Port Group\"" @@ -1148,7 +1148,9 @@ class VCenterVm # ######################################################################## def to_one - str = "NAME = \"#{@vm.name}\"\n"\ + cluster_name = @vm.runtime.host.parent.name + + str = "NAME = \"#{@vm.name} - #{cluster_name}\"\n"\ "CPU = \"#{@vm.config.hardware.numCPU}\"\n"\ "vCPU = \"#{@vm.config.hardware.numCPU}\"\n"\ "MEMORY = \"#{@vm.config.hardware.memoryMB}\"\n"\ @@ -1161,7 +1163,7 @@ class VCenterVm " TYPE =\"vnc\",\n"\ " LISTEN =\"0.0.0.0\"\n"\ "]\n"\ - "SCHED_REQUIREMENTS=\"NAME=\\\"#{@vm.runtime.host.parent.name}\\\"\"\n" + "SCHED_REQUIREMENTS=\"NAME=\\\"#{cluster_name}\\\"\"\n" if @vm.config.annotation.nil? || @vm.config.annotation.empty? str << "DESCRIPTION = \"vCenter Template imported by OpenNebula"\ @@ -1199,7 +1201,7 @@ class VCenterVm def vm_to_one host_name = @vm.runtime.host.parent.name - str = "NAME = \"#{@vm.name}\"\n"\ + str = "NAME = \"#{@vm.name} - #{host_name}\"\n"\ "CPU = \"#{@vm.config.hardware.numCPU}\"\n"\ "vCPU = \"#{@vm.config.hardware.numCPU}\"\n"\ "MEMORY = \"#{@vm.config.hardware.memoryMB}\"\n"\