vagrant-parallels 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e2eafea3e2e0ae509943e4ebb2cb4a130b3d56
-  data.tar.gz: 9b0786ae6319a6de87a44177dc6d71a38092a2bb
+  metadata.gz: b271fd1ed2f08b026d9317bf6ee17c9496d5b922
+  data.tar.gz: aa561b076317de9620478d4b30c0cac2177a4b8b
 SHA512:
-  metadata.gz: c99c4916c89822602b2436c56be351cd4ac2d796f89fefee4d0a08caeb7eac55a30a18504a2c4f7b3f670d9d26e06a537c37e06798f279026aff921885ff0eb4
-  data.tar.gz: 87a0f541244f1cf52d8d74e52c86ee7c7b5dab6653a9d2c8c2a967e0319c2fa753cb3057fb01e8b6d2c951e656685af85f1c94d65de032fcf0c90b85d5e75681
+  metadata.gz: a8d65174aca4de8bd57ea2d4c8c51f5e72bd5203430cc178c7caa4ce2aa4f71ce59cb5bc06398de08e50451eb4e1b6805f8c313cbd8bc29085eacb979f8d50ba
+  data.tar.gz: b15155423725c42436433722ec1cf5dd79252dcdace3b5912cb2ce7b8c5c4f0f10b6c0685e398299c7969dc3ca248d7d14074d3f56dd632ed95f33cd2d400301

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

@@ -26,28 +26,6 @@ module VagrantPlugins
           end
         end
 
-        def create_host_only_network(options)
-          # Create the interface
-          execute_prlsrvctl('net', 'add', options[:network_id], '--type', 'host-only')
-
-          # Configure it
-          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
-
-          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
 
         def delete_unused_host_only_networks
           networks = read_virtual_networks
@@ -147,37 +125,6 @@ module VagrantPlugins
           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|
-            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_ip = net_info['DHCPv4 server']['Server address']
-            if network_address(info[:ip], info[:netmask]) ==
-              network_address(dhcp_ip, info[:netmask])
-              info[:dhcp] = {
-                ip: dhcp_ip,
-                lower: net_info['DHCPv4 server']['IP scope start address'],
-                upper: net_info['DHCPv4 server']['IP scope end address']
-              }
-            end
-            hostonly_ifaces << info
-          end
-          hostonly_ifaces
-        end
-
         def read_network_interfaces
           nics = {}
 
@@ -247,20 +194,6 @@ module VagrantPlugins
           execute_prlctl('set', @uuid, '--longer-battery-life', state)
         end
 
-        def ssh_ip
-          '127.0.0.1'
-        end
-
-        def ssh_port(expected_port)
-          @logger.debug("Searching for SSH port: #{expected_port.inspect}")
-
-          # Look for the forwarded port only by comparing the guest port
-          read_forwarded_ports.each do |r|
-            return r[:hostport] if r[:guestport] == expected_port
-          end
-
-          nil
-        end
       end
     end
   end

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

@@ -54,13 +54,9 @@ module VagrantPlugins
 
           execute_prlsrvctl('net', 'set', options[:network_id], *args)
 
-          # Determine interface to which it has been bound
-          net_info = json { execute_prlsrvctl('net', 'info', options[:network_id], '--json') }
-          iface_name = net_info['Bound To']
-
           # Return the details
           {
-            name:    iface_name,
+            name:    options[:network_id],
             ip:      options[:adapter_ip],
             netmask: options[:netmask],
             dhcp:    options[:dhcp]
@@ -126,11 +122,16 @@ module VagrantPlugins
             end
 
             if adapter[:type] == :hostonly
-              # Oddly enough, but there is a 'bridge' anyway.
+              # 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", adapter[:hostonly]])
+              args.concat(["--type", "bridged", "--iface", net_info['Bound To']])
             elsif adapter[:type] == :bridged
               args.concat(["--type", "bridged", "--iface", adapter[:bridge]])
             elsif adapter[:type] == :shared
@@ -275,7 +276,6 @@ module VagrantPlugins
           net_list.each do |iface|
             info = {}
             net_info = json { execute_prlsrvctl('net', 'info', iface['Network ID'], '--json') }
-            # Really we need to work with bounded virtual interface
             info[:name]     = net_info['Network ID']
             info[:bound_to] = net_info['Bound To']
             info[:ip]       = net_info['Parallels adapter']['IP address']

data/lib/vagrant-parallels/util/compile_forwarded_ports.rb

@@ -22,6 +22,12 @@ module VagrantPlugins
               # If the forwarded port was marked as disabled, ignore.
               next if options[:disabled]
 
+              # Temporary disable automatically pre-configured forwarded ports
+              # for SSH, since it is working not so well [GH-146]
+              # TODO: Roll it back when forwarded ports will be completely
+              # fixed in Parallels Desktop 10
+              next if id == 'ssh'
+
               mappings[host_port.to_s + protocol.to_s] =
                 Model::ForwardedPort.new(id, host_port, guest_port, options)
             end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler