Merge pull request #121 from mikehadlow/master

Added overload to GetQueuesAsync

Author: mikehadlow

Source/EasyNetQ.Management.Client.IntegrationTests/ManagementClientTests.cs

@@ -237,6 +237,18 @@ public async Task Should_get_queues()
 			(await managementClient.GetQueuesAsync().ConfigureAwait(false)).ToList().Count.ShouldBeGreaterThan(0);
 		}
 
+		[Fact]
+		public async Task Should_get_queues_by_vhost()
+		{
+			var vhost = await managementClient.CreateVhostAsync(testVHost).ConfigureAwait(false);
+			vhost.Name.ShouldEqual(testVHost);
+
+            var queueName = $"{testVHost}_{testQueue}";
+
+			await CreateTestQueueInVhost(queueName, vhost).ConfigureAwait(false);
+			(await managementClient.GetQueuesAsync(vhost).ConfigureAwait(false)).ToList().Count.ShouldBeGreaterThan(0);
+		}
+
 		[Fact]
 		public async Task Should_be_able_to_get_a_queue_by_name()
 		{
@@ -409,6 +421,11 @@ private async Task<Queue> EnsureQueueExists(string managementApiTestQueue)
 		private async Task<Queue> CreateTestQueue(string queueName)
 		{
 			var vhost = await managementClient.GetVhostAsync(vhostName).ConfigureAwait(false);
+            return await CreateTestQueueInVhost(queueName, vhost);
+		}
+
+		private async Task<Queue> CreateTestQueueInVhost(string queueName, Vhost vhost)
+		{
 			var queueInfo = new QueueInfo(queueName);
 			await managementClient.CreateQueueAsync(queueInfo, vhost).ConfigureAwait(false);
 			return await managementClient.GetQueueAsync(queueName, vhost).ConfigureAwait(false);
@@ -1058,4 +1075,4 @@ public async Task Should_disable_tracing()
             Assert.False(vhostAfterUpdate.Tracing);
         }
 	}
-}
+}

Source/EasyNetQ.Management.Client/IManagementClient.cs

@@ -91,6 +91,14 @@ Task<Channel> GetChannelAsync(
         /// <returns></returns>
         Task<IEnumerable<Queue>> GetQueuesAsync(CancellationToken cancellationToken = default(CancellationToken));
 
+        /// <summary>
+        /// A list of all queues for a virtual host.
+        /// </summary>
+        /// <param name="vhost"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        Task<IEnumerable<Queue>> GetQueuesAsync(Vhost vhost, CancellationToken cancellationToken = default(CancellationToken));
+
         /// <summary>
         /// A list of all bindings.
         /// </summary>
@@ -532,4 +540,4 @@ Task DeleteParameterAsync(
         /// <returns></returns>
         Task<List<Federation>> GetFederationAsync(CancellationToken cancellationToken = default(CancellationToken));
     }
-}
+}

Source/EasyNetQ.Management.Client/ManagementClient.cs

@@ -267,6 +267,11 @@ public Task<PublishResult> PublishAsync(Exchange exchange, PublishInfo publishIn
             return GetAsync<IEnumerable<Queue>>("queues", cancellationToken);
         }
 
+        public Task<IEnumerable<Queue>> GetQueuesAsync(Vhost vhost, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return GetAsync<IEnumerable<Queue>>($"queues/{SanitiseVhostName(vhost.Name)}", cancellationToken);
+        }
+
         public async Task<Queue> CreateQueueAsync(QueueInfo queueInfo, Vhost vhost,
             CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -833,4 +838,4 @@ public void Dispose()
             httpClient.Dispose();
         }
     }
-}
+}