reindex rethrottle integration tests

Author: russcam

src/Nest/Document/Multiple/ReindexRethrottle/ReindexNode.cs

@@ -87,7 +87,7 @@ public class ReindexStatus
 		public long ThrottledInMilliseconds { get; internal set; }
 
 		[JsonProperty("requests_per_second")]
-		public long RequestsPerSecond { get; internal set; }
+		public Union<string,long> RequestsPerSecond { get; internal set; }
 
 		[JsonProperty("throttled_until_millis")]
 		public long ThrottledUntilInMilliseconds { get; internal set; }

src/Nest/Document/Multiple/ReindexRethrottle/ReindexRethrottleResponse.cs

@@ -7,11 +7,12 @@ namespace Nest
 	public interface IReindexRethrottleResponse : IResponse
 	{
 		[JsonProperty("nodes")]
-		IEnumerable<ReindexNode> Nodes { get; set; }
+		[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))]
+		Dictionary<string, ReindexNode> Nodes { get; set; }
 	}
 
 	public class ReindexRethrottleResponse : ResponseBase, IReindexRethrottleResponse
 	{
-		public IEnumerable<ReindexNode> Nodes { get; set; }
+		public Dictionary<string, ReindexNode> Nodes { get; set; }
 	}
 }

src/Nest/Nest.csproj

@@ -533,6 +533,9 @@
     <Compile Include="Document\Multiple\ReindexOnServer\ReindexRouting.cs" />
     <Compile Include="Document\Multiple\ReindexOnServer\ReindexRoutingJsonConverter.cs" />
     <Compile Include="Document\Multiple\ReindexOnServer\ReindexSource.cs" />
+    <Compile Include="Document\Multiple\ReindexRethrottle\ElasticClient-ReindexRethrottle.cs" />
+    <Compile Include="Document\Multiple\ReindexRethrottle\ReindexNode.cs" />
+    <Compile Include="Document\Multiple\ReindexRethrottle\ReindexRethrottleResponse.cs" />
     <Compile Include="Document\Multiple\UpdateByQuery\UpdateByQueryRequest.cs" />
     <Compile Include="Document\Multiple\UpdateByQuery\UpdateByQueryResponse.cs" />
     <Compile Include="Document\Multiple\UpdateByQuery\ElasticClient-UpdateByQuery.cs" />

src/Tests/Document/Multiple/ReindexRethrottle/ReindexRethrottleApiTests.cs

@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Nest;
 using Tests.Document.Multiple.Reindex;
+using Tests.Document.Multiple.ReindexOnServer;
 using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
