From 9ff9e0d7ce1de64141672cb80e91d867f0f365f5 Mon Sep 17 00:00:00 2001 From: Stephan Leicht Vogt Date: Mon, 22 Dec 2014 16:45:01 +0100 Subject: [PATCH] try getting ip in a IPv4/IPv6 environment --- lib/vagrant-parallels/driver/pd_10.rb | 6 ++++++ lib/vagrant-parallels/driver/pd_8.rb | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/lib/vagrant-parallels/driver/pd_10.rb b/lib/vagrant-parallels/driver/pd_10.rb index 89f3e0c6..328f4b72 100644 --- a/lib/vagrant-parallels/driver/pd_10.rb +++ b/lib/vagrant-parallels/driver/pd_10.rb @@ -161,6 +161,12 @@ def read_shared_interface nat: [] } + # Try IPv4/v6 address style + if info[:ip].nil? + info[:ip] = net_info['Parallels adapter']['IPv4 address'] + info[:netmask] = net_info['Parallels adapter']['IPv4 subnet mask'] + end + if net_info.key?('DHCPv4 server') info[:dhcp] = { ip: net_info['DHCPv4 server']['Server address'], diff --git a/lib/vagrant-parallels/driver/pd_8.rb b/lib/vagrant-parallels/driver/pd_8.rb index 7df377c3..269d711b 100644 --- a/lib/vagrant-parallels/driver/pd_8.rb +++ b/lib/vagrant-parallels/driver/pd_8.rb @@ -282,6 +282,13 @@ def read_host_only_interfaces info[:bound_to] = net_info['Bound To'] info[:ip] = net_info['Parallels adapter']['IP address'] info[:netmask] = net_info['Parallels adapter']['Subnet mask'] + + # Try IPv4/v6 address style + if info[:ip].nil? + info[:ip] = net_info['Parallels adapter']['IPv4 address'] + info[:netmask] = net_info['Parallels adapter']['IPv4 subnet mask'] + end + # Such interfaces are always in 'Up' info[:status] = "Up" @@ -364,6 +371,12 @@ def read_shared_interface status: "Up" } + # Try IPv4/v6 address style + if info[:ip].nil? + info[:ip] = net_info['Parallels adapter']['IPv4 address'] + info[:netmask] = net_info['Parallels adapter']['IPv4 subnet mask'] + end + if net_info.key?('DHCPv4 server') info[:dhcp] = { ip: net_info['DHCPv4 server']['Server address'],