397d3c5c4f
Rename across every client surface using each language's idiomatic convention:
* .NET clients/dotnet/MxGateway.Client[.Cli|.Tests]/
-> clients/dotnet/ZB.MOM.WW.MxGateway.Client[.Cli|.Tests]/
namespaces -> ZB.MOM.WW.MxGateway.Client[.Cli|.Tests]
contracts ProjectReference repointed to ZB.MOM.WW.MxGateway.Contracts
sln migrated to slnx (dotnet sln migrate)
* Python src/mxgateway -> src/zb_mom_ww_mxgateway
src/mxgateway_cli -> src/zb_mom_ww_mxgateway_cli
distribution: mxaccess-gateway-client -> zb-mom-ww-mxaccess-gateway-client
* Rust crate: mxgateway-client -> zb-mom-ww-mxgateway-client
build.rs proto path repointed
* Java subprojects: mxgateway-{client,cli} -> zb-mom-ww-mxgateway-{client,cli}
packages com.dohertylan.mxgateway -> com.zb.mom.ww.mxgateway
group com.dohertylan.mxgateway -> com.zb.mom.ww.mxgateway
rootProject mxaccessgw-java -> zb-mom-ww-mxaccessgw-java
* Go generate-proto.ps1 proto path repointed; module path and
package mxgateway kept (Go convention).
* proto-inputs.json: generatedOutputs.python updated to new package path.
* scripts/run-client-e2e-tests.ps1: Java CLI install path + gradle task
updated to zb-mom-ww-mxgateway-cli.
CLI binary names (mxgw, mxgw-py, mxgw-go, mxgateway-cli) and wire-level
identifiers (MXGATEWAY_* env vars, the mxgw_<id>_<secret> API key
prefix, protobuf package names like mxaccess_gateway.v1, all MXAccess
references) intentionally NOT renamed.
Fix pre-existing alarms-over-gateway breaks unblocked by the rename:
* mxaccess_gateway.proto: add missing public message QueryActiveAlarmsRequest
{session_id, client_correlation_id, alarm_filter_prefix} and missing
rpc QueryActiveAlarms(QueryActiveAlarmsRequest) returns
(stream ActiveAlarmSnapshot). All four typed clients referenced
these but they were absent from the proto.
* MxAccessGatewayService.QueryActiveAlarms: implement the new RPC on
the server, streaming from IGatewayAlarmService.CurrentAlarms with
optional alarm_filter_prefix filter.
* clients/dotnet/.../DiscoverHierarchyOptions.cs: add the hand-written
.NET POCO that wraps DiscoverHierarchyRequest (referenced by
GalaxyRepositoryClient.DiscoverHierarchyAsync but never authored).
* Drop retired session_id field references from
AcknowledgeAlarmRequest/AcknowledgeAlarmReply test fixtures across
.NET, Rust, Go, and Python clients.
* Rust integration test: add the missing stream_alarms impl on the
fake MxAccessGateway server (the trait gained the method, fake
didn't).
* Rust CLI test: bump expected gatewayProtocolVersion 2 -> 3.
Regenerated artifacts updated in this commit:
* src/ZB.MOM.WW.MxGateway.Contracts/Generated/{MxaccessGateway,MxaccessGatewayGrpc}.cs
* clients/python/src/zb_mom_ww_mxgateway/generated/*_pb2{,_grpc}.py
* clients/go/internal/generated/*.pb.go
(C# regenerated by Grpc.Tools on contracts build; Python and Go via
their generate-proto.ps1 scripts; Rust regenerates from .proto via
tonic-build at compile time so no checked-in artefact.)
Verification: 472 server tests, 275 worker tests (9 dev-rig skipped),
18 integration tests (live MxAccess + LDAP + Galaxy), 57 .NET client
tests, 32 Rust workspace tests, 39 Python tests, all Go packages, and
gradle build for Java all pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
325 lines
14 KiB
C#
325 lines
14 KiB
C#
using ZB.MOM.WW.MxGateway.Contracts.Proto;
|
|
using Grpc.Core;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Client.Tests;
|
|
|
|
/// <summary>Tests for MxGatewaySession and client command behavior.</summary>
|
|
public sealed class MxGatewayClientSessionTests
|
|
{
|
|
/// <summary>Verifies that open session attaches API key metadata and cancellation token.</summary>
|
|
[Fact]
|
|
public async Task OpenSessionRawAsync_AttachesApiKeyMetadataAndCancellation()
|
|
{
|
|
using CancellationTokenSource cancellation = new();
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
await client.OpenSessionRawAsync(new OpenSessionRequest(), cancellation.Token);
|
|
|
|
var call = Assert.Single(transport.OpenSessionCalls);
|
|
Assert.Equal("Bearer test-api-key", call.CallOptions.Headers?.GetValue("authorization"));
|
|
Assert.Equal(cancellation.Token, call.CallOptions.CancellationToken);
|
|
}
|
|
|
|
/// <summary>Verifies that open session returns a session with the raw open reply.</summary>
|
|
[Fact]
|
|
public async Task OpenSessionAsync_ReturnsSessionWithRawOpenReply()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.OpenSessionReply.WorkerProcessId = 1234;
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
|
|
Assert.Equal("session-fixture", session.SessionId);
|
|
Assert.Same(transport.OpenSessionReply, session.OpenSessionReply);
|
|
Assert.Equal(1234, session.OpenSessionReply.WorkerProcessId);
|
|
}
|
|
|
|
/// <summary>Verifies that register builds a register command and returns server handle.</summary>
|
|
[Fact]
|
|
public async Task RegisterAsync_BuildsRegisterCommandAndReturnsServerHandle()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddInvokeReply(new MxCommandReply
|
|
{
|
|
SessionId = "session-fixture",
|
|
Kind = MxCommandKind.Register,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
Register = new RegisterReply { ServerHandle = 12 },
|
|
});
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
|
|
int serverHandle = await session.RegisterAsync("fixture-client");
|
|
|
|
Assert.Equal(12, serverHandle);
|
|
var call = Assert.Single(transport.InvokeCalls);
|
|
Assert.Equal("session-fixture", call.Request.SessionId);
|
|
Assert.False(string.IsNullOrWhiteSpace(call.Request.ClientCorrelationId));
|
|
Assert.Equal(MxCommandKind.Register, call.Request.Command.Kind);
|
|
Assert.Equal("fixture-client", call.Request.Command.Register.ClientName);
|
|
}
|
|
|
|
/// <summary>Verifies that add item 2 builds a command with the specified context.</summary>
|
|
[Fact]
|
|
public async Task AddItem2Async_BuildsAddItem2CommandWithContext()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddInvokeReply(new MxCommandReply
|
|
{
|
|
SessionId = "session-fixture",
|
|
Kind = MxCommandKind.AddItem2,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
AddItem2 = new AddItem2Reply { ItemHandle = 34 },
|
|
});
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
|
|
int itemHandle = await session.AddItem2Async(12, "Area001.Pump001.Speed", "runtime");
|
|
|
|
Assert.Equal(34, itemHandle);
|
|
MxCommandRequest request = Assert.Single(transport.InvokeCalls).Request;
|
|
Assert.Equal(MxCommandKind.AddItem2, request.Command.Kind);
|
|
Assert.Equal(12, request.Command.AddItem2.ServerHandle);
|
|
Assert.Equal("Area001.Pump001.Speed", request.Command.AddItem2.ItemDefinition);
|
|
Assert.Equal("runtime", request.Command.AddItem2.ItemContext);
|
|
}
|
|
|
|
/// <summary>Verifies that write raw builds a write command with the raw value.</summary>
|
|
[Fact]
|
|
public async Task WriteRawAsync_BuildsWriteCommandWithRawValue()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddInvokeReply(new MxCommandReply
|
|
{
|
|
SessionId = "session-fixture",
|
|
Kind = MxCommandKind.Write,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
});
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
MxValue value = new()
|
|
{
|
|
DataType = MxDataType.Integer,
|
|
VariantType = "VT_I4",
|
|
Int32Value = 123,
|
|
};
|
|
|
|
MxCommandReply reply = await session.WriteRawAsync(12, 34, value, 56);
|
|
|
|
Assert.Equal(MxCommandKind.Write, reply.Kind);
|
|
MxCommandRequest request = Assert.Single(transport.InvokeCalls).Request;
|
|
Assert.Equal(MxCommandKind.Write, request.Command.Kind);
|
|
Assert.Equal(12, request.Command.Write.ServerHandle);
|
|
Assert.Equal(34, request.Command.Write.ItemHandle);
|
|
Assert.Same(value, request.Command.Write.Value);
|
|
Assert.Equal(56, request.Command.Write.UserId);
|
|
}
|
|
|
|
/// <summary>Verifies that write 2 raw builds a write 2 command with value and timestamp.</summary>
|
|
[Fact]
|
|
public async Task Write2RawAsync_BuildsWrite2CommandWithValueAndTimestamp()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddInvokeReply(new MxCommandReply
|
|
{
|
|
SessionId = "session-fixture",
|
|
Kind = MxCommandKind.Write2,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
});
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
MxValue value = 123.ToMxValue();
|
|
MxValue timestampValue = DateTimeOffset.Parse("2026-01-01T00:00:00Z").ToMxValue();
|
|
|
|
MxCommandReply reply = await session.Write2RawAsync(12, 34, value, timestampValue, 56);
|
|
|
|
Assert.Equal(MxCommandKind.Write2, reply.Kind);
|
|
MxCommandRequest request = Assert.Single(transport.InvokeCalls).Request;
|
|
Assert.Equal(MxCommandKind.Write2, request.Command.Kind);
|
|
Assert.Equal(12, request.Command.Write2.ServerHandle);
|
|
Assert.Equal(34, request.Command.Write2.ItemHandle);
|
|
Assert.Same(value, request.Command.Write2.Value);
|
|
Assert.Same(timestampValue, request.Command.Write2.TimestampValue);
|
|
Assert.Equal(56, request.Command.Write2.UserId);
|
|
}
|
|
|
|
/// <summary>Verifies that subscribe bulk builds one command and returns per-item results.</summary>
|
|
[Fact]
|
|
public async Task SubscribeBulkAsync_BuildsOneBulkCommandAndReturnsPerItemResults()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddInvokeReply(new MxCommandReply
|
|
{
|
|
SessionId = "session-fixture",
|
|
Kind = MxCommandKind.SubscribeBulk,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
SubscribeBulk = new BulkSubscribeReply
|
|
{
|
|
Results =
|
|
{
|
|
new SubscribeResult
|
|
{
|
|
ServerHandle = 12,
|
|
TagAddress = "Area001.Pump001.Speed",
|
|
ItemHandle = 34,
|
|
WasSuccessful = true,
|
|
},
|
|
},
|
|
},
|
|
});
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
|
|
IReadOnlyList<SubscribeResult> results = await session.SubscribeBulkAsync(
|
|
12,
|
|
["Area001.Pump001.Speed"]);
|
|
|
|
SubscribeResult result = Assert.Single(results);
|
|
Assert.Equal(34, result.ItemHandle);
|
|
MxCommandRequest request = Assert.Single(transport.InvokeCalls).Request;
|
|
Assert.Equal(MxCommandKind.SubscribeBulk, request.Command.Kind);
|
|
Assert.Equal(12, request.Command.SubscribeBulk.ServerHandle);
|
|
Assert.Equal(["Area001.Pump001.Speed"], request.Command.SubscribeBulk.TagAddresses);
|
|
}
|
|
|
|
/// <summary>Verifies that stream events yields events in the order received from the gateway.</summary>
|
|
[Fact]
|
|
public async Task StreamEventsAsync_YieldsEventsInGatewayOrder()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddEvent(new MxEvent
|
|
{
|
|
SessionId = "session-fixture",
|
|
Family = MxEventFamily.OnDataChange,
|
|
WorkerSequence = 1,
|
|
});
|
|
transport.AddEvent(new MxEvent
|
|
{
|
|
SessionId = "session-fixture",
|
|
Family = MxEventFamily.OnWriteComplete,
|
|
WorkerSequence = 2,
|
|
});
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
List<ulong> sequences = [];
|
|
|
|
await foreach (MxEvent gatewayEvent in session.StreamEventsAsync(afterWorkerSequence: 0))
|
|
{
|
|
sequences.Add(gatewayEvent.WorkerSequence);
|
|
}
|
|
|
|
Assert.Equal([1UL, 2UL], sequences);
|
|
StreamEventsRequest request = Assert.Single(transport.StreamEventsCalls).Request;
|
|
Assert.Equal("session-fixture", request.SessionId);
|
|
}
|
|
|
|
/// <summary>Verifies that close is explicit and idempotent.</summary>
|
|
[Fact]
|
|
public async Task CloseAsync_IsExplicitAndIdempotent()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
|
|
CloseSessionReply first = await session.CloseAsync();
|
|
CloseSessionReply second = await session.CloseAsync();
|
|
|
|
Assert.Same(first, second);
|
|
var call = Assert.Single(transport.CloseSessionCalls);
|
|
Assert.Equal("session-fixture", call.Request.SessionId);
|
|
}
|
|
|
|
/// <summary>Verifies that invoke retries safe diagnostic commands on transient RPC failure.</summary>
|
|
[Fact]
|
|
public async Task InvokeAsync_RetriesSafeDiagnosticCommandOnTransientGrpcFailure()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.InvokeExceptions.Enqueue(CreateTransientRpcException());
|
|
transport.AddInvokeReply(new MxCommandReply
|
|
{
|
|
SessionId = "session-fixture",
|
|
Kind = MxCommandKind.Ping,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
});
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
|
|
await session.InvokeAsync(new MxCommandRequest
|
|
{
|
|
SessionId = session.SessionId,
|
|
Command = new MxCommand { Kind = MxCommandKind.Ping, Ping = new PingCommand() },
|
|
});
|
|
|
|
Assert.Equal(2, transport.InvokeCalls.Count);
|
|
}
|
|
|
|
/// <summary>Verifies that open session does not retry on transient RPC failure.</summary>
|
|
[Fact]
|
|
public async Task OpenSessionAsync_DoesNotRetryTransientGrpcFailure()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.OpenSessionExceptions.Enqueue(CreateTransientRpcException());
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
|
|
await Assert.ThrowsAsync<RpcException>(async () => await client.OpenSessionAsync());
|
|
|
|
Assert.Single(transport.OpenSessionCalls);
|
|
}
|
|
|
|
/// <summary>Verifies that invoke does not retry write commands on transient RPC failure.</summary>
|
|
[Fact]
|
|
public async Task InvokeAsync_DoesNotRetryWriteCommand()
|
|
{
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.InvokeExceptions.Enqueue(CreateTransientRpcException());
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
|
|
await Assert.ThrowsAsync<RpcException>(async () =>
|
|
await session.WriteRawAsync(1, 2, 3.ToMxValue(), userId: 0));
|
|
|
|
Assert.Single(transport.InvokeCalls);
|
|
}
|
|
|
|
/// <summary>Verifies that invoke helpers pass cancellation token to the transport.</summary>
|
|
[Fact]
|
|
public async Task InvokeHelpers_PassCancellationTokenToTransport()
|
|
{
|
|
using CancellationTokenSource cancellation = new();
|
|
FakeGatewayTransport transport = CreateTransport();
|
|
transport.AddInvokeReply(new MxCommandReply
|
|
{
|
|
SessionId = "session-fixture",
|
|
Kind = MxCommandKind.Advise,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
});
|
|
await using MxGatewayClient client = CreateClient(transport);
|
|
MxGatewaySession session = await client.OpenSessionAsync();
|
|
|
|
await session.AdviseAsync(12, 34, cancellation.Token);
|
|
|
|
Assert.Equal(cancellation.Token, Assert.Single(transport.InvokeCalls).CallOptions.CancellationToken);
|
|
}
|
|
|
|
private static MxGatewayClient CreateClient(FakeGatewayTransport transport)
|
|
{
|
|
return new MxGatewayClient(transport.Options, transport);
|
|
}
|
|
|
|
private static FakeGatewayTransport CreateTransport()
|
|
{
|
|
return new FakeGatewayTransport(new MxGatewayClientOptions
|
|
{
|
|
Endpoint = new Uri("http://localhost:5000"),
|
|
ApiKey = "test-api-key",
|
|
});
|
|
}
|
|
|
|
private static RpcException CreateTransientRpcException()
|
|
{
|
|
return new RpcException(new Status(StatusCode.Unavailable, "gateway unavailable"));
|
|
}
|
|
}
|