mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 00:31:32 +08:00
105508bcbd
# Description
Nodes created at runtime now get their NodeIds from a single
`DefaultNodeIdFactory` rather than from a `New` override per
NodeManager.
The factory derives a deterministic identifier from a canonical,
length-prefixed browse path, which is injective where the classic
`{parent}_{child}` concatenation was not — `A_B` + `C` and `A` + `B_C`
both produced `A_B_C` — and it also records the parent's identifier type
and qualifies cross-namespace segments by URI, so identifiers no longer
shift with namespace-table ordering.
A NodeManager selects its style declaratively instead of writing
assignment code:
```csharp
NodeIdFactory = NodeIdFactory.WithMode(NodeIdAssignmentMode.Counter);
```
`NodeIdAssignmentMode` offers `String` (the canonical path verbatim, the
default), `Numeric` / `Guid` / `Opaque` (that path through SHA-256),
`Counter` (sequential, for nodes whose browse paths repeat — per-session
diagnostics, inference jobs, rediscovered assets) and `None`. The
counter
starts above `0x40000000`, out of reach of any authored model, so a
long-running server cannot walk a runtime instance onto a type node.
`New` overrides are gone from every NodeManager the stack ships except
two whose identifiers are a domain scheme rather than an assignment
policy: `FileSystemNodeManager`, whose NodeIds encode the file path they
resolve back to, and `RoboticsNodeManager`, whose build coordinator
reserves identifiers across managers with ownership tracking.
**Namespace rule.** Every identifier is minted into the NodeManager's
own
namespace. Neither the parent's namespace nor the browse name's is
consulted: a parent can belong to a companion-specification model whose
NodeIds are fixed by its NodeSet (`DeviceSet` in the DI namespace), and
a
browse name only names the type that declared the child. NodeManagers
whose instance namespace is not their first one rebase with
`WithDefaultNamespaceIndex`.
**Types vs instances.** An authored NodeId on a node that stands on its
own is kept. A node hanging off a parent is re-minted, because it
reached
the factory through `AssignNodeIds` walking a subtree copied from a type
declaration. Keeping those would alias every instance onto the type's
own
nodes, and the predefined-node index takes the last writer, so the type
would quietly become an instance rather than the clash being reported.
New `ISystemContext.CreateInstance(...)` builds an instance of a
generated
type and rebases its subtree through `AssignInstanceNodeId` — the path
the
generated `CreateInstanceOf<Type>` helpers already took. The AI
NodeManager was the one place calling `NodeState.Create` directly, so
its
roots kept the NodeId their state object is born with (the type's own);
it now uses the shared path.
## Breaking changes
- `IAsyncNodeManager` extends `INodeIdFactory` and gains `AddNode` and
`AddRootNotifier`. This lets the fluent surface mint and register
through the interface instead of type-testing for
`AsyncCustomNodeManager` and silently falling back to a concatenated
identifier when the test failed — that fallback was itself a source of
divergent NodeIds.
- `AsyncNodeManagerAdapter` delegates `New` to the wrapped NodeManager,
so
**`CustomNodeManager2` behaves exactly as before**: it mints nothing and
a node keeps whatever NodeId it already has. Servers built on it are
unaffected.
## Notes for reviewers
- `docs/NodeIdAssignment.md` is new and describes the whole mechanism:
the
factory contract, identifier formats, type declarations vs instances,
the generated helpers and their parameters, per-NodeManager behaviour,
and an inventory of every member involved.
- The three commits are independently revertible.
- Two pieces that look redundant are deliberately kept, with the
reasoning
recorded in the doc: `assignInstanceNodeIds` (it *suppresses* minting,
where the rebase rule *forces* it) and the generator's
`NodeId.Equals(TypeNodeIdConstant)` guard (it distinguishes a
caller-assigned NodeId from a declaration's).
- Fluent builder tests previously passed only because of the removed
fallback; they now run against a real `DefaultNodeIdFactory` through a
shared `FluentTestNodeManager` helper.
## Related Issues
_No tracking issue yet._
## Checklist
- [ ] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf)
and read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage.
- [x] I have added all necessary documentation.
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings.
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed.
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.
> Test runs were on **net10.0 only** — .NET Framework was not exercised
> locally. Suites run green on an idle machine: Server 4950/4955, GDS
> 1116/1170, WotCon 1225/1225, Vision 484/485, DI 424/424, AI 174/174,
> ISA95 136/136, Positioning 69/69, RobotIntent 22/22. One unrelated
> pre-existing failure remains in `Opc.Ua.Types.Tests`
> (`EveryEmbeddedExampleMatchesItsRecordedHash`) — a WoT fixture checked
> out with CRLF, fixed by
> `git add --renormalize tests/Opc.Ua.Types.Tests/Wot/Assets`.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
218 lines
8.7 KiB
C#
218 lines
8.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.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Vision;
|
|
using Opc.Ua.Vision.Server;
|
|
using Opc.Ua.Vision.Server.Builders;
|
|
|
|
namespace Opc.Ua.Vision.Tests
|
|
{
|
|
/// <summary>
|
|
/// Integration tests over a real <see cref="VisionNodeManager"/>
|
|
/// booted inside a <see cref="Opc.Ua.Server.TestFramework.ServerFixture{T}"/>.
|
|
/// These exercise the address-space bootstrap, the fluent build
|
|
/// context, and the small policy surfaces on the manager itself.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Vision")]
|
|
public sealed class VisionNodeManagerIntegrationTests
|
|
{
|
|
[Test]
|
|
public async Task CreateAddressSpaceExposesVisionRootUnderServer()
|
|
{
|
|
await using var fixture = new VisionServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
|
|
Assert.That(fixture.Manager.Root, Is.Not.Null);
|
|
Assert.That(fixture.Manager.Root.BrowseName.Name, Is.EqualTo("Vision"));
|
|
Assert.That(fixture.Manager.Root.Sensors, Is.Not.Null,
|
|
"The mandatory Sensors folder must exist under Vision.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task ConformanceUnitsIsEmptyByDefault()
|
|
{
|
|
await using var fixture = new VisionServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
|
|
Assert.That(fixture.Manager.ConformanceUnits.Count, Is.EqualTo(0));
|
|
}
|
|
|
|
[Test]
|
|
public async Task ServerProfilesIsEmptyWhenNoSensorsOrPipelinesAreAdded()
|
|
{
|
|
await using var fixture = new VisionServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
|
|
Assert.That(fixture.Manager.ServerProfiles.Count, Is.EqualTo(0),
|
|
"No facets are exposed on an empty Vision address space.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task CreateVisionBuildContextExposesVisionRootAndInstanceIndex()
|
|
{
|
|
await using var fixture = new VisionServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
|
|
IVisionBuildContext context = fixture.Manager.CreateVisionBuildContext();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(context.Root, Is.SameAs(fixture.Manager.Root));
|
|
Assert.That(context.InstanceNamespaceIndex, Is.GreaterThan(0));
|
|
Assert.That(context.VisionNamespaceIndex, Is.GreaterThan(0));
|
|
Assert.That(context.InstanceNamespaceIndex, Is.Not.EqualTo(context.VisionNamespaceIndex));
|
|
Assert.That(context.Nodes, Is.Not.Null);
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public async Task NewNodeIdReturnsExistingNodeIdWhenNodeAlreadyHasOne()
|
|
{
|
|
await using var fixture = new VisionServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
|
|
var existing = new BaseObjectState(null)
|
|
{
|
|
NodeId = new NodeId("Existing", fixture.Manager.NamespaceIndex),
|
|
SymbolicName = "Existing"
|
|
};
|
|
|
|
NodeId result = fixture.Manager.New(fixture.Manager.SystemContext, existing);
|
|
|
|
Assert.That(result, Is.EqualTo(existing.NodeId));
|
|
}
|
|
|
|
[Test]
|
|
public async Task NewNodeIdFallsBackToASequentialIdWhenThereIsNoBrowsePath()
|
|
{
|
|
await using var fixture = new VisionServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
|
|
// no browse name, so there is no path for the deterministic
|
|
// factory to derive an identifier from.
|
|
var orphan = new BaseObjectState(null)
|
|
{
|
|
NodeId = NodeId.Null,
|
|
SymbolicName = "Orphan"
|
|
};
|
|
|
|
NodeId result = fixture.Manager.New(fixture.Manager.SystemContext, orphan);
|
|
|
|
Assert.That(result.IsNull, Is.False);
|
|
Assert.That(result.IdType, Is.EqualTo(IdType.Numeric));
|
|
Assert.That(
|
|
result.NamespaceIndex,
|
|
Is.EqualTo(fixture.Manager.NodeIdFactory.DefaultNamespaceIndex));
|
|
}
|
|
|
|
[Test]
|
|
public async Task NewNodeIdBuildsChildPathWhenParentIsPresent()
|
|
{
|
|
await using var fixture = new VisionServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
|
|
NodeId result = MintChild(fixture, "Parent", "Child");
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(result.IdType, Is.EqualTo(IdType.Numeric));
|
|
Assert.That(
|
|
result.NamespaceIndex,
|
|
Is.EqualTo(fixture.Manager.NodeIdFactory.DefaultNamespaceIndex));
|
|
|
|
// A numeric identifier cannot be read back for the path it
|
|
// came from, so this asserts the property the path gives
|
|
// rather than its spelling: both halves of the path move the
|
|
// result, and the same path gives the same result.
|
|
Assert.That(MintChild(fixture, "OtherParent", "Child"), Is.Not.EqualTo(result));
|
|
Assert.That(MintChild(fixture, "Parent", "OtherChild"), Is.Not.EqualTo(result));
|
|
Assert.That(MintChild(fixture, "Parent", "Child"), Is.EqualTo(result));
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Mints the NodeId the manager would give a child of the named
|
|
/// parent.
|
|
/// </summary>
|
|
private static NodeId MintChild(
|
|
VisionServerFixture fixture,
|
|
string parentName,
|
|
string browseName)
|
|
{
|
|
var parent = new BaseObjectState(null)
|
|
{
|
|
NodeId = new NodeId(parentName, fixture.Manager.NamespaceIndex),
|
|
SymbolicName = parentName
|
|
};
|
|
var child = new BaseObjectState(parent)
|
|
{
|
|
NodeId = NodeId.Null,
|
|
SymbolicName = browseName,
|
|
BrowseName = new QualifiedName(browseName, fixture.Manager.NamespaceIndex)
|
|
};
|
|
|
|
return fixture.Manager.New(fixture.Manager.SystemContext, child);
|
|
}
|
|
|
|
[Test]
|
|
public async Task AddingImageSensorPublishesFacetProfilesOnServer()
|
|
{
|
|
await using var fixture = new VisionServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
IVisionBuildContext context = fixture.CreateBuildContext();
|
|
|
|
context.Nodes.AddImageSensor("Cam1", sensor => sensor
|
|
.WithSensorId("cam-1")
|
|
.WithModality(VisionSensorModalityEnum.Area2D)
|
|
.WithRealityKind(VisionRealityKindEnum.Physical)
|
|
.WithResolution(640u, 480u)
|
|
.WithPixelFormat("Mono8"));
|
|
|
|
fixture.Manager.PublishServerProfiles();
|
|
|
|
ArrayOf<string> profiles = fixture.Manager.ServerProfiles;
|
|
Assert.That(profiles.Count, Is.GreaterThan(0),
|
|
"Adding a sensor must derive at least one facet on the server profile array.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task DisposeAsyncCanBeCalledMultipleTimesWithoutThrowing()
|
|
{
|
|
var fixture = new VisionServerFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
|
|
await fixture.DisposeAsync().ConfigureAwait(false);
|
|
Assert.DoesNotThrowAsync(async () => await fixture.DisposeAsync().ConfigureAwait(false));
|
|
}
|
|
}
|
|
}
|