Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions Consul.Test/CoordinateTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
// -----------------------------------------------------------------------

using System;
using System.Net;
using System.Threading.Tasks;
using Xunit;

Expand Down Expand Up @@ -73,5 +74,46 @@ public async Task Coordinate_GetNode()
Assert.IsType<CoordinateEntry[]>(nodeDetails);
Assert.NotEmpty(nodeDetails);
}

[Fact]
public async Task Coordinate_Update()
{
var nodeName = "foo-update-lan";
var registration = new CatalogRegistration
{
Node = nodeName,
Address = "1.1.1.1"
};
var register = await _client.Catalog.Register(registration);
var nodeResult = await _client.Catalog.Node(nodeName);
Assert.Equal(HttpStatusCode.OK, nodeResult.StatusCode);

var coord = new CoordinateEntry
{
Node = nodeName,
Coord = new SerfCoordinate
{
Error = 1.5,
Height = 0.5,
Adjustment = 0.0,
Vec = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 },
}
};

var response = await _client.Coordinate.Update(coord);
Assert.Equal(HttpStatusCode.OK, response.StatusCode);

var q = new QueryOptions { WaitIndex = nodeResult.LastIndex, };
var newCoordResult = await _client.Coordinate.Node(nodeName, q);
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.NotNull(newCoordResult.Response);

var newCoord = newCoordResult.Response[0];
Assert.Equal(coord.Coord.Vec.Count, newCoord.Coord.Vec.Count);
Assert.Equal(coord.Node, newCoord.Node);
Assert.True(Math.Abs(coord.Coord.Height - newCoord.Coord.Height) <= 0.00001);
Assert.True(Math.Abs(coord.Coord.Adjustment - newCoord.Coord.Adjustment) <= 0.00001);
Assert.True(Math.Abs(coord.Coord.Error - newCoord.Coord.Error) <= 0.00001);
}
}
}
24 changes: 24 additions & 0 deletions Consul/Coordinate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ namespace Consul
public class CoordinateEntry
{
public string Node { get; set; }
public string Segment { get; set; }
public SerfCoordinate Coord { get; set; }
}

Expand Down Expand Up @@ -105,6 +106,29 @@ public Task<QueryResult<CoordinateEntry[]>> Node(string node, CancellationToken
{
return Node(node, QueryOptions.Default, ct);
}

/// <summary>
/// Updates the LAN network coordinates for a node in a given datacenter.
/// </summary>
/// <param name="entry">A coordinate entry</param>
/// <param name="q">Customized write options</param>
/// <param name="ct">Cancellation Token</param>
/// <returns>An empty write result</returns>
public Task<WriteResult> Update(CoordinateEntry entry, WriteOptions q, CancellationToken ct = default)
{
return _client.Put("/v1/coordinate/update", entry, q).Execute(ct);
}

/// <summary>
/// Updates the LAN network coordinates for a node in a given datacenter.
/// </summary>
/// <param name="entry">A coordinate entry</param>
/// <param name="ct">Cancellation Token</param>
/// <returns>An empty write result</returns>
public Task<WriteResult> Update(CoordinateEntry entry, CancellationToken ct = default)
{
return Update(entry, WriteOptions.Default, ct);
}
}

public partial class ConsulClient : IConsulClient
Expand Down
2 changes: 2 additions & 0 deletions Consul/Interfaces/ICoordinateEndpoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,7 @@ public interface ICoordinateEndpoint
Task<QueryResult<CoordinateEntry[]>> Node(string node, QueryOptions q, CancellationToken ct = default);
Task<QueryResult<CoordinateEntry[]>> Node(string node, CancellationToken ct = default);
Task<QueryResult<CoordinateEntry[]>> Nodes(QueryOptions q, CancellationToken ct = default);
Task<WriteResult> Update(CoordinateEntry entry, WriteOptions q, CancellationToken ct = default);
Task<WriteResult> Update(CoordinateEntry entry, CancellationToken ct = default);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we also need a variant with WriteOptions

}
}