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>
82 lines
2.9 KiB
C#
82 lines
2.9 KiB
C#
using System;
|
|
using System.Threading;
|
|
using ArchestrA;
|
|
using ZB.MOM.WW.OtOpcUa.Host.Configuration;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Historian.Aveva
|
|
{
|
|
/// <summary>
|
|
/// Creates and opens Historian SDK connections. Extracted so tests can inject
|
|
/// fakes that control connection success, failure, and timeout behavior.
|
|
/// </summary>
|
|
internal interface IHistorianConnectionFactory
|
|
{
|
|
/// <summary>
|
|
/// Creates a new Historian SDK connection, opens it, and waits until it is ready.
|
|
/// Throws on connection failure or timeout.
|
|
/// </summary>
|
|
HistorianAccess CreateAndConnect(HistorianConfiguration config, HistorianConnectionType type);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Production implementation that creates real Historian SDK connections.
|
|
/// </summary>
|
|
internal sealed class SdkHistorianConnectionFactory : IHistorianConnectionFactory
|
|
{
|
|
public HistorianAccess CreateAndConnect(HistorianConfiguration config, HistorianConnectionType type)
|
|
{
|
|
var conn = new HistorianAccess();
|
|
|
|
var args = new HistorianConnectionArgs
|
|
{
|
|
ServerName = config.ServerName,
|
|
TcpPort = (ushort)config.Port,
|
|
IntegratedSecurity = config.IntegratedSecurity,
|
|
UseArchestrAUser = config.IntegratedSecurity,
|
|
ConnectionType = type,
|
|
ReadOnly = true,
|
|
PacketTimeout = (uint)(config.CommandTimeoutSeconds * 1000)
|
|
};
|
|
|
|
if (!config.IntegratedSecurity)
|
|
{
|
|
args.UserName = config.UserName ?? string.Empty;
|
|
args.Password = config.Password ?? string.Empty;
|
|
}
|
|
|
|
if (!conn.OpenConnection(args, out var error))
|
|
{
|
|
conn.Dispose();
|
|
throw new InvalidOperationException(
|
|
$"Failed to open Historian SDK connection to {config.ServerName}:{config.Port}: {error.ErrorCode}");
|
|
}
|
|
|
|
// The SDK connects asynchronously — poll until the connection is ready
|
|
var timeoutMs = config.CommandTimeoutSeconds * 1000;
|
|
var elapsed = 0;
|
|
while (elapsed < timeoutMs)
|
|
{
|
|
var status = new HistorianConnectionStatus();
|
|
conn.GetConnectionStatus(ref status);
|
|
|
|
if (status.ConnectedToServer)
|
|
return conn;
|
|
|
|
if (status.ErrorOccurred)
|
|
{
|
|
conn.Dispose();
|
|
throw new InvalidOperationException(
|
|
$"Historian SDK connection failed: {status.Error}");
|
|
}
|
|
|
|
Thread.Sleep(250);
|
|
elapsed += 250;
|
|
}
|
|
|
|
conn.Dispose();
|
|
throw new TimeoutException(
|
|
$"Historian SDK connection to {config.ServerName}:{config.Port} timed out after {config.CommandTimeoutSeconds}s");
|
|
}
|
|
}
|
|
}
|