vagrant-parallels 1.3.13 → 1.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 727a5615d19f3fff40b44693a73f342cc06b9001
-  data.tar.gz: b1e332a7d7e33212ab4d2a667793164d072e2808
+  metadata.gz: 8b4e446a9236fe27c45d9f8e79cbc7e5debda99d
+  data.tar.gz: c27a4ff8d5072c5ec13e77867b6b006aaf430be7
 SHA512:
-  metadata.gz: 4370287033f4ac59521630571d7b9bdc968aee1131f671a0cb38dabe1225cd02228ee93b41447706c77cd43797a07b1b4d901579cda297895c93da69fb8e0118
-  data.tar.gz: 7abeeba088fc9797c2ad6aae3d7ab3587c553fd70cb9bffcbc4fcb4fb7a423fc313bd886650be633b22d680097b6150af23b80b979c43894d8ee17806109d763
+  metadata.gz: da331c7f9b348afc57b8e4cd35ac95d9db2ef6691c77e30de2c54a7ebcbf842dc02e90fb842dfa1855e60a66a152714243189e3f6f55388d4ba2042bff6af014
+  data.tar.gz: a30ce5518be12603fc39e76e196f84ac48d664cabe89ca14f4d9f006ad6a89ffe497cd08ba014f53e5db378d592c03c993cd62fe25e19cd350363032277ae8b7

data/Vagrantfile

@@ -54,17 +54,16 @@ Vagrant.configure('2') do |config|
     # end
 
     c.vm.provider :parallels do |prl, config_override|
-      config_override.vm.network :public_network, adapter: 0
-      prl.network_adapter(1, :shared)
+      # config_override.vm.network :public_network, adapter: 0
+      # prl.network_adapter(1, :shared)
+      #prl.use_linked_clone = true
     end
 
-#    c.vm.network 'private_network', ip: '192.168.60.4'
-#    c.vm.network 'private_network', ip: '10.2.0.220', netmask: '255.255.0.0'
-#    c.vm.network 'public_network'
-
     c.vm.hostname = 'my-funny-centos.do.sw.ru'
     c.vm.box = 'parallels/centos-6.6'
 
+    #c.vm.network 'private_network', ip: '192.168.255.3', netmask: '255.255.252.0'
+
     c.vm.provision :shell do |s|
       s.inline = 'echo Hello, World'
     end

data/lib/vagrant-parallels/action/export.rb

@@ -51,7 +51,13 @@ module VagrantPlugins
 
         def export
           @env[:ui].info I18n.t('vagrant.actions.vm.export.exporting')
-          @env[:machine].provider.driver.export(@env['export.temp_dir'], @tpl_name) do |progress|
+
+          options = {
+            template: true,
+            dst: @env['export.temp_dir'].to_s
+          }
+
+          @env[:machine].provider.driver.clone_vm(@env[:machine].id, @tpl_name, options) do |progress|
             @env[:ui].clear_line
             @env[:ui].report_progress(progress, 100, false)
 

data/lib/vagrant-parallels/action/import.rb

@@ -79,10 +79,25 @@ module VagrantPlugins
         end
 
         def import(env, tpl_name)
-          env[:ui].info I18n.t("vagrant.actions.vm.import.importing",
-                               :name => @machine.box.name)
+          # Generate virtual machine name
+          vm_name = "#{tpl_name}_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
+          opts = {}
+
+          # Linked clones are supported only for PD 11 and higher
+          if @machine.provider_config.use_linked_clone &&
+            @machine.provider.pd_version_satisfies?('>= 11')
+
+            env[:ui].info I18n.t('vagrant_parallels.actions.vm.import.importing_linked',
+                                 :name => @machine.box.name)
+            opts[:snapshot_id] = snapshot_id(tpl_name)
+            opts[:linked] = true
+          else
+            env[:ui].info I18n.t("vagrant.actions.vm.import.importing",
+                                 :name => @machine.box.name)
+          end
+
           # Import the virtual machine
-          @machine.id = @machine.provider.driver.import(tpl_name) do |progress|
+          @machine.id = @machine.provider.driver.clone_vm(tpl_name, vm_name, opts) do |progress|
             env[:ui].clear_line
             env[:ui].report_progress(progress, 100, false)
 
@@ -101,6 +116,23 @@ module VagrantPlugins
           end
         end
 
