mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-17 05:11:13 +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
215 lines
9.7 KiB
C#
215 lines
9.7 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.Generic;
|
|
using System.Linq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua;
|
|
using Opc.Ua.OpenUsd.Scene;
|
|
using Opc.Ua.OpenUsd.Server.Scene;
|
|
|
|
namespace Opc.Ua.OpenUsd.Tests
|
|
{
|
|
/// <summary>
|
|
/// Custom prim metadata materialization and export (§6.3). Each authored metadata entry is
|
|
/// materialized as a Property carrying its value in its own DataType — not stringified — so it
|
|
/// round-trips through the address space with its type intact, and a nested dictionary is
|
|
/// materialized as a nested <c>Metadata/</c> folder that recovers as a nested dictionary.
|
|
/// </summary>
|
|
[TestFixture]
|
|
public class PrimMetadataMaterializationTests
|
|
{
|
|
// ---- Typed scalar metadata round-trips (§6.3) ----------------------------------
|
|
|
|
[Test]
|
|
public void Metadata_ScalarTypes_RoundTrip()
|
|
{
|
|
var stage = new UsdStage("S") { DefaultPrim = "P" };
|
|
var prim = new UsdPrim("P", "Xform");
|
|
prim.Metadata["author"] = UsdValue.FromString("Ada");
|
|
prim.Metadata["visible"] = UsdValue.From(true);
|
|
prim.Metadata["count"] = UsdValue.From(7L);
|
|
prim.Metadata["huge"] = UsdValue.From(9_000_000_000L);
|
|
prim.Metadata["scale"] = UsdValue.From(2.5);
|
|
stage.AddRootPrim(prim);
|
|
|
|
MaterializedScene ms = MaterializationHarness.Materialize(stage);
|
|
UsdStage exported = ms.Context.ExportUsdStage(ms.Result);
|
|
|
|
IDictionary<string, UsdValue> md = PrimOf(exported, "P").Metadata;
|
|
Assert.Multiple(() =>
|
|
{
|
|
UsdTestHelpers.AssertString(md["author"], "Ada");
|
|
UsdTestHelpers.AssertBoolean(md["visible"], true);
|
|
UsdTestHelpers.AssertInteger(md["count"], 7L);
|
|
UsdTestHelpers.AssertInteger(md["huge"], 9_000_000_000L);
|
|
UsdTestHelpers.AssertDouble(md["scale"], 2.5);
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void Metadata_IsMaterializedTyped_NotStringified()
|
|
{
|
|
// The defect this pins: metadata used to be stringified, losing its type. Each leaf
|
|
// must now carry the exact DataType and a value in that type, so a client reads the
|
|
// authored kind rather than an opaque string.
|
|
var stage = new UsdStage("S") { DefaultPrim = "P" };
|
|
var prim = new UsdPrim("P", "Xform");
|
|
prim.Metadata["count"] = UsdValue.From(7L);
|
|
prim.Metadata["scale"] = UsdValue.From(2.5);
|
|
prim.Metadata["visible"] = UsdValue.From(true);
|
|
prim.Metadata["author"] = UsdValue.FromString("Ada");
|
|
stage.AddRootPrim(prim);
|
|
|
|
MaterializedScene ms = MaterializationHarness.Materialize(stage);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
PropertyState count = MetaProperty(ms, "/P", "count");
|
|
Assert.That(count.DataType, Is.EqualTo(Opc.Ua.DataTypeIds.Int64));
|
|
Assert.That(count.Value.AsBoxedObject(), Is.EqualTo(7L));
|
|
|
|
PropertyState scale = MetaProperty(ms, "/P", "scale");
|
|
Assert.That(scale.DataType, Is.EqualTo(Opc.Ua.DataTypeIds.Double));
|
|
Assert.That(scale.Value.AsBoxedObject(), Is.EqualTo(2.5));
|
|
|
|
PropertyState visible = MetaProperty(ms, "/P", "visible");
|
|
Assert.That(visible.DataType, Is.EqualTo(Opc.Ua.DataTypeIds.Boolean));
|
|
Assert.That(visible.Value.AsBoxedObject(), Is.True);
|
|
|
|
PropertyState author = MetaProperty(ms, "/P", "author");
|
|
Assert.That(author.DataType, Is.EqualTo(Opc.Ua.DataTypeIds.String));
|
|
Assert.That(author.Value.AsBoxedObject(), Is.EqualTo("Ada"));
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public void Metadata_IntArray_RoundTrips_AsTypedSequence()
|
|
{
|
|
var stage = new UsdStage("S") { DefaultPrim = "P" };
|
|
var prim = new UsdPrim("P", "Xform");
|
|
prim.Metadata["order"] = UsdTestHelpers.IntegerArray(3L, 1L, 2L);
|
|
stage.AddRootPrim(prim);
|
|
|
|
MaterializedScene ms = MaterializationHarness.Materialize(stage);
|
|
|
|
// The materialized value is a typed one-dimensional Int64 array, not text.
|
|
PropertyState order = MetaProperty(ms, "/P", "order");
|
|
Assert.That(order.DataType, Is.EqualTo(Opc.Ua.DataTypeIds.Int64));
|
|
Assert.That(order.ValueRank, Is.EqualTo(ValueRanks.OneDimension));
|
|
|
|
UsdStage exported = ms.Context.ExportUsdStage(ms.Result);
|
|
IDictionary<string, UsdValue> md = PrimOf(exported, "P").Metadata;
|
|
Assert.That(md["order"].TryGetArray(out ArrayOf<UsdValue> values), Is.True);
|
|
Assert.That(values.ToArray()!.Select(v => v.TryGetInteger(out long integer) ? integer : 0L).ToArray(),
|
|
Is.EqualTo(s_longValues1),
|
|
"The array must round-trip element-wise, preserving order.");
|
|
}
|
|
|
|
// ---- Nested metadata maps to nested folders (§6.3) -----------------------------
|
|
|
|
[Test]
|
|
public void Metadata_NestedDictionary_RoundTrips()
|
|
{
|
|
var stage = new UsdStage("S") { DefaultPrim = "P" };
|
|
var prim = new UsdPrim("P", "Xform");
|
|
var revisionData = new Dictionary<string, UsdValue>(StringComparer.Ordinal)
|
|
{
|
|
["major"] = UsdValue.From(1L),
|
|
["minor"] = UsdValue.From(2L)
|
|
};
|
|
var customData = new Dictionary<string, UsdValue>(StringComparer.Ordinal)
|
|
{
|
|
["author"] = UsdValue.FromString("Ada"),
|
|
["revision"] = UsdValue.FromDictionary(revisionData)
|
|
};
|
|
prim.Metadata["customData"] = UsdValue.FromDictionary(customData);
|
|
stage.AddRootPrim(prim);
|
|
|
|
MaterializedScene ms = MaterializationHarness.Materialize(stage);
|
|
|
|
// A nested dictionary is materialized as a nested Metadata folder (a FolderState child),
|
|
// so the structure is browsable as authored.
|
|
NodeState? metadataFolder = ms.Prim("/P").Metadata;
|
|
Assert.That(metadataFolder, Is.Not.Null);
|
|
List<FolderState> subFolders =
|
|
MaterializationHarness.ChildrenOfType<FolderState>(ms.Context, metadataFolder!);
|
|
Assert.That(subFolders, Has.Count.EqualTo(1),
|
|
"The nested dictionary must materialize as one nested Metadata sub-folder.");
|
|
|
|
UsdStage exported = ms.Context.ExportUsdStage(ms.Result);
|
|
IDictionary<string, UsdValue> md = PrimOf(exported, "P").Metadata;
|
|
|
|
Assert.That(md["customData"].TryGetDictionary(out IReadOnlyDictionary<string, UsdValue> exportedCustom),
|
|
Is.True);
|
|
UsdTestHelpers.AssertString(exportedCustom["author"], "Ada");
|
|
|
|
Assert.That(exportedCustom["revision"].TryGetDictionary(out IReadOnlyDictionary<string, UsdValue> revision),
|
|
Is.True);
|
|
Assert.Multiple(() =>
|
|
{
|
|
UsdTestHelpers.AssertInteger(revision["major"], 1L);
|
|
UsdTestHelpers.AssertInteger(revision["minor"], 2L);
|
|
});
|
|
}
|
|
|
|
private static UsdPrim PrimOf(UsdStage stage, string name)
|
|
{
|
|
foreach (UsdPrim prim in stage.RootPrims)
|
|
{
|
|
if (string.Equals(prim.Name, name, StringComparison.Ordinal))
|
|
{
|
|
return prim;
|
|
}
|
|
}
|
|
Assert.Fail($"Prim {name} was not found in the exported stage.");
|
|
return new UsdPrim(name);
|
|
}
|
|
|
|
private static PropertyState MetaProperty(MaterializedScene ms, string primPath, string key)
|
|
{
|
|
NodeState? folder = ms.Prim(primPath).Metadata;
|
|
Assert.That(folder, Is.Not.Null, $"Prim {primPath} has no Metadata folder.");
|
|
foreach (PropertyState property in
|
|
MaterializationHarness.ChildrenOfType<PropertyState>(ms.Context, folder!))
|
|
{
|
|
if (string.Equals(property.BrowseName.Name, key, StringComparison.Ordinal))
|
|
{
|
|
return property;
|
|
}
|
|
}
|
|
Assert.Fail($"Metadata property {key} not found on {primPath}.");
|
|
return null!;
|
|
}
|
|
|
|
private static readonly long[] s_longValues1 = [3L, 1L, 2L];
|
|
}
|
|
}
|