From 2f9a0ac2530c2056bf34058552c404df4e2622f0 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Fri, 29 Oct 2021 09:43:47 -0700 Subject: [PATCH] Adjust default range --- .../providers/virtualbox/action/network.rb | 4 ++-- .../virtualbox/action/network_test.rb | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb index d676cd35a..f96b3a667 100644 --- a/plugins/providers/virtualbox/action/network.rb +++ b/plugins/providers/virtualbox/action/network.rb @@ -22,7 +22,7 @@ module VagrantPlugins # Version of VirtualBox that introduced hostonly network range restrictions HOSTONLY_VALIDATE_VERSION = Gem::Version.new("6.1.28") # Default valid range for hostonly networks - HOSTONLY_DEFAULT_RANGE = [IPAddr.new("192.68.56.0/21").freeze].freeze + HOSTONLY_DEFAULT_RANGE = [IPAddr.new("192.168.56.0/21").freeze].freeze include Vagrant::Util::NetworkIP include Vagrant::Util::ScopedHashOverride @@ -271,7 +271,7 @@ module VagrantPlugins options[:ip] = matching_device[:ip] else # Default IP is in the 20-bit private network block for DHCP based networks - options[:ip] = "192.68.56.1" + options[:ip] = "192.168.56.1" end end diff --git a/test/unit/plugins/providers/virtualbox/action/network_test.rb b/test/unit/plugins/providers/virtualbox/action/network_test.rb index 7e9a7e70c..56df587c0 100644 --- a/test/unit/plugins/providers/virtualbox/action/network_test.rb +++ b/test/unit/plugins/providers/virtualbox/action/network_test.rb @@ -315,29 +315,29 @@ describe VagrantPlugins::ProviderVirtualBox::Action::Network do subject.call(env) expect(driver).to have_received(:create_host_only_network).with({ - adapter_ip: '192.68.56.1', + adapter_ip: '192.168.56.1', netmask: '255.255.255.0', }) expect(driver).to have_received(:create_dhcp_server).with('vboxnet0', { - adapter_ip: "192.68.56.1", + adapter_ip: "192.168.56.1", auto_config: true, - ip: "192.68.56.1", + ip: "192.168.56.1", mac: nil, name: nil, netmask: "255.255.255.0", nic_type: nil, type: :dhcp, - dhcp_ip: "192.68.56.2", - dhcp_lower: "192.68.56.3", - dhcp_upper: "192.68.56.254", + dhcp_ip: "192.168.56.2", + dhcp_lower: "192.168.56.3", + dhcp_upper: "192.168.56.254", adapter: 2 }) expect(guest).to have_received(:capability).with(:configure_networks, [{ type: :dhcp, - adapter_ip: "192.68.56.1", - ip: "192.68.56.1", + adapter_ip: "192.168.56.1", + ip: "192.168.56.1", netmask: "255.255.255.0", auto_config: true, interface: nil @@ -395,8 +395,8 @@ describe VagrantPlugins::ProviderVirtualBox::Action::Network do { ip: 'foo'}, { ip: '1.2.3'}, { ip: 'dead::beef::'}, - { ip: '192.68.56.3', netmask: 64}, - { ip: '192.68.56.3', netmask: 'ffff:ffff::'}, + { ip: '192.168.56.3', netmask: 64}, + { ip: '192.168.56.3', netmask: 'ffff:ffff::'}, { ip: 'dead:beef::', netmask: 'foo:bar::'}, { ip: 'dead:beef::', netmask: '255.255.255.0'} ].each do |args|