27a8d05b7c
The mxaccessgw updated alarms to a session-less central monitor: AcknowledgeAlarm dropped SessionId and alarm transitions now come from the session-less StreamAlarms feed instead of the per-session worker StreamEvents stream. The GalaxyDriver no longer compiled against the updated client. - GatewayGalaxyAlarmAcknowledger: session-less rewrite — no GalaxyMxSession; outcome read from ProtocolStatus (throw) and Hresult (warn). - New IGalaxyAlarmFeed seam + GatewayGalaxyAlarmFeed: background consumer of StreamAlarms that decodes the active-alarm snapshot plus live transitions into GalaxyAlarmTransition and reopens the stream on transport faults. - EventPump: drop the dead per-session OnAlarmTransition path; the per-session stream no longer carries alarms. - GalaxyDriver: bridge the feed onto IAlarmSource.OnAlarmEvent; the feed starts on SubscribeAlarmsAsync, independent of data subscriptions. - Tests: replace EventPumpAlarmTests with GatewayGalaxyAlarmFeedTests; move the driver alarm-source tests onto the IGalaxyAlarmFeed seam. Browse needed no change — GatewayGalaxyHierarchySource consumes the unchanged DiscoverHierarchy contract. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
108 lines
4.1 KiB
C#
108 lines
4.1 KiB
C#
using Shouldly;
|
|
using Xunit;
|
|
using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
|
|
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Config;
|
|
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Runtime;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests;
|
|
|
|
/// <summary>
|
|
/// Pins that the GalaxyDriver populates the extended AlarmEventArgs fields
|
|
/// (OperatorComment, OriginalRaiseTimestampUtc, AlarmCategory) when the gateway
|
|
/// alarm feed delivers a transition with the rich payload, and leaves them null on
|
|
/// transitions that don't carry them.
|
|
/// </summary>
|
|
public sealed class GalaxyDriverAlarmEventArgsExtensionTests
|
|
{
|
|
[Fact]
|
|
public async Task Acknowledge_transition_with_full_payload_populates_extended_fields()
|
|
{
|
|
var feed = new FakeAlarmFeed();
|
|
using var driver = NewDriver(feed);
|
|
|
|
await driver.SubscribeAlarmsAsync(["Tank01"], CancellationToken.None);
|
|
var observed = new List<AlarmEventArgs>();
|
|
driver.OnAlarmEvent += (_, args) => observed.Add(args);
|
|
|
|
var raise = new DateTime(2026, 5, 1, 12, 0, 0, DateTimeKind.Utc);
|
|
var ack = raise.AddSeconds(45);
|
|
feed.Emit(new GalaxyAlarmTransition(
|
|
AlarmFullReference: "Tank01.Level.HiHi",
|
|
SourceObjectReference: "Tank01",
|
|
AlarmTypeName: "AnalogLimitAlarm.HiHi",
|
|
TransitionKind: GalaxyAlarmTransitionKind.Acknowledge,
|
|
SeverityBucket: AlarmSeverity.Critical,
|
|
OpcUaSeverity: 800,
|
|
RawMxAccessSeverity: 750,
|
|
OriginalRaiseTimestampUtc: raise,
|
|
TransitionTimestampUtc: ack,
|
|
OperatorUser: "alice",
|
|
OperatorComment: "investigating",
|
|
Category: "Process",
|
|
Description: "Tank 01 high-high level"));
|
|
|
|
observed.ShouldHaveSingleItem();
|
|
observed[0].OperatorComment.ShouldBe("investigating");
|
|
observed[0].OriginalRaiseTimestampUtc.ShouldBe(raise);
|
|
observed[0].AlarmCategory.ShouldBe("Process");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Raise_transition_without_optional_fields_leaves_them_null()
|
|
{
|
|
var feed = new FakeAlarmFeed();
|
|
using var driver = NewDriver(feed);
|
|
|
|
await driver.SubscribeAlarmsAsync(["Tank01"], CancellationToken.None);
|
|
var observed = new List<AlarmEventArgs>();
|
|
driver.OnAlarmEvent += (_, args) => observed.Add(args);
|
|
|
|
feed.Emit(new GalaxyAlarmTransition(
|
|
AlarmFullReference: "Tank01.Level.HiHi",
|
|
SourceObjectReference: string.Empty,
|
|
AlarmTypeName: "AnalogLimitAlarm.HiHi",
|
|
TransitionKind: GalaxyAlarmTransitionKind.Raise,
|
|
SeverityBucket: AlarmSeverity.Critical,
|
|
OpcUaSeverity: 800,
|
|
RawMxAccessSeverity: 750,
|
|
OriginalRaiseTimestampUtc: null,
|
|
TransitionTimestampUtc: DateTime.UtcNow,
|
|
OperatorUser: string.Empty,
|
|
OperatorComment: string.Empty,
|
|
Category: string.Empty,
|
|
Description: string.Empty));
|
|
|
|
observed.ShouldHaveSingleItem();
|
|
observed[0].OperatorComment.ShouldBeNull();
|
|
observed[0].OriginalRaiseTimestampUtc.ShouldBeNull();
|
|
observed[0].AlarmCategory.ShouldBeNull();
|
|
}
|
|
|
|
private static GalaxyDriver NewDriver(IGalaxyAlarmFeed feed)
|
|
{
|
|
var options = new GalaxyDriverOptions(
|
|
new GalaxyGatewayOptions("http://localhost:5000", "literal-api-key"),
|
|
new GalaxyMxAccessOptions("AlarmExtensionTest"),
|
|
new GalaxyRepositoryOptions(),
|
|
new GalaxyReconnectOptions());
|
|
return new GalaxyDriver(
|
|
driverInstanceId: "drv-1",
|
|
options: options,
|
|
hierarchySource: null,
|
|
alarmFeed: feed);
|
|
}
|
|
|
|
/// <summary>In-memory <see cref="IGalaxyAlarmFeed"/> the test drives directly.</summary>
|
|
private sealed class FakeAlarmFeed : IGalaxyAlarmFeed
|
|
{
|
|
public event EventHandler<GalaxyAlarmTransition>? OnAlarmTransition;
|
|
|
|
public void Start() { }
|
|
|
|
public void Emit(GalaxyAlarmTransition transition)
|
|
=> OnAlarmTransition?.Invoke(this, transition);
|
|
|
|
public ValueTask DisposeAsync() => ValueTask.CompletedTask;
|
|
}
|
|
}
|