vagrant-parallels 1.6.2 → 1.6.3

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

@@ -74,7 +74,8 @@ module VagrantPlugins
         def_delegators :@driver,
                        :clear_forwarded_ports,
                        :clear_shared_folders,
-                       :compact,
+                       :compact_hdd,
+                       :connect_network_interface,
                        :create_host_only_network,
                        :create_snapshot,
                        :delete,
@@ -99,6 +100,7 @@ module VagrantPlugins
                        :read_network_interfaces,
                        :read_shared_interface,
                        :read_shared_folders,
+                       :read_shared_network_id,
                        :read_settings,
                        :read_state,
                        :read_used_ports,

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

@@ -15,10 +15,10 @@ module VagrantPlugins
           @logger = Log4r::Logger.new('vagrant_parallels::driver::pd_10')
         end
 
-        def clear_forwarded_ports
+        def clear_forwarded_ports(ports)
           args = []
-          read_forwarded_ports.each do |r|
-            args.concat(["--nat-#{r[:protocol]}-del", r[:rule_name]])
+          ports.each do |r|
+            args.concat(["--nat-#{r[:protocol]}-del", r[:name]])
           end
 
           if !args.empty?
@@ -32,7 +32,7 @@ module VagrantPlugins
           # '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['Type'] == 'host-only' && net['Bound To'] &&
               net['Bound To'].match(/^(?>vnic|Parallels Host-Only #)(\d+)$/)[1].to_i >= 2
           end
 
@@ -131,31 +131,25 @@ module VagrantPlugins
 
           hostonly_ifaces = []
           net_list.each do |iface|
-            info = {}
-            net_info = json { execute_prlsrvctl('net', 'info', iface['Network ID'], '--json') }
-            adapter = net_info['Parallels adapter']
+            net_info = json do
+              execute_prlsrvctl('net', 'info', iface['Network ID'], '--json')
+            end
 
-            info[:name]     = net_info['Network ID']
-            info[:bound_to] = net_info['Bound To']
-            # In PD >= 10.1.2 there are new field names for an IP/Subnet
-            info[:ip]       = adapter['IP address'] || adapter['IPv4 address']
-            info[:netmask]  = adapter['Subnet mask'] || adapter['IPv4 subnet mask']
-
-            # Such interfaces are always in 'Up'
-            info[:status]   = 'Up'
-
-            # There may be a fake DHCPv4 parameters
-            # We can trust them only if adapter IP and DHCP IP are in the same subnet
-            dhcp_info = net_info['DHCPv4 server']
-            if dhcp_info && (network_address(info[:ip], info[:netmask]) ==
-              network_address(dhcp_info['Server address'], info[:netmask]))
-              info[:dhcp] = {
-                ip:    dhcp_info['Server address'],
-                lower: dhcp_info['IP scope start address'],
-                upper: dhcp_info['IP scope end address']
-              }
+            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 << info
+
+            hostonly_ifaces << iface
           end
           hostonly_ifaces
         end
@@ -189,19 +183,22 @@ module VagrantPlugins
             execute_prlsrvctl('net', 'info', read_shared_network_id, '--json')
           end
 
+          iface = {
+            nat:    [],
+            status: 'Down'
+          }
           adapter = net_info['Parallels adapter']
 
-          # In PD >= 10.1.2 there are new field names for an IP/Subnet
-          info = {
-            name:    net_info['Bound To'],
-            ip:      adapter['IP address'] || adapter['IPv4 address'],
-            netmask: adapter['Subnet mask'] || adapter['IPv4 subnet mask'],
-            status:  'Up',
-            nat:     []
-          }
+          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')
-            info[:dhcp] = {
+            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']
@@ -210,8 +207,8 @@ module VagrantPlugins
 
           net_info['NAT server'].each do |group, rules|
             rules.each do |name, params|
-              info[:nat] << {
-                rule_name: name,
+              iface[:nat] << {
+                name:      name,
                 protocol:  group == 'TCP rules' ? 'tcp' : 'udp',
                 guest:     params['destination IP/VM id'],
                 hostport:  params['source port'],
@@ -220,7 +217,7 @@ module VagrantPlugins
             end
           end
 
-          info
+          iface
         end
 
         def read_used_ports

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

@@ -14,6 +14,10 @@ module VagrantPlugins
 
           @logger = Log4r::Logger.new('vagrant_parallels::driver::pd_11')
         end
+
+        def connect_network_interface(name)
+          execute_prlsrvctl('net', 'set', name, '--connect-host-to-net', 'on')
+        end
       end
     end
   end

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

@@ -98,27 +98,24 @@ module VagrantPlugins
 
           hostonly_ifaces = []
           net_list.each do |iface|
-            info = {}
-            net_info = json { execute_prlsrvctl('net', 'info', iface['Network ID'], '--json') }
-            info[:name]     = net_info['Network ID']
-            info[:bound_to] = net_info['Bound To']
-            info[:ip]       = net_info['Parallels adapter']['IP address']
-            info[:netmask]  = net_info['Parallels adapter']['Subnet mask']
-            # Such interfaces are always in 'Up'
-            info[:status]   = 'Up'
-
-            # There may be a fake DHCPv4 parameters
-            # We can trust them only if adapter IP and DHCP IP are in the same subnet
-            dhcp_info = net_info['DHCPv4 server']
-            if dhcp_info && (network_address(info[:ip], info[:netmask]) ==
-              network_address(dhcp_info['Server address'], info[:netmask]))
-              info[:dhcp] = {
-                ip:    dhcp_info['Server address'],
-                lower: dhcp_info['IP scope start address'],
-                upper: dhcp_info['IP scope end address']
-              }
+            net_info = json do
+              execute_prlsrvctl('net', 'info', iface['Network ID'], '--json')
             end
-            hostonly_ifaces << info
+
+            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
@@ -156,22 +153,29 @@ module VagrantPlugins
           net_info = json do
             execute_prlsrvctl('net', 'info', read_shared_network_id, '--json')
           end
-          info = {
-            name:    net_info['Bound To'],
-            ip:      net_info['Parallels adapter']['IP address'],
-            netmask: net_info['Parallels adapter']['Subnet mask'],
-            status: 'Up'
+
+          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')
-            info[:dhcp] = {
+            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
 
-          info
+          iface
         end
       end
     end

data/lib/vagrant-parallels/errors.rb

@@ -19,6 +19,10 @@ module VagrantPlugins
         error_key(:dhcp_leases_file_not_accessible)
       end
 
+      class ExternalDiskNotFound < VagrantParallelsError
+        error_key(:external_disk_not_found)
+      end
+
       class JSONParseError < VagrantParallelsError
         error_key(:json_parse_error)
       end
@@ -71,8 +75,12 @@ module VagrantPlugins
         error_key(:parallels_unsupported_version)
       end
 
-      class SharedAdapterNotFound < VagrantParallelsError
-        error_key(:shared_adapter_not_found)
+      class SharedInterfaceDisconnected < VagrantParallelsError
+        error_key(:shared_interface_disconnected)
+      end
+
+      class SharedInterfaceNotFound < VagrantParallelsError
+        error_key(:shared_interface_not_found)
       end
 
       class SnapshotIdNotDetected < VagrantParallelsError

data/lib/vagrant-parallels/version.rb

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

data/locales/en.yml

@@ -38,6 +38,13 @@ en:
         JSON string is shown below:
 
         %{data}
+
+      external_disk_not_found: |-
+        External disk image could not be found. In case of linked clone it is
+        usually because the parent VM image was removed. It means that the virtual
+        disk is inconsistent, please remove it from the VM configuration.
+
+        Disk image path: %{path}
       linux_mount_failed: |-
         Failed to mount folders in Linux guest. This is usually because
         the "prl_fs" file system is not available. Please verify that
@@ -69,12 +76,12 @@ en:
         appears that every slot is in use. Please lower the number of used
         network adapters.
       parallels_not_detected: |-
-        Vagrant could not detect Parallels Desktop! Make sure it is properly installed.
-        Vagrant uses the `prlctl` binary that ships with Parallels Desktop, and requires
-        this to be available on the PATH. If Parallels Desktop is installed, please find
-        the `prlctl` binary and add it to the PATH environmental variable.
+        Vagrant could not detect Parallels Desktop Pro! Make sure it is properly installed.
+        Vagrant uses the `prlctl` binary that only ships with Pro and Business
+        editions of Parallels Desktop. If the one is installed, please make sure
+        that the `prlctl` binary is available on the PATH environment variable.
       parallels_tools_iso_not_found: |-
-        Parallels Tools ISO file does not exists. The Parallels provider uses it
+        Parallels Tools ISO file does not exist. The Parallels provider uses it
         to install or update Parallels Tools in the guest machine. Try to
         reinstall Parallels Desktop.
 
@@ -110,10 +117,16 @@ en:
         check and try again.
 
          Snapshot ID: %{snapshot}
-      shared_adapter_not_found: |-
-        Shared network adapter was not found in your virtual machine configuration.
-        It is required to communicate with VM and forward ports. Please check
-        network configuration in your Vagrantfile.
+      shared_interface_not_found: |-
+        Shared network interface was not found in your virtual machine configuration.
+        It is required for communications with VM and port forwarding. Please
+        check network configuration in your Vagrantfile.
+      shared_interface_disconnected: |-
+        Your Mac host is not connected to Shared network. It is required for
+        communications with VM and port forwarding. Please enable this option in GUI:
+
+        Parallels Desktop -> Preferences -> Network -> Shared -> Connect Mac to this network
+
       vm_clone_failure: |-
         The VM cloning failed! Please ensure that the box you're using is not
         corrupted and try again.
@@ -184,6 +197,8 @@ en:
         box:
           register: Registering VM image from the base box '%{name}'...
           unregister: Unregistering the box VM image...
+        check_shared_interface:
+          connecting: Connecting host to Shared network...
         clone:
           full: Cloning new virtual machine...
           linked: Creating new virtual machine as a linked clone...
@@ -211,6 +226,7 @@ en:
             reload your VM.
         export:
           compacting: Compacting exported HDDs...
+          copying_linked_disks: Copying linked disks...
         forward_ports:
           forwarding_entry: |-
             %{guest_port} => %{host_port}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,21 +75,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- Vagrantfile
-- debug.log
 - lib/vagrant-parallels.rb
 - lib/vagrant-parallels/action.rb
 - lib/vagrant-parallels/action/boot.rb
 - lib/vagrant-parallels/action/box_register.rb
 - lib/vagrant-parallels/action/box_unregister.rb
+- lib/vagrant-parallels/action/check_shared_interface.rb
 - lib/vagrant-parallels/action/clear_forwarded_ports.rb
 - lib/vagrant-parallels/action/clear_network_interfaces.rb
 - lib/vagrant-parallels/action/clear_shared_folders.rb
@@ -137,25 +131,6 @@ files:
 - lib/vagrant-parallels/util/compile_forwarded_ports.rb
 - lib/vagrant-parallels/version.rb
 - locales/en.yml
-- tasks/acceptance.rake
-- tasks/bundler.rake
-- tasks/test.rake
-- test/acceptance/base.rb
-- test/acceptance/provider/linked_clone_spec.rb
-- test/acceptance/provider/snapshot_spec.rb
-- test/acceptance/shared/context_parallels.rb
-- test/acceptance/skeletons/linked_clone/Vagrantfile
-- test/unit/base.rb
-- test/unit/cap_test.rb
-- test/unit/config_test.rb
-- test/unit/driver/pd_10_test.rb
-- test/unit/driver/pd_8_test.rb
-- test/unit/driver/pd_9_test.rb
-- test/unit/support/shared/parallels_context.rb
-- test/unit/support/shared/pd_driver_examples.rb
-- test/unit/synced_folder_test.rb
-- vagrant-parallels.gemspec
-- vagrant-spec.config.example.rb
 homepage: http://github.com/Parallels/vagrant-parallels
 licenses:
 - MIT
@@ -176,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-parallels
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Parallels provider for Vagrant.

data/.gitignore

@@ -1,34 +0,0 @@
-# OS-specific
-.DS_Store
-
-# Vagrant stuff
-acceptance_config.yml
-boxes/*
-/Vagrantfile
-.vagrant
-vagrant-spec.config.rb
-
-# Bundler/Rubygems
-*.gem
-.bundle
-pkg/*
-tags
-Gemfile.lock
-test/tmp/
-/vendor
-
-# Python
-*.pyc
-
-# Rubinius
-*.rbc
-
-# IDE junk
-.idea/*
-*.iml
-
-# Ruby Managers
-.rbenv
-.ruby-gemset
-.ruby-version
-.rvmrc