+        def snapshot_id(tpl_name)
+          snap_id = @machine.provider.driver.read_current_snapshot(tpl_name)
+
+          # If there is no current snapshot, just create the new one.
+          if !snap_id
+            @logger.info('Create a new snapshot')
+            opts = {
+              name: 'vagrant_linked_clone',
+              desc: 'Snapshot to create linked clones for Vagrant'
+            }
+            snap_id = @machine.provider.driver.create_snapshot(tpl_name, opts)
+          end
+
+          @logger.info("User this snapshot ID to create a linked clone: #{snap_id}")
+          snap_id
+        end
+
         def unregister_template(tpl_name)
           @logger.info("Unregister the box template: '#{tpl_name}'")
           @machine.provider.driver.unregister(tpl_name)

data/lib/vagrant-parallels/action/network.rb

@@ -29,11 +29,8 @@ module VagrantPlugins
           # Get the list of network adapters from the configuration
           network_adapters_config = env[:machine].provider_config.network_adapters.dup
 
-          # Get maximum number of network adapters
-          max_adapters = env[:machine].provider.driver.max_network_adapters
-
           # Assign the adapter slot for each high-level network
-          available_slots = Set.new(0...max_adapters)
+          available_slots = Set.new(0...16)
           network_adapters_config.each do |slot, _data|
             available_slots.delete(slot)
           end
@@ -197,6 +194,8 @@ module VagrantPlugins
                 interface = bridgedifs[index]
                 @env[:ui].info("#{index + 1}) #{interface[:name]}", :prefix => false)
               end
+              @env[:ui].info(I18n.t(
+                "vagrant.actions.vm.bridged_networking.choice_help")+"\n")
 
               # The range of valid choices
               valid = Range.new(1, bridgedifs.length)
@@ -204,7 +203,8 @@ module VagrantPlugins
               # The choice that the user has chosen as the bridging interface
               choice = nil
               while !valid.include?(choice)
-                choice = @env[:ui].ask("What interface should the network bridge to? Enter a number: ")
+                choice = @env[:ui].ask(
+                  'Which interface should the network bridge to? Enter a number: ')
                 choice = choice.to_i
               end
 
@@ -289,16 +289,16 @@ module VagrantPlugins
             # with the final octet + 1. So "172.28.0.0" turns into "172.28.0.1"
             dhcp_ip    = ip_parts.dup
             dhcp_ip[3] += 1
-            dhcp_options[:dhcp_ip] ||= dhcp_ip.join(".")
+            dhcp_options[:dhcp_ip] = options[:dhcp_ip] || dhcp_ip.join(".")
 
             # Calculate the lower and upper bound for the DHCP server
             dhcp_lower    = ip_parts.dup
             dhcp_lower[3] += 2
-            dhcp_options[:dhcp_lower] ||= dhcp_lower.join(".")
+            dhcp_options[:dhcp_lower] = options[:dhcp_lower] || dhcp_lower.join(".")
 
             dhcp_upper    = ip_parts.dup
             dhcp_upper[3] = 254
-            dhcp_options[:dhcp_upper] ||= dhcp_upper.join(".")
+            dhcp_options[:dhcp_upper] = options[:dhcp_upper] || dhcp_upper.join(".")
           end
 
           return {

data/lib/vagrant-parallels/config.rb

@@ -6,6 +6,7 @@ module VagrantPlugins
       attr_accessor :destroy_unused_network_interfaces
       attr_accessor :functional_psf
       attr_accessor :optimize_power_consumption
+      attr_accessor :use_linked_clone
       attr_accessor :name
       attr_reader   :network_adapters
       attr_accessor :regen_src_uuid
@@ -22,6 +23,7 @@ module VagrantPlugins
         @customizations    = []
         @destroy_unused_network_interfaces = UNSET_VALUE
         @functional_psf = UNSET_VALUE
+        @use_linked_clone = UNSET_VALUE
         @network_adapters  = {}
         @name              = UNSET_VALUE
         @optimize_power_consumption = UNSET_VALUE
@@ -79,6 +81,8 @@ module VagrantPlugins
           @optimize_power_consumption = true
         end
 
+        @use_linked_clone = false if @use_linked_clone == UNSET_VALUE
+
         @name = nil if @name == UNSET_VALUE
 
         @regen_src_uuid = true if @regen_src_uuid == UNSET_VALUE