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

277 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.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using Moq;
using NUnit.Framework;
using Opc.Ua.Client;
using Opc.Ua.Client.TestFramework;
using Opc.Ua.Machinery.Server;
using Opc.Ua.Machinery.Server.Builders;
using Opc.Ua.Server;
using Opc.Ua.Server.FileSystem;
using Opc.Ua.Server.TestFramework;
using Opc.Ua.Tests;
using ClientSession = Opc.Ua.Client.ISession;
namespace Opc.Ua.MachineTool.Tests
{
/// <summary>
/// Verifies the shared file-directory lifetime required by MachineTool FileSystem and WorkMasters.
/// </summary>
[TestFixture]
[Category("MachineTool")]
[Category("Integration")]
[NonParallelizable]
public sealed class MachineToolFileLifetimeTests
{
/// <summary>
/// Closing a session releases its directory-backed handles without closing another session's reader.
/// </summary>
[TestCase(false, false)]
[TestCase(false, true)]
[TestCase(true, false)]
[TestCase(true, true)]
public async Task FileSystemReleasesOnlyClosedSessionHandlesAsync(bool workMasters, bool abandonFile)
{
string root = Path.Combine(TestContext.CurrentContext.WorkDirectory, "mt-files", Guid.NewGuid().ToString("N"));
var serverFixture = new ServerFixture<FileServer>(telemetry => new FileServer(telemetry))
{
AutoAccept = true,
SecurityNone = true
};
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
await using var firstClient = new ClientFixture(telemetry);
await using var secondClient = new ClientFixture(telemetry);
ClientSession? first = null;
ClientSession? second = null;
try
{
await serverFixture.LoadConfigurationAsync(root).ConfigureAwait(false);
FileServer server = await serverFixture.StartAsync().ConfigureAwait(false);
IMachineryBuildContext context = server.Manager.CreateMachineryBuildContext();
MachineToolState machine = context.Context.CreateInstanceOfMachineToolType(
context.MachinesFolder, new QualifiedName("FileMachine", context.InstanceNamespaceIndex));
var builder = context.AddMachine(machine, new QualifiedName("FileMachine"));
builder.WithIdentification(machine.Identification!, identity =>
{
identity.Manufacturer = new LocalizedText("File lifetime test");
identity.SerialNumber = "FileMachine";
identity.ProductInstanceUri = "urn:machinetool-tests:file-lifetime";
});
machine.AddFileSystem(context.Context);
FileDirectoryState directory = machine.FileSystem!;
if (workMasters)
{
ushort modelIndex = (ushort)context.Context.NamespaceUris.GetIndex(Namespaces.MachineTool);
FileDirectoryState workMastersDirectory = context.Context.CreateInstanceOfFileDirectoryType(
directory, new QualifiedName(BrowseNames.WorkMasters, modelIndex));
directory.AddChild(workMastersDirectory);
directory = workMastersDirectory;
}
await builder.BuildAsync().ConfigureAwait(false);
await using IFileDirectoryBinding binding = await new FileDirectoryBinder().BindAsync(
directory,
CreateProvider(),
context.Context,
registerNode: (node, ct) => server.Manager.AddPredefinedNodeAsync(node, ct),
deregisterNode: async (node, ct) =>
{
await server.Manager.DeleteNodeAsync(server.Manager.SystemContext, node.NodeId, ct)
.ConfigureAwait(false);
}).ConfigureAwait(false);
var children = new List<BaseInstanceState>();
directory.GetChildren(context.Context, children);
FileState file = (FileState)children.Find(static child => child is FileState)!;
Assert.That(file, Is.Not.Null);
var endpoint = new Uri($"opc.tcp://localhost:{serverFixture.Port}");
await firstClient.LoadClientConfigurationAsync(root, "FileClientA").ConfigureAwait(false);
await secondClient.LoadClientConfigurationAsync(root, "FileClientB").ConfigureAwait(false);
first = await firstClient.ConnectAsync(endpoint, SecurityPolicies.None).ConfigureAwait(false);
second = await secondClient.ConnectAsync(endpoint, SecurityPolicies.None).ConfigureAwait(false);
using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(30));
CancellationToken ct = timeout.Token;
var firstFile = new FileTypeClient(first, file.NodeId, telemetry);
var secondFile = new FileTypeClient(second, file.NodeId, telemetry);
uint firstHandle = await firstFile.OpenAsync(1, ct).ConfigureAwait(false);
uint secondHandle = await secondFile.OpenAsync(1, ct).ConfigureAwait(false);
Assert.That(await ReadOpenCountAsync(second, file, ct).ConfigureAwait(false), Is.EqualTo(2));
ServiceResultException wrongOwner = Assert.ThrowsAsync<ServiceResultException>(async () =>
await secondFile.ReadAsync(firstHandle, 3, ct).ConfigureAwait(false))!;
Assert.That(wrongOwner.StatusCode, Is.EqualTo(StatusCodes.BadInvalidState));
if (!abandonFile)
{
await firstFile.CloseAsync(firstHandle, ct).ConfigureAwait(false);
}
StatusCode closed = await first.CloseAsync(ct).ConfigureAwait(false);
Assert.That(StatusCode.IsGood(closed), Is.True);
first.Dispose();
first = null;
ByteString surviving = await secondFile.ReadAsync(secondHandle, 3, ct).ConfigureAwait(false);
Assert.That(surviving.ToArray(), Is.EqualTo(new byte[] { 1, 2, 3 }));
await secondFile.CloseAsync(secondHandle, ct).ConfigureAwait(false);
Assert.That(await ReadOpenCountAsync(second, file, ct).ConfigureAwait(false), Is.Zero,
"Session close must release abandoned FileSystem/WorkMasters handles before returning.");
}
finally
{
if (first != null)
{
await first.CloseAsync(CancellationToken.None).ConfigureAwait(false);
first.Dispose();
}
if (second != null)
{
await second.CloseAsync(CancellationToken.None).ConfigureAwait(false);
second.Dispose();
}
await serverFixture.StopAsync().ConfigureAwait(false);
if (Directory.Exists(root))
{
Directory.Delete(root, recursive: true);
}
}
}
/// <summary>
/// Reads OpenCount over the real session rather than inspecting the binder's private handle store.
/// </summary>
private static async ValueTask<ushort> ReadOpenCountAsync(
ClientSession session,
FileState file,
CancellationToken cancellationToken)
{
DataValue value = await session.ReadValueAsync(file.OpenCount!.NodeId, cancellationToken)
.ConfigureAwait(false);
Assert.That(value.StatusCode, Is.EqualTo(StatusCodes.Good));
Assert.That(value.WrappedValue.TryGetValue(out ushort count), Is.True);
return count;
}
/// <summary>
/// Supplies a read-only file through the public provider contract.
/// </summary>
private static IFileSystemProvider CreateProvider()
{
var provider = new Mock<IFileSystemProvider>(MockBehavior.Strict);
provider.SetupGet(value => value.MountName).Returns("Files");
provider.SetupGet(value => value.IsWritable).Returns(false);
provider.Setup(value => value.EnumerateAsync(string.Empty, It.IsAny<CancellationToken>()))
.Returns((string _, CancellationToken ct) => EnumerateFileAsync(ct));
provider.Setup(value => value.GetEntryAsync("program.nc", It.IsAny<CancellationToken>()))
.ReturnsAsync(s_fileEntry);
provider.Setup(value => value.OpenReadAsync("program.nc", It.IsAny<CancellationToken>()))
.Returns((string _, CancellationToken _) =>
new ValueTask<Stream>(new MemoryStream([1, 2, 3], writable: false)));
return provider.Object;
}
/// <summary>
/// Enumerates the deterministic provider file while honoring cancellation.
/// </summary>
private static async IAsyncEnumerable<FileSystemEntry> EnumerateFileAsync(
[EnumeratorCancellation] CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
await Task.CompletedTask.ConfigureAwait(false);
yield return s_fileEntry;
}
/// <summary>
/// Hosts the actual generated MachineTool model on the existing Machinery manager.
/// </summary>
private sealed class FileServer : StandardServer
{
/// <summary>
/// Creates a test server without another namespace owner.
/// </summary>
public FileServer(ITelemetryContext telemetry)
: base(telemetry)
{
}
/// <summary>
/// Gets the shared namespace owner.
/// </summary>
public MachineryNodeManager Manager { get; private set; } = null!;
/// <inheritdoc/>
protected override ValueTask<IMasterNodeManager> CreateMasterNodeManagerAsync(
IServerInternal server,
ApplicationConfiguration configuration,
CancellationToken cancellationToken = default)
{
var options = new MachineryServerOptions
{
Parts = MachineryParts.BuildingBlocks | MachineryParts.Jobs
};
Manager = new MachineryNodeManager(
server,
configuration,
[new MachineryModelProvider(options.Parts), new ModelProvider()],
options);
return new ValueTask<IMasterNodeManager>(
new MasterNodeManager(server, configuration, null, [Manager]));
}
}
/// <summary>
/// Loads only MachineTool's released namespace closure for the lifetime regression.
/// </summary>
private sealed class ModelProvider : IMachineryModelProvider
{
/// <inheritdoc/>
public int Order => 100;
/// <inheritdoc/>
public ArrayOf<string> NamespaceUris => MachineToolModels.GetNamespaceUris(MachineToolParts.MachineTool);
/// <inheritdoc/>
public void AddPredefinedNodes(NodeStateCollection nodes, ISystemContext context)
{
nodes.AddMachineToolTypeSystem(context);
context.EncodeableFactory.Builder.AddMachineToolTypeSystem().Commit();
}
}
/// <summary>Metadata for the provider's single immutable file.</summary>
private static readonly FileSystemEntry s_fileEntry = new(
"program.nc", "program.nc", false, 3, false,
new DateTime(2026, 1, 2, 3, 4, 5, DateTimeKind.Utc), "application/octet-stream");
}
}