Merge pull request #10629 from chrisroberts/f-vbox6-import-windows

Fix import paths on Windows for the vbox 6 driver

plugins/providers/virtualbox/driver/version_6_0.rb

@@ -46,7 +46,11 @@ module VagrantPlugins
             @logger.warn("Failed to locate base path for disks. Using current working directory.")
             base_path = "."
           else
-            base_path = File.dirname(result[:settings_path])
+            base_path = result[:settings_path]
+            if Vagrant::Util::Platform.windows? || Vagrant::Util::Platform.wsl?
+              base_path.gsub!('\\', '/')
+            end
+            base_path = File.dirname(base_path)
           end
 
           @logger.info("Base path for disk import: #{base_path}")
@@ -61,14 +65,7 @@ module VagrantPlugins
             disk_params << "--unit"
             disk_params << unit_num
             disk_params << "--disk"
-            if Vagrant::Util::Platform.windows?
-              # we use the block form of sub here to ensure that if the specified_name happens to end with a number (which is fairly likely) then
-              # we won't end up having the character sequence of a \ followed by a number be interpreted as a back reference.  For example, if
-              # specified_name were "abc123", then "\\abc123\\".reverse would be "\\321cba\\", and the \3 would be treated as a back reference by the sub
-              disk_params << path.reverse.sub("\\#{suggested_name}\\".reverse) { "\\#{specified_name}\\".reverse }.reverse # Replace only last occurrence
-            else
-              disk_params << path.reverse.sub("/#{suggested_name}/".reverse, "/#{specified_name}/".reverse).reverse # Replace only last occurrence
-            end
+            disk_params << path.reverse.sub("/#{suggested_name}/".reverse, "/#{specified_name}/".reverse).reverse # Replace only last occurrence
           end
 
           execute("import", ovf , *name_params, *disk_params, retryable: true) do |type, data|

test/unit/plugins/providers/virtualbox/driver/version_6_0_test.rb

@@ -95,5 +95,68 @@ OUTPUT
         expect { subject.import(ovf) }.to raise_error(Vagrant::Errors::VirtualBoxNoName)
       end
     end
+
+    context "when within windows" do
+      before do
+        allow(Vagrant::Util::Platform).to receive(:windows?).and_return(true)
+      end
+
+      let(:output) {<<-OUTPUT
+0%...10%...20%...30%...40%...50%...60%...70%...80%...90%...100%
+Interpreting C:\\home\\user\\.vagrant.d\\boxes\\hashicorp-VAGRANTSLASH-precise64\\1.1.0\\virtualbox\\box.ovf...
+OK.
+Disks:
+  vmdisk1       85899345920     -1      http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized       box-disk1.vmdk  -1      -1
+
+Virtual system 0:
+ 0: Suggested OS type: "Ubuntu_64"
+    (change with "--vsys 0 --ostype <type>"; use "list ostypes" to list all possible values)
+ 1: Suggested VM name "precise64"
+    (change with "--vsys 0 --vmname <name>")
+ 2: Suggested VM group "/"
+    (change with "--vsys 0 --group <group>")
+ 3: Suggested VM settings file name "C:\\home\\user\\VirtualBox VMs\\precise64\\precise64.vbox"
+    (change with "--vsys 0 --settingsfile <filename>")
+ 4: Suggested VM base folder "C:\\home\\vagrant\\VirtualBox VMs"
+    (change with "--vsys 0 --basefolder <path>")
+ 5: Number of CPUs: 2
+    (change with "--vsys 0 --cpus <n>")
+ 6: Guest memory: 384 MB
+    (change with "--vsys 0 --memory <MB>")
+ 7: Network adapter: orig NAT, config 3, extra slot=0;type=NAT
+ 8: CD-ROM
+    (disable with "--vsys 0 --unit 8 --ignore")
+ 9: IDE controller, type PIIX4
+    (disable with "--vsys 0 --unit 9 --ignore")
+10: IDE controller, type PIIX4
+    (disable with "--vsys 0 --unit 10 --ignore")
+11: SATA controller, type AHCI
+    (disable with "--vsys 0 --unit 11 --ignore")
+12: Hard disk image: source image=box-disk1.vmdk, target path=box-disk1.vmdk, controller=11;channel=0
+    (change target path with "--vsys 0 --unit 12 --disk path";
+    disable with "--vsys 0 --unit 12 --ignore")
+OUTPUT
+      }
+
+      it "should include disk image on import" do
+        expect(subject).to receive(:execute).with("import", "-n", ovf).and_return(output)
+        expect(subject).to receive(:execute) do |*args|
+          match = args[3, args.size].detect { |a| a.include?("disk1.vmdk") }
+          expect(match).to include("disk1.vmdk")
+        end
+        expect(subject.import(ovf)).to eq(machine_id)
+      end
+
+      it "should update the suggested VM path from default box name" do
+        expect(subject).to receive(:execute).with("import", "-n", ovf).and_return(output)
+        expect(subject).to receive(:execute) do |*args|
+          match = args[3, args.size].detect { |a| a.include?("box-disk1.vmdk") }
+          expect(match).not_to include("/precise64/box-disk1.vmdk")
+          expect(match).to match(/.+precise64_.+?\/box-disk1.vmdk/)
+        end
+        expect(subject.import(ovf)).to eq(machine_id)
+      end
+
+    end
   end
 end