From ec95f0616cbb1c0ac336ba4996e911429d0088d5 Mon Sep 17 00:00:00 2001
From: Francisco-Taboada <francisco.taboada@enernoc.com>
Date: Fri, 11 Oct 2019 08:45:19 +0200
Subject: [PATCH] Add vhost parameter to allow create queues, exchanges and
 binding in the specified vhost

---
 .../containers/RabbitMQContainer.java         | 56 +++++++++++++++++++
 .../containers/RabbitMQContainerTest.java     |  8 ++-
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index ea25bf629e6..8cb9ba93d26 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -221,6 +221,25 @@ public RabbitMQContainer withBinding(String source, String destination, Map<Stri
         return self();
     }
 
+    public RabbitMQContainer withBinding(String vhost, String source, String destination) {
+        values.add(asList("rabbitmqadmin", "declare", "binding",
+                "--vhost=" + vhost,
+                "source=" + source,
+                "destination=" + destination));
+        return self();
+    }
+
+    public RabbitMQContainer withBinding(String vhost, String source, String destination, Map<String, Object> arguments, String routingKey, String destinationType) {
+        values.add(asList("rabbitmqadmin", "declare", "binding",
+                "--vhost=" + vhost,
+                "source=" + source,
+                "destination=" + destination,
+                "routing_key=" + routingKey,
+                "destination_type=" + destinationType,
+                "arguments=" + toJson(arguments)));
+        return self();
+    }
+
     public RabbitMQContainer withParameter(String component, String name, String value) {
         values.add(asList("rabbitmqadmin", "declare", "parameter",
                 "component=" + component,
@@ -312,6 +331,23 @@ public RabbitMQContainer withVhostLimit(String vhost, String name, int value) {
         return self();
     }
 
+    public RabbitMQContainer withQueue(String vhost, String name) {
+        values.add(asList("rabbitmqadmin", "declare", "queue",
+                "--vhost=" + vhost,
+                "name=" + name));
+        return self();
+    }
+
+    public RabbitMQContainer withQueue(String vhost, String name, boolean autoDelete, boolean durable, Map<String, Object> arguments) {
+        values.add(asList("rabbitmqadmin", "declare", "queue",
+                "--vhost=" + vhost,
+                "name=" + name,
+                "auto_delete=" + autoDelete,
+                "durable=" + durable,
+                "arguments=" + toJson(arguments)));
+        return self();
+    }
+
     public RabbitMQContainer withQueue(String name) {
         values.add(asList("rabbitmqadmin", "declare", "queue",
                 "name=" + name));
@@ -345,6 +381,26 @@ public RabbitMQContainer withExchange(String name, String type, boolean autoDele
         return self();
     }
 
+    public RabbitMQContainer withExchange(String vhost, String name, String type) {
+        values.add(asList("rabbitmqadmin", "declare", "exchange",
+                "--vhost=" + vhost,
+                "name=" + name,
+                "type=" + type));
+        return self();
+    }
+
+    public RabbitMQContainer withExchange(String vhost, String name, String type, boolean autoDelete, boolean internal, boolean durable, Map<String, Object> arguments) {
+        values.add(asList("rabbitmqadmin", "declare", "exchange",
+                "--vhost=" + vhost,
+                "name=" + name,
+                "type=" + type,
+                "auto_delete=" + autoDelete,
+                "internal=" + internal,
+                "durable=" + durable,
+                "arguments=" + toJson(arguments)));
+        return self();
+    }
+
     /**
      * Overwrites the default RabbitMQ configuration file with the supplied one.
      *
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index bdda594818f..8a491fa06fa 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -83,11 +83,15 @@ public void shouldCreateRabbitMQContainerWithExchange() throws IOException, Inte
     {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
             container.withExchange("test-exchange", "direct");
+            container.withVhost("vhost").withExchange("vhost","test-exchange", "direct");
 
             container.start();
 
             assertThat(container.execInContainer("rabbitmqctl", "list_exchanges").getStdout())
                 .containsPattern("test-exchange\\s+direct");
+
+            assertThat(container.execInContainer("rabbitmqctl", "list_exchanges", "--vhost=vhost").getStdout())
+                .containsPattern("test-exchange\\s+direct");
         }
     }
 
@@ -96,12 +100,12 @@ public void shouldCreateRabbitMQContainerWithQueues() throws IOException, Interr
     {
         try (RabbitMQContainer container = new RabbitMQContainer()) {
 
-            container.withQueue("queue-one")
+            container.withVhost("vhost").withQueue("vhost","queue-one")
                 .withQueue("queue-two", false, true, ImmutableMap.of("x-message-ttl", 1000));
 
             container.start();
 
-            assertThat(container.execInContainer("rabbitmqctl", "list_queues", "name", "arguments").getStdout())
+            assertThat(container.execInContainer("rabbitmqctl", "list_queues", "--vhost=vhost","name", "arguments").getStdout())
                 .containsPattern("queue-one");
             assertThat(container.execInContainer("rabbitmqctl", "list_queues", "name", "arguments").getStdout())
                 .containsPattern("queue-two\\s.*x-message-ttl");