mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 17:16:16 +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
308 lines
13 KiB
C#
308 lines
13 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.Conversion;
|
|
using Opc.Ua.OpenUsd.Scene;
|
|
|
|
namespace Opc.Ua.OpenUsd.Tests
|
|
{
|
|
/// <summary>
|
|
/// Conversion-layer tests for full <c><Variant></c> branch fidelity (§5.6, Composition
|
|
/// Provenance CU): the reader captures <em>every</em> authored branch of a
|
|
/// <c>variantSet "name" = { … }</c> block — not only the selected one — into
|
|
/// <see cref="UsdVariantSet.Variants"/>, the writer re-emits the block preserving branch order,
|
|
/// and the §7.4 signature deliberately ignores non-selected branches (they are un-composed
|
|
/// authoring provenance) while still distinguishing the resolved selection.
|
|
/// </summary>
|
|
[TestFixture]
|
|
public class VariantBranchConversionTests
|
|
{
|
|
private static string Wrap(params string[] bodyLines)
|
|
{
|
|
var lines = new List<string>
|
|
{
|
|
"#usda 1.0",
|
|
"(",
|
|
" defaultPrim = \"P\"",
|
|
" metersPerUnit = 1.0",
|
|
" upAxis = \"Z\"",
|
|
")",
|
|
string.Empty,
|
|
"def Xform \"P\"",
|
|
"{",
|
|
};
|
|
lines.AddRange(bodyLines);
|
|
lines.Add("}");
|
|
lines.Add(string.Empty);
|
|
return string.Join("\n", lines);
|
|
}
|
|
|
|
private static UsdVariantSet ParseSingleVariantSet(params string[] bodyLines)
|
|
{
|
|
UsdStage stage = UsdaReader.Parse(Wrap(bodyLines), "V");
|
|
UsdPrim prim = stage.Find("/P")!;
|
|
return prim.VariantSets.Single();
|
|
}
|
|
|
|
// ---- parsing ------------------------------------------------------------------
|
|
|
|
[Test]
|
|
public void MultipleBranches_WithNoSelection_AreAllParsed()
|
|
{
|
|
UsdVariantSet set = ParseSingleVariantSet(
|
|
" variantSet \"lod\" = {",
|
|
" \"high\" {",
|
|
" int resolution = 1024",
|
|
" }",
|
|
" \"low\" {",
|
|
" int resolution = 256",
|
|
" }",
|
|
" }");
|
|
|
|
// No 'variants = {...}' metadata was authored, so nothing is selected.
|
|
Assert.That(set.SetName, Is.EqualTo("lod"));
|
|
Assert.That(set.Selection, Is.EqualTo(string.Empty));
|
|
// Both branches captured, in authored order.
|
|
Assert.That(set.Variants.Select(v => v.Name), Is.EqualTo(s_stringValues1));
|
|
}
|
|
|
|
[Test]
|
|
public void BranchBody_CapturesAttributes()
|
|
{
|
|
UsdVariantSet set = ParseSingleVariantSet(
|
|
" variantSet \"lod\" = {",
|
|
" \"high\" {",
|
|
" int resolution = 1024",
|
|
" token quality = \"best\"",
|
|
" }",
|
|
" }");
|
|
|
|
UsdPrim high = set.Variants.Single();
|
|
Assert.That(high.Attributes.Select(a => a.Name), Is.EqualTo(s_stringValues2));
|
|
UsdTestHelpers.AssertInteger(high.Attributes[0].Value, 1024L);
|
|
UsdTestHelpers.AssertString(high.Attributes[1].Value, "best");
|
|
}
|
|
|
|
[Test]
|
|
public void BranchBody_CapturesChildPrims()
|
|
{
|
|
UsdVariantSet set = ParseSingleVariantSet(
|
|
" variantSet \"lod\" = {",
|
|
" \"high\" {",
|
|
" def Xform \"Detail\"",
|
|
" {",
|
|
" int subdivisions = 3",
|
|
" }",
|
|
" }",
|
|
" }");
|
|
|
|
UsdPrim high = set.Variants.Single();
|
|
Assert.That(high.Children.Select(c => c.Name), Is.EqualTo(s_stringValues3));
|
|
Assert.That(high.Children[0].TypeName, Is.EqualTo("Xform"));
|
|
Assert.That(high.Children[0].Attributes.Single().Name, Is.EqualTo("subdivisions"));
|
|
}
|
|
|
|
[Test]
|
|
public void SingleLineVariantSetBlock_IsParsed()
|
|
{
|
|
UsdVariantSet set = ParseSingleVariantSet(
|
|
" variantSet \"lod\" = { \"high\" { } \"low\" { } }");
|
|
|
|
Assert.That(set.Variants.Select(v => v.Name), Is.EqualTo(s_stringValues1));
|
|
}
|
|
|
|
[Test]
|
|
public void SelectionAndBranches_Coexist()
|
|
{
|
|
// The selection lives in the prim metadata header; the branches live in the body.
|
|
var usda = string.Join(
|
|
"\n",
|
|
"#usda 1.0",
|
|
"(",
|
|
" defaultPrim = \"P\"",
|
|
" metersPerUnit = 1.0",
|
|
" upAxis = \"Z\"",
|
|
")",
|
|
string.Empty,
|
|
"def Xform \"P\" (",
|
|
" variants = {",
|
|
" string lod = \"high\"",
|
|
" }",
|
|
")",
|
|
"{",
|
|
" variantSet \"lod\" = {",
|
|
" \"high\" {",
|
|
" int resolution = 1024",
|
|
" }",
|
|
" \"low\" {",
|
|
" int resolution = 256",
|
|
" }",
|
|
" }",
|
|
"}",
|
|
string.Empty);
|
|
|
|
UsdPrim prim = UsdaReader.Parse(usda, "V").Find("/P")!;
|
|
UsdVariantSet set = prim.VariantSets.Single();
|
|
Assert.That(set.Selection, Is.EqualTo("high"));
|
|
Assert.That(set.Variants.Select(v => v.Name), Is.EqualTo(s_stringValues1));
|
|
}
|
|
|
|
// ---- writing / round-trip -----------------------------------------------------
|
|
|
|
[Test]
|
|
public void Writer_ReEmitsBranches_PreservingOrder()
|
|
{
|
|
UsdStage stage = BuildStageWithBranches("first", "second", "third");
|
|
string written = UsdaWriter.Write(stage);
|
|
|
|
Assert.That(written, Does.Contain("variantSet \"lod\" = {"));
|
|
int firstIdx = written.IndexOf("\"first\" {", System.StringComparison.Ordinal);
|
|
int secondIdx = written.IndexOf("\"second\" {", System.StringComparison.Ordinal);
|
|
int thirdIdx = written.IndexOf("\"third\" {", System.StringComparison.Ordinal);
|
|
Assert.That(firstIdx, Is.GreaterThan(0));
|
|
Assert.That(secondIdx, Is.GreaterThan(firstIdx));
|
|
Assert.That(thirdIdx, Is.GreaterThan(secondIdx));
|
|
}
|
|
|
|
[Test]
|
|
public void Branches_RoundTripThroughWriteAndReparse()
|
|
{
|
|
UsdStage stage = BuildStageWithBranches("high", "low");
|
|
// Give the branches distinct bodies so a lost or reordered branch is observable.
|
|
UsdVariantSet set = stage.Find("/P")!.VariantSets.Single();
|
|
set.Variants[0].Attributes.Add(new UsdAttribute("resolution", "int") { Value = UsdValue.From(1024L) });
|
|
set.Variants[1].Attributes.Add(new UsdAttribute("resolution", "int") { Value = UsdValue.From(256L) });
|
|
|
|
string written = UsdaWriter.Write(stage);
|
|
UsdStage reparsed = UsdaReader.Parse(written, stage.StageName);
|
|
|
|
UsdVariantSet reSet = reparsed.Find("/P")!.VariantSets.Single();
|
|
Assert.That(reSet.Variants.Select(v => v.Name), Is.EqualTo(s_stringValues1));
|
|
UsdTestHelpers.AssertInteger(reSet.Variants[0].Attributes.Single().Value, 1024L);
|
|
UsdTestHelpers.AssertInteger(reSet.Variants[1].Attributes.Single().Value, 256L);
|
|
}
|
|
|
|
[Test]
|
|
public void WriterOutputIsAFixedPoint_ForVariantBranches()
|
|
{
|
|
UsdStage stage = BuildStageWithBranches("high", "low");
|
|
UsdVariantSet set = stage.Find("/P")!.VariantSets.Single();
|
|
set.Variants[0].Attributes.Add(new UsdAttribute("resolution", "int") { Value = UsdValue.From(1024L) });
|
|
set.Variants[0].AddChild(new UsdPrim("Detail", "Xform"));
|
|
|
|
string firstWrite = UsdaWriter.Write(stage);
|
|
string secondWrite = UsdaWriter.Write(UsdaReader.Parse(firstWrite, stage.StageName));
|
|
|
|
Assert.That(secondWrite, Is.EqualTo(firstWrite));
|
|
}
|
|
|
|
// ---- signature ----------------------------------------------------------------
|
|
|
|
[Test]
|
|
public void Signature_IgnoresNonSelectedBranches()
|
|
{
|
|
// Two stages identical in name/selection but with different branch *bodies* must sign
|
|
// identically: the branches are un-composed authoring provenance, out of §7.4 scope.
|
|
UsdStage a = BuildStageWithBranches("high", "low");
|
|
a.Find("/P")!.VariantSets.Single().Selection = "high";
|
|
a.Find("/P")!.VariantSets.Single().Variants[0]
|
|
.Attributes.Add(new UsdAttribute("resolution", "int") { Value = UsdValue.From(1024L) });
|
|
|
|
UsdStage b = BuildStageWithBranches("high", "low");
|
|
b.Find("/P")!.VariantSets.Single().Selection = "high";
|
|
b.Find("/P")!.VariantSets.Single().Variants[0]
|
|
.Attributes.Add(new UsdAttribute("resolution", "int") { Value = UsdValue.From(256L) });
|
|
b.Find("/P")!.VariantSets.Single().Variants[1]
|
|
.Attributes.Add(new UsdAttribute("extra", "double") { Value = UsdValue.From(3.5) });
|
|
|
|
Assert.That(
|
|
UsdSceneSignature.Compute(b),
|
|
Is.EqualTo(UsdSceneSignature.Compute(a)),
|
|
"non-selected branch bodies must not affect the composed-scene signature");
|
|
}
|
|
|
|
[Test]
|
|
public void Signature_IgnoresBranchPresenceEntirely()
|
|
{
|
|
// A stage with captured branches and one with none (same set name/selection) sign the
|
|
// same, so adding branch capture never perturbs an existing signature (§7.4).
|
|
UsdStage withBranches = BuildStageWithBranches("high", "low");
|
|
withBranches.Find("/P")!.VariantSets.Single().Selection = "high";
|
|
|
|
var withoutBranches = new UsdStage("V") { DefaultPrim = "P" };
|
|
var prim = new UsdPrim("P", "Xform");
|
|
prim.VariantSets.Add(new UsdVariantSet("lod", "high"));
|
|
withoutBranches.AddRootPrim(prim);
|
|
|
|
Assert.That(
|
|
UsdSceneSignature.Compute(withBranches),
|
|
Is.EqualTo(UsdSceneSignature.Compute(withoutBranches)));
|
|
}
|
|
|
|
[Test]
|
|
public void Signature_DistinguishesSelection()
|
|
{
|
|
UsdStage a = BuildStageWithBranches("high", "low");
|
|
a.Find("/P")!.VariantSets.Single().Selection = "high";
|
|
|
|
UsdStage b = BuildStageWithBranches("high", "low");
|
|
b.Find("/P")!.VariantSets.Single().Selection = "low";
|
|
|
|
Assert.That(
|
|
UsdSceneSignature.Compute(b),
|
|
Is.Not.EqualTo(UsdSceneSignature.Compute(a)),
|
|
"the resolved selection is a composed-scene property and must be signed");
|
|
Assert.That(UsdSceneSignature.FirstDifference(a, b), Is.Not.Null);
|
|
}
|
|
|
|
// ---- helpers -------------------------------------------------------------------
|
|
|
|
private static UsdStage BuildStageWithBranches(params string[] branchNames)
|
|
{
|
|
var stage = new UsdStage("V") { DefaultPrim = "P" };
|
|
var prim = new UsdPrim("P", "Xform");
|
|
var set = new UsdVariantSet("lod");
|
|
foreach (string name in branchNames)
|
|
{
|
|
set.Variants.Add(new UsdPrim(name));
|
|
}
|
|
prim.VariantSets.Add(set);
|
|
stage.AddRootPrim(prim);
|
|
return stage;
|
|
}
|
|
|
|
private static readonly string[] s_stringValues1 = ["high", "low"];
|
|
private static readonly string[] s_stringValues2 = ["resolution", "quality"];
|
|
private static readonly string[] s_stringValues3 = ["Detail"];
|
|
}
|
|
}
|