mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 03:12:55 +09:00
Bug #4550: Add support for vCenter CDROM add
This commit is contained in:
1 parent
6a6caeb04b
commit
bbf7a98413
2 files changed
+48
-20
No files matched your search
@@ -47,6 +47,7 @@ hostname = drv_action["/VMM_DRIVER_ACTION_DATA/HOST"]
|
||||
vm_id = drv_action["/VMM_DRIVER_ACTION_DATA/VM/ID"]
|
||||
ds_name = drv_action["/VMM_DRIVER_ACTION_DATA/VM/TEMPLATE/DISK[ATTACH='YES']/DATASTORE"]
|
||||
img_path = drv_action["/VMM_DRIVER_ACTION_DATA/VM/TEMPLATE/DISK[ATTACH='YES']/SOURCE"]
|
||||
type = drv_action["/VMM_DRIVER_ACTION_DATA/VM/TEMPLATE/DISK[ATTACH='YES']/TYPE"]
|
||||
size_kb = 0 # No volatile disk support at the moment
|
||||
|
||||
if ds_name.nil? || hostname.nil? || img_path.nil?
|
||||
@@ -60,6 +61,7 @@ begin
|
||||
deploy_id,
|
||||
ds_name,
|
||||
img_path,
|
||||
type,
|
||||
size_kb)
|
||||
rescue Exception => e
|
||||
STDERR.puts "Error attach image #{img_path}. Reason: #{e.message}"
|
||||
|
||||
@@ -655,7 +655,8 @@ class VIClient
|
||||
|
||||
# Create Search Spec
|
||||
spec = RbVmomi::VIM::HostDatastoreBrowserSearchSpec.new
|
||||
spec.query = [RbVmomi::VIM::VmDiskFileQuery.new]
|
||||
spec.query = [RbVmomi::VIM::VmDiskFileQuery.new,
|
||||
RbVmomi::VIM::IsoImageFileQuery.new]
|
||||
spec.details = RbVmomi::VIM::FileQueryFlags(:fileOwner => true,
|
||||
:fileSize => true,
|
||||
:fileType => true,
|
||||
@@ -799,7 +800,8 @@ class VIClient
|
||||
|
||||
# Create Search Spec
|
||||
spec = RbVmomi::VIM::HostDatastoreBrowserSearchSpec.new
|
||||
spec.query = [RbVmomi::VIM::VmDiskFileQuery.new]
|
||||
spec.query = [RbVmomi::VIM::VmDiskFileQuery.new,
|
||||
RbVmomi::VIM::IsoImageFileQuery.new]
|
||||
spec.details = RbVmomi::VIM::FileQueryFlags(:fileOwner => true,
|
||||
:fileSize => true,
|
||||
:fileType => true,
|
||||
@@ -2433,8 +2435,9 @@ private
|
||||
disks.each{|disk|
|
||||
ds_name = disk.elements["DATASTORE"].text
|
||||
img_name = disk.elements["SOURCE"].text
|
||||
type_str = disk.elements["TYPE"].text
|
||||
|
||||
disk_array += attach_disk("", "", ds_name, img_name, 0, vm, connection)[:deviceChange]
|
||||
disk_array += attach_disk("", "", ds_name, img_name, 0, type_str, vm, connection)[:deviceChange]
|
||||
}
|
||||
|
||||
device_change += disk_array
|
||||
@@ -2467,7 +2470,7 @@ private
|
||||
# @params vm[RbVmomi::VIM::VirtualMachine] VM if called from instance
|
||||
# @params connection[ViClient::connectoon] connection if called from instance
|
||||
############################################################################
|
||||
def self.attach_disk(hostname, deploy_id, ds_name, img_name, size_kb, vm=nil, connection=nil)
|
||||
def self.attach_disk(hostname, deploy_id, ds_name, img_name, type, size_kb, vm=nil, connection=nil)
|
||||
only_return = true
|
||||
if !vm
|
||||
hid = VIClient::translate_hostname(hostname)
|
||||
@@ -2484,24 +2487,47 @@ private
|
||||
|
||||
controller, new_number = find_free_controller(vm)
|
||||
|
||||
vmdk_backing = RbVmomi::VIM::VirtualDiskFlatVer2BackingInfo(
|
||||
:datastore => ds,
|
||||
:diskMode => 'persistent',
|
||||
:fileName => "[#{ds_name}] #{img_name}"
|
||||
)
|
||||
if type == "CDROM"
|
||||
vmdk_backing = RbVmomi::VIM::VirtualCdromIsoBackingInfo(
|
||||
:datastore => ds,
|
||||
:fileName => "[#{ds_name}] #{img_name}"
|
||||
)
|
||||
|
||||
device = RbVmomi::VIM::VirtualDisk(
|
||||
:backing => vmdk_backing,
|
||||
:capacityInKB => size_kb,
|
||||
:controllerKey => controller.key,
|
||||
:key => -1,
|
||||
:unitNumber => new_number
|
||||
)
|
||||
cd = vm.config.hardware.device.select {|hw|
|
||||
hw.class == RbVmomi::VIM::VirtualCdrom}.first
|
||||
device = RbVmomi::VIM::VirtualCdrom(
|
||||
backing: vmdk_backing,
|
||||
key: cd.key,
|
||||
controllerKey: cd.controllerKey,
|
||||
connectable: RbVmomi::VIM::VirtualDeviceConnectInfo(
|
||||
startConnected: false,
|
||||
connected: false,
|
||||
allowGuestControl: false
|
||||
)
|
||||
)
|
||||
device_config_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
|
||||
:device => device,
|
||||
:operation => RbVmomi::VIM::VirtualDeviceConfigSpecOperation('edit')
|
||||
)
|
||||
else
|
||||
vmdk_backing = RbVmomi::VIM::VirtualDiskFlatVer2BackingInfo(
|
||||
:datastore => ds,
|
||||
:diskMode => 'persistent',
|
||||
:fileName => "[#{ds_name}] #{img_name}"
|
||||
)
|
||||
|
||||
device_config_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
|
||||
:device => device,
|
||||
:operation => RbVmomi::VIM::VirtualDeviceConfigSpecOperation('add')
|
||||
)
|
||||
device = RbVmomi::VIM::VirtualDisk(
|
||||
:backing => vmdk_backing,
|
||||
:capacityInKB => size_kb,
|
||||
:controllerKey => controller.key,
|
||||
:key => -1,
|
||||
:unitNumber => new_number
|
||||
)
|
||||
device_config_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
|
||||
:device => device,
|
||||
:operation => RbVmomi::VIM::VirtualDeviceConfigSpecOperation('add')
|
||||
)
|
||||
end
|
||||
|
||||
vm_config_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
|
||||
:deviceChange => [device_config_spec]
|
||||
|
||||
Reference in new issue
Block a user