beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ability to create and attach disks to hyper-v guests

Browse Source
This commit is contained in:
Brian Cain 2020-04-13 14:36:06 -07:00
parent b79d6bdc27
commit bb2195b692
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/providers/hyperv/cap/configure_disks.rb
View File

@ -90,7 +90,7 @@ module VagrantPlugins
# TODO: Is it possible for a disk to not be connected by this point
# for hyper-v? Since we get the disk from the vm info itself
#disk_info = machine.provider.driver.get_port_and_device(current_disk["UUID"])
#disk_info = machine.provider.driver.get_port_and_device(current_disk["DiskIdentifier"])
#if disk_info.empty?
# LOGGER.warn("Disk '#{disk.name}' is not connected to guest '#{machine.name}', Vagrant will attempt to connect disk to guest")
# dsk_info = get_next_port(machine)
@ -101,7 +101,7 @@ module VagrantPlugins
# LOGGER.info("No further configuration required for disk '#{disk.name}'")
#end
disk_metadata = {uuid: current_disk["UUID"], name: disk.name}
disk_metadata = {uuid: current_disk["DiskIdentifier"], name: disk.name, path: current_disk["Path"]}
end
disk_metadata
@ -135,32 +135,27 @@ module VagrantPlugins
# @param [Kernel_V2::VagrantConfigDisk] disk_config
def self.create_disk(machine, disk_config)
machine.ui.detail(I18n.t("vagrant.cap.configure_disks.create_disk", name: disk_config.name))
disk_provider_config = {}
disk_provider_config = disk_config.provider_config[:hyperv] if disk_config.provider_config
# TODO: Create and store disk before attaching
#
# create supporting powershell scripts and hyper-v driver methods
#
# pass along disk_provider_config if defined. This should
# contain various options for creating disks
# Get the machines data dir, that will now be the path for the new disk
guest_info = machine.provider.driver.show_vm_info
guest_folder = File.dirname(guest_info["CfgFile"])
guest_disk_folder = machine.data_dir.join("Virtual Hard Disks")
# Set the extension
disk_ext = disk_config.disk_ext
disk_file = File.join(guest_folder, disk_config.name) + ".#{disk_ext}"
disk_file = File.join(guest_disk_folder, disk_config.name) + ".#{disk_ext}"
LOGGER.info("Attempting to create a new disk file '#{disk_file}' of size '#{disk_config.size}' bytes")
disk_var = machine.provider.driver.create_disk(disk_file, disk_config.size, disk_ext.upcase)
disk_metadata = {uuid: disk_var.split(':').last.strip, name: disk_config.name}
machine.provider.driver.create_disk(disk_file, disk_config.size, disk_provider_config)
disk_info = machine.provider.driver.get_disk(disk_file)
disk_metadata = {uuid: disk_info["DiskIdentifier"], name: disk_config.name, path: disk_info["Path"]}
# This might not be required. If no port is specified, we can just
# attach the disk with the command for hyper-v
dsk_controller_info = get_next_port(machine)
machine.provider.driver.attach_disk(dsk_controller_info[:port], dsk_controller_info[:device], disk_file)
#dsk_controller_info = get_next_port(machine)
machine.provider.driver.attach_disk(nil, nil, nil, disk_file)
disk_metadata
end
@ -172,11 +167,12 @@ module VagrantPlugins
def self.resize_disk(machine, disk_config, defined_disk)
machine.ui.detail(I18n.t("vagrant.cap.configure_disks.resize_disk", name: disk_config.name), prefix: true)
# TODO: Resize the disks
machine.provider.driver.resize_disk(defined_disk["Location"], disk_config.size.to_i)
machine.provider.driver.resize_disk(defined_disk["Path"], disk_config.size.to_i)
disk_info = machine.provider.driver.get_disk(defined_disk["Path"])
# Store updated metadata
disk_metadata = {uuid: defined_disk["UUID"], name: disk_config.name}
disk_metadata = {uuid: disk_info["DiskIdentifier"], name: disk_config.name, path: disk_info["Path"]}
disk_metadata
end

2
plugins/providers/hyperv/driver.rb
View File

@ -52,7 +52,7 @@ module VagrantPlugins
# @param [String] path
# @param [Int] size_bytes
# @param [Hash] opts
def new_vdh(path, size_bytes, **opts)
def create_disk(path, size_bytes, **opts)
# ensure size_bytes is a uint64
execute(:new_vdh, DiskFilePath: path, DiskSizeBytes: size_bytes)
end

2
plugins/providers/hyperv/scripts/attach_disk_drive.ps1
View File

@ -14,7 +14,7 @@ try {
$VM = Hyper-V\Get-VM -Id $VmId
#Hyper-V\Add-VMHardDiskDrive -VMName $vm -ControllerType $ControllerType -ControllerNumber $ControllerNumber -ControllerLocation $ControllerLocation -Path $DiskFilePath
# Add logic to support missing params. Below is the simple case for attaching a disk
Hyper-V\Add-VMHardDiskDrive -VMName $VM -Path $DiskFilePath
Hyper-V\Add-VMHardDiskDrive -VMName $VM.Name -Path $DiskFilePath
} catch {
Write-ErrorMessage "Failed to attach disk ${DiskFilePath} to VM ${VM}: ${PSItem}"
exit 1

2
plugins/providers/hyperv/scripts/new_vdh.ps1
View File

@ -2,7 +2,7 @@
param(
[Parameter(Mandatory=$true)]
[string]$DiskFilePath
[string]$DiskFilePath,
[Parameter(Mandatory=$true)]
[UInt64]$DiskSizeBytes
)