mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 00:56:28 +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
146 lines
6.1 KiB
C#
146 lines
6.1 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.Collections.Generic;
|
|
using System.Linq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.OpenUsd.Scene;
|
|
using Opc.Ua.OpenUsd.Server.Scene;
|
|
|
|
namespace Opc.Ua.OpenUsd.Tests
|
|
{
|
|
/// <summary>
|
|
/// Connections carry their authored SdfPaths on the attribute node itself, in
|
|
/// <c>ConnectionPaths</c> — the counterpart of a relationship's <c>TargetPaths</c>
|
|
/// (draft OPC UA — OpenUSD Scene Materialization §5.4, §5.5, §7.4).
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// These cases pin the properties the browsable <c>UsdConnection</c> edges alone cannot
|
|
/// provide: materialized attributes deliberately share the model's placeholder NodeId, so the
|
|
/// edges are ambiguous and carry neither authored order nor a target outside the materialized
|
|
/// subtree. They also cover the <b>bare</b> export overload — the one with no side channel —
|
|
/// because that is where the loss used to occur.
|
|
/// </remarks>
|
|
[TestFixture]
|
|
public class ConnectionPathsMemberTests
|
|
{
|
|
private static UsdStage BuildStage(params string[] connections)
|
|
{
|
|
var stage = new UsdStage("Cs");
|
|
var root = new UsdPrim("Root", "Xform");
|
|
var shader = new UsdPrim("Shader", "Shader");
|
|
var a = new UsdAttribute("outputs:a", "token");
|
|
var b = new UsdAttribute("outputs:b", "token");
|
|
var sink = new UsdAttribute("inputs:sink", "token");
|
|
foreach (string c in connections)
|
|
{
|
|
sink.Connections.Add(c);
|
|
}
|
|
shader.Attributes.Add(a);
|
|
shader.Attributes.Add(b);
|
|
shader.Attributes.Add(sink);
|
|
root.AddChild(shader);
|
|
stage.AddRootPrim(root);
|
|
return stage;
|
|
}
|
|
|
|
private static UsdAttribute ExportedSink(UsdStage exported)
|
|
{
|
|
return exported.AllPrims()
|
|
.SelectMany(p => p.Attributes)
|
|
.Single(a => a.Name == "inputs:sink");
|
|
}
|
|
|
|
[Test]
|
|
public void ConnectionPaths_IsAuthoredOnTheNode()
|
|
{
|
|
MaterializedScene ms = MaterializationHarness.Materialize(
|
|
BuildStage("/Root/Shader.outputs:a", "/Root/Shader.outputs:b"));
|
|
|
|
UsdAttributeState node = ms.Result.AttributesByPath["/Root/Shader.inputs:sink"];
|
|
Assert.That(node.ConnectionPaths, Is.Not.Null);
|
|
ArrayOf<string> paths = node.ConnectionPaths!.Value;
|
|
|
|
Assert.That(paths.ToArray(), Is.EqualTo(s_stringValues1));
|
|
}
|
|
|
|
[Test]
|
|
public void BareOverload_RecoversAuthoredOrder()
|
|
{
|
|
// The bare overload has no side channel; before ConnectionPaths existed it could only
|
|
// read the ambiguous edges and could not reproduce the authored sequence.
|
|
MaterializedScene ms = MaterializationHarness.Materialize(
|
|
BuildStage("/Root/Shader.outputs:b", "/Root/Shader.outputs:a"));
|
|
|
|
UsdStage exported = ms.Context.ExportUsdStage(ms.Result.Stage);
|
|
|
|
Assert.That(ExportedSink(exported).Connections, Is.EqualTo(s_stringValues2));
|
|
}
|
|
|
|
[Test]
|
|
public void BareOverload_KeepsTargetOutsideTheMaterializedSubtree()
|
|
{
|
|
// No node exists for this path, so there is no browsable edge to rebuild it from.
|
|
MaterializedScene ms = MaterializationHarness.Materialize(
|
|
BuildStage("/Elsewhere/Other.outputs:surface"));
|
|
|
|
UsdStage exported = ms.Context.ExportUsdStage(ms.Result.Stage);
|
|
|
|
Assert.That(ExportedSink(exported).Connections,
|
|
Is.EqualTo(s_stringValues3));
|
|
}
|
|
|
|
[Test]
|
|
public void BareOverload_KeepsDuplicateTargets()
|
|
{
|
|
// Deduped as browsable edges, but the authored multiplicity must survive.
|
|
MaterializedScene ms = MaterializationHarness.Materialize(
|
|
BuildStage("/Root/Shader.outputs:a", "/Root/Shader.outputs:a"));
|
|
|
|
UsdStage exported = ms.Context.ExportUsdStage(ms.Result.Stage);
|
|
|
|
Assert.That(ExportedSink(exported).Connections, Has.Count.EqualTo(2));
|
|
}
|
|
|
|
[Test]
|
|
public void AttributeWithoutConnections_ExportsNone()
|
|
{
|
|
MaterializedScene ms = MaterializationHarness.Materialize(BuildStage());
|
|
|
|
UsdStage exported = ms.Context.ExportUsdStage(ms.Result.Stage);
|
|
|
|
Assert.That(ExportedSink(exported).Connections, Is.Empty);
|
|
}
|
|
|
|
private static readonly string[] s_stringValues1 = ["/Root/Shader.outputs:a", "/Root/Shader.outputs:b"];
|
|
private static readonly string[] s_stringValues2 = ["/Root/Shader.outputs:b", "/Root/Shader.outputs:a"];
|
|
private static readonly string[] s_stringValues3 = ["/Elsewhere/Other.outputs:surface"];
|
|
}
|
|
}
|