3b2defd94f
Renames all 11 projects (5 src + 6 tests), the .slnx solution file, all source-file namespaces, all axaml namespace references, and all v1 documentation references in CLAUDE.md and docs/*.md (excluding docs/v2/ which is already in OtOpcUa form). Also updates the TopShelf service registration name from "LmxOpcUa" to "OtOpcUa" per Phase 0 Task 0.6.
Preserves runtime identifiers per Phase 0 Out-of-Scope rules to avoid breaking v1/v2 client trust during coexistence: OPC UA `ApplicationUri` defaults (`urn:{GalaxyName}:LmxOpcUa`), server `EndpointPath` (`/LmxOpcUa`), `ServerName` default (feeds cert subject CN), `MxAccessConfiguration.ClientName` default (defensive — stays "LmxOpcUa" for MxAccess audit-trail consistency), client OPC UA identifiers (`ApplicationName = "LmxOpcUaClient"`, `ApplicationUri = "urn:localhost:LmxOpcUaClient"`, cert directory `%LocalAppData%\LmxOpcUaClient\pki\`), and the `LmxOpcUaServer` class name (class rename out of Phase 0 scope per Task 0.5 sed pattern; happens in Phase 1 alongside `LmxNodeManager → GenericDriverNodeManager` Core extraction). 23 LmxOpcUa references retained, all enumerated and justified in `docs/v2/implementation/exit-gate-phase-0.md`.
Build clean: 0 errors, 30 warnings (lower than baseline 167). Tests at strict improvement over baseline: 821 passing / 1 failing vs baseline 820 / 2 (one flaky pre-existing failure passed this run; the other still fails — both pre-existing and unrelated to the rename). `Client.UI.Tests`, `Historian.Aveva.Tests`, `Client.Shared.Tests`, `IntegrationTests` all match baseline exactly. Exit gate compliance results recorded in `docs/v2/implementation/exit-gate-phase-0.md` with all 7 checks PASS or DEFERRED-to-PR-review (#7 service install verification needs Windows service permissions on the reviewer's box).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
57 lines
2.3 KiB
C#
57 lines
2.3 KiB
C#
using Opc.Ua;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Client.CLI.Helpers;
|
|
|
|
/// <summary>
|
|
/// Parses node ID strings into OPC UA <see cref="NodeId" /> objects.
|
|
/// Supports standard OPC UA format (e.g., "ns=2;s=MyNode", "i=85") and bare numeric IDs.
|
|
/// </summary>
|
|
public static class NodeIdParser
|
|
{
|
|
/// <summary>
|
|
/// Parses a string into a <see cref="NodeId" />. Returns <c>null</c> if the input is null or empty.
|
|
/// </summary>
|
|
/// <param name="nodeIdString">The node ID string to parse.</param>
|
|
/// <returns>A parsed <see cref="NodeId" />, or <c>null</c> if input is null/empty.</returns>
|
|
/// <exception cref="FormatException">Thrown when the string cannot be parsed as a valid NodeId.</exception>
|
|
public static NodeId? Parse(string? nodeIdString)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(nodeIdString))
|
|
return null;
|
|
|
|
var trimmed = nodeIdString.Trim();
|
|
|
|
// Standard OPC UA format: ns=X;s=..., ns=X;i=..., ns=X;g=..., ns=X;b=...
|
|
// Also: s=..., i=..., g=..., b=... (namespace 0 implied)
|
|
if (trimmed.Contains('='))
|
|
try
|
|
{
|
|
return NodeId.Parse(trimmed);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
throw new FormatException($"Invalid node ID format: '{nodeIdString}'", ex);
|
|
}
|
|
|
|
// Bare numeric: treat as namespace 0, numeric identifier
|
|
if (uint.TryParse(trimmed, out var numericId)) return new NodeId(numericId);
|
|
|
|
throw new FormatException(
|
|
$"Invalid node ID format: '{nodeIdString}'. Expected format like 'ns=2;s=MyNode', 'i=85', or a numeric ID.");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Parses a string into a <see cref="NodeId" />, throwing if the input is null or empty.
|
|
/// </summary>
|
|
/// <param name="nodeIdString">The node ID string to parse.</param>
|
|
/// <returns>A parsed <see cref="NodeId" />.</returns>
|
|
/// <exception cref="ArgumentException">Thrown when the input is null or empty.</exception>
|
|
/// <exception cref="FormatException">Thrown when the string cannot be parsed as a valid NodeId.</exception>
|
|
public static NodeId ParseRequired(string? nodeIdString)
|
|
{
|
|
var result = Parse(nodeIdString);
|
|
if (result == null)
|
|
throw new ArgumentException("Node ID is required but was not provided.");
|
|
return result;
|
|
}
|
|
} |