From 38f23fe0011def2d1df0ef52d2da2b4e3ad19b51 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 30 May 2016 17:08:50 -0400
Subject: [PATCH] providers/docker: Allow TCP and UDP ports on same number

This commit changes the way ports are aggregated in the Docker provider.
Previously ports were aggregated by their "number", but that is not a
truly unique representation. Instead, the protocol is now taken into
account when generating the port map.

Fixes GH-5527
---
 plugins/providers/docker/action/create.rb     |  2 +-
 .../providers/docker/action/create_test.rb    | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/plugins/providers/docker/action/create_test.rb

diff --git a/plugins/providers/docker/action/create.rb b/plugins/providers/docker/action/create.rb
index 89034b117..6b4122693 100644
--- a/plugins/providers/docker/action/create.rb
+++ b/plugins/providers/docker/action/create.rb
@@ -135,7 +135,7 @@ module VagrantPlugins
               next
             end
 
-            mappings[options[:host]] = options
+            mappings["#{options[:host]}/#{options[:protocol]}"] = options
           end
 
           # Build the results
diff --git a/test/unit/plugins/providers/docker/action/create_test.rb b/test/unit/plugins/providers/docker/action/create_test.rb
new file mode 100644
index 000000000..2b2a9c669
--- /dev/null
+++ b/test/unit/plugins/providers/docker/action/create_test.rb
@@ -0,0 +1,55 @@
+require_relative "../../../../base"
+require_relative "../../../../../../plugins/providers/docker/action/create"
+
+describe VagrantPlugins::DockerProvider::Action::Create do
+  include_context "unit"
+  include_context "virtualbox"
+
+  let(:sandbox) { isolated_environment }
+
+  let(:iso_env) do
+    # We have to create a Vagrantfile so there is a root path
+    sandbox.vagrantfile("")
+    sandbox.create_vagrant_env
+  end
+
+  let(:machine) do
+    iso_env.machine(iso_env.machine_names[0], :virtualbox).tap do |m|
+      m.provider.stub(driver: driver)
+    end
+  end
+
+  let(:env)    {{ machine: machine, ui: machine.ui, root_path: Pathname.new(".") }}
+  let(:app)    { lambda { |*args| }}
+  let(:driver) { double("driver", create: "abcd1234") }
+
+  subject { described_class.new(app, env) }
+
+  after do
+    sandbox.close
+  end
+
+  describe "#call" do
+    it "calls the next action in the chain" do
+      called = false
+      app = ->(*args) { called = true }
+
+      action = described_class.new(app, env)
+      action.call(env)
+
+      expect(called).to eq(true)
+    end
+  end
+
+  describe "#forwarded_ports" do
+    it "does not clobber ports with different protocols" do
+      subject.instance_variable_set(:@machine, machine)
+      machine.config.vm.network "forwarded_port", guest: 8125, host: 8125, protocol: "tcp"
+      machine.config.vm.network "forwarded_port", guest: 8125, host: 8125, protocol: "udp"
+
+      result = subject.forwarded_ports(false)
+
+      expect(result).to eq(["8125:8125", "8125:8125/udp"])
+    end
+  end
+end