@@ -14,20 +15,68 @@
 namespace Tests.Document.Multiple.ReindexRethrottle
 {
 	[Collection(IntegrationContext.Reindex)]
-	public class ReindexRethrottleApiTests
-		: ApiIntegrationTestBase<IReindexRethrottleResponse, IReindexRethrottleRequest, ReindexRethrottleDescriptor, ReindexRethrottleRequest>
+	public class ReindexRethrottleReindexApiTests : ReindexRethrottleApiTests
 	{
-		private readonly TaskId _taskId = "rhtoNesNR4aXVIY2bRR4GQ:13056";
+		public ReindexRethrottleReindexApiTests(ReindexCluster cluster, EndpointUsage usage) : base(cluster, usage)
+		{
+		}
 
-		public ReindexRethrottleApiTests(ReindexCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		protected override void OnBeforeCall(IElasticClient client)
+		{
+			var reindex = client.ReindexOnServer(r => r
+				.Source(s => s
+					.Index(Index<Project>())
+				)
+				.Destination(s => s
+					.Index(CallIsolatedValue)
+					.OpType(OpType.Create)
+				)
+				.Refresh()
+				.RequestsPerSecond(1)
+				.WaitForCompletion(false)
+			);
 
-		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+			reindex.IsValid.Should().BeTrue();
+			this.ExtendedValue(TaskIdKey, reindex.Task);
+		}
+	}
+
+	[Collection(IntegrationContext.Reindex)]
+	public class ReindexRethrottleUpdateByQueryTests : ReindexRethrottleApiTests
+	{
+		public ReindexRethrottleUpdateByQueryTests(ReindexCluster cluster, EndpointUsage usage) : base(cluster, usage)
 		{
 		}
 
 		protected override void OnBeforeCall(IElasticClient client)
 		{
-			base.OnBeforeCall(client);
+			var reindex = client.UpdateByQuery<Project>(Nest.Indices.Index<Project>(), Types.Type<Project>(), u => u
+				.Conflicts(Conflicts.Proceed)
+				.Query(q => q.MatchAll())
+				.Script(s => s.Inline("ctx._source.numberOfCommits+10"))
+				.Refresh()
+				.RequestsPerSecond(1)
+				.WaitForCompletion(false)
+			);
+
+			reindex.IsValid.Should().BeTrue();
+			this.ExtendedValue(TaskIdKey, reindex.Task);
+		}
+	}
+
+	public abstract class ReindexRethrottleApiTests
+		: ApiIntegrationTestBase<IReindexRethrottleResponse, IReindexRethrottleRequest, ReindexRethrottleDescriptor, ReindexRethrottleRequest>
+	{
+		protected TaskId TaskId => this.RanIntegrationSetup ? this.ExtendedValue<TaskId>(TaskIdKey) : "foo:1";
+
+		protected const string TaskIdKey = "taskId";
+
+		protected ReindexRethrottleApiTests(ReindexCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
+		{
+			client.IndexMany(Project.Projects);
+			client.Refresh(Index<Project>());
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(
@@ -36,24 +85,56 @@ protected override LazyResponses ClientUsage() => Calls(
 			request: (client, r) => client.ReindexRethrottle(r),
 			requestAsync: (client, r) => client.ReindexRethrottleAsync(r)
 		);
-		protected override void OnAfterCall(IElasticClient client) => client.Refresh(CallIsolatedValue);
 
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
-
-		protected override string UrlPath => $"/_reindex/rhtoNesNR4aXVIY2bRR4GQ%3A13056/_rethrottle";
+		protected override string UrlPath => $"/_reindex/{TaskId.NodeId}%3A{TaskId.TaskNumber}/_rethrottle?requests_per_second=0";
 
 		protected override bool SupportsDeserialization => false;
 
 		protected override Func<ReindexRethrottleDescriptor, IReindexRethrottleRequest> Fluent => d => d
-			.TaskId(_taskId);
+			.TaskId(TaskId)
+			.RequestsPerSecond(0);
 
-		protected override ReindexRethrottleRequest Initializer => new ReindexRethrottleRequest(_taskId);
+		protected override ReindexRethrottleRequest Initializer => new ReindexRethrottleRequest(TaskId)
+		{
+			RequestsPerSecond = 0,
+		};
 
 		protected override void ExpectResponse(IReindexRethrottleResponse response)
 		{
+			response.IsValid.Should().BeTrue();
+
+			response.Nodes.Should().NotBeEmpty().And.HaveCount(1);
+			var node = response.Nodes.First().Value;
+
+			node.Name.Should().NotBeNullOrEmpty();
+			node.TransportAddress.Should().NotBeNullOrEmpty();
+			node.Host.Should().NotBeNullOrEmpty();
+			node.Ip.Should().NotBeNullOrEmpty();
+			node.Roles.Should().NotBeEmpty();
+			node.Attributes.Should().NotBeEmpty();
+
+			node.Tasks.Should().NotBeEmpty().And.HaveCount(1);
+
+			node.Tasks.First().Key.Should().Be(TaskId);
+
+			var task = node.Tasks.First().Value;
+
+			task.Node.Should().NotBeNullOrEmpty().And.Be(TaskId.NodeId);
+			task.Id.Should().Be(TaskId.TaskNumber);
+			task.Type.Should().NotBeNullOrEmpty();
+			task.Action.Should().NotBeNullOrEmpty();
+
+			task.Status.RequestsPerSecond.Match(
+				s => s.Should().Be("unlimited"),
+				l => l.Should().Be(0)
+			);
+
+			task.StartTimeInMilliseconds.Should().BeGreaterThan(0);
+			task.RunningTimeInNanoseconds.Should().BeGreaterThan(0);
 		}
 
 		protected override object ExpectJson => null;

src/Tests/Framework/ApiTestBase.cs

@@ -28,7 +28,7 @@ public abstract class ApiTestBase<TResponse, TInterface, TDescriptor, TInitializ
 
 		protected string CallIsolatedValue => _uniqueValues.Value;
 		protected T ExtendedValue<T>(string key) where T : class => this._uniqueValues.ExtendedValue<T>(key);
-
+		protected void ExtendedValue<T>(string key, T value) where T : class => this._uniqueValues.ExtendedValue(key, value);
 		protected virtual void IntegrationSetup(IElasticClient client, CallUniqueValues values) { }
 		protected virtual void OnBeforeCall(IElasticClient client) { }
 		protected virtual void OnAfterCall(IElasticClient client) { }

src/Tests/Tests.csproj

@@ -321,6 +321,8 @@
     <Compile Include=".\Mapping\Types\Core\Number\NumberMappingTests.cs" />
     <Compile Include="Aggregations\AggregationVisitorTests.cs" />
     <Compile Include="CodeStandards\Serialization\Converters.doc.cs" />
+    <Compile Include="Document\Multiple\ReindexRethrottle\ReindexRethrottleApiTests.cs" />
+    <Compile Include="Document\Multiple\ReindexRethrottle\ReindexRethrottleUrlTests.cs" />
     <Compile Include="Framework\MockData\Tag.cs" />
     <Compile Include="Framework\MockResponses\SniffingResponse.cs" />
     <Compile Include="Indices\IndexManagement\OpenCloseIndex\OpenIndex\OpenIndexApiTests.cs" />