2e0743ad25
H1 (HIGH): write-routing key now (AddressSpaceRealm, bareId), not bare-only. A raw s=<RawPath> and a UNS s=<Area/Line/Equip/Eff> can collide as bare strings; the bare-only key let a colliding raw+UNS pair route to the WRONG driver ref (last-writer-wins). The realm the node manager resolves (RealmOf) is now threaded through IOpcUaNodeWriteGateway.WriteAsync -> RouteNodeWrite -> _driverRefByNodeId keyed by (realm, bareId). New regression test: Colliding_raw_and_uns_bare_ids_route_to_their_own_driver_by_realm. M1 (MEDIUM): discovered-node injection made coherently DORMANT. HandleDiscoveredNodes hard-short-circuits (single enforcement point; _discoveredByDriver never populates so the re-inject tail is inert too), with a clear log pointing at the /raw browse-commit flow. New pin: Discovered_nodes_are_ignored_dormant_in_v3; the 16+2 v2 injection scenarios re-pointed to an accurate skip reason (DiscoveryInjectionDormantV3). M2 (MEDIUM): realm-qualified dual-node self-correction tests — Failed_uns_write_reverts_uns_node_and_leaves_raw_node_untouched + Raw_realm_revert_reverts_raw_node_only (the second fails if the realm is dropped). L1: removed the = AddressSpaceRealm.Uns defaults from the consequential node-manager mutation methods (WriteValue/WriteAlarmCondition/MaterialiseAlarmCondition/ EnsureFolder/EnsureVariable/UpdateFolderDisplayName/UpdateTagAttributes/ RaiseNodesAddedModelChange/Remove*/RevertOptimisticWriteIfNeeded) + the AttributeValueUpdate/AlarmStateUpdate records, so the compiler forces explicit realm; read-only accessors + internal builders retain their defaults. L3: fixed the stale VirtualTagHostActor class comment (V3NodeIds.Uns, not the retired EquipmentNodeIds.Variable). Also: DeploymentArtifactRawUnsParityTests — Raw/UNS node-set byte-parity round-trip between AddressSpaceComposer.Compose and DeploymentArtifact.ParseComposition. Claude-Session: https://claude.ai/code/session_01LVneM3eh1UtJxEisFXgmox
134 lines
5.8 KiB
C#
134 lines
5.8 KiB
C#
using Shouldly;
|
|
using ZB.MOM.WW.OtOpcUa.Commons.OpcUa;
|
|
using Xunit;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests;
|
|
|
|
/// <summary>
|
|
/// R2-07 T4a — <see cref="OtOpcUaNodeManager.MaterialiseAlarmCondition"/> must be idempotent for a
|
|
/// same-id + same-kind re-apply: it KEEPS the existing <c>AlarmConditionState</c> instance instead of
|
|
/// dropping-and-recreating it. This is what preserves a client's MonitoredItems on an alarm-condition
|
|
/// node across a PURE-ADD deploy (the MaterialiseScriptedAlarms pass re-runs over the whole composition
|
|
/// every apply, re-touching every existing enabled condition). A genuine kind-swap (native↔scripted)
|
|
/// still recreates so the flip takes effect.
|
|
/// </summary>
|
|
public sealed class NodeManagerAlarmIdempotentMaterialiseTests : IDisposable
|
|
{
|
|
private static CancellationToken Ct => TestContext.Current.CancellationToken;
|
|
|
|
private readonly string _pkiRoot = Path.Combine(
|
|
Path.GetTempPath(),
|
|
$"otopcua-alarm-idempotent-{Guid.NewGuid():N}");
|
|
|
|
/// <summary>Re-materialising the SAME alarm id + kind returns the SAME instance (reference-equal) — the
|
|
/// condition node is not torn down, so subscriptions on it survive.</summary>
|
|
[Trait("Category", "Unit")]
|
|
[Fact]
|
|
public async Task Re_materialise_same_id_and_kind_keeps_the_same_instance()
|
|
{
|
|
var (host, server) = await BootAsync();
|
|
var nm = server.NodeManager!;
|
|
nm.EnsureFolder("eq-1", parentNodeId: null, displayName: "Equipment 1", realm: AddressSpaceRealm.Uns);
|
|
|
|
nm.MaterialiseAlarmCondition("alm-1", "eq-1", "HighTemp", "OffNormalAlarm", 700, isNative: false, realm: AddressSpaceRealm.Uns);
|
|
var first = nm.TryGetAlarmCondition("alm-1");
|
|
first.ShouldNotBeNull();
|
|
|
|
// Same id + same kind ⇒ skip-if-present: the existing instance is kept.
|
|
nm.MaterialiseAlarmCondition("alm-1", "eq-1", "HighTemp", "OffNormalAlarm", 700, isNative: false, realm: AddressSpaceRealm.Uns);
|
|
var second = nm.TryGetAlarmCondition("alm-1");
|
|
|
|
second.ShouldBeSameAs(first);
|
|
|
|
await host.DisposeAsync();
|
|
}
|
|
|
|
/// <summary>A kind-swap (scripted → native) on the same id still RECREATES the node so the native flag
|
|
/// flips — the drop-and-recreate is preserved for the kind-swap case.</summary>
|
|
[Trait("Category", "Unit")]
|
|
[Fact]
|
|
public async Task Kind_swap_recreates_and_flips_native_flag()
|
|
{
|
|
var (host, server) = await BootAsync();
|
|
var nm = server.NodeManager!;
|
|
nm.EnsureFolder("eq-1", parentNodeId: null, displayName: "Equipment 1", realm: AddressSpaceRealm.Uns);
|
|
|
|
nm.MaterialiseAlarmCondition("alm-1", "eq-1", "HighTemp", "OffNormalAlarm", 700, isNative: false, realm: AddressSpaceRealm.Uns);
|
|
var scripted = nm.TryGetAlarmCondition("alm-1");
|
|
nm.IsNativeAlarmNode("alm-1").ShouldBeFalse();
|
|
|
|
// Same id but the OTHER kind ⇒ recreate (a different instance) and the native flag is now set.
|
|
nm.MaterialiseAlarmCondition("alm-1", "eq-1", "HighTemp", "OffNormalAlarm", 700, isNative: true, realm: AddressSpaceRealm.Uns);
|
|
var native = nm.TryGetAlarmCondition("alm-1");
|
|
|
|
native.ShouldNotBeSameAs(scripted);
|
|
nm.IsNativeAlarmNode("alm-1").ShouldBeTrue();
|
|
|
|
await host.DisposeAsync();
|
|
}
|
|
|
|
/// <summary>After a full <see cref="OtOpcUaNodeManager.RebuildAddressSpace"/> cleared the maps, the next
|
|
/// materialise creates a FRESH instance (the skip-if-present guard sees no entry) — so a re-severity
|
|
/// arriving via the rebuild path is reflected.</summary>
|
|
[Trait("Category", "Unit")]
|
|
[Fact]
|
|
public async Task Materialise_after_rebuild_creates_fresh_instance()
|
|
{
|
|
var (host, server) = await BootAsync();
|
|
var nm = server.NodeManager!;
|
|
nm.EnsureFolder("eq-1", parentNodeId: null, displayName: "Equipment 1", realm: AddressSpaceRealm.Uns);
|
|
|
|
nm.MaterialiseAlarmCondition("alm-1", "eq-1", "HighTemp", "OffNormalAlarm", 700, isNative: false, realm: AddressSpaceRealm.Uns);
|
|
var before = nm.TryGetAlarmCondition("alm-1");
|
|
|
|
nm.RebuildAddressSpace();
|
|
nm.TryGetAlarmCondition("alm-1").ShouldBeNull();
|
|
|
|
nm.EnsureFolder("eq-1", parentNodeId: null, displayName: "Equipment 1", realm: AddressSpaceRealm.Uns);
|
|
nm.MaterialiseAlarmCondition("alm-1", "eq-1", "HighTemp", "OffNormalAlarm", 700, isNative: false, realm: AddressSpaceRealm.Uns);
|
|
var after = nm.TryGetAlarmCondition("alm-1");
|
|
|
|
after.ShouldNotBeNull();
|
|
after.ShouldNotBeSameAs(before);
|
|
|
|
await host.DisposeAsync();
|
|
}
|
|
|
|
private async Task<(OpcUaApplicationHost Host, OtOpcUaSdkServer Server)> BootAsync()
|
|
{
|
|
var host = new OpcUaApplicationHost(
|
|
new OpcUaApplicationHostOptions
|
|
{
|
|
ApplicationName = "OtOpcUa.AlarmIdempotentTest",
|
|
ApplicationUri = $"urn:OtOpcUa.AlarmIdempotentTest:{Guid.NewGuid():N}",
|
|
OpcUaPort = AllocateFreePort(),
|
|
PublicHostname = "localhost",
|
|
PkiStoreRoot = _pkiRoot,
|
|
},
|
|
Microsoft.Extensions.Logging.Abstractions.NullLogger<OpcUaApplicationHost>.Instance);
|
|
|
|
var server = new OtOpcUaSdkServer();
|
|
await host.StartAsync(server, Ct);
|
|
return (host, server);
|
|
}
|
|
|
|
private static int AllocateFreePort()
|
|
{
|
|
using var listener = new System.Net.Sockets.TcpListener(System.Net.IPAddress.Loopback, 0);
|
|
listener.Start();
|
|
var port = ((System.Net.IPEndPoint)listener.LocalEndpoint).Port;
|
|
listener.Stop();
|
|
return port;
|
|
}
|
|
|
|
/// <summary>Cleans up the PKI root directory.</summary>
|
|
public void Dispose()
|
|
{
|
|
if (Directory.Exists(_pkiRoot))
|
|
{
|
|
try { Directory.Delete(_pkiRoot, recursive: true); }
|
|
catch { /* best-effort cleanup */ }
|
|
}
|
|
}
|
|
}
|