Files
Marc Schier 0374e19121 Add MachineTool, WMTP, GMS and CranesHoists companions (#4765)
# 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.
2026-10-15 15:15:46 +02:00

244 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;
using System.Collections.Generic;
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.Schema.Model;
using Opc.Ua.SourceGeneration.Dependency;
using Opc.Ua.Tests;
namespace Opc.Ua.SourceGeneration.Generator.Tests
{
/// <summary>
/// Retains explicit wire method declarations independently of generated method state class identities.
/// </summary>
[TestFixture]
[Category("Generator")]
public sealed class InheritedMethodDeclarationTests
{
/// <summary>
/// Explicit external and core declarations survive file and assembly-payload dependency paths.
/// </summary>
[TestCase(false, "Results_Read", 7001u, 7008u, "http://test.org/UA/MethodBase/")]
[TestCase(true, "Results_Read", 7001u, 7008u, "http://test.org/UA/MethodBase/")]
[TestCase(false, "Transfer_GenerateFileForWrite", 7002u, 15749u, "http://opcfoundation.org/UA/")]
[TestCase(true, "Transfer_GenerateFileForWrite", 7002u, 15749u, "http://opcfoundation.org/UA/")]
public void ExplicitInheritedDeclarationSurvivesDependencyImport(
bool usePayload,
string methodPath,
uint methodId,
uint declarationId,
string declarationNamespace)
{
using var files = new VirtualFileSystem();
string basePath = Path.Combine(Directory.GetCurrentDirectory(), "MethodBase.NodeSet2.xml");
string consumerPath = Path.Combine(Directory.GetCurrentDirectory(), "MethodConsumer.NodeSet2.xml");
files.Add(basePath, Encoding.UTF8.GetBytes(kBaseNodeSet));
files.Add(consumerPath, Encoding.UTF8.GetBytes(kConsumerNodeSet));
ITelemetryContext telemetry = NUnitTelemetryContext.Create(logLevel: LogLevel.Error);
IFileSystem source = typeof(Generators).Assembly
.AsFileSystem("Opc.Ua.SourceGeneration.Design").WithFallback(files);
var dependencies = new Dictionary<string, ModelDependencyV1>();
if (usePayload)
{
IModelDesign producer = source.OpenModelDesign(
new DesignFileCollection { Targets = [basePath] }, [], telemetry, useAllowSubtypes: true);
var dependencyGenerator = new ModelDependencyGenerator(new GeneratorContext
{
FileSystem = files,
ModelDesign = producer,
OutputFolder = string.Empty,
Telemetry = telemetry,
Options = new GeneratorOptions { OmitFluentApi = true }
});
dependencyGenerator.Emit();
string payloadCode = Encoding.UTF8.GetString(files.Get(files.CreatedFiles.Single(
path => path.EndsWith(".ModelDependencies.g.cs", StringComparison.Ordinal))));
AttributeSyntax attribute = CSharpSyntaxTree.ParseText(payloadCode).GetRoot()
.DescendantNodes().OfType<AttributeSyntax>().Single();
var literal = (LiteralExpressionSyntax)attribute.ArgumentList!.Arguments.Last().Expression;
ModelDependencyV1? payload = ModelDependencyV1.FromBase64Payload(literal.Token.ValueText);
Assert.That(payload, Is.Not.Null);
dependencies.Add("http://test.org/UA/MethodBase/", payload!);
}
IModelDesign model = source.OpenModelDesign(
new DesignFileCollection
{
Targets = [consumerPath],
Dependencies = usePayload ? [] : [basePath]
},
[], telemetry, useAllowSubtypes: true, referencedDependencies: dependencies);
ObjectTypeDesign consumer = model.Nodes.OfType<ObjectTypeDesign>()
.Single(type => type.SymbolicName.Name == "ConsumerType");
var method = (MethodDesign)consumer.Hierarchy.Nodes[methodPath].Instance!;
var generator = new NodeStateGenerator(new GeneratorContext
{
FileSystem = files,
ModelDesign = model,
OutputFolder = string.Empty,
Telemetry = telemetry,
Options = new GeneratorOptions { OmitFluentApi = true }
});
generator.Emit();
string code = Encoding.UTF8.GetString(files.Get(files.CreatedFiles.Single(
path => path.EndsWith(".NodeStates.ex.g.cs", StringComparison.Ordinal))));
MethodDeclarationSyntax factory = CSharpSyntaxTree.ParseText(code).GetRoot()
.DescendantNodes().OfType<MethodDeclarationSyntax>()
.Single(candidate => candidate.Identifier.ValueText == "CreateConsumerType_" + methodPath);
AssignmentExpressionSyntax declaration = factory.DescendantNodes().OfType<AssignmentExpressionSyntax>()
.Single(assignment => assignment.Left.ToString() == "baseState.MethodDeclarationId");
Assert.Multiple(() =>
{
Assert.That(method.NumericId, Is.EqualTo(methodId));
Assert.That(method.MethodDeclarationNode, Is.Not.Null);
Assert.That(method.MethodDeclarationNode!.FindNumericIdentifier(), Is.EqualTo(declarationId));
Assert.That(method.MethodDeclarationNode!.SymbolicId.Namespace, Is.EqualTo(declarationNamespace));
Assert.That(declaration.Right.ToString(), Does.StartWith(
$"global::Opc.Ua.NodeId.Create({declarationId}u,"));
});
}
private const string kBaseNodeSet =
"""
<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd"
xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd">
<NamespaceUris><Uri>http://test.org/UA/MethodBase/</Uri></NamespaceUris>
<Models>
<Model ModelUri="http://test.org/UA/MethodBase/" 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=1004" BrowseName="1:ResultManagementType">
<DisplayName>ResultManagementType</DisplayName>
<References>
<Reference ReferenceType="i=45" IsForward="false">i=58</Reference>
<Reference ReferenceType="i=47">ns=1;i=7008</Reference>
</References>
</UAObjectType>
<UAMethod NodeId="ns=1;i=7008" BrowseName="1:Read" ParentNodeId="ns=1;i=1004">
<DisplayName>Read</DisplayName>
<References>
<Reference ReferenceType="i=47" IsForward="false">ns=1;i=1004</Reference>
<Reference ReferenceType="i=37">i=80</Reference>
<Reference ReferenceType="i=46">ns=1;i=6001</Reference>
</References>
</UAMethod>
<UAVariable NodeId="ns=1;i=6001" BrowseName="InputArguments" ParentNodeId="ns=1;i=7008"
DataType="i=296" ValueRank="1">
<DisplayName>InputArguments</DisplayName>
<References>
<Reference ReferenceType="i=46" IsForward="false">ns=1;i=7008</Reference>
<Reference ReferenceType="i=40">i=68</Reference>
<Reference ReferenceType="i=37">i=78</Reference>
</References>
<Value><uax:ListOfExtensionObject><uax:ExtensionObject>
<uax:TypeId><uax:Identifier>i=297</uax:Identifier></uax:TypeId>
<uax:Body><uax:Argument>
<uax:Name>Timeout</uax:Name>
<uax:DataType><uax:Identifier>i=6</uax:Identifier></uax:DataType>
<uax:ValueRank>-1</uax:ValueRank>
<uax:ArrayDimensions />
</uax:Argument></uax:Body>
</uax:ExtensionObject></uax:ListOfExtensionObject></Value>
</UAVariable>
</UANodeSet>
""";
private const string kConsumerNodeSet =
"""
<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
<NamespaceUris>
<Uri>http://test.org/UA/MethodConsumer/</Uri>
<Uri>http://test.org/UA/MethodBase/</Uri>
</NamespaceUris>
<Models>
<Model ModelUri="http://test.org/UA/MethodConsumer/" 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" />
<RequiredModel ModelUri="http://test.org/UA/MethodBase/" Version="1.0.0"
PublicationDate="2024-01-01T00:00:00Z" />
</Model>
</Models>
<UAObjectType NodeId="ns=1;i=1002" BrowseName="1:ConsumerType">
<DisplayName>ConsumerType</DisplayName>
<References>
<Reference ReferenceType="i=45" IsForward="false">i=58</Reference>
<Reference ReferenceType="i=47">ns=1;i=5019</Reference>
<Reference ReferenceType="i=47">ns=1;i=5024</Reference>
</References>
</UAObjectType>
<UAObject NodeId="ns=1;i=5019" BrowseName="1:Results" ParentNodeId="ns=1;i=1002">
<DisplayName>Results</DisplayName>
<References>
<Reference ReferenceType="i=47" IsForward="false">ns=1;i=1002</Reference>
<Reference ReferenceType="i=40">ns=2;i=1004</Reference>
<Reference ReferenceType="i=37">i=78</Reference>
<Reference ReferenceType="i=47">ns=1;i=7001</Reference>
</References>
</UAObject>
<UAMethod NodeId="ns=1;i=7001" BrowseName="2:Read" ParentNodeId="ns=1;i=5019"
MethodDeclarationId="ns=2;i=7008">
<DisplayName>Read</DisplayName>
<References>
<Reference ReferenceType="i=47" IsForward="false">ns=1;i=5019</Reference>
<Reference ReferenceType="i=37">i=80</Reference>
</References>
</UAMethod>
<UAObject NodeId="ns=1;i=5024" BrowseName="1:Transfer" ParentNodeId="ns=1;i=1002">
<DisplayName>Transfer</DisplayName>
<References>
<Reference ReferenceType="i=47" IsForward="false">ns=1;i=1002</Reference>
<Reference ReferenceType="i=40">i=15744</Reference>
<Reference ReferenceType="i=37">i=80</Reference>
<Reference ReferenceType="i=47">ns=1;i=7002</Reference>
</References>
</UAObject>
<UAMethod NodeId="ns=1;i=7002" BrowseName="GenerateFileForWrite" ParentNodeId="ns=1;i=5024"
MethodDeclarationId="i=15749">
<DisplayName>GenerateFileForWrite</DisplayName>
<References>
<Reference ReferenceType="i=47" IsForward="false">ns=1;i=5024</Reference>
<Reference ReferenceType="i=37">i=80</Reference>
</References>
</UAMethod>
</UANodeSet>
""";
}
}