From 5ecb1cdc26085e136c14613cd5af2ed652e1f222 Mon Sep 17 00:00:00 2001
From: sophia <scastellarin95@gmail.com>
Date: Tue, 6 Jul 2021 16:19:17 -0500
Subject: [PATCH] Get/set machine id

---
 internal/core/machine.go                 | 3 ++-
 plugins/commands/serve/client/machine.rb | 3 ++-
 plugins/providers/virtualbox/provider.rb | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/internal/core/machine.go b/internal/core/machine.go
index 57a374bc8..0aacc713b 100644
--- a/internal/core/machine.go
+++ b/internal/core/machine.go
@@ -13,10 +13,11 @@ func (m *Machine) Close() (err error) {
 }
 
 func (m *Machine) ID() (id string, err error) {
-	return "machine-id-value", nil
+	return m.target.Uuid, nil
 }
 
 func (m *Machine) SetID(value string) (err error) {
+	m.target.Uuid = value
 	return
 }
 
diff --git a/plugins/commands/serve/client/machine.rb b/plugins/commands/serve/client/machine.rb
index df0fc9772..efbb54815 100644
--- a/plugins/commands/serve/client/machine.rb
+++ b/plugins/commands/serve/client/machine.rb
@@ -38,6 +38,7 @@ module VagrantPlugins
         def get_id
           req = Google::Protobuf::Empty.new
           result = @client.get_id(req).id
+          @logger.debug("Got remote machine id: #{result}")
           if result.nil?
             raise "Failed to get machine ID. REF: #{ref.inspect} - ID WAS NIL"
           end
@@ -45,7 +46,7 @@ module VagrantPlugins
         end
 
         def set_id(new_id)
-          req = SDK::Target::SetIDRequest.new(
+          req = SDK::Target::Machine::SetIDRequest.new(
             id: new_id
           )
           @client.set_id(req)
diff --git a/plugins/providers/virtualbox/provider.rb b/plugins/providers/virtualbox/provider.rb
index f7a86c920..b65d6f797 100644
--- a/plugins/providers/virtualbox/provider.rb
+++ b/plugins/providers/virtualbox/provider.rb
@@ -55,7 +55,7 @@ module VagrantPlugins
 
         begin
           @logger.debug("Instantiating the driver for machine ID: #{@machine.id.inspect}")
-          @driver = Driver::Meta.new(id)
+          @driver = Driver::Meta.new(uuid=id)
         rescue Driver::Meta::VMNotFound
           # The virtual machine doesn't exist, so we probably have a stale
           # ID. Just clear the id out of the machine and reload it.