feat(dcl): move the OPC UA client to OPC Foundation SDK 2.0.1 (#125)
OPCFoundation.NetStandard.Opc.Ua.Client and the test-only .Server move 1.5.378.182 -> 2.0.1, the version OtOpcUa master runs (lmxopcua#782; #799 and #801 closed). Transitive Core/Core.Types/Types/Configuration/ Security.Certificates resolve to 2.0.1. API breaks fixed in the DCL adapter: - Built-in types are immutable structs (Variant, DataValue, NodeId, LocalizedText, StatusCode, ArrayOf<T>). New OpcUaValueBoundary restores the SDK 1.5 CLR shapes for every read, subscription and alarm-event value (byte[], UTC DateTime with no-timestamp = MinValue, Guid, detached arrays) and builds write variants with SDK 1.5's new Variant(object) semantics (byte[] = ByteString scalar). - StatusCodes members are no longer constants: switches/patterns over them (verify-outcome mapping, connection-level classification, BadResourceUnavailable) match by value. - CertificateIdentifier no longer caches a certificate and the CertificateValidator/CertificateValidation event is gone: the configuration's CertificateManager owns trust lists and the loaded application certificate and is disposed with the session; auto-accept and the verify probe's capture-and-reject use AcceptError. - new UserIdentity(X509Certificate2) is gone: X509 user identities use X509IdentityTokenHandler with an on-demand PFX provider (still fails fast on a missing file/key). - DefaultSessionFactory takes the telemetry context; collections are ArrayOf<T>; EventFilter select clauses and ContentFilter operands are built immutably. UserName identity (lmxopcua#880): SDK 2's default handler sends a password over 64 bytes - every 65-character OtOpcUa API key - as an RsaEncryptedSecret that SDK 1.5 servers reject with BadIdentityTokenInvalid and SDK 2 servers accept only within a 5-minute clock window (#873). The DCL now always uses LegacyRsaUserNameIdentityTokenHandler (ported from OtOpcUa be28aa44), i.e. exactly what it sent on SDK 1.5, so it logs in to both server generations during a mixed rollout. Tests: the in-process secured test server is ported to SDK 2 and can admit an API key; new tests cover the handler (mutation-checked: 5 of 7 fail with the SDK default handler), the value boundary, and a 65-char key end to end over None/Sign/SignAndEncrypt with a wrong key reaching the key check (BadIdentityTokenRejected). Claude-Session: https://claude.ai/code/session_01GT67ACmpMR7b9LGRPLijMi
This commit is contained in:
+18
-11
@@ -7,18 +7,25 @@ namespace ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Tests;
|
||||
/// <summary>ScadaBridge#117: quality follows the StatusCode severity bits, not "== 0".</summary>
|
||||
public class OpcUaStatusCodeMappingTests
|
||||
{
|
||||
// SDK 2 (ScadaBridge#125): StatusCodes members are StatusCode structs, not constants, so the
|
||||
// cases are a TheoryData rather than InlineData.
|
||||
public static TheoryData<uint, QualityCode> Cases => new()
|
||||
{
|
||||
{ StatusCodes.Good.Code, QualityCode.Good },
|
||||
{ StatusCodes.GoodLocalOverride.Code, QualityCode.Good },
|
||||
{ StatusCodes.GoodClamped.Code, QualityCode.Good },
|
||||
{ StatusCodes.Good.Code | 0x0480u, QualityCode.Good }, // info bits set
|
||||
{ StatusCodes.Uncertain.Code, QualityCode.Uncertain },
|
||||
{ StatusCodes.UncertainLastUsableValue.Code, QualityCode.Uncertain },
|
||||
{ StatusCodes.UncertainSensorNotAccurate.Code, QualityCode.Uncertain },
|
||||
{ StatusCodes.Bad.Code, QualityCode.Bad },
|
||||
{ StatusCodes.BadNodeIdUnknown.Code, QualityCode.Bad },
|
||||
{ StatusCodes.BadResourceUnavailable.Code, QualityCode.Bad },
|
||||
{ 0xC0000000u, QualityCode.Bad },
|
||||
};
|
||||
|
||||
[Theory]
|
||||
[InlineData(StatusCodes.Good, QualityCode.Good)]
|
||||
[InlineData(StatusCodes.GoodLocalOverride, QualityCode.Good)]
|
||||
[InlineData(StatusCodes.GoodClamped, QualityCode.Good)]
|
||||
[InlineData(StatusCodes.Good | 0x0480u, QualityCode.Good)] // info bits set
|
||||
[InlineData(StatusCodes.Uncertain, QualityCode.Uncertain)]
|
||||
[InlineData(StatusCodes.UncertainLastUsableValue, QualityCode.Uncertain)]
|
||||
[InlineData(StatusCodes.UncertainSensorNotAccurate, QualityCode.Uncertain)]
|
||||
[InlineData(StatusCodes.Bad, QualityCode.Bad)]
|
||||
[InlineData(StatusCodes.BadNodeIdUnknown, QualityCode.Bad)]
|
||||
[InlineData(StatusCodes.BadResourceUnavailable, QualityCode.Bad)]
|
||||
[InlineData(0xC0000000u, QualityCode.Bad)]
|
||||
[MemberData(nameof(Cases))]
|
||||
public void MapStatusCode_UsesSeverityBits(uint code, QualityCode expected) =>
|
||||
Assert.Equal(expected, OpcUaDataConnection.MapStatusCode(code));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user