mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-26 12:40:03 +08:00
# Description _Describe the changes here to communicate to the maintainers why they should accept this pull request. By default - this will become the Commit message after merging and thus define history._ Add provider-backed MachineTool, bundled WMTP, GMS and CranesHoists companions using the existing Machinery/MachineVision fluent, DI and typed-client approach. **The PR is open/non-draft by user choice. Current head `ecc4a7d6ca3e8004cf28ab54da605da302d026bf` is mergeable and has 108 successful checks, six intentionally skipped checks, zero failures and zero pending checks. All five primary workflows completed successfully at that exact head.** | Family | Released specification/model | Packaging | | --- | --- | --- | | MachineTool | OPC 40501-1, 1.02.0 | Model, Server, Client and MCP; normal root versions | | WMTP | OPC 40505, 1.0.0 | Bundled in MachineTool; distinct CLR/wire namespace and independent WMTP-only hosting | | GMS | OPC 40210 reference 1.0.1, normative model 1.0.0 | Model, Server, Client and MCP; normal root versions | | CranesHoists | OPC 40020-1, 1.00 | Model, Server, Client and MCP; all four plus Debug variants forced preview | There are **12 new packable projects**. No separate WMTP package/profile/guide, root version bump, tag, release or package publication is included. Mandatory instance structure is the default; selected optional features require explicit providers. The implementation reuses Machinery results/jobs/files/ProcessValues and Robotics topology, including retained MachineTool Production, defined GMS jobs/parts, modern ISA95/Machinery jobs, shared-owner hosting and isolated instances alongside MachineVision. Runtime and integration fixes preserve raw quality/timestamps, coherent acquisition, namespace ownership, accepted-configuration state, borrowed-resource lifetime, session/node/file cleanup, terminal-value publication, event propagation and endpoint-aware capability publication. Firmware/licence transfer means provider acceptance, not installation/activation. Cancellation does not silently abort another caller's operation. The later upstream MCP expansion is integrated without losing either family set or its default-off privileged/live execution policy. ### Conformance and scope Canonical model inputs are pinned to UA-Nodeset revision `96a08945425d0295edb3607d2a38f6841ef44046`. **GMS upstream exception:** [Annex A.1](https://reference.opcfoundation.org/specs/OPC-40210/annex-a) makes the released NodeSet normative, but §12.3.2.7 requires undefined `GMS_ProductionStatisticsType`. Inherited statistics and defined jobs/parts are implemented without inventing a standard type/NodeId; the complete GMS Production facet is withheld. The requirement ledger records **102 positively evidenced CU rows, 96 directly negative-tested rows and six explicit negative-evidence limitations**. All 648 test-class/name/TRX links were independently resolved to passing cases. The six limitations concern Stacklight, retained legacy PowerOnDuration, Machinery PowerOnDuration, WorkingUnit, Obligation and MaintenanceMode. They are not claims that every invalid-input or hardware-control behavior was tested. The undefined GMS requirement is outside the 102 defined CUs. No external certification claim is made. Retained baseline complete-assembly line coverage, with generated code retained and no source exclusions: | Family | Model | Server | Client | | --- | ---: | ---: | ---: | | MachineTool/WMTP | 83.80% | 91.98% | 84.74% | | GMS | 95.51% | 90.63% | 88.38% | | CranesHoists | 92.76% | 94.45% | 92.24% | These nine measurements predate the later focused review fixes and merges; they are not relabelled as new `ecc4a7d6c` percentages. The current head's separate CI code-coverage check succeeded. No new exclusions or threshold relaxations were introduced. ## Related Issues - Fixes [#4764](https://github.com/OPCFoundation/UA-.NETStandard/issues/4764), the implementation/design and acceptance tracker. ## 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. - [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. - [ ] 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. - [x] I have addressed **all** PR feedback received.
171 lines
9.1 KiB
C#
171 lines
9.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;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using Microsoft.CodeAnalysis.CSharp;
|
|
using Microsoft.CodeAnalysis.CSharp.Syntax;
|
|
using Microsoft.Extensions.Logging;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.SourceGeneration.Generator.Tests
|
|
{
|
|
/// <summary>
|
|
/// Retains explicitly declared nested placeholders without instantiating template nodes by default.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Generator")]
|
|
public sealed class NestedPlaceholderDeclarationTests
|
|
{
|
|
/// <summary>
|
|
/// A program placeholder inside a job placeholder keeps its explicit numeric identity and required properties.
|
|
/// </summary>
|
|
[TestCase("i=11510")]
|
|
[TestCase("i=11508")]
|
|
public void NestedPlaceholdersPreserveDeclaredIdsAndChildren(string modellingRule)
|
|
{
|
|
using var files = new VirtualFileSystem();
|
|
string path = Path.Combine(Directory.GetCurrentDirectory(), "NestedPlaceholders.NodeSet2.xml");
|
|
files.Add(path, Encoding.UTF8.GetBytes(
|
|
kNodeSet.Replace("PLACEHOLDER_RULE", modellingRule, StringComparison.Ordinal)));
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
|
|
var nodesets = new NodesetFileCollection(
|
|
[(path, new NodesetFileOptions())], [], files, telemetry);
|
|
nodesets.GenerateCode(
|
|
files, string.Empty, telemetry, new GeneratorOptions { OmitFluentApi = true });
|
|
string code = Encoding.UTF8.GetString(files.Get(files.CreatedFiles.Single(
|
|
file => file.EndsWith(".NodeStates.ex.g.cs", StringComparison.Ordinal))));
|
|
MethodDeclarationSyntax[] methods = CSharpSyntaxTree.ParseText(code).GetRoot()
|
|
.DescendantNodes().OfType<MethodDeclarationSyntax>().ToArray();
|
|
MethodDeclarationSyntax container = FindDeclarationFactory(methods, 76);
|
|
MethodDeclarationSyntax placeholder = FindDeclarationFactory(methods, 93);
|
|
string placeholderName = placeholder.Identifier.ValueText;
|
|
Assert.That(container.ToString(), Does.Contain(placeholderName + "(context, state,"),
|
|
"A locally declared template must survive even when nested beneath another placeholder.");
|
|
MethodDeclarationSyntax name = FindDeclarationFactory(methods, 214);
|
|
MethodDeclarationSyntax number = FindDeclarationFactory(methods, 255);
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(placeholder.ToString(), Does.Contain(name.Identifier.ValueText + "(context, state,"));
|
|
Assert.That(placeholder.ToString(), Does.Contain(number.Identifier.ValueText + "(context, state,"));
|
|
Assert.That(methods.Single(
|
|
method => method.Identifier.ValueText == "CreateInstanceOfJobListType").ToString(),
|
|
Does.Not.Contain(FindDeclarationFactory(methods, 74).Identifier.ValueText + "(context,"));
|
|
});
|
|
}
|
|
|
|
private static MethodDeclarationSyntax FindDeclarationFactory(
|
|
MethodDeclarationSyntax[] methods,
|
|
uint identifier)
|
|
{
|
|
string assignment = $"global::Opc.Ua.NodeId.Create({identifier}u,";
|
|
MethodDeclarationSyntax? factory = methods.SingleOrDefault(method =>
|
|
method.DescendantNodes().OfType<AssignmentExpressionSyntax>().Any(expression =>
|
|
expression.Left.ToString() == "nodeState.NodeId" &&
|
|
expression.Right.ToString().StartsWith(assignment, StringComparison.Ordinal)));
|
|
Assert.That(factory, Is.Not.Null, $"No generated factory retains declared numeric NodeId {identifier}.");
|
|
return factory!;
|
|
}
|
|
|
|
private const string kNodeSet =
|
|
"""
|
|
<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
|
|
<NamespaceUris><Uri>http://test.org/UA/NestedPlaceholders/</Uri></NamespaceUris>
|
|
<Models>
|
|
<Model ModelUri="http://test.org/UA/NestedPlaceholders/" Version="1.0.0"
|
|
PublicationDate="2024-01-01T00:00:00Z">
|
|
<RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.05.02"
|
|
PublicationDate="2022-11-01T00:00:00Z" />
|
|
</Model>
|
|
</Models>
|
|
<UAObjectType NodeId="ns=1;i=59" BrowseName="1:ProgramType">
|
|
<DisplayName>ProgramType</DisplayName>
|
|
<References><Reference ReferenceType="i=45" IsForward="false">i=58</Reference></References>
|
|
</UAObjectType>
|
|
<UAObjectType NodeId="ns=1;i=30" BrowseName="1:JobListType">
|
|
<DisplayName>JobListType</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="i=45" IsForward="false">i=23518</Reference>
|
|
<Reference ReferenceType="i=49">ns=1;i=74</Reference>
|
|
</References>
|
|
</UAObjectType>
|
|
<UAObject NodeId="ns=1;i=74" BrowseName="<OrderedObject>" SymbolicName="OrderedObject"
|
|
ParentNodeId="ns=1;i=30">
|
|
<DisplayName><OrderedObject></DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="i=49" IsForward="false">ns=1;i=30</Reference>
|
|
<Reference ReferenceType="i=40">i=58</Reference>
|
|
<Reference ReferenceType="i=37">i=11510</Reference>
|
|
<Reference ReferenceType="i=47">ns=1;i=76</Reference>
|
|
</References>
|
|
</UAObject>
|
|
<UAObject NodeId="ns=1;i=76" BrowseName="1:ProductionPrograms" ParentNodeId="ns=1;i=74">
|
|
<DisplayName>ProductionPrograms</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="i=47" IsForward="false">ns=1;i=74</Reference>
|
|
<Reference ReferenceType="i=40">i=23518</Reference>
|
|
<Reference ReferenceType="i=37">i=78</Reference>
|
|
<Reference ReferenceType="i=49">ns=1;i=93</Reference>
|
|
</References>
|
|
</UAObject>
|
|
<UAObject NodeId="ns=1;i=93" BrowseName="<OrderedObject>" SymbolicName="OrderedObject"
|
|
ParentNodeId="ns=1;i=76">
|
|
<DisplayName><OrderedObject></DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="i=49" IsForward="false">ns=1;i=76</Reference>
|
|
<Reference ReferenceType="i=40">ns=1;i=59</Reference>
|
|
<Reference ReferenceType="i=37">PLACEHOLDER_RULE</Reference>
|
|
<Reference ReferenceType="i=46">ns=1;i=214</Reference>
|
|
<Reference ReferenceType="i=46">ns=1;i=255</Reference>
|
|
</References>
|
|
</UAObject>
|
|
<UAVariable NodeId="ns=1;i=214" BrowseName="1:Name" ParentNodeId="ns=1;i=93" DataType="i=12">
|
|
<DisplayName>Name</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="i=46" IsForward="false">ns=1;i=93</Reference>
|
|
<Reference ReferenceType="i=40">i=68</Reference>
|
|
<Reference ReferenceType="i=37">i=78</Reference>
|
|
</References>
|
|
</UAVariable>
|
|
<UAVariable NodeId="ns=1;i=255" BrowseName="NumberInList" ParentNodeId="ns=1;i=93" DataType="i=5">
|
|
<DisplayName>NumberInList</DisplayName>
|
|
<References>
|
|
<Reference ReferenceType="i=46" IsForward="false">ns=1;i=93</Reference>
|
|
<Reference ReferenceType="i=40">i=68</Reference>
|
|
<Reference ReferenceType="i=37">i=78</Reference>
|
|
</References>
|
|
</UAVariable>
|
|
</UANodeSet>
|
|
""";
|
|
}
|
|
}
|