vagrant-parallels 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96a1ffdfb9901688a2af90776e4c7f86c1ea5d27
-  data.tar.gz: dedfe0e23fbcaf6b429f31f422bb96b32ad2c7da
+  metadata.gz: 0e014ab2a7c2e81aebb3325f22e60334982cceed
+  data.tar.gz: 180a1225025aa7b162173b7f46ab7eb695db30ce
 SHA512:
-  metadata.gz: 20bc34e6060d31b4af5656c360146104f90fad6d967797c2f6d674f50f5ab5da2c9505dd97cb6c9f919f79e9fe6309412e7a1582ffe8f5587b4c52a1c05e574c
-  data.tar.gz: 9ced0b39362f1f48a7bffb36f7b5477ddac77ef37ff475fc1dd836f066aefd5912a146e729962a7658ffe6222dd8dc0723b64993cd24a5bee73ef8e4095a3529
+  metadata.gz: 3c932834e0ef5d2e4ae6cc91b17569b0f56c9c6246b23e228a966ffbd1932bb9a0760383382331b9bb985f5f226b4f96a75025f2b5f762a33d40c8732fb45c5b
+  data.tar.gz: 5c55c0dd9852a23133bd4dce45fd395e19790529f1de6b486ccf6cd07737606f170a7fd929af07f1e7b8eeaf8524f77bcc9e659c762221b3c73a507823275dcb

data/CHANGELOG.md

