Add RDPPort to vagrant winrm-config.

criteo · Mar 26, 2015 · d672a4e · d672a4e
1 parent 473d0cb
commit d672a4e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/lib/vagrant-winrm/commands/winrm_config.rb b/lib/vagrant-winrm/commands/winrm_config.rb
@@ -34,7 +34,8 @@ def execute
             winrm_host: VagrantPlugins::CommunicatorWinRM::Helper.winrm_info(machine)[:host],
             winrm_port: VagrantPlugins::CommunicatorWinRM::Helper.winrm_info(machine)[:port],
             winrm_user: machine.config.winrm.username,
-            winrm_password: machine.config.winrm.password
+            winrm_password: machine.config.winrm.password,
+            rdp_port: machine.config.rdp.port
           }
 
           # Render the template and output directly to STDOUT

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -19,8 +19,13 @@ def mock_env
       allow(config).to receive(:[]) { |key| config.send(key) }
     end
   }
+  let(:rdp_config) {
+    double('rdp_config', port: 4321, search_port: 98765).tap do |config|
+      allow(config).to receive(:[]) { |key| config.send(key) }
+    end
+  }
   let(:config_vm) { double('config_vm', communicator: :winrm) }
-  let(:machine_config) { double('machine_config', winrm: winrm_config, vm: config_vm) }
+  let(:machine_config) { double('machine_config', winrm: winrm_config, rdp: rdp_config, vm: config_vm) }
 
   let(:provider) {
     double('provider', to_sym: :virtualbox).tap do |provider|

diff --git a/spec/vagrant-winrm/commands/winrm_config_spec.rb b/spec/vagrant-winrm/commands/winrm_config_spec.rb
@@ -59,6 +59,7 @@
         expect($stdout.string).to match(/#{winrm_config.port}/)
         expect($stdout.string).to match(/#{winrm_config.username}/)
         expect($stdout.string).to match(/#{winrm_config.password}/)
+        expect($stdout.string).to match(/#{rdp_config.port}/)
       ensure
         $stdout = STDOUT
       end
@@ -74,6 +75,7 @@
         expect($stdout.string).to match(/#{winrm_config.port}/)
         expect($stdout.string).to match(/#{winrm_config.username}/)
         expect($stdout.string).to match(/#{winrm_config.password}/)
+        expect($stdout.string).to match(/#{rdp_config.port}/)
       ensure
         $stdout = STDOUT
       end
@@ -89,6 +91,7 @@
         expect($stdout.string).to match(/#{winrm_config.port}/)
         expect($stdout.string).to match(/#{winrm_config.username}/)
         expect($stdout.string).to match(/#{winrm_config.password}/)
+        expect($stdout.string).to match(/#{rdp_config.port}/)
       ensure
         $stdout = STDOUT
       end

diff --git a/templates/winrm_config/config.erb b/templates/winrm_config/config.erb
@@ -2,4 +2,5 @@ Host <%= host_key %>
   HostName <%= winrm_host %>
   Port <%= winrm_port %>
   User <%= winrm_user %>
-  Password <%= winrm_password %>
+  Password <%= winrm_password %>
+  RDPPort <%= rdp_port %>