mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 14:43:08 +08:00
da7412c429
## Summary - support the xRegistry 0.6.0 distinct Resource/Version hierarchy: `Registry -> Group -> Resource -> Versions -> Version` - instantiate stable logical Resource nodes separately from exact Version nodes while preserving existing Version NodeIds - delegate logical Resource FileType operations and Version-view metadata to the selected default Version with handle pinning and shared writer reservations - make Resource and Version delete behavior role-stable and use `MetaEpoch` / `Epoch` respectively - use stable Resource SourceNodes, exact Version SourceNodes and the `Server -> Registry -> Group -> Resource -> Version` notifier chain - keep a model-metadata-gated client fallback for 0.5 flat Servers; 0.6 Servers expose no legacy aliases - target `HasWoTProjection` at the real stable logical Resource node - use `AsyncCustomNodeManager` for the registration, fast-path, and federation managers, with awaited lifecycle, node mutations, event delivery, and cleanup - handle startup rollback, reentrant deletion callbacks, undisclosed file handles, and retryable cleanup without blocking unrelated file operations ## Authoritative dependencies - companion specification: OPCF-Members/spec-drafts#32 at `d3399fca025025a73e5a6b599f850a81d985c060` - OPC UA binding: xregistry/spec#568 - xRegistry event semantics: xregistry/spec#563, merged as `66ee31e47fbadff6ab982ae1516f7d9065e46b64` - companion NodeSet SHA-256: `369f5f3f1814b333e4eeb52bfb4b6a730cdff372505a5f91a54c94f0016ac4cf` ## Review feedback - keep the WoT Connectivity information-model designation at `1.1`; draft revisions update the publication date without changing the model version - eliminate all 198 unique CA1861 diagnostics across 54 files and remove seven obsolete project suppressions - fix the analyzer-clean touched-path CA1307 and the hierarchy follow-up CA1846/CA1851 diagnostics without dropping legacy-TFM compatibility - recover the reconcile queue after callback faults/cancellation and continue accepted pending changes - remove migration guidance for the xRegistry managers, which are new in 2.0 ## Compatibility - public WoT Connectivity model designation remains `1.1` - generated event-record ABI, constructors, options, NodeIds, and stored documents remain compatible - the generic xRegistry managers are new in 2.0 and implement `IAsyncNodeManager`; use `IAsyncNodeManagerFactory` and the async lifecycle hooks (see `docs\XRegistry.md`) - persistence schema and document blobs remain compatible unless noted below ## Validation - merge validation at `980422f76` with upstream `e8bec27d5`: 454 targeted WoT/materialization/model/registry cases and all 327 XRegistry cases passed on both net10.0 and net48; all 29 net10 aggregation sample cases passed - feedback regressions at `308e8ba74`: 55 targeted queue and live registry event/projection/lifecycle cases passed on each of net10.0 and net48 - prior CI: all 266 checks passed at `6489a0908`; the unchanged Ubuntu Core certificate-counter test and dependent jobs passed on the one-time retry ([run 34117304035, attempt 2](https://github.com/OPCFoundation/UA-.NETStandard/actions/runs/34117304035/attempts/2)) - `Opc.Ua.XRegistry.Tests` — 327 passed on net10.0 and net48 for migration commit `32c914aaf` - `Opc.Ua.WotCon.Tests` net10.0 — 1348 passed - `Opc.Ua.WotCon.Bindings.Tests` net10.0 — 683 passed - `Opc.Ua.SourceGeneration.Core.Tests` net10.0 — 3807 passed, 8 skipped - `Opc.Ua.SourceGeneration.Tests` net10.0 — 145 passed - `Opc.Ua.SourceGeneration.Stack.Tests` net10.0 — 94 passed - affected XRegistry and WoT client/server projects build successfully - xRegistry NodeSet is byte-identical to the companion artifact - repository-wide CA1861 inventory — 198 unique diagnostics across 54 files reduced to zero - targeted changed-fixture validation — 1,098 passed, 3 skipped, 0 failed - constrained full `UA.slnx` net10.0 Release build — CA1861 = 0 - `Opc.Ua.XRegistry.Client` net472 and netstandard2.1 builds — 0 warnings, 0 errors - independent shared-array safety review — no significant issues - `git diff --check` The final review regressions cover concurrent reconcile/open, synthetic logical handle collisions across default switches, cross-session Close isolation, shared writer reservations, logical FileType property/change propagation, logical Labels delegation, role-fixed deletion, event sources, model-version gating, and stable `HasWoTProjection` targets. The companion specification and protocol binding are reviewed in the linked PRs above. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 5c79a1ed-6dab-4522-a9fc-6548caa78ad5 Copilot-Session: b605797f-a97a-4cd0-8f12-016d33c2fd88 Copilot-Session: 7ef369a5-2307-4f71-8a11-15af0e72f240 Copilot-Session: e716d455-8397-4d22-9c5a-398847ab7317
282 lines
11 KiB
C#
282 lines
11 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Robotics.Server;
|
|
using Opc.Ua.Robotics.Server.Builders;
|
|
using Opc.Ua.RobotIntent;
|
|
using Opc.Ua.RobotIntent.Server;
|
|
using Opc.Ua.Server;
|
|
using Opc.Ua.Server.Hosting;
|
|
using Opc.Ua.Server.TestFramework;
|
|
|
|
namespace Opc.Ua.Robotics.Tests
|
|
{
|
|
/// <summary>
|
|
/// Verifies executor resolution for multiple Robot Intent controllers.
|
|
/// </summary>
|
|
[TestFixture]
|
|
public class IntentControllerExecutorResolutionTests
|
|
{
|
|
[Test]
|
|
public async Task SharedDiExecutorReceivesControllerIdentityForTwoControllers()
|
|
{
|
|
var executor = new SharedIdentityExecutor();
|
|
var services = new ServiceCollection();
|
|
services
|
|
.AddOpcUa()
|
|
.AddServer(static _ => { })
|
|
.AddRobotIntent();
|
|
services.AddSingleton<IIntentExecutor>(executor);
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
await using var fixture = new RobotIntentFixture(provider);
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
IRobotIntentBuildContext context = fixture.Manager.CreateRobotIntentBuildContext();
|
|
|
|
(IIntentControllerBuilder left, IIntentControllerBuilder right) =
|
|
await AddTwoControllersAsync(context).ConfigureAwait(false);
|
|
fixture.Manager.StartIntentControllerHosts();
|
|
SubmitAccepted(context, left, "left-intent");
|
|
SubmitAccepted(context, right, "right-intent");
|
|
|
|
await WaitAsync(() => executor.Records.Count >= 2).ConfigureAwait(false);
|
|
ExecutionRecord[] records = [.. executor.Records];
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(records.Select(static record => record.ControllerName), Does.Contain("LeftArm"));
|
|
Assert.That(records.Select(static record => record.ControllerName), Does.Contain("RightArm"));
|
|
Assert.That(records.Single(record => record.IntentId == "left-intent").ControllerId,
|
|
Is.EqualTo(left.State.NodeId));
|
|
Assert.That(records.Single(record => record.IntentId == "right-intent").ControllerId,
|
|
Is.EqualTo(right.State.NodeId));
|
|
Assert.That(records.All(static record => !record.ControllerId.IsNull), Is.True);
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public async Task PerControllerDiExecutorsDriveTwoControllersIndependently()
|
|
{
|
|
var leftExecutor = new NamedExecutor();
|
|
var rightExecutor = new NamedExecutor();
|
|
var services = new ServiceCollection();
|
|
services
|
|
.AddOpcUa()
|
|
.AddServer(static _ => { })
|
|
.AddRobotIntent()
|
|
.AddRobotIntentExecutor("LeftArm", leftExecutor)
|
|
.AddRobotIntentExecutor("RightArm", rightExecutor);
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
await using var fixture = new RobotIntentFixture(provider);
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
IRobotIntentBuildContext context = fixture.Manager.CreateRobotIntentBuildContext();
|
|
|
|
(IIntentControllerBuilder left, IIntentControllerBuilder right) =
|
|
await AddTwoControllersAsync(context).ConfigureAwait(false);
|
|
fixture.Manager.StartIntentControllerHosts();
|
|
SubmitAccepted(context, left, "left-only");
|
|
SubmitAccepted(context, right, "right-only");
|
|
|
|
await WaitAsync(() => leftExecutor.IntentIds.Contains("left-only") &&
|
|
rightExecutor.IntentIds.Contains("right-only")).ConfigureAwait(false);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(leftExecutor.IntentIds.ToArray(), Is.EqualTo(s_stringValues1));
|
|
Assert.That(rightExecutor.IntentIds.ToArray(), Is.EqualTo(s_stringValues2));
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public async Task MissingExecutorStillFailsAtBuildTime()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services
|
|
.AddOpcUa()
|
|
.AddServer(static _ => { })
|
|
.AddRobotIntent();
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
await using var fixture = new RobotIntentFixture(provider);
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
IRobotIntentBuildContext context = fixture.Manager.CreateRobotIntentBuildContext();
|
|
|
|
Exception? error = null;
|
|
try
|
|
{
|
|
await context.AddIntentControllerAsync(
|
|
"NoExecutor",
|
|
static controller => controller.Accepts<WaitIntentDataType>()).ConfigureAwait(false);
|
|
}
|
|
catch (InvalidOperationException ex)
|
|
{
|
|
error = ex;
|
|
}
|
|
|
|
Assert.That(error, Is.TypeOf<InvalidOperationException>()
|
|
.With.Message.Contains("No Robot Intent executor is registered"));
|
|
}
|
|
|
|
private static async ValueTask<(IIntentControllerBuilder Left, IIntentControllerBuilder Right)>
|
|
AddTwoControllersAsync(IRobotIntentBuildContext context)
|
|
{
|
|
IIntentControllerBuilder left = await context.AddIntentControllerAsync(
|
|
"LeftArm",
|
|
static controller => controller.Accepts<WaitIntentDataType>()).ConfigureAwait(false);
|
|
IIntentControllerBuilder right = await context.AddIntentControllerAsync(
|
|
"RightArm",
|
|
static controller => controller.Accepts<WaitIntentDataType>()).ConfigureAwait(false);
|
|
return (left, right);
|
|
}
|
|
|
|
private static void SubmitAccepted(
|
|
IRobotIntentBuildContext context,
|
|
IIntentControllerBuilder controller,
|
|
string intentId)
|
|
{
|
|
var sessionId = new NodeId(intentId + "-session", 2);
|
|
Assert.That(controller.Host.RequestControl(context.Context, sessionId, out _), Is.True);
|
|
IntentAdmission admission = controller.Host.SubmitIntent(context.Context, sessionId, new WaitIntentDataType
|
|
{
|
|
IntentId = intentId,
|
|
Duration = 1.0
|
|
});
|
|
Assert.That(admission.Accepted, Is.True);
|
|
}
|
|
|
|
private static async Task WaitAsync(Func<bool> condition)
|
|
{
|
|
for (int ii = 0; ii < 500; ii++)
|
|
{
|
|
if (condition())
|
|
{
|
|
return;
|
|
}
|
|
await Task.Delay(10).ConfigureAwait(false);
|
|
}
|
|
Assert.Fail("timed out waiting for the expected condition");
|
|
}
|
|
|
|
private readonly record struct ExecutionRecord(string IntentId, NodeId ControllerId, string ControllerName);
|
|
|
|
private sealed class SharedIdentityExecutor : IIntentExecutor
|
|
{
|
|
public ConcurrentQueue<ExecutionRecord> Records { get; } = new();
|
|
|
|
public ValueTask<IntentOutcome> ExecuteAsync(
|
|
IntentExecution execution,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
Records.Enqueue(new ExecutionRecord(
|
|
execution.IntentId,
|
|
execution.ControllerId,
|
|
execution.ControllerName));
|
|
return new ValueTask<IntentOutcome>(IntentOutcome.Success);
|
|
}
|
|
|
|
public bool CanCancel(IntentExecution execution)
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
|
|
private sealed class NamedExecutor : IIntentExecutor
|
|
{
|
|
public ConcurrentQueue<string> IntentIds { get; } = new();
|
|
|
|
public ValueTask<IntentOutcome> ExecuteAsync(
|
|
IntentExecution execution,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
IntentIds.Enqueue(execution.IntentId);
|
|
return new ValueTask<IntentOutcome>(IntentOutcome.Success);
|
|
}
|
|
|
|
public bool CanCancel(IntentExecution execution)
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
|
|
private sealed class RobotIntentFixture : IAsyncDisposable
|
|
{
|
|
public RobotIntentFixture(IServiceProvider services)
|
|
{
|
|
m_services = services;
|
|
}
|
|
|
|
public RobotIntentNodeManager Manager { get; private set; } = null!;
|
|
|
|
public async Task StartAsync()
|
|
{
|
|
m_fixture = new ServerFixture<StandardServer>(
|
|
telemetry => new StandardServer(telemetry))
|
|
{
|
|
AutoAccept = true,
|
|
SecurityNone = true
|
|
};
|
|
StandardServer server = await m_fixture.StartAsync().ConfigureAwait(false);
|
|
Manager = new RobotIntentNodeManager(
|
|
server.CurrentInstance,
|
|
m_fixture.Config,
|
|
new IRobotIntentModelProvider[] { new RobotIntentModelProvider() },
|
|
new RobotIntentServerOptions(),
|
|
null,
|
|
m_services);
|
|
await Manager.CreateAddressSpaceAsync(new Dictionary<NodeId, IList<IReference>>())
|
|
.ConfigureAwait(false);
|
|
}
|
|
|
|
public async ValueTask DisposeAsync()
|
|
{
|
|
if (Manager != null)
|
|
{
|
|
await Manager.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
if (m_fixture != null)
|
|
{
|
|
await m_fixture.StopAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
private readonly IServiceProvider m_services;
|
|
private ServerFixture<StandardServer>? m_fixture;
|
|
}
|
|
|
|
private static readonly string[] s_stringValues1 = ["left-only"];
|
|
private static readonly string[] s_stringValues2 = ["right-only"];
|
|
}
|
|
}
|