@@ -1,6 +1,22 @@
+## 1.7.0 (November 15, 2016)
+BREAKING CHANGES:
+  - **Dropped support of Parallels Desktop 8 and 9**. These versions have 
+  reached their [End-of-Life and End-of-Support](http://kb.parallels.com/eu/122533).
+  - **Removed customization options, which were previously deprecated:**
+  [[GH-271](https://github.com/Parallels/vagrant-parallels/pull/271)]
+    - "use_linked_clone" - use `linked_clone` instead.
+    - "regen_box_uuid" - use `regen_src_uuid` instead.
+    - "optimize_power_consumption".  
+  
+FEATURES:
+  - **IPv6 Private Networks:** Private networking now supports IPv6. 
+  This only works with Parallels Desktop 12 and higher.
+  [[GH-273](https://github.com/Parallels/vagrant-parallels/pull/273)]
+
+
 ## 1.6.3 (July 11, 2016)
 DEPRECATIONS:
-  - The following provider options was renamed:
+  - The following provider options were renamed:
     - `regen_box_uuid` was renamed to `regen_src_uuid`
     - `use_linked_clone` was renamed to `linked clone`
 

data/README.md

@@ -4,15 +4,15 @@
 [![Code Climate](https://codeclimate.com/github/Parallels/vagrant-parallels.png)](https://codeclimate.com/github/Parallels/vagrant-parallels)
 
 This is a plugin for [Vagrant](http://www.vagrantup.com),
-allowing to power [Parallels Desktop for Mac](http://www.parallels.com/products/desktop/)
-based virtual machines.
+allowing to manage [Parallels Desktop](http://www.parallels.com/products/desktop/) 
+virtual machines on OS X hosts.
 
 ### Requirements 
 - [Vagrant v1.8](http://www.vagrantup.com) or higher
-- [Parallels Desktop 8 for Mac](http://www.parallels.com/products/desktop/) or higher
+- [Parallels Desktop 10 for Mac](http://www.parallels.com/products/desktop/) or higher
 
-*Note:* In [**Parallels Desktop 11 for Mac**](http://www.parallels.com/products/desktop/), 
-only **Pro** and **Business** editions are compatible with this Vagrant provider. 
+*Note:* Only **Pro** and **Business** editions of **Parallels Desktop for Mac** 
+are compatible with this Vagrant provider. 
 Standard edition doesn't have a command line functionality and can not be used 
 with Vagrant.
 
@@ -55,17 +55,6 @@ please report it on the [Issue Tracker](https://github.com/Parallels/vagrant-par
 
 * Author: Youssef Shahin <yshahin@gmail.com>
 * Author: Mikhail Zholobov <legal90@gmail.com>
-* Copyright 2013-2015, Parallels IP Holdings GmbH.
+* Copyright 2013-2016, Parallels IP Holdings GmbH.
 
-```text
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-```
+Vagrant Parallels Provider is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).

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

@@ -119,11 +119,9 @@ module VagrantPlugins
             f.write(env[:clone_id])
           end
 
-          if env[:machine].provider.pd_version_satisfies?('>= 10')
-            # Convert template to VM (compatibility with old-styled boxes)
-            env[:machine].provider.driver.execute_prlctl(
-              'set', env[:clone_id], '--template', 'off')
-          end
+          # Convert template to VM (compatibility with old-styled boxes)
+          env[:machine].provider.driver.execute_prlctl(
+            'set', env[:clone_id], '--template', 'off')
         end
       end
     end

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

@@ -7,11 +7,6 @@ module VagrantPlugins
         end
 
         def call(env)
-          # Port Forwarding feature is available only with PD >= 10
-          if !env[:machine].provider.pd_version_satisfies?('>= 10')
-            return @app.call(env)
-          end
-
           ports = env[:machine].provider.driver.read_forwarded_ports
           if !ports.empty?
             env[:ui].info I18n.t('vagrant.actions.vm.clear_forward_ports.deleting')

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

@@ -8,12 +8,8 @@ module VagrantPlugins
         end
 
         def call(env)
-          # Disable requiring password for delete action [GH-67].
-          # It is available only since PD 10.
-          if env[:machine].provider.pd_version_satisfies?('>= 10')
-            @logger.info('Disabling password restrictions: remove-vm')
-            env[:machine].provider.driver.disable_password_restrictions(['remove-vm'])
-          end
+          @logger.info('Disabling password restrictions: remove-vm')
+          env[:machine].provider.driver.disable_password_restrictions(['remove-vm'])
 
           env[:ui].info I18n.t('vagrant.actions.vm.destroy.destroying')
           env[:machine].provider.driver.delete

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

@@ -13,11 +13,6 @@ module VagrantPlugins
         # Execution
         #--------------------------------------------------------------
         def call(env)
-          # Port Forwarding feature is available only with PD >= 10
-          if !env[:machine].provider.pd_version_satisfies?('>= 10')
-            return @app.call(env)
-          end
-
           @env = env
 
           # Get the ports we're forwarding

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

@@ -17,12 +17,9 @@ module VagrantPlugins
           options = {}
 
           # Disable requiring password for register and clone actions [GH-67].
-          # It is available only since PD 10.
-          if env[:machine].provider.pd_version_satisfies?('>= 10')
-            acts = ['clone-vm']
-            @logger.info("Disabling password restrictions: #{acts.join(', ')}")
-            env[:machine].provider.driver.disable_password_restrictions(acts)
-          end
+          acts = ['clone-vm']
+          @logger.info("Disabling password restrictions: #{acts.join(', ')}")
+          env[:machine].provider.driver.disable_password_restrictions(acts)
 
           if env[:machine].provider_config.regen_src_uuid \
             && env[:machine].provider.pd_version_satisfies?('>= 10.1.2')

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

@@ -1,8 +1,7 @@
+require 'ipaddr'
 require 'set'
-
 require 'log4r'
 
-require 'vagrant/util/network_ip'
 require 'vagrant/util/scoped_hash_override'
 
 module VagrantPlugins
@@ -14,7 +13,6 @@ module VagrantPlugins
       #
       # This handles all the `config.vm.network` configurations.
       class Network
-        include Vagrant::Util::NetworkIP
         include Vagrant::Util::ScopedHashOverride
         @@lock = Mutex.new
 
@@ -253,7 +251,6 @@ module VagrantPlugins
             mac:         nil,
             name:        nil,
             nic_type:    nil,
-            netmask:     '255.255.255.0',
             type:        :static
           }.merge(options)
 
@@ -263,47 +260,57 @@ module VagrantPlugins
           # Default IP is in the 20-bit private network block for DHCP based networks
           options[:ip] = '10.37.129.1' if options[:type] == :dhcp && !options[:ip]
 
-          # Calculate our network address for the given IP/netmask
-          netaddr  = network_address(options[:ip], options[:netmask])
-
-          # Verify that a host-only network subnet would not collide
-          # with a bridged networking interface.
-          #
-          # If the subnets overlap in any way then the host only network
-          # will not work because the routing tables will force the
-          # traffic onto the real interface rather than the virtual
-          # network interface.
-          @env[:machine].provider.driver.read_bridged_interfaces.each do |interface|
-            that_netaddr = network_address(interface[:ip], interface[:netmask])
-            raise Vagrant::Errors::NetworkCollision if \
-              netaddr == that_netaddr && interface[:status] != 'Down'
+          begin
+            ip = IPAddr.new(options[:ip])
+            if ip.ipv4?
+              options[:netmask] ||= '255.255.255.0'
+            elsif ip.ipv6?
+              options[:netmask] ||= 64
+
+              # Append a 6 to the end of the type
+              options[:type] = "#{options[:type]}6".to_sym
+            else
+              raise IPAddr::AddressFamilyError, 'unknown address family'
+            end
+
+            # Calculate our network address for the given IP/netmask
+            netaddr = IPAddr.new("#{options[:ip]}/#{options[:netmask]}")
+          rescue IPAddr::Error => e
+            raise VagrantPlugins::Parallels::Errors::NetworkInvalidAddress,
+                  options: options, error: e.message
           end
 
-          # Split the IP address into its components
-          ip_parts = netaddr.split('.').map { |i| i.to_i }
+          if ip.ipv4?
+            # Verify that a host-only network subnet would not collide
+            # with a bridged networking interface.
+            #
+            # If the subnets overlap in any way then the host only network
+            # will not work because the routing tables will force the
+            # traffic onto the real interface rather than the virtual
+            # network interface.
+            @env[:machine].provider.driver.read_bridged_interfaces.each do |interface|
+              next if interface[:status] == 'Down'
+              that_netaddr = IPAddr.new("#{interface[:ip]}/#{interface[:netmask]}")
+              raise Vagrant::Errors::NetworkCollision if netaddr.include? that_netaddr
+            end
+          end
 
-          # Calculate the adapter IP, which we assume is the IP ".1" at
-          # the end usually.
-          adapter_ip    = ip_parts.dup
-          adapter_ip[3] += 1
-          options[:adapter_ip] ||= adapter_ip.join('.')
+          # Calculate the adapter IP which is the network address with the final
+          # bit group appended by 1. Usually it is "x.x.x.1" for IPv4 and
+          # "<prefix>::1" for IPv6
+          options[:adapter_ip] ||= (netaddr | 1).to_s
 
           dhcp_options = {}
           if options[:type] == :dhcp
-            # Calculate the DHCP server IP, which is the network address
-            # 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] = 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] = options[:dhcp_lower] || dhcp_lower.join('.')
-
-            dhcp_upper    = ip_parts.dup
-            dhcp_upper[3] = 254
-            dhcp_options[:dhcp_upper] = options[:dhcp_upper] || dhcp_upper.join('.')
+            # Calculate the IP and lower & upper bound for the DHCP server
+            # Example: for "192.168.22.64/26" network range it wil be:
+            # dhcp_ip: "192.168.22.65",
+            # dhcp_lower: "192.168.22.66"
+            # dhcp_upper: "192.168.22.126"
+            ip_range = netaddr.to_range
+            dhcp_options[:dhcp_ip]    = options[:dhcp_ip]    || (ip_range.first | 1).to_s
+            dhcp_options[:dhcp_lower] = options[:dhcp_lower] || (ip_range.first | 2).to_s
+            dhcp_options[:dhcp_upper] = options[:dhcp_upper] || (ip_range.last(2).first).to_s
           end
 
           {
@@ -444,14 +451,19 @@ module VagrantPlugins
 
         # This finds a matching host only network for the given configuration.
         def hostonly_find_matching_network(config)
-          this_netaddr = network_address(config[:ip], config[:netmask])
+          this_netaddr = IPAddr.new("#{config[:ip]}/#{config[:netmask]}")
 
           @env[:machine].provider.driver.read_host_only_interfaces.each do |interface|
             return interface if config[:name] && config[:name] == interface[:name]
 
-            if interface[:ip]
-              return interface if this_netaddr == \
-                network_address(interface[:ip], interface[:netmask])
+            if interface[:ip] && this_netaddr.ipv4?
+              netaddr = IPAddr.new("#{interface[:ip]}/#{interface[:netmask]}")
+              return interface if netaddr.include? this_netaddr
+            end
+
+            if interface[:ipv6] && this_netaddr.ipv6?
+              netaddr = IPAddr.new("#{interface[:ipv6]}/#{interface[:ipv6_prefix]}")
+              return interface if netaddr.include? this_netaddr
             end
           end
 

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

@@ -7,11 +7,6 @@ module VagrantPlugins
         end
 
         def call(env)
-          # Port Forwarding feature is available only with PD >= 10
-          if !env[:machine].provider.pd_version_satisfies?('>= 10')
-            return @app.call(env)
-          end
-
           # Get the forwarded ports used by other virtual machines and
           # consider those in use as well.
           env[:port_collision_extra_in_use] =

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

@@ -30,22 +30,14 @@ module VagrantPlugins
         private
 
         def default_settings
-          settings = {}
-
-          return settings if @env[:machine].provider.pd_version_satisfies?('< 9')
-          settings.merge!(
+          settings = {
             startup_view: 'same',
             on_shutdown: 'close',
             on_window_close: 'keep-running',
             auto_share_camera: 'off',
             smart_guard: 'off',
             longer_battery_life: 'on'
-          )
-
-          # Check the legacy option
-          if !@env[:machine].provider_config.optimize_power_consumption
-            settings[:longer_battery_life] = 'off'
-          end
+          }
 
           return settings  if @env[:machine].provider.pd_version_satisfies?('< 10.1.2')
           settings.merge!(

data/lib/vagrant-parallels/action.rb

@@ -394,7 +394,6 @@ module VagrantPlugins
       autoload :BoxRegister, File.expand_path('../action/box_register', __FILE__)
       autoload :BoxUnregister, File.expand_path('../action/box_unregister', __FILE__)
       autoload :HandleGuestTools, File.expand_path('../action/handle_guest_tools', __FILE__)
-      autoload :HandleForwardedPortCollisions, File.expand_path('../action/handle_forwarded_port_collisions.rb', __FILE__)
       autoload :CheckSharedInterface, File.expand_path('../action/check_shared_interface', __FILE__)
       autoload :ClearNetworkInterfaces, File.expand_path('../action/clear_network_interfaces', __FILE__)
       autoload :ClearForwardedPorts, File.expand_path('../action/clear_forwarded_ports', __FILE__)

data/lib/vagrant-parallels/config.rb

@@ -13,10 +13,6 @@ module VagrantPlugins
       attr_accessor :regen_src_uuid
       attr_accessor :update_guest_tools
 
-      # Deprecated options
-      attr_accessor :regen_box_uuid
-      attr_accessor :use_linked_clone
-
       # Compatibility with virtualbox provider's syntax
       alias :check_guest_additions= :check_guest_tools=
 
@@ -29,15 +25,10 @@ module VagrantPlugins
         @linked_clone_snapshot = UNSET_VALUE
         @network_adapters  = {}
         @name              = UNSET_VALUE
-        @optimize_power_consumption = UNSET_VALUE
         @regen_src_uuid     = UNSET_VALUE
         @update_guest_tools = UNSET_VALUE
 
         network_adapter(0, :shared)
-
-        # Deprecated options
-        @regen_box_uuid = UNSET_VALUE
-        @use_linked_clone = UNSET_VALUE
       end
 
       def customize(*command)
@@ -68,16 +59,6 @@ module VagrantPlugins
       end
 
       def finalize!
-        if @regen_box_uuid != UNSET_VALUE
-          puts "Parallels provider: Vagrantfile option 'regen_box_uuid' is deprecated and will be removed. Please, use 'regen_src_uuid' instead"
-          @regen_src_uuid = @regen_box_uuid if @regen_src_uuid == UNSET_VALUE
-        end
-
-        if @use_linked_clone != UNSET_VALUE
-          puts "Parallels provider: Vagrantfile option 'use_linked_clone' is deprecated and will be removed. Please, use 'linked_clone' instead"
-          @linked_clone = @use_linked_clone if @linked_clone == UNSET_VALUE
-        end
-
         if @check_guest_tools == UNSET_VALUE
           @check_guest_tools = true
         end
@@ -118,10 +99,6 @@ module VagrantPlugins
           end
         end
 
-        if @optimize_power_consumption != UNSET_VALUE
-          machine.env.ui.warn I18n.t('vagrant_parallels.config.deprecate_power_consumption')
-        end
-
         { 'Parallels Provider' => errors }
       end
     end

data/lib/vagrant-parallels/driver/base.rb

@@ -54,7 +54,14 @@ module VagrantPlugins
         #     }
         #
         def clear_forwarded_ports(ports)
-          raise NotImplementedError
+          args = []
+          ports.each do |r|
+            args.concat(["--nat-#{r[:protocol]}-del", r[:name]])
+          end
+
+          if !args.empty?
+            execute_prlsrvctl('net', 'set', read_shared_network_id, *args)
+          end
         end
 
         # Clears the shared folders that have been set on the virtual machine.
@@ -187,7 +194,25 @@ module VagrantPlugins
 
         # Deletes any host only networks that aren't being used for anything.
         def delete_unused_host_only_networks
-          raise NotImplementedError
+          networks = read_virtual_networks
+          # 'Shared'(vnic0) and 'Host-Only'(vnic1) are default in Parallels Desktop
+          # They should not be deleted anyway.
+          networks.keep_if do |net|
+            net['Type'] == 'host-only' && net['Bound To'] &&
+              net['Bound To'].match(/^(?>vnic|Parallels Host-Only #)(\d+)$/)[1].to_i >= 2
+          end
+
+          read_vms_info.each do |vm|
+            used_nets = vm.fetch('Hardware', {}).select { |name, _| name.start_with? 'net' }
+            used_nets.each_value do |net_params|
+              networks.delete_if { |net| net['Network ID'] == net_params.fetch('iface', nil) }
+            end
+          end
+
+          networks.each do |net|
+            # Delete the actual host only network interface.
+            execute_prlsrvctl('net', 'del', net['Network ID'])
+          end
         end
 
         # Disables requiring password on such operations as creating, adding,
@@ -196,7 +221,10 @@ module VagrantPlugins
         # @param [Array<String>] acts List of actions. Available values:
         # ['create-vm', 'add-vm', 'remove-vm', 'clone-vm']
         def disable_password_restrictions(acts)
-          raise NotImplementedError
+          server_info = json { execute_prlsrvctl('info', '--json') }
+          server_info.fetch('Require password to',[]).each do |act|
+            execute_prlsrvctl('set', '--require-pwd', "#{act}:off") if acts.include? act
+          end
         end
 
         # Enables network adapters on the VM.
@@ -215,7 +243,45 @@ module VagrantPlugins
         # @param [Array<Symbol => Symbol, String>] adapters
         # Array of adapters to be enabled.
         def enable_adapters(adapters)
-          raise NotImplementedError
+          # Get adapters which have already configured for this VM
+          # Such adapters will be just overridden
+          existing_adapters = read_settings.fetch('Hardware', {}).keys.select do |name|
+            name.start_with? 'net'
+          end
+
+          # Disable all previously existing adapters (except shared 'vnet0')
+          existing_adapters.each do |adapter|
+            if adapter != 'vnet0'
+              execute_prlctl('set', @uuid, '--device-set', adapter, '--disable')
+            end
+          end
+
+          adapters.each do |adapter|
+            args = []
+            if existing_adapters.include? "net#{adapter[:adapter]}"
+              args.concat(['--device-set',"net#{adapter[:adapter]}", '--enable'])
+            else
+              args.concat(['--device-add', 'net'])
+            end
+
+            if adapter[:type] == :hostonly
+              args.concat(['--type', 'host', '--iface', adapter[:hostonly]])
+            elsif adapter[:type] == :bridged
+              args.concat(['--type', 'bridged', '--iface', adapter[:bridge]])
+            elsif adapter[:type] == :shared
+              args.concat(['--type', 'shared'])
+            end
+
+            if adapter[:mac_address]
+              args.concat(['--mac', adapter[:mac_address]])
+            end
+
+            if adapter[:nic_type]
+              args.concat(['--adapter-type', adapter[:nic_type].to_s])
+            end
+
+            execute_prlctl('set', @uuid, *args)
+          end
         end
 
         # Create a set of port forwarding rules for a virtual machine.
@@ -237,7 +303,20 @@ module VagrantPlugins
         # @param [Array<Hash>] ports An array of ports to set. See documentation
         # for more information on the format.
         def forward_ports(ports)
-          raise NotImplementedError
+          args = []
+          ports.each do |options|
+            protocol = options[:protocol] || 'tcp'
+            pf_builder = [
+              options[:name],
+              options[:hostport],
+              @uuid,
+              options[:guestport]
+            ]
+
+            args.concat(["--nat-#{protocol}-add", pf_builder.join(',')])
+          end
+
+          execute_prlsrvctl('net', 'set', read_shared_network_id, *args)
         end
 
         # Lists all snapshots for the specified VM. Returns an empty hash if
@@ -328,7 +407,13 @@ module VagrantPlugins
         # Otherwise only rules related to the context VM will be returned.
         # @return [Array<Symbol => String>]
         def read_forwarded_ports(global=false)
-          raise NotImplementedError
+          all_rules = read_shared_interface[:nat]
+
+          if global
+            all_rules
+          else
+            all_rules.select { |r| r[:guest].include?(@uuid) }
+          end
         end
 
         # Returns an IP of the virtual machine. It requires that Shared network
@@ -418,7 +503,37 @@ module VagrantPlugins
         #
         # @return [Array<Symbol => String>]
         def read_host_only_interfaces
-          raise NotImplementedError
+          net_list = read_virtual_networks
+          net_list.keep_if { |net| net['Type'] == 'host-only' }
+
+          hostonly_ifaces = []
+          net_list.each do |iface|
+            net_info = json do
+              execute_prlsrvctl('net', 'info', iface['Network ID'], '--json')
+            end
+
+            iface = {
+              name:   net_info['Network ID'],
+              status: 'Down'
+            }
+
+            adapter = net_info['Parallels adapter']
+            if adapter && net_info['Bound To']
+              # In PD >= 10.1.2 there are new field names for an IP/Subnet
+              iface[:ip]       = adapter['IP address'] || adapter['IPv4 address']
+              iface[:netmask]  = adapter['Subnet mask'] || adapter['IPv4 subnet mask']
+              iface[:bound_to] = net_info['Bound To']
+              iface[:status]   = 'Up'
+
+              if adapter['IPv6 address'] && adapter['IPv6 subnet mask']
+                iface[:ipv6]        = adapter['IPv6 address']
+                iface[:ipv6_prefix] = adapter['IPv6 subnet mask']
+              end
+            end
+
+            hostonly_ifaces << iface
+          end
+          hostonly_ifaces
         end
 
         # Returns the MAC address of the first Shared network interface.
@@ -448,7 +563,27 @@ module VagrantPlugins
         #
         # @return [<Integer => Hash>]
         def read_network_interfaces
-          raise NotImplementedError
+          nics = {}
+
+          # Get enabled VM's network interfaces
+          ifaces = read_settings.fetch('Hardware', {}).keep_if do |dev, params|
+            dev.start_with?('net') and params.fetch('enabled', true)
+          end
+          ifaces.each do |name, params|
+            adapter = name.match(/^net(\d+)$/)[1].to_i
+            nics[adapter] ||= {}
+
+            if params['type'] == 'shared'
+              nics[adapter][:type] = :shared
+            elsif params['type'] == 'host'
+              nics[adapter][:type] = :hostonly
+              nics[adapter][:hostonly] = params.fetch('iface','')
+            elsif params['type'] == 'bridged'
+              nics[adapter][:type] = :bridged
+              nics[adapter][:bridge] = params.fetch('iface','')
+            end
+          end
+          nics
         end
 
         # Returns virtual machine settings
@@ -472,7 +607,45 @@ module VagrantPlugins
         #
         # @return [<Symbol => String, Hash>]
         def read_shared_interface
-          raise NotImplementedError
+          net_info = json do
+            execute_prlsrvctl('net', 'info', read_shared_network_id, '--json')
+          end
+
+          iface = {
+            nat:    [],
+            status: 'Down'
+          }
+          adapter = net_info['Parallels adapter']
+
+          if adapter && net_info['Bound To']
+            # In PD >= 10.1.2 there are new field names for an IP/Subnet
+            iface[:ip]       = adapter['IP address'] || adapter['IPv4 address']
+            iface[:netmask]  = adapter['Subnet mask'] || adapter['IPv4 subnet mask']
+            iface[:bound_to] = net_info['Bound To']
+            iface[:status]   = 'Up'
+          end
+
+          if net_info.key?('DHCPv4 server')
+            iface[:dhcp] = {
+              ip:    net_info['DHCPv4 server']['Server address'],
+              lower: net_info['DHCPv4 server']['IP scope start address'],
+              upper: net_info['DHCPv4 server']['IP scope end address']
+            }
+          end
+
+          net_info['NAT server'].each do |group, rules|
+            rules.each do |name, params|
+              iface[:nat] << {
+                name:      name,
+                protocol:  group == 'TCP rules' ? 'tcp' : 'udp',
+                guest:     params['destination IP/VM id'],
+                hostport:  params['source port'],
+                guestport: params['destination port']
+              }
+            end
+          end
+
+          iface
         end
 
         # Returns a list of shared folders in format:
@@ -501,6 +674,8 @@ module VagrantPlugins
         #
         # @return [Array]
         def read_used_ports
+          # Ignore our own used ports
+          read_forwarded_ports(true).reject { |r| r[:guest].include?(@uuid) }
         end
 
         # Returns the configuration of all virtual networks in Parallels Desktop.
@@ -603,7 +778,8 @@ module VagrantPlugins
         # @param [Boolean] optimized Use "Longer Battery Life"
         # instead "Better Performance"
         def set_power_consumption_mode(optimized)
-          raise NotImplementedError
+          state = optimized ? 'on' : 'off'
+          execute_prlctl('set', @uuid, '--longer-battery-life', state)
         end
 
         # Share a set of folders on this VM.

data/lib/vagrant-parallels/driver/meta.rb

@@ -44,11 +44,10 @@ module VagrantPlugins
           major_ver = @@version.split('.').first.to_i
           driver_klass =
             case major_ver
-            when 1..7 then raise Errors::ParallelsUnsupportedVersion
-            when 8 then PD_8
-            when 9 then PD_9
+            when 1..9 then raise Errors::ParallelsUnsupportedVersion
             when 10 then PD_10
-            else PD_11
+            when 11 then PD_11
+            else PD_12
             end
 
           # Starting since PD 11 only Pro and Business editions have CLI

data/lib/vagrant-parallels/driver/pd_10.rb

@@ -2,228 +2,18 @@ require 'log4r'
 
 require 'vagrant/util/platform'
 
-require_relative 'pd_9'
+require_relative 'base'
 
 module VagrantPlugins
   module Parallels
     module Driver
       # Driver for Parallels Desktop 10.
-      class PD_10 < PD_9
+      class PD_10 < Base
         def initialize(uuid)
           super(uuid)
 
           @logger = Log4r::Logger.new('vagrant_parallels::driver::pd_10')
         end
-
-        def clear_forwarded_ports(ports)
-          args = []
-          ports.each do |r|
-            args.concat(["--nat-#{r[:protocol]}-del", r[:name]])
-          end
-
-          if !args.empty?
-            execute_prlsrvctl('net', 'set', read_shared_network_id, *args)
-          end
-        end
-
-
-        def delete_unused_host_only_networks
-          networks = read_virtual_networks
-          # 'Shared'(vnic0) and 'Host-Only'(vnic1) are default in Parallels Desktop
-          # They should not be deleted anyway.
-          networks.keep_if do |net|
-            net['Type'] == 'host-only' && net['Bound To'] &&
-              net['Bound To'].match(/^(?>vnic|Parallels Host-Only #)(\d+)$/)[1].to_i >= 2
-          end
-
-          read_vms_info.each do |vm|
-            used_nets = vm.fetch('Hardware', {}).select { |name, _| name.start_with? 'net' }
-            used_nets.each_value do |net_params|
-              networks.delete_if { |net| net['Network ID'] == net_params.fetch('iface', nil) }
-            end
-          end
-
-          networks.each do |net|
-            # Delete the actual host only network interface.
-            execute_prlsrvctl('net', 'del', net['Network ID'])
-          end
-        end
-
-        def disable_password_restrictions(acts)
-          server_info = json { execute_prlsrvctl('info', '--json') }
-          server_info.fetch('Require password to',[]).each do |act|
-            execute_prlsrvctl('set', '--require-pwd', "#{act}:off") if acts.include? act
-          end
-        end
-
-        def enable_adapters(adapters)
-          # Get adapters which have already configured for this VM
-          # Such adapters will be just overridden
-          existing_adapters = read_settings.fetch('Hardware', {}).keys.select do |name|
-            name.start_with? 'net'
-          end
-
-          # Disable all previously existing adapters (except shared 'vnet0')
-          existing_adapters.each do |adapter|
-            if adapter != 'vnet0'
-              execute_prlctl('set', @uuid, '--device-set', adapter, '--disable')
-            end
-          end
-
-          adapters.each do |adapter|
-            args = []
-            if existing_adapters.include? "net#{adapter[:adapter]}"
-              args.concat(['--device-set',"net#{adapter[:adapter]}", '--enable'])
-            else
-              args.concat(['--device-add', 'net'])
-            end
-
-            if adapter[:type] == :hostonly
-              args.concat(['--type', 'host', '--iface', adapter[:hostonly]])
-            elsif adapter[:type] == :bridged
-              args.concat(['--type', 'bridged', '--iface', adapter[:bridge]])
-            elsif adapter[:type] == :shared
-              args.concat(['--type', 'shared'])
-            end
-
-            if adapter[:mac_address]
-              args.concat(['--mac', adapter[:mac_address]])
-            end
-
-            if adapter[:nic_type]
-              args.concat(['--adapter-type', adapter[:nic_type].to_s])
-            end
-
-            execute_prlctl('set', @uuid, *args)
-          end
-        end
-
-        def forward_ports(ports)
-          args = []
-          ports.each do |options|
-            protocol = options[:protocol] || 'tcp'
-            pf_builder = [
-              options[:name],
-              options[:hostport],
-              @uuid,
-              options[:guestport]
-            ]
-
-            args.concat(["--nat-#{protocol}-add", pf_builder.join(',')])
-          end
-
-          execute_prlsrvctl('net', 'set', read_shared_network_id, *args)
-        end
-
-        def read_forwarded_ports(global=false)
-          all_rules = read_shared_interface[:nat]
-
-          if global
-            all_rules
-          else
-            all_rules.select { |r| r[:guest].include?(@uuid) }
-          end
-        end
-
-        def read_host_only_interfaces
-          net_list = read_virtual_networks
-          net_list.keep_if { |net| net['Type'] == 'host-only' }
-
-          hostonly_ifaces = []
-          net_list.each do |iface|
-            net_info = json do
-              execute_prlsrvctl('net', 'info', iface['Network ID'], '--json')
-            end
-
-            iface = {
-              name:   net_info['Network ID'],
-              status: 'Down'
-            }
-
-            adapter = net_info['Parallels adapter']
-            if adapter && net_info['Bound To']
-              # In PD >= 10.1.2 there are new field names for an IP/Subnet
-              iface[:ip]       = adapter['IP address'] || adapter['IPv4 address']
-              iface[:netmask]  = adapter['Subnet mask'] || adapter['IPv4 subnet mask']
-              iface[:bound_to] = net_info['Bound To']
-              iface[:status]   = 'Up'
-            end
-
-            hostonly_ifaces << iface
-          end
-          hostonly_ifaces
-        end
-
-        def read_network_interfaces
-          nics = {}
-
-          # Get enabled VM's network interfaces
-          ifaces = read_settings.fetch('Hardware', {}).keep_if do |dev, params|
-            dev.start_with?('net') and params.fetch('enabled', true)
-          end
-          ifaces.each do |name, params|
-            adapter = name.match(/^net(\d+)$/)[1].to_i
-            nics[adapter] ||= {}
-
-            if params['type'] == 'shared'
-              nics[adapter][:type] = :shared
-            elsif params['type'] == 'host'
-              nics[adapter][:type] = :hostonly
-              nics[adapter][:hostonly] = params.fetch('iface','')
-            elsif params['type'] == 'bridged'
-              nics[adapter][:type] = :bridged
-              nics[adapter][:bridge] = params.fetch('iface','')
-            end
-          end
-          nics
-        end
-
-        def read_shared_interface
-          net_info = json do
-            execute_prlsrvctl('net', 'info', read_shared_network_id, '--json')
-          end
-
-          iface = {
-            nat:    [],
-            status: 'Down'
-          }
-          adapter = net_info['Parallels adapter']
-
-          if adapter && net_info['Bound To']
-            # In PD >= 10.1.2 there are new field names for an IP/Subnet
-            iface[:ip]       = adapter['IP address'] || adapter['IPv4 address']
-            iface[:netmask]  = adapter['Subnet mask'] || adapter['IPv4 subnet mask']
-            iface[:bound_to] = net_info['Bound To']
-            iface[:status]   = 'Up'
-          end
-
-          if net_info.key?('DHCPv4 server')
-            iface[:dhcp] = {
-              ip:    net_info['DHCPv4 server']['Server address'],
-              lower: net_info['DHCPv4 server']['IP scope start address'],
-              upper: net_info['DHCPv4 server']['IP scope end address']
-            }
-          end
-
-          net_info['NAT server'].each do |group, rules|
-            rules.each do |name, params|
-              iface[:nat] << {
-                name:      name,
-                protocol:  group == 'TCP rules' ? 'tcp' : 'udp',
-                guest:     params['destination IP/VM id'],
-                hostport:  params['source port'],
-                guestport: params['destination port']
-              }
-            end
-          end
-
-          iface
-        end
-
-        def read_used_ports
-          # Ignore our own used ports
-          read_forwarded_ports(true).reject { |r| r[:guest].include?(@uuid) }
-        end
       end
     end
   end

data/lib/vagrant-parallels/driver/pd_12.rb

@@ -0,0 +1,56 @@
+require 'log4r'
+
+require 'vagrant/util/platform'
+
+require_relative 'pd_11'
+
+module VagrantPlugins
+  module Parallels
+    module Driver
+      # Driver for Parallels Desktop 12.
+      class PD_12 < PD_11
+        def initialize(uuid)
+          super(uuid)
+
+          @logger = Log4r::Logger.new('vagrant_parallels::driver::pd_12')
+        end
+
+        def create_host_only_network(options)
+          # Create the interface
+          execute_prlsrvctl('net', 'add', options[:network_id], '--type', 'host-only')
+
+          # Get the IP so we can determine v4 vs v6
+          ip = IPAddr.new(options[:adapter_ip])
+          if ip.ipv4?
+            args = ['--ip', "#{options[:adapter_ip]}/#{options[:netmask]}"]
+            if options[:dhcp]
+              args.concat(['--dhcp-ip', options[:dhcp][:ip],
+                           '--ip-scope-start', options[:dhcp][:lower],
+                           '--ip-scope-end', options[:dhcp][:upper]])
+            end
+          elsif ip.ipv6?
+            # Convert prefix length to netmask ("32" -> "ffff:ffff::")
+            options[:netmask] = IPAddr.new(IPAddr::IN6MASK, Socket::AF_INET6)
+                                  .mask(options[:netmask]).to_s
+
+            args = ['--host-assign-ip6', 'on',
+                    '--ip6', "#{options[:adapter_ip]}/#{options[:netmask]}"]
+            # DHCPv6 setting is not supported by Vagrant yet.
+          else
+            raise IPAddr::AddressFamilyError, 'BUG: unknown address family'
+          end
+
+          execute_prlsrvctl('net', 'set', options[:network_id], *args)
+
+          # Return the details
+          {
+            name:    options[:network_id],
+            ip:      options[:adapter_ip],
+            netmask: options[:netmask],
+            dhcp:    options[:dhcp]
+          }
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-parallels/errors.rb

@@ -39,6 +39,10 @@ module VagrantPlugins
         error_key(:mac_os_x_required)
       end
 
+      class NetworkInvalidAddress < VagrantParallelsError
+        error_key(:network_invalid_address)
+      end
+
       class ExecutionError < VagrantParallelsError
         error_key(:execution_error)
       end

data/lib/vagrant-parallels/plugin.rb

@@ -138,10 +138,9 @@ module VagrantPlugins
     # our drivers only when they are needed.
     module Driver
       autoload :Meta, File.expand_path('../driver/meta', __FILE__)
-      autoload :PD_8, File.expand_path('../driver/pd_8', __FILE__)
-      autoload :PD_9, File.expand_path('../driver/pd_9', __FILE__)
       autoload :PD_10, File.expand_path('../driver/pd_10', __FILE__)
       autoload :PD_11, File.expand_path('../driver/pd_11', __FILE__)
+      autoload :PD_12, File.expand_path('../driver/pd_12', __FILE__)
     end
 
     module Model

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.6.3'
+    VERSION = '1.7.0'
   end
 end

data/locales/en.yml

@@ -58,6 +58,11 @@ en:
         which are not supported by "prl_fs" file system.
 
         Invalid mount options: %{options}
+      network_invalid_address: |-
+        Network settings specified in your Vagrantfile are invalid:
+
+        Network settings: %{options}
+        Error: %{error}
       mac_os_x_required: |-
         Parallels provider works only on OS X (Mac OS X) systems.
       parallels_install_incomplete: |-
@@ -100,7 +105,7 @@ en:
       parallels_unsupported_version: |-
         Vagrant has detected that you have a version of Parallels Desktop for Mac
         installed that is not supported. Vagrant Parallels provider is compatible
-        only with Parallels Desktop 8 or later.
+        only with Parallels Desktop 10 or later.
         Please upgrade your installation: http://parallels.com/desktop
 
         Note: Starting since Parallels Desktop 11 for Mac, Vagrant Parallels

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,6 @@ files:
 - lib/vagrant-parallels/action/export.rb
 - lib/vagrant-parallels/action/forced_halt.rb
 - lib/vagrant-parallels/action/forward_ports.rb
-- lib/vagrant-parallels/action/handle_forwarded_port_collisions.rb
 - lib/vagrant-parallels/action/handle_guest_tools.rb
 - lib/vagrant-parallels/action/import.rb
 - lib/vagrant-parallels/action/network.rb
@@ -117,8 +116,7 @@ files:
 - lib/vagrant-parallels/driver/meta.rb
 - lib/vagrant-parallels/driver/pd_10.rb
 - lib/vagrant-parallels/driver/pd_11.rb
-- lib/vagrant-parallels/driver/pd_8.rb
-- lib/vagrant-parallels/driver/pd_9.rb
+- lib/vagrant-parallels/driver/pd_12.rb
 - lib/vagrant-parallels/errors.rb
 - lib/vagrant-parallels/guest_cap/darwin/install_parallels_tools.rb
 - lib/vagrant-parallels/guest_cap/darwin/mount_parallels_shared_folder.rb

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

@@ -1,30 +0,0 @@
-module VagrantPlugins
-  module Parallels
-    module Action
-      class HandleForwardedPortCollisions < Vagrant::Action::Builtin::HandleForwardedPortCollisions
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_parallels::action::handle_port_collisions')
-        end
-
-        # This middleware just wraps the builtin action and allows to skip it if
-        # port forwarding is not supported for current Parallels Desktop version.
-        def call(env)
-          if env[:machine].provider.pd_version_satisfies?('>= 10')
-            super
-          else
-            # Just continue if port forwarding is not supported
-            @app.call(env)
-          end
-        end
-
-        def recover(env)
-          if env[:machine].provider.pd_version_satisfies?('>= 10')
-            super
-          end
-          # Do nothing if port forwarding is not supported
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-parallels/driver/pd_8.rb

@@ -1,183 +0,0 @@
-require 'log4r'
-require 'nokogiri'
-require 'securerandom'
-
-require 'vagrant/util/platform'
-
-require_relative 'base'
-
-module VagrantPlugins
-  module Parallels
-    module Driver
-      # Driver for Parallels Desktop 8.
-      class PD_8 < Base
-        def initialize(uuid)
-          super(uuid)
-
-          @logger = Log4r::Logger.new('vagrant_parallels::driver::pd_8')
-        end
-
-        def delete_unused_host_only_networks
-          networks = read_virtual_networks
-
-          # 'Shared'(vnic0) and 'Host-Only'(vnic1) are default in Parallels Desktop
-          # They should not be deleted anyway.
-          networks.keep_if do |net|
-            net['Type'] == 'host-only' &&
-              net['Bound To'].match(/^(?>vnic|Parallels Host-Only #)(\d+)$/)[1].to_i >= 2
-          end
-
-          read_vms_info.each do |vm|
-            used_nets = vm.fetch('Hardware', {}).select { |name, _| name.start_with? 'net' }
-            used_nets.each_value do |net_params|
-              networks.delete_if { |net|  net['Bound To'] == net_params.fetch('iface', nil) }
-            end
-
-          end
-
-          networks.each do |net|
-            # Delete the actual host only network interface.
-            execute_prlsrvctl('net', 'del', net['Network ID'])
-          end
-        end
-
-        def enable_adapters(adapters)
-          # Get adapters which have already configured for this VM
-          # Such adapters will be just overridden
-          existing_adapters = read_settings.fetch('Hardware', {}).keys.select do |name|
-            name.start_with? 'net'
-          end
-
-          # Disable all previously existing adapters (except shared 'vnet0')
-          existing_adapters.each do |adapter|
-            if adapter != 'vnet0'
-              execute_prlctl('set', @uuid, '--device-set', adapter, '--disable')
-            end
-          end
-
-          adapters.each do |adapter|
-            args = []
-            if existing_adapters.include? "net#{adapter[:adapter]}"
-              args.concat(['--device-set',"net#{adapter[:adapter]}", '--enable'])
-            else
-              args.concat(['--device-add', 'net'])
-            end
-
-            if adapter[:type] == :hostonly
-              # Determine interface to which it has been bound
-              net_info = json do
-                execute_prlsrvctl('net', 'info', adapter[:hostonly], '--json')
-              end
-
-              # Oddly enough, but there is a 'bridge' type anyway.
-              # The only difference is the destination interface:
-              # - in host-only (private) network it will be bridged to the 'vnicX' device
-              # - in real bridge (public) network it will be bridged to the assigned device
-              args.concat(['--type', 'bridged', '--iface', net_info['Bound To']])
-            elsif adapter[:type] == :bridged
-              args.concat(['--type', 'bridged', '--iface', adapter[:bridge]])
-            elsif adapter[:type] == :shared
-              args.concat(['--type', 'shared'])
-            end
-
-            if adapter[:mac_address]
-              args.concat(['--mac', adapter[:mac_address]])
-            end
-
-            if adapter[:nic_type]
-              args.concat(['--adapter-type', adapter[:nic_type].to_s])
-            end
-
-            execute_prlctl('set', @uuid, *args)
-          end
-        end
-
-        def read_host_only_interfaces
-          net_list = read_virtual_networks
-          net_list.keep_if { |net| net['Type'] == 'host-only' }
-
-          hostonly_ifaces = []
-          net_list.each do |iface|
-            net_info = json do
-              execute_prlsrvctl('net', 'info', iface['Network ID'], '--json')
-            end
-
-            iface = {
-              name:   net_info['Network ID'],
-              status: 'Down'
-            }
-
-            adapter = net_info['Parallels adapter']
-            if adapter && net_info['Bound To']
-              iface[:ip]       = adapter['IP address']
-              iface[:netmask]  = adapter['Subnet mask']
-              iface[:bound_to] = net_info['Bound To']
-              iface[:status]   = 'Up'
-            end
-
-            hostonly_ifaces << iface
-          end
-          hostonly_ifaces
-        end
-
-        def read_network_interfaces
-          nics = {}
-
-          # Get enabled VM's network interfaces
-          ifaces = read_settings.fetch('Hardware', {}).keep_if do |dev, params|
-            dev.start_with?('net') and params.fetch('enabled', true)
-          end
-          ifaces.each do |name, params|
-            adapter = name.match(/^net(\d+)$/)[1].to_i
-            nics[adapter] ||= {}
-
-            if params['type'] == 'shared'
-              nics[adapter][:type] = :shared
-            elsif params['type'] == 'host'
-              # It is PD internal host-only network and it is bounded to 'vnic1'
-              nics[adapter][:type] = :hostonly
-              nics[adapter][:hostonly] = 'vnic1'
-            elsif params['type'] == 'bridged' and params.fetch('iface','').start_with?('vnic')
-              # Bridged to the 'vnicXX'? Then it is a host-only, actually.
-              nics[adapter][:type] = :hostonly
-              nics[adapter][:hostonly] = params.fetch('iface','')
-            elsif params['type'] == 'bridged'
-              nics[adapter][:type] = :bridged
-              nics[adapter][:bridge] = params.fetch('iface','')
-            end
-          end
-          nics
-        end
-
-        def read_shared_interface
-          net_info = json do
-            execute_prlsrvctl('net', 'info', read_shared_network_id, '--json')
-          end
-
-          iface = {
-            nat:    [],
-            status: 'Down'
-          }
-
-          adapter = net_info['Parallels adapter']
-          if adapter && net_info['Bound To']
-            iface[:ip]       = adapter['IP address']
-            iface[:netmask]  = adapter['Subnet mask']
-            iface[:bound_to] = net_info['Bound To']
-            iface[:status]   = 'Up'
-          end
-
-          if net_info.key?('DHCPv4 server')
-            iface[:dhcp] = {
-              ip:    net_info['DHCPv4 server']['Server address'],
-              lower: net_info['DHCPv4 server']['IP scope start address'],
-              upper: net_info['DHCPv4 server']['IP scope end address']
-            }
-          end
-
-          iface
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-parallels/driver/pd_9.rb

@@ -1,25 +0,0 @@
-require 'log4r'
-
-require 'vagrant/util/platform'
-
-require_relative 'pd_8'
-
-module VagrantPlugins
-  module Parallels
-    module Driver
-      # Driver for Parallels Desktop 9.
-      class PD_9 < PD_8
-        def initialize(uuid)
-          super(uuid)
-
-          @logger = Log4r::Logger.new('vagrant_parallels::driver::pd_9')
-        end
-
-        def set_power_consumption_mode(optimized)
-          state = optimized ? 'on' : 'off'
-          execute_prlctl('set', @uuid, '--longer-battery-life', state)
-        end
-      end
-    end
-  end
-end