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>
242 lines
8.4 KiB
C#
242 lines
8.4 KiB
C#
using Grpc.Core;
|
|
using ZB.MOM.WW.MxGateway.Contracts.Proto;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Client.Tests;
|
|
|
|
/// <summary>
|
|
/// Fake implementation of IMxGatewayClientTransport for testing.
|
|
/// </summary>
|
|
internal sealed class FakeGatewayTransport(MxGatewayClientOptions options) : IMxGatewayClientTransport
|
|
{
|
|
private readonly Queue<MxCommandReply> _invokeReplies = new();
|
|
private readonly List<MxEvent> _events = [];
|
|
|
|
/// <summary>
|
|
/// Gets the gateway client options.
|
|
/// </summary>
|
|
public MxGatewayClientOptions Options { get; } = options;
|
|
|
|
/// <summary>
|
|
/// Gets null, since this is a test fake without a real gRPC client.
|
|
/// </summary>
|
|
public MxAccessGateway.MxAccessGatewayClient? RawClient => null;
|
|
|
|
/// <summary>
|
|
/// Gets the list of captured OpenSessionAsync calls.
|
|
/// </summary>
|
|
public List<(OpenSessionRequest Request, CallOptions CallOptions)> OpenSessionCalls { get; } = [];
|
|
|
|
/// <summary>
|
|
/// Gets the list of captured CloseSessionAsync calls.
|
|
/// </summary>
|
|
public List<(CloseSessionRequest Request, CallOptions CallOptions)> CloseSessionCalls { get; } = [];
|
|
|
|
/// <summary>
|
|
/// Gets the list of captured InvokeAsync calls.
|
|
/// </summary>
|
|
public List<(MxCommandRequest Request, CallOptions CallOptions)> InvokeCalls { get; } = [];
|
|
|
|
/// <summary>
|
|
/// Gets the list of captured StreamEventsAsync calls.
|
|
/// </summary>
|
|
public List<(StreamEventsRequest Request, CallOptions CallOptions)> StreamEventsCalls { get; } = [];
|
|
|
|
/// <summary>
|
|
/// Gets the list of captured AcknowledgeAlarmAsync calls.
|
|
/// </summary>
|
|
public List<(AcknowledgeAlarmRequest Request, CallOptions CallOptions)> AcknowledgeAlarmCalls { get; } = [];
|
|
|
|
/// <summary>
|
|
/// Gets the list of captured QueryActiveAlarmsAsync calls.
|
|
/// </summary>
|
|
public List<(QueryActiveAlarmsRequest Request, CallOptions CallOptions)> QueryActiveAlarmsCalls { get; } = [];
|
|
|
|
/// <summary>
|
|
/// Gets the queue of exceptions to throw from AcknowledgeAlarmAsync.
|
|
/// </summary>
|
|
public Queue<Exception> AcknowledgeAlarmExceptions { get; } = new();
|
|
|
|
private readonly Queue<AcknowledgeAlarmReply> _acknowledgeReplies = new();
|
|
private readonly List<ActiveAlarmSnapshot> _activeAlarmSnapshots = [];
|
|
|
|
/// <summary>
|
|
/// Gets or sets the reply to return from OpenSessionAsync.
|
|
/// </summary>
|
|
public OpenSessionReply OpenSessionReply { get; set; } = new()
|
|
{
|
|
SessionId = "session-fixture",
|
|
BackendName = "mxaccess-worker",
|
|
GatewayProtocolVersion = 1,
|
|
WorkerProtocolVersion = 1,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
};
|
|
|
|
/// <summary>
|
|
/// Gets or sets the reply to return from CloseSessionAsync.
|
|
/// </summary>
|
|
public CloseSessionReply CloseSessionReply { get; set; } = new()
|
|
{
|
|
SessionId = "session-fixture",
|
|
FinalState = SessionState.Closed,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
};
|
|
|
|
/// <summary>
|
|
/// Gets the queue of exceptions to throw from OpenSessionAsync.
|
|
/// </summary>
|
|
public Queue<Exception> OpenSessionExceptions { get; } = new();
|
|
|
|
/// <summary>
|
|
/// Gets the queue of exceptions to throw from CloseSessionAsync.
|
|
/// </summary>
|
|
public Queue<Exception> CloseSessionExceptions { get; } = new();
|
|
|
|
/// <summary>
|
|
/// Gets the queue of exceptions to throw from InvokeAsync.
|
|
/// </summary>
|
|
public Queue<Exception> InvokeExceptions { get; } = new();
|
|
|
|
/// <summary>
|
|
/// Verifies that the OpenSessionAsync call is recorded and returns the configured reply.
|
|
/// </summary>
|
|
/// <param name="request">The OpenSessionRequest to process.</param>
|
|
/// <param name="callOptions">Call options specifying RPC behavior.</param>
|
|
public Task<OpenSessionReply> OpenSessionAsync(
|
|
OpenSessionRequest request,
|
|
CallOptions callOptions)
|
|
{
|
|
OpenSessionCalls.Add((request, callOptions));
|
|
if (OpenSessionExceptions.TryDequeue(out Exception? exception))
|
|
{
|
|
throw exception;
|
|
}
|
|
|
|
return Task.FromResult(OpenSessionReply);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that the CloseSessionAsync call is recorded and returns the configured reply.
|
|
/// </summary>
|
|
/// <param name="request">The CloseSessionRequest to process.</param>
|
|
/// <param name="callOptions">Call options specifying RPC behavior.</param>
|
|
public Task<CloseSessionReply> CloseSessionAsync(
|
|
CloseSessionRequest request,
|
|
CallOptions callOptions)
|
|
{
|
|
CloseSessionCalls.Add((request, callOptions));
|
|
if (CloseSessionExceptions.TryDequeue(out Exception? exception))
|
|
{
|
|
throw exception;
|
|
}
|
|
|
|
return Task.FromResult(CloseSessionReply);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that the InvokeAsync call is recorded and returns the next enqueued reply.
|
|
/// </summary>
|
|
/// <param name="request">The MxCommandRequest to process.</param>
|
|
/// <param name="callOptions">Call options specifying RPC behavior.</param>
|
|
public Task<MxCommandReply> InvokeAsync(
|
|
MxCommandRequest request,
|
|
CallOptions callOptions)
|
|
{
|
|
InvokeCalls.Add((request, callOptions));
|
|
if (InvokeExceptions.TryDequeue(out Exception? exception))
|
|
{
|
|
throw exception;
|
|
}
|
|
|
|
return Task.FromResult(_invokeReplies.Dequeue());
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verifies that the StreamEventsAsync call is recorded and yields all enqueued events.
|
|
/// </summary>
|
|
/// <param name="request">The StreamEventsRequest to process.</param>
|
|
/// <param name="callOptions">Call options specifying RPC behavior.</param>
|
|
public async IAsyncEnumerable<MxEvent> StreamEventsAsync(
|
|
StreamEventsRequest request,
|
|
CallOptions callOptions)
|
|
{
|
|
StreamEventsCalls.Add((request, callOptions));
|
|
|
|
foreach (MxEvent gatewayEvent in _events)
|
|
{
|
|
callOptions.CancellationToken.ThrowIfCancellationRequested();
|
|
await Task.Yield();
|
|
yield return gatewayEvent;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Enqueues a reply to be returned from the next InvokeAsync call.
|
|
/// </summary>
|
|
/// <param name="reply">The reply to enqueue.</param>
|
|
public void AddInvokeReply(MxCommandReply reply)
|
|
{
|
|
_invokeReplies.Enqueue(reply);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Enqueues an event to be yielded from StreamEventsAsync.
|
|
/// </summary>
|
|
/// <param name="gatewayEvent">The event to enqueue.</param>
|
|
public void AddEvent(MxEvent gatewayEvent)
|
|
{
|
|
_events.Add(gatewayEvent);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Records the acknowledge call and returns the next enqueued reply (or default).
|
|
/// </summary>
|
|
public Task<AcknowledgeAlarmReply> AcknowledgeAlarmAsync(
|
|
AcknowledgeAlarmRequest request,
|
|
CallOptions callOptions)
|
|
{
|
|
AcknowledgeAlarmCalls.Add((request, callOptions));
|
|
if (AcknowledgeAlarmExceptions.TryDequeue(out Exception? exception))
|
|
{
|
|
throw exception;
|
|
}
|
|
|
|
return Task.FromResult(_acknowledgeReplies.Count > 0
|
|
? _acknowledgeReplies.Dequeue()
|
|
: new AcknowledgeAlarmReply
|
|
{
|
|
CorrelationId = request.ClientCorrelationId,
|
|
ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
|
|
Status = new MxStatusProxy { Success = 1, Category = MxStatusCategory.Ok },
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Records the query call and yields each enqueued snapshot.
|
|
/// </summary>
|
|
public async IAsyncEnumerable<ActiveAlarmSnapshot> QueryActiveAlarmsAsync(
|
|
QueryActiveAlarmsRequest request,
|
|
CallOptions callOptions)
|
|
{
|
|
QueryActiveAlarmsCalls.Add((request, callOptions));
|
|
|
|
foreach (ActiveAlarmSnapshot snapshot in _activeAlarmSnapshots)
|
|
{
|
|
callOptions.CancellationToken.ThrowIfCancellationRequested();
|
|
await Task.Yield();
|
|
yield return snapshot;
|
|
}
|
|
}
|
|
|
|
/// <summary>Enqueues an acknowledge reply.</summary>
|
|
public void AddAcknowledgeReply(AcknowledgeAlarmReply reply)
|
|
{
|
|
_acknowledgeReplies.Enqueue(reply);
|
|
}
|
|
|
|
/// <summary>Enqueues a snapshot to be yielded from QueryActiveAlarmsAsync.</summary>
|
|
public void AddActiveAlarmSnapshot(ActiveAlarmSnapshot snapshot)
|
|
{
|
|
_activeAlarmSnapshots.Add(snapshot);
|
|
}
|
|
}
|