From 2a3f9dad29e7da571d175ebe821df598373e4c71 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Thu, 12 Dec 2019 16:30:38 -0800 Subject: [PATCH] Remove uuid from params No need to pass in machine uuid as it is a class variable already for the driver --- plugins/providers/virtualbox/cap/configure_disks.rb | 2 +- plugins/providers/virtualbox/driver/base.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/providers/virtualbox/cap/configure_disks.rb b/plugins/providers/virtualbox/cap/configure_disks.rb index afd31ca34..8a896a501 100644 --- a/plugins/providers/virtualbox/cap/configure_disks.rb +++ b/plugins/providers/virtualbox/cap/configure_disks.rb @@ -67,7 +67,7 @@ module VagrantPlugins # @param [Vagrant::Machine] machine # @param [Kernel_V2::VagrantConfigDisk] disk_config def self.create_disk(machine, disk_config) - guest_info = machine.provider.driver.show_vm_info(machine.id) + guest_info = machine.provider.driver.show_vm_info disk_provider_config = disk_config.provider_config[:virtualbox] guest_folder = File.dirname(guest_info["CfgFile"]) diff --git a/plugins/providers/virtualbox/driver/base.rb b/plugins/providers/virtualbox/driver/base.rb index 9a2bb00a0..5cecd4539 100644 --- a/plugins/providers/virtualbox/driver/base.rb +++ b/plugins/providers/virtualbox/driver/base.rb @@ -372,9 +372,9 @@ module VagrantPlugins # # @param [String] uuid # @return [Hash] info - def show_vm_info(uuid) + def show_vm_info info = {} - execute('showvminfo', uuid, '--machinereadable', retryable: true).split("\n").each do |line| + execute('showvminfo', @uuid, '--machinereadable', retryable: true).split("\n").each do |line| parts = line.partition('=') key = parts.first.gsub('"', '') value = parts.last.gsub('"', '')