mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 14:43:08 +08:00
0374e19121
# 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.
204 lines
11 KiB
C#
204 lines
11 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Client.Alarms;
|
|
using Opc.Ua.Client.TestFramework;
|
|
using Opc.Ua.MachineTool.Server;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.MachineTool.Tests
|
|
{
|
|
/// <summary>
|
|
/// Exercises provider cancellation, callback reentrancy, per-instance disposal and standard method permissions.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[NonParallelizable]
|
|
[Category("MachineTool")]
|
|
public sealed class MachineToolNotificationLifetimeTests
|
|
{
|
|
/// <summary>
|
|
/// Runtime removal cancels and drains only its own admitted notification acquisition.
|
|
/// </summary>
|
|
[TestCase(false)]
|
|
[TestCase(true)]
|
|
public async Task CancellationAndRemovalDrainAcquisitionWithoutChangingOtherMachinesAsync(bool remove)
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
int reads = 0;
|
|
var entered = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
var provider = new Mock<IMachineToolNotificationProvider>(MockBehavior.Strict);
|
|
provider.Setup(source => source.ReadAsync(It.IsAny<ulong>(), It.IsAny<CancellationToken>()))
|
|
.Returns((ulong _, CancellationToken ct) => ReadAsync(ct));
|
|
await using MachineToolRuntime<MachineToolState> runtime =
|
|
await MachineToolNotificationTests.BuildAsync(fixture, provider.Object, "Blocking")
|
|
.ConfigureAwait(false);
|
|
var otherProvider = new MachineToolNotificationTests.NotificationProvider(
|
|
new MachineToolNotificationSnapshot());
|
|
await using MachineToolRuntime<MachineToolState> other =
|
|
await MachineToolNotificationTests.BuildAsync(fixture, otherProvider, "Independent")
|
|
.ConfigureAwait(false);
|
|
using var cancellation = new CancellationTokenSource();
|
|
Task pending = runtime.RefreshNotificationsAsync(cancellation.Token).AsTask();
|
|
await entered.Task.WaitAsync(TimeSpan.FromSeconds(5)).ConfigureAwait(false);
|
|
if (remove)
|
|
{
|
|
await runtime.DisposeAsync().AsTask().WaitAsync(TimeSpan.FromSeconds(5)).ConfigureAwait(false);
|
|
}
|
|
else
|
|
{
|
|
await cancellation.CancelAsync().ConfigureAwait(false);
|
|
}
|
|
await Assert.ThatAsync(async () => await pending.ConfigureAwait(false),
|
|
Throws.InstanceOf<OperationCanceledException>()).ConfigureAwait(false);
|
|
await other.RefreshNotificationsAsync().ConfigureAwait(false);
|
|
Assert.That(fixture.Context.Manager.FindPredefinedNode(other.NodeId), Is.SameAs(other.State));
|
|
if (remove)
|
|
{
|
|
Assert.That(fixture.Context.Manager.FindPredefinedNode(runtime.NodeId), Is.Null);
|
|
Assert.ThrowsAsync<ObjectDisposedException>(async () =>
|
|
await runtime.RefreshNotificationsAsync().ConfigureAwait(false));
|
|
}
|
|
else
|
|
{
|
|
Assert.That(fixture.Context.Manager.FindPredefinedNode(runtime.NodeId), Is.SameAs(runtime.State));
|
|
Assert.That(runtime.Notifications!.Observation!.Revision, Is.Zero);
|
|
}
|
|
|
|
async ValueTask<MachineToolNotificationSnapshot> ReadAsync(CancellationToken ct)
|
|
{
|
|
if (Interlocked.Increment(ref reads) != 1)
|
|
{
|
|
entered.TrySetResult(true);
|
|
await Task.Delay(Timeout.InfiniteTimeSpan, ct).ConfigureAwait(false);
|
|
}
|
|
return new MachineToolNotificationSnapshot();
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Provider callbacks cannot recursively update or await disposal of their own runtime.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task ReentrantProviderOperationsFailPromptlyWithoutDeadlockAsync()
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
MachineToolRuntime<MachineToolState>? runtime = null;
|
|
var provider = new Mock<IMachineToolNotificationProvider>(MockBehavior.Strict);
|
|
provider.Setup(source => source.ReadAsync(It.IsAny<ulong>(), It.IsAny<CancellationToken>()))
|
|
.Returns((ulong _, CancellationToken _) => ReadAsync());
|
|
runtime = await MachineToolNotificationTests.BuildAsync(fixture, provider.Object).ConfigureAwait(false);
|
|
await using (runtime.ConfigureAwait(false))
|
|
{
|
|
await runtime.RefreshNotificationsAsync().AsTask().WaitAsync(TimeSpan.FromSeconds(5))
|
|
.ConfigureAwait(false);
|
|
}
|
|
|
|
async ValueTask<MachineToolNotificationSnapshot> ReadAsync()
|
|
{
|
|
if (runtime != null)
|
|
{
|
|
await Assert.ThatAsync(async () => await runtime.DisposeAsync().ConfigureAwait(false),
|
|
Throws.TypeOf<ServiceResultException>().With.Property("StatusCode")
|
|
.EqualTo(StatusCodes.BadInvalidState)).ConfigureAwait(false);
|
|
await Assert.ThatAsync(async () => await runtime.RefreshAsync().ConfigureAwait(false),
|
|
Throws.TypeOf<ServiceResultException>().With.Property("StatusCode")
|
|
.EqualTo(StatusCodes.BadInvalidState)).ConfigureAwait(false);
|
|
await Assert.ThatAsync(
|
|
async () => await runtime.Notifications!.DisposeAsync().ConfigureAwait(false),
|
|
Throws.TypeOf<ServiceResultException>().With.Property("StatusCode")
|
|
.EqualTo(StatusCodes.BadInvalidState)).ConfigureAwait(false);
|
|
}
|
|
return new MachineToolNotificationSnapshot();
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Enable, disable, comment and acknowledge use existing Part 9 methods and the latest provider permissions.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task StandardConditionMethodsRespectPermissionsAndNeverResetEquipmentAsync()
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
MachineToolAlert alert = MachineToolNotificationValidationTests.Alert();
|
|
var provider = new MachineToolNotificationTests.NotificationProvider(
|
|
new MachineToolNotificationSnapshot { Alerts = [alert] });
|
|
await using MachineToolRuntime<MachineToolState> runtime =
|
|
await MachineToolNotificationTests.BuildAsync(fixture, provider).ConfigureAwait(false);
|
|
Assert.That(runtime.Notifications!.TryGetAlert(alert.Key, out AlertState? state), Is.True);
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
await using var transport = new ClientFixture(telemetry);
|
|
await transport.LoadClientConfigurationAsync(fixture.Root, "ConditionPermissions").ConfigureAwait(false);
|
|
using ISession session = await transport.ConnectAsync(fixture.Endpoint, SecurityPolicies.None)
|
|
.ConfigureAwait(false);
|
|
var client = new AlarmClient(session, telemetry);
|
|
await client.AddCommentAsync(state!.NodeId, state.EventId!.Value, new LocalizedText("Inspected"))
|
|
.ConfigureAwait(false);
|
|
Assert.That(state.Comment!.Value.Text, Is.EqualTo("Inspected"));
|
|
await client.DisableAsync(state.NodeId).ConfigureAwait(false);
|
|
Assert.That(state.EnabledState!.Id!.Value, Is.False);
|
|
Assert.That(state.Retain!.Value, Is.False);
|
|
await client.EnableAsync(state.NodeId).ConfigureAwait(false);
|
|
Assert.That(state.Retain.Value, Is.True);
|
|
provider.Snapshot = new MachineToolNotificationSnapshot
|
|
{
|
|
Revision = 1,
|
|
Alerts = [alert with { AllowedOperations = MachineToolConditionOperations.None }]
|
|
};
|
|
await runtime.RefreshNotificationsAsync().ConfigureAwait(false);
|
|
await Assert.ThatAsync(async () =>
|
|
await client.AcknowledgeAsync(state.NodeId, state.EventId.Value, new LocalizedText("Denied"))
|
|
.ConfigureAwait(false),
|
|
Throws.TypeOf<ServiceResultException>().With.Property("StatusCode")
|
|
.EqualTo(StatusCodes.BadUserAccessDenied)).ConfigureAwait(false);
|
|
await Assert.ThatAsync(async () => await client.DisableAsync(state.NodeId).ConfigureAwait(false),
|
|
Throws.TypeOf<ServiceResultException>().With.Property("StatusCode")
|
|
.EqualTo(StatusCodes.BadUserAccessDenied)).ConfigureAwait(false);
|
|
await Assert.ThatAsync(async () =>
|
|
await client.AddCommentAsync(state.NodeId, state.EventId.Value, new LocalizedText("Denied"))
|
|
.ConfigureAwait(false),
|
|
Throws.TypeOf<ServiceResultException>().With.Property("StatusCode")
|
|
.EqualTo(StatusCodes.BadUserAccessDenied)).ConfigureAwait(false);
|
|
Assert.That(state.ActiveState!.Id!.Value, Is.True);
|
|
Assert.That(state.AckedState!.Id!.Value, Is.False);
|
|
Assert.That(state.Comment.Value.Text, Is.EqualTo("Inspected"));
|
|
Assert.That(state.Confirm, Is.Null);
|
|
await session.CloseAsync(CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
}
|
|
}
|