mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-29 07:07:24 +08:00
# Description Remove stock phrasing and correct misleading or inconsistent technical documentation. The initial two passes covered 367 Markdown files, followed by an interactive review of 169 editorial flags. The U5 interpretation originally deferred in that review has since received the upstream Mantis answer recorded by #4843; remaining server/spec follow-ups stay explicit in the CTT log. - Correct package responsibilities, migration steps, API names, ownership, protocol descriptions and links. Keep bundled migration guides synchronized. Preserve historical conclusions as historical records with separate re-check notes. - Provide at least two rendered TOC levels throughout `docs/`. Convert appropriate architecture figures to Mermaid without changing code examples, transcripts or historical quotations. - Address the October 19 feedback with concrete setup/migration instructions, corrected certificate paths and PubSub names, shorter repeated caveats, consistent XML comments, and a full review of the Concepts guide. Retain #4839's API corrections. - Integrate #4841's runtime/performance guidance and review incoming/recent prose. Preserve dated measurements rather than claiming new benchmark runs; clarify allocation ratios, startup-only processor settings, JIT warm-up and the benchmark commit's scope. Missing raw measurement artifacts and repeat ranges remain tracked by #4842. - Merge master through `e8c5d800a` in `32c6394b7`. Resolve the CTT log conflict using the updated Mantis states and OPC answers, retaining historical framing and re-checks for C28/C32/C43. - Address the latest naming/index feedback in `adb5bf693`: rename the guides to `docs/WotCon.md` and `docs/WotNodeSetConversion.md`; move the provider and DataType-declaration contracts into the conversion guide and remove `docs/WoT.md`. Rename `samples/DI` to `samples/Di` and `samples/Isa95` to `samples/ISA95`. Add content-index READMEs to Di, FluentApi, ISA95, Lds and PubSub; update solution entries, project references, Docker/CI paths, test fixture paths and documentation links with exact casing. **WoT guide scope.** This branch retains the detailed conversion guide that #4758 had replaced with an anchor stub. Conversion limits, verified document sets, preservation rules and provider ownership now live together in `WotNodeSetConversion.md`; binding/runtime guidance remains in `WotBindings.md` and `WotCon.md`. The design-rationale/test-ledger prose was shortened, the oversized argument-table cell moved into its section, and existing anchors preserved. **SDK policy is a separate, explicit user-directed change.** `global.json` sets a stable minimum of `10.0.400`, `rollForward: latestMajor`, and `allowPrerelease: false`. Newer major SDKs are permitted; CI's explicit SDK pins are unchanged. README, GettingStarted, DeveloperGuide and Recycling instructions reflect the possible analyzer differences. The image-contract regression fix accepts compatible stable SDK images instead of requiring exact equality with the floor. The latest four rename/index threads are resolved after publication. Three older threads remain open: universal obsolete-removal timing, unconditional nonce-strength wording, and a blanket Vision NativeAOT claim. Existing implementation/evidence constraints are explained in their inline replies. The two-level TOCs remain as requested. ## Validation - `git diff --check` and staged diff checks: passed. The untouched upstream AutoID NodeSet retains its provenance bytes, including two existing license-header trailing spaces. - `.\.azurepipelines\validate-migration-plugin.ps1`: passed; 15 bundled migration documents and manifests synchronized. - Documentation/path validation: **101** documents retain two rendered TOC levels (**2,228** entries), with idempotent formatting. **52** new relative links and their anchors passed exact-case checks. No tracked references to the old guide/sample paths remain. Both relocated provider-contract sections are preserved in the destination. - `dotnet sln UA.slnx list`: passed; shows the renamed Di/ISA95 projects and the existing FluentApi/Lds/PubSub projects. Updated solution and pump ProjectReference paths also passed exact-case existence checks. - Latest focused commands, run from the repository root: ```powershell # Passed: 61 channel send-order and reconnect tests. dotnet test tests\Opc.Ua.Core.Tests\Opc.Ua.Core.Tests.csproj -p:CustomTestTarget=net10.0 --filter 'FullyQualifiedName~UaSCBinaryChannelSendOrderTests|FullyQualifiedName~TcpReconnectKeyAgreementTests' --verbosity minimal # Passed: 5 pump datasheet tests; builds the renamed pump sample. dotnet test tests\Opc.Ua.Di.Tests\Opc.Ua.Di.Tests.csproj -p:CustomTestTarget=net10.0 --filter 'FullyQualifiedName~PumpDatasheetConformanceTests' --verbosity minimal # Passed: 4 repository NodeSet path/round-trip tests, including the moved pump models. dotnet test tests\Opc.Ua.Types.Tests\Opc.Ua.Types.Tests.csproj -p:CustomTestTarget=net10.0 --filter 'FullyQualifiedName~RepositorySourceSurvivesSerializedLinkedPartitionsAsync' --verbosity minimal # Passed: build, zero warnings/errors. dotnet build samples\ISA95\MinimalIsa95Server\MinimalIsa95Server.csproj -p:CustomTestTarget=net10.0 -f net10.0 --verbosity minimal # Passed: dependent sample-test project build, zero warnings/errors. dotnet build tests\Opc.Ua.WotCon.Samples.Tests\Opc.Ua.WotCon.Samples.Tests.csproj -p:CustomTestTarget=net10.0 -f net10.0 --verbosity minimal ``` Earlier focused integration checks passed 2,620 tests across AutoID, event queues/scheduling, source generation, MCP/package profiles and WoT. Both reviewed Mermaid diagrams rendered locally without network access. These checks are not a full solution run. The full solution has **not** been rerun for this review. Earlier `dotnet test UA.slnx -p:CustomTestTarget=net10.0 --verbosity quiet` did not pass: three AOT projects rejected VSTest and 20 Vision tests failed during graphics initialization with `OutOfMemoryException`. Remaining long-running tests were stopped at the user's request. A focused Vision rerun passed 558 tests and reproduced those 20 failures. The earlier `dotnet test UA.slnx -p:CustomTestTarget=net48 --verbosity quiet` was blocked by the former SDK pin and was not retried after the policy change. The user approved proceeding with those limitations documented; current remote CI is not claimed green. ## Related Issues - Follow-up #4842 tracks the requested 2.0.2+ benchmark/tuning and diagnostic-tool documentation refresh. #4841 supplies documentation and earlier results, not all newly requested measurements. - #4758 explains the conversion guide's earlier consolidation; the current provider contracts are now consolidated into `WotNodeSetConversion.md`. - #4839 supplies the reviewed API corrections; #4843 supplies the updated CTT issue record. - The original prose cleanup and SDK policy were user-requested without a source issue. No new runtime architecture is introduced by these documentation edits. ## Checklist _Put an `x` in the boxes that apply. You can complete these step by step after opening the PR._ - [ ] 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. - [ ] 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. - [ ] 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. --------- Co-authored-by: Roman Ettlinger <romanett98@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
328 lines
16 KiB
C#
328 lines
16 KiB
C#
/* ========================================================================
|
||
* Copyright (c) 2005-2025 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.Threading;
|
||
using System.Threading.Tasks;
|
||
using Microsoft.Extensions.Logging;
|
||
using Opc.Ua;
|
||
using Opc.Ua.OpenUsd;
|
||
using Opc.Ua.OpenUsd.Server;
|
||
using Opc.Ua.Pumps;
|
||
using Opc.Ua.Server;
|
||
using Opc.Ua.Server.Fluent;
|
||
using Opc.Ua.Server.NodeManager;
|
||
|
||
namespace Pumps
|
||
{
|
||
/// <summary>
|
||
/// Wires the draft OPC UA — OpenUSD Bindings composition/aggregation model
|
||
/// (spec §5.12–5.14) onto the server: the pump composed 1:1 of Impeller and
|
||
/// Bearing component Objects (child prims), and a ProductionLine aggregating
|
||
/// 1..n pumps (Many, instanceable) with a dynamically added/removed pump
|
||
/// (model-change events) and a cross-server component (federation).
|
||
/// </summary>
|
||
public partial class PumpNodeManager
|
||
{
|
||
private BaseObjectState? m_productionLine;
|
||
private FolderState? m_linePumps;
|
||
private NodeId m_dynamicPumpNodeId;
|
||
private const string LinePrimPath = "/Plant/Line1";
|
||
|
||
// 1:1 (Child): create Impeller + Bearing component Objects on the pump, each
|
||
// with its own representation, and declare One <Component> bindings.
|
||
private void AttachPumpComponents(
|
||
PumpState pump, OpenUsdRepresentationState pumpRep, ushort ns, string primPath)
|
||
{
|
||
(BaseObjectState _, OpenUsdRepresentationState impellerRep) = CreateRepresentedComponent(
|
||
pump, "Impeller", pump.BrowseName.NamespaceIndex, primPath + "/Impeller", ns);
|
||
(BaseObjectState _, OpenUsdRepresentationState bearingRep) = CreateRepresentedComponent(
|
||
pump, "Bearing", pump.BrowseName.NamespaceIndex, primPath + "/Bearing", ns);
|
||
|
||
CreateComponentBinding(pumpRep, ns, "ImpellerComponent",
|
||
GuidFor("ImpellerComponent"),
|
||
OpenUsdCardinalityEnum.One, OpenUsdCompositionArcEnum.Child,
|
||
primPath + "/Impeller", componentRepresentation: impellerRep.NodeId);
|
||
CreateComponentBinding(pumpRep, ns, "BearingComponent",
|
||
GuidFor("BearingComponent"),
|
||
OpenUsdCardinalityEnum.One, OpenUsdCompositionArcEnum.Child,
|
||
primPath + "/Bearing", componentRepresentation: bearingRep.NodeId);
|
||
}
|
||
|
||
/// <summary>
|
||
/// Composes one full-fidelity pump prim per configured pump.
|
||
/// </summary>
|
||
/// <remarks>
|
||
/// <para>
|
||
/// The DeviceSet carries a plant-level representation anchored on
|
||
/// <c>/Plant</c> with a single <c>Many</c> component binding scoped to
|
||
/// <c>PumpType</c>. A connector resolves that binding against the
|
||
/// DeviceSet's children and composes
|
||
/// <c>/Plant/Pumps/<BrowseName></c> for each pump from the served
|
||
/// <c>pump.usda</c> component asset, so the rendered scene follows
|
||
/// <c>--pumps N</c> without the stage having to author anything per pump.
|
||
/// </para>
|
||
/// <para>
|
||
/// The arc is <c>Reference</c>, not <c>Instance</c>: an instanceable prim
|
||
/// turns its descendants into a shared prototype, and a shared prototype
|
||
/// cannot carry the per-pump impeller rotation, casing colour or gauge
|
||
/// needles that make each machine read as its own.
|
||
/// </para>
|
||
/// </remarks>
|
||
private void MaterialisePlantAggregation(INodeManagerBuilder builder)
|
||
{
|
||
if (m_plantStage == null)
|
||
{
|
||
return;
|
||
}
|
||
try
|
||
{
|
||
ushort ns = (ushort)Server.NamespaceUris.GetIndex(Opc.Ua.OpenUsd.Namespaces.OpenUSD);
|
||
NodeState? deviceSet = PredefinedNodes.FindById(NodeId.Create(
|
||
Opc.Ua.Di.Objects.DeviceSet, DiNamespaceUri, Server.NamespaceUris));
|
||
if (deviceSet == null)
|
||
{
|
||
return;
|
||
}
|
||
|
||
OpenUsdRepresentationState plantRep = SystemContext.CreateRepresentation(
|
||
deviceSet, m_plantStage.NodeId, PlantPrimPath, ns);
|
||
|
||
NodeId pumpTypeId = NodeId.Create(
|
||
Opc.Ua.Pumps.ObjectTypes.PumpType,
|
||
Opc.Ua.Pumps.Namespaces.Pumps,
|
||
Server.NamespaceUris);
|
||
// Not dynamic: the configured pump set is fixed by --pumps N at
|
||
// start-up, and the dynamic add/remove path is already demonstrated
|
||
// by the ProductionLine. Declaring it dynamic here would also make
|
||
// the connector's stale-prim reconciliation sweep every prim under
|
||
// /Plant/Pumps — including the Impeller and Bearing component prims
|
||
// this scope now contains — and deactivate them.
|
||
CreateComponentBinding(plantRep, ns, "ConfiguredPumps",
|
||
new Guid("a1b2c3d4-0004-4000-8000-000000000001"),
|
||
OpenUsdCardinalityEnum.Many, OpenUsdCompositionArcEnum.Reference,
|
||
"Pumps",
|
||
assetReference: "@pump.usda@</Pump>",
|
||
componentTypeDefinition: pumpTypeId);
|
||
|
||
// Staging assigns the whole subtree its final NodeIds - the same
|
||
// pass AssignInstanceChildNodeIds used to run here - and leaves
|
||
// the registration to CreateAddressSpaceAsync.
|
||
builder.Add(plantRep, deviceSet.NodeId);
|
||
|
||
if (m_openUsdRoot?.Representations is FolderState registry)
|
||
{
|
||
plantRep.RegisterInDiscovery(registry);
|
||
}
|
||
|
||
m_logger.MaterialisedPlantAggregation(m_twins.Count);
|
||
}
|
||
catch (Exception ex)
|
||
{
|
||
m_logger.LogError(ex, "Failed to materialise the plant aggregation.");
|
||
}
|
||
}
|
||
|
||
// 1..n + dynamic aggregation: a ProductionLine aggregating pumps. The
|
||
// aggregation is an address-space demo only - it carries no OpenUSD
|
||
// representation, so the rendered hall holds exactly the pumps the
|
||
// connected server simulates and nothing else. A line pump is a static
|
||
// topology entry, not a machine anyone is driving; rendering it put
|
||
// phantom pumps in the twin that no client could account for.
|
||
// The subtree is staged on the builder rather than registered here: the
|
||
// manager's CreateAddressSpaceAsync registers everything staged during
|
||
// Configure and runs the reverse-reference pass over it, and staging
|
||
// mints the NodeIds through the same factory this method used to call
|
||
// by hand.
|
||
private void MaterialiseProductionLine(INodeManagerBuilder builder)
|
||
{
|
||
if (m_plantStage == null)
|
||
{
|
||
return;
|
||
}
|
||
try
|
||
{
|
||
ushort ns = (ushort)Server.NamespaceUris.GetIndex(Opc.Ua.OpenUsd.Namespaces.OpenUSD);
|
||
NodeState? deviceSet = PredefinedNodes.FindById(NodeId.Create(
|
||
Opc.Ua.Di.Objects.DeviceSet, DiNamespaceUri, Server.NamespaceUris));
|
||
if (deviceSet == null)
|
||
{
|
||
return;
|
||
}
|
||
|
||
BaseObjectState line = builder
|
||
.AddObject(new QualifiedName("ProductionLine", ns), deviceSet.NodeId)
|
||
.Node;
|
||
|
||
FolderState pumps = builder
|
||
.AddFolder(new QualifiedName("Pumps", ns), line.NodeId)
|
||
.Node;
|
||
m_linePumps = pumps;
|
||
|
||
// Two static aggregated entries (1..n baseline).
|
||
CreateAggregatedPump(builder, pumps.NodeId, "P-201", ns);
|
||
CreateAggregatedPump(builder, pumps.NodeId, "P-202", ns);
|
||
|
||
// Dynamic composition: emit model-change events on runtime add/remove.
|
||
ModelChangeEmissionEnabled = true;
|
||
_ = RunDynamicCompositionAsync(ns);
|
||
|
||
m_productionLine = line;
|
||
m_logger.LogInformation("Materialised ProductionLine (aggregates 1..n pumps).");
|
||
}
|
||
catch (Exception ex)
|
||
{
|
||
m_logger.LogError(ex, "Failed to materialise the ProductionLine.");
|
||
}
|
||
}
|
||
|
||
// An aggregated line entry: a plain topology Object with no
|
||
// representation, because it is not a machine the server simulates.
|
||
private static void CreateAggregatedPump(
|
||
INodeManagerBuilder builder, NodeId parentId, string name, ushort ns)
|
||
{
|
||
BaseObjectState entry = builder
|
||
.AddObject(new QualifiedName(name, ns), parentId)
|
||
.Node;
|
||
entry.ReferenceTypeId = ReferenceTypeIds.Organizes;
|
||
}
|
||
|
||
// Dynamic demo (§5.13): repeatedly add a pump (emits a GeneralModelChange),
|
||
// hold, then remove it (emits again), so a connector observes both the add and
|
||
// the remove regardless of when it connects. Bounded so the server quiesces.
|
||
private async Task RunDynamicCompositionAsync(ushort ns)
|
||
{
|
||
try
|
||
{
|
||
for (int i = 0; i < 3; i++)
|
||
{
|
||
await Task.Delay(4000).ConfigureAwait(false);
|
||
m_dynamicPumpNodeId = await AddLinePumpAsync("P-203",
|
||
LinePrimPath + "/Pumps/P_203", ns).ConfigureAwait(false);
|
||
await Task.Delay(4000).ConfigureAwait(false);
|
||
if (!m_dynamicPumpNodeId.IsNull)
|
||
{
|
||
await DeleteNodeAsync(SystemContext, m_dynamicPumpNodeId, CancellationToken.None)
|
||
.ConfigureAwait(false);
|
||
m_logger.RemovedLinePump(m_dynamicPumpNodeId);
|
||
m_dynamicPumpNodeId = NodeId.Null;
|
||
}
|
||
}
|
||
// Final add: leave P-203 in place so the composed stage renders it.
|
||
await Task.Delay(2000).ConfigureAwait(false);
|
||
m_dynamicPumpNodeId = await AddLinePumpAsync("P-203",
|
||
LinePrimPath + "/Pumps/P_203", ns).ConfigureAwait(false);
|
||
m_logger.LogInformation("Dynamic composition: P-203 left added (final state).");
|
||
}
|
||
catch (Exception ex)
|
||
{
|
||
m_logger.LogWarning(ex, "Dynamic composition demo failed.");
|
||
}
|
||
}
|
||
|
||
private async Task<NodeId> AddLinePumpAsync(string name, string primPath, ushort ns)
|
||
{
|
||
if (m_linePumps == null)
|
||
{
|
||
return NodeId.Null;
|
||
}
|
||
var pump = new BaseObjectState(null)
|
||
{
|
||
SymbolicName = name,
|
||
BrowseName = new QualifiedName(name, ns),
|
||
DisplayName = new LocalizedText(name),
|
||
TypeDefinitionId = Opc.Ua.ObjectTypeIds.BaseObjectType
|
||
};
|
||
_ = SystemContext.CreateRepresentation(
|
||
pump, m_plantStage!.NodeId, primPath, ns);
|
||
|
||
NodeId newId = await CreateNodeAsync(SystemContext, m_linePumps.NodeId,
|
||
ReferenceTypeIds.Organizes, new QualifiedName(name, ns), pump, CancellationToken.None)
|
||
.ConfigureAwait(false);
|
||
m_logger.AddedLinePump(name, newId);
|
||
return newId;
|
||
}
|
||
|
||
private (BaseObjectState, OpenUsdRepresentationState) CreateRepresentedComponent(
|
||
NodeState parent, string name, ushort objNs, string primPath, ushort openUsdNs,
|
||
NodeId refType = default)
|
||
{
|
||
var obj = new BaseObjectState(parent)
|
||
{
|
||
SymbolicName = name,
|
||
BrowseName = new QualifiedName(name, objNs),
|
||
DisplayName = new LocalizedText(name),
|
||
ReferenceTypeId = refType.IsNull ? ReferenceTypeIds.HasComponent : refType,
|
||
TypeDefinitionId = Opc.Ua.ObjectTypeIds.BaseObjectType
|
||
};
|
||
parent.AddChild(obj);
|
||
obj.NodeId = SystemContext.NodeIdFactory.New(SystemContext, obj);
|
||
|
||
OpenUsdRepresentationState rep = SystemContext.CreateRepresentation(
|
||
obj, m_plantStage!.NodeId, primPath, openUsdNs);
|
||
return (obj, rep);
|
||
}
|
||
|
||
// Thin adapter over the reusable Opc.Ua.OpenUsd.Server authoring API: the
|
||
// component/composition-binding logic lives in the SDK
|
||
// (OpenUsdRepresentationAuthoring.AddComponentBinding), not in this sample.
|
||
private void CreateComponentBinding(
|
||
OpenUsdRepresentationState rep, ushort ns, string name, Guid bindingDefinitionId,
|
||
OpenUsdCardinalityEnum cardinality, OpenUsdCompositionArcEnum arc, string targetPrimPath,
|
||
NodeId componentRepresentation = default, string? assetReference = null,
|
||
bool dynamic = false, NodeId changeEventSource = default,
|
||
string? componentServerUri = null, string? componentEndpointUrl = null,
|
||
NodeId componentTypeDefinition = default)
|
||
{
|
||
_ = rep.AddComponentBinding(
|
||
SystemContext, ns, name, bindingDefinitionId, cardinality, arc, targetPrimPath,
|
||
componentRepresentation, assetReference, dynamic, changeEventSource,
|
||
componentServerUri, componentEndpointUrl, componentTypeDefinition);
|
||
}
|
||
}
|
||
|
||
internal static partial class OpenUsdCompositionLog
|
||
{
|
||
[LoggerMessage(EventId = PumpDeviceIntegrationServerEventIds.OpenUsdComposition + 1,
|
||
Level = LogLevel.Information,
|
||
Message = "Dynamic composition: removed line pump (NodeId={NodeId}); model-change emitted.")]
|
||
public static partial void RemovedLinePump(this ILogger logger, NodeId nodeId);
|
||
|
||
[LoggerMessage(EventId = PumpDeviceIntegrationServerEventIds.OpenUsdComposition + 2,
|
||
Level = LogLevel.Information,
|
||
Message = "Dynamic composition: added line pump '{Name}' (NodeId={NodeId}); model-change emitted.")]
|
||
public static partial void AddedLinePump(this ILogger logger, string name, NodeId nodeId);
|
||
|
||
[LoggerMessage(EventId = PumpDeviceIntegrationServerEventIds.OpenUsdComposition + 3,
|
||
Level = LogLevel.Information,
|
||
Message = "Plant aggregation composes {PumpCount} configured pump(s) from pump.usda.")]
|
||
public static partial void MaterialisedPlantAggregation(this ILogger logger, int pumpCount);
|
||
}
|
||
}
|