From b5a94774053bb2314ab64cb0d292cda63aa14aaa Mon Sep 17 00:00:00 2001 From: Max Lincoln Date: Thu, 11 Dec 2014 13:39:24 -0500 Subject: [PATCH] Fix default forwarded ports --- plugins/kernel_v2/config/vm.rb | 7 +++++++ test/unit/plugins/kernel_v2/config/vm_test.rb | 18 +++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index a06478096..fd08f436a 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -399,6 +399,13 @@ module VagrantPlugins host_ip: "127.0.0.1", id: "winrm", auto_correct: true + + network :forwarded_port, + guest: 5986, + host: 55986, + host_ip: "127.0.0.1", + id: "winrm-ssl", + auto_correct: true end elsif !@__networks["forwarded_port-ssh"] network :forwarded_port, diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb index 3028e2552..50f185c9c 100644 --- a/test/unit/plugins/kernel_v2/config/vm_test.rb +++ b/test/unit/plugins/kernel_v2/config/vm_test.rb @@ -169,13 +169,17 @@ describe VagrantPlugins::Kernel_V2::VMConfig do n = subject.networks expect(n.length).to eq(2) - # WinRM HTTP - network = find_network("winrm") - # expect(n[0][0]).to eq(:forwarded_port) - expect(network[:guest]).to eq(5985) - expect(network[:host]).to eq(55985) - expect(network[:host_ip]).to eq("127.0.0.1") - expect(network[:id]).to eq("winrm") + expect(n[0][0]).to eq(:forwarded_port) + expect(n[0][1][:guest]).to eq(5985) + expect(n[0][1][:host]).to eq(55985) + expect(n[0][1][:host_ip]).to eq("127.0.0.1") + expect(n[0][1][:id]).to eq("winrm") + + expect(n[1][0]).to eq(:forwarded_port) + expect(n[1][1][:guest]).to eq(5986) + expect(n[1][1][:host]).to eq(55986) + expect(n[1][1][:host_ip]).to eq("127.0.0.1") + expect(n[1][1][:id]).to eq("winrm-ssl") end it "allows overriding SSH" do