haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only forward one port for winrm

This commit is contained in:
Max Lincoln 2014-07-23 16:05:06 -04:00
parent 2caaf82ae0
commit 62ddd92768
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/kernel_v2/config/vm.rb
View File

@ -400,14 +400,6 @@ module VagrantPlugins
id: "winrm", id: "winrm",
auto_correct: true auto_correct: true
end end
if !@__networks["forwarded_port-winrmssl"]
network :forwarded_port,
guest: 5986,
host: 55986,
host_ip: "127.0.0.1",
id: "winrmssl",
auto_correct: true
end
elsif !@__networks["forwarded_port-ssh"] elsif !@__networks["forwarded_port-ssh"]
network :forwarded_port, network :forwarded_port,
guest: 22, guest: 22,

31
test/unit/plugins/kernel_v2/config/vm_test.rb
View File

@ -167,7 +167,7 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
subject.communicator = "winrm" subject.communicator = "winrm"
subject.finalize! subject.finalize!
n = subject.networks n = subject.networks
expect(n.length).to eq(2) expect(n.length).to eq(1)
# WinRM HTTP # WinRM HTTP
expect(n[0][0]).to eq(:forwarded_port) expect(n[0][0]).to eq(:forwarded_port)
@ -175,13 +175,6 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
expect(n[0][1][:host]).to eq(55985) expect(n[0][1][:host]).to eq(55985)
expect(n[0][1][:host_ip]).to eq("127.0.0.1") expect(n[0][1][:host_ip]).to eq("127.0.0.1")
expect(n[0][1][:id]).to eq("winrm") expect(n[0][1][:id]).to eq("winrm")
# WinRM HTTPS
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("winrmssl")
end end
it "allows overriding SSH" do it "allows overriding SSH" do
@ -203,12 +196,22 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
guest: 22, host: 14100, id: "winrm" guest: 22, host: 14100, id: "winrm"
subject.finalize! subject.finalize!
n = subject.networks winrm_network = find_network 'winrm'
expect(n.length).to eq(1) expect(winrm_network[:guest]).to eq(22)
expect(n[0][0]).to eq(:forwarded_port) expect(winrm_network[:host]).to eq(14100)
expect(n[0][1][:guest]).to eq(22) expect(winrm_network[:id]).to eq("winrm")
expect(n[0][1][:host]).to eq(14100) end
expect(n[0][1][:id]).to eq("winrm")
it "allows overriding WinRM SSL" do
subject.communicator = :winrmssl
subject.network "forwarded_port",
guest: 22, host: 14100, id: "winrmssl"
subject.finalize!
winrmssl_network = find_network 'winrmssl'
expect(winrmssl_network[:guest]).to eq(22)
expect(winrmssl_network[:host]).to eq(14100)
expect(winrmssl_network[:id]).to eq("winrmssl")
end end
it "turns all forwarded port ports to ints" do it "turns all forwarded port ports to ints" do