vagrant-parallels 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0edffdd16955b96b56809b61199a6b06ad6aa3e3
-  data.tar.gz: 828d632341884533c630af940f403eda2b69236f
+  metadata.gz: 150b4748c54d9fd85cddbb8b3821e65b1b0ea050
+  data.tar.gz: a25cdb0366e623fbaf794d45e90b91261be7ef7a
 SHA512:
-  metadata.gz: d520eba339de9118692e15603e4a1b6eb196eeb9aaa48ba440271786eead0f10430d507942461452f97bf54eb526856cc96ada539bd1e0bdbc43f872243e72f1
-  data.tar.gz: 1920626602a1094308109eac530c61d24b1f32a4294c619fe01516fa408f4d1eb5d8b580d3c598c62f74ccbe1da1c6126778edce2323d5eabbbd18c97923a87a
+  metadata.gz: 6cd23c3f489895417619f46a2e485f0d76695ea07be9ac15e74cf994ca1a09b58d47c75f573b01652d76747b07b6d388238be85d7e7628aacb05ab1d0de1b244
+  data.tar.gz: 3a888ef92c82ec23efea76df59ede060ca34f0ff168a95c9a82e979be65dad72964233fa102cd93c0bb849d6b6767771a29e8b4e3bb7aade8eb26dff9f132fbc

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

@@ -125,6 +125,41 @@ 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') }
+            adapter = net_info['Parallels adapter']
+
+            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_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 = {}
 
@@ -153,10 +188,14 @@ module VagrantPlugins
           net_info = json do
             execute_prlsrvctl('net', 'info', read_shared_network_id, '--json')
           end
+
+          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:      net_info['Parallels adapter']['IP address'],
-            netmask: net_info['Parallels adapter']['Subnet mask'],
+            ip:      adapter['IP address'] || adapter['IPv4 address'],
+            netmask: adapter['Subnet mask'] || adapter['IPv4 subnet mask'],
             status:  'Up',
             nat:     []
           }

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.3.5'
+    VERSION = '1.3.6'
   end
 end

metadata

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