mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55: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.
257 lines
14 KiB
C#
257 lines
14 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 NUnit.Framework;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Client.Subscriptions;
|
|
using Opc.Ua.Client.TestFramework;
|
|
using Opc.Ua.MachineTool.Client;
|
|
using Opc.Ua.MachineTool.Server;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.MachineTool.Tests
|
|
{
|
|
/// <summary>
|
|
/// Verifies bounded passive event workflows using actual Publish and ConditionRefresh services.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[NonParallelizable]
|
|
[Category("MachineTool")]
|
|
[Category("Integration")]
|
|
public sealed class MachineToolNotificationClientTests
|
|
{
|
|
/// <summary>
|
|
/// A retained refresh completes at RefreshEnd, preserves standard fields and never implicitly acknowledges.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task RetainedRefreshUsesNativeConditionDecoderAndReleasesSubscriptionAsync()
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
var sample = new MachineToolSampleInfo(
|
|
new DateTime(2026, 6, 8, 10, 11, 12, DateTimeKind.Utc), StatusCodes.UncertainLastUsableValue);
|
|
var provider = new MachineToolNotificationTests.NotificationProvider(new MachineToolNotificationSnapshot
|
|
{
|
|
Alerts =
|
|
[
|
|
new MachineToolAlert
|
|
{
|
|
Key = "Coolant", ErrorCode = "E91", Message = new LocalizedText("Coolant empty"),
|
|
Severity = 800, IsActive = true, Sample = sample
|
|
}
|
|
]
|
|
});
|
|
await using MachineToolRuntime<MachineToolState> runtime =
|
|
await MachineToolNotificationTests.BuildAsync(fixture, provider).ConfigureAwait(false);
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
await using var transport = new ClientFixture(telemetry);
|
|
transport.UseSubscriptionEngineFactory(DefaultSubscriptionEngineFactory.Instance);
|
|
await transport.LoadClientConfigurationAsync(fixture.Root, "NotificationObserver").ConfigureAwait(false);
|
|
using ISession session = await transport.ConnectAsync(fixture.Endpoint, SecurityPolicies.None)
|
|
.ConfigureAwait(false);
|
|
await using MachineToolClient client = session.CreateMachineToolClient(telemetry);
|
|
Assert.That(session.TryGetSubscriptionManager(out ISubscriptionManager? subscriptions), Is.True);
|
|
int before = subscriptions!.Count;
|
|
|
|
MachineToolEventObservation result = await client.ObserveConditionsAsync(runtime.NodeId,
|
|
new MachineToolObservationOptions { Window = TimeSpan.FromSeconds(10), MaximumNotifications = 1 })
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(result.RefreshCompleted, Is.True);
|
|
Assert.That(result.Events.Count, Is.EqualTo(1));
|
|
Assert.That(result.Events[0].Event, Is.TypeOf<AlertTypeRecord>());
|
|
var alert = (AlertTypeRecord)result.Events[0].Event;
|
|
Assert.That(alert.ErrorCode, Is.EqualTo("E91"));
|
|
Assert.That(alert.Time, Is.EqualTo(sample.SourceTimestamp));
|
|
Assert.That(runtime.Notifications!.TryGetAlert("Coolant", out AlertState? state), Is.True);
|
|
Assert.That(alert.ConditionId, Is.EqualTo(state!.NodeId));
|
|
Assert.That(state.AckedState!.Id!.Value, Is.False);
|
|
Assert.That(subscriptions.Count, Is.EqualTo(before));
|
|
await session.CloseAsync(CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Live messages use concrete types, propagate once, preserve fields and report server overflow.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task LiveEventsSupportGeneratedVendorDecodersAndExplicitOverflowAsync()
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
var provider = new MachineToolNotificationTests.NotificationProvider(new MachineToolNotificationSnapshot());
|
|
await using MachineToolRuntime<MachineToolState> runtime =
|
|
await MachineToolNotificationTests.BuildAsync(fixture, provider).ConfigureAwait(false);
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
await using var transport = new ClientFixture(telemetry);
|
|
transport.UseSubscriptionEngineFactory(DefaultSubscriptionEngineFactory.Instance);
|
|
await transport.LoadClientConfigurationAsync(fixture.Root, "LiveEvents").ConfigureAwait(false);
|
|
using ISession session = await transport.ConnectAsync(fixture.Endpoint, SecurityPolicies.None)
|
|
.ConfigureAwait(false);
|
|
await using MachineToolClient client = session.CreateMachineToolClient(telemetry);
|
|
var options = new MachineToolObservationOptions
|
|
{
|
|
Window = TimeSpan.FromSeconds(10),
|
|
MaximumNotifications = 1
|
|
};
|
|
Task<MachineToolEventObservation> first = client.ObserveEventsAsync(runtime.NodeId, options).AsTask();
|
|
await WaitForMonitoringAsync(runtime.State).ConfigureAwait(false);
|
|
MachineToolMessage message = MachineToolNotificationValidationTests.Message(1);
|
|
provider.Snapshot = new MachineToolNotificationSnapshot { Revision = 1, Messages = [message] };
|
|
await runtime.RefreshNotificationsAsync().ConfigureAwait(false);
|
|
MachineToolEventObservation initial = await first.ConfigureAwait(false);
|
|
Assert.That(initial.Events.Count, Is.EqualTo(1));
|
|
Assert.That(initial.Events[0].Event, Is.TypeOf<NotificationEventTypeRecord>());
|
|
var record = (NotificationEventTypeRecord)initial.Events[0].Event;
|
|
Assert.That(record.Identifier, Is.EqualTo("M1"));
|
|
Assert.That(record.Time, Is.EqualTo(message.Time));
|
|
Assert.That(record.EventType.NamespaceIndex, Is.EqualTo(fixture.Context.InstanceNamespaceIndex));
|
|
Assert.That(initial.DroppedNotifications, Is.Zero);
|
|
|
|
QualifiedName[][] generated = NotificationEventTypeRecord.Decoder.GetStandardFields(session.NamespaceUris);
|
|
ArrayOf<ArrayOf<QualifiedName>> fields =
|
|
Array.ConvertAll(generated, static path => path.ToArrayOf()).ToArrayOf();
|
|
int decoded = 0;
|
|
client.WithEventDecoder(new ExpandedNodeId(record.EventType), fields, values =>
|
|
{
|
|
Interlocked.Increment(ref decoded);
|
|
return NotificationEventTypeRecord.Decoder.Decode(values.ToArray()!);
|
|
});
|
|
Task<MachineToolEventObservation> next = client.ObserveEventsAsync(runtime.NodeId, options).AsTask();
|
|
await WaitForMonitoringAsync(runtime.State).ConfigureAwait(false);
|
|
Assert.Throws<ServiceResultException>(() => client.WithEventDecoder(
|
|
new ExpandedNodeId(new NodeId(Guid.NewGuid(), fixture.Context.InstanceNamespaceIndex)), fields,
|
|
values => NotificationEventTypeRecord.Decoder.Decode(values.ToArray()!)));
|
|
var overflow = new EventQueueOverflowEventState(null);
|
|
overflow.Initialize(
|
|
fixture.Context.Context, runtime.State, EventSeverity.Low, new LocalizedText("Overflow"));
|
|
await runtime.State.ReportEventAsync(fixture.Context.Context, overflow).ConfigureAwait(false);
|
|
provider.Snapshot = new MachineToolNotificationSnapshot
|
|
{
|
|
Revision = 2,
|
|
Messages = [message with { Sequence = 2, Identifier = "M2" }]
|
|
};
|
|
await runtime.RefreshNotificationsAsync().ConfigureAwait(false);
|
|
MachineToolEventObservation observed = await next.ConfigureAwait(false);
|
|
Assert.That(decoded, Is.EqualTo(1));
|
|
Assert.That(((NotificationEventTypeRecord)observed.Events[0].Event).Identifier, Is.EqualTo("M2"));
|
|
Assert.That(observed.DroppedNotifications, Is.EqualTo(1));
|
|
Assert.That(observed.RefreshCompleted, Is.False);
|
|
Assert.That(observed.LimitReached, Is.True);
|
|
await session.CloseAsync(CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// A retained refresh reports truncation instead of claiming a complete one-condition inventory.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task RetainedConditionCountLimitDoesNotClaimCompletenessAsync()
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
MachineToolAlert alert = MachineToolNotificationValidationTests.Alert();
|
|
var provider = new MachineToolNotificationTests.NotificationProvider(
|
|
new MachineToolNotificationSnapshot { Alerts = [alert, alert with { Key = "Second" }] });
|
|
await using MachineToolRuntime<MachineToolState> runtime =
|
|
await MachineToolNotificationTests.BuildAsync(fixture, provider).ConfigureAwait(false);
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
await using var transport = new ClientFixture(telemetry);
|
|
transport.UseSubscriptionEngineFactory(DefaultSubscriptionEngineFactory.Instance);
|
|
await transport.LoadClientConfigurationAsync(fixture.Root, "TruncatedConditions").ConfigureAwait(false);
|
|
using ISession session = await transport.ConnectAsync(fixture.Endpoint, SecurityPolicies.None)
|
|
.ConfigureAwait(false);
|
|
await using MachineToolClient client = session.CreateMachineToolClient(telemetry);
|
|
|
|
MachineToolEventObservation result = await client.ObserveConditionsAsync(runtime.NodeId,
|
|
new MachineToolObservationOptions { Window = TimeSpan.FromSeconds(10), MaximumNotifications = 1 })
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(result.Events.Count, Is.EqualTo(1));
|
|
Assert.That(result.RefreshCompleted, Is.False);
|
|
Assert.That(result.LimitReached, Is.True);
|
|
Assert.That(result.DroppedNotifications, Is.GreaterThanOrEqualTo(1));
|
|
await session.CloseAsync(CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Caller cancellation and facade disposal both join subscription deletion and preserve the borrowed session.
|
|
/// </summary>
|
|
[TestCase(false)]
|
|
[TestCase(true)]
|
|
public async Task EventObservationCancellationReleasesOnlyItsOwnedSubscriptionAsync(bool disposeFacade)
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
var provider = new MachineToolNotificationTests.NotificationProvider(new MachineToolNotificationSnapshot());
|
|
await using MachineToolRuntime<MachineToolState> runtime =
|
|
await MachineToolNotificationTests.BuildAsync(fixture, provider).ConfigureAwait(false);
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
await using var transport = new ClientFixture(telemetry);
|
|
transport.UseSubscriptionEngineFactory(DefaultSubscriptionEngineFactory.Instance);
|
|
await transport.LoadClientConfigurationAsync(fixture.Root, "CancelledEvents").ConfigureAwait(false);
|
|
using ISession session = await transport.ConnectAsync(fixture.Endpoint, SecurityPolicies.None)
|
|
.ConfigureAwait(false);
|
|
await using MachineToolClient client = session.CreateMachineToolClient(telemetry);
|
|
Assert.That(session.TryGetSubscriptionManager(out ISubscriptionManager? subscriptions), Is.True);
|
|
int before = subscriptions!.Count;
|
|
using var cancellation = new CancellationTokenSource();
|
|
Task<MachineToolEventObservation> pending = client.ObserveEventsAsync(runtime.NodeId,
|
|
new MachineToolObservationOptions { Window = TimeSpan.FromSeconds(30) }, cancellation.Token).AsTask();
|
|
await WaitForMonitoringAsync(runtime.State).ConfigureAwait(false);
|
|
if (disposeFacade)
|
|
{
|
|
await client.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
else
|
|
{
|
|
await cancellation.CancelAsync().ConfigureAwait(false);
|
|
}
|
|
await Assert.ThatAsync(() => pending,
|
|
Throws.InstanceOf<OperationCanceledException>()).ConfigureAwait(false);
|
|
Assert.That(subscriptions.Count, Is.EqualTo(before));
|
|
Assert.That(session.Connected, Is.True);
|
|
await session.CloseAsync(CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Waits on the real server's public event-monitoring state, not a guessed subscription setup delay.
|
|
/// </summary>
|
|
private static async Task WaitForMonitoringAsync(NodeState node)
|
|
{
|
|
using var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
|
|
while (!node.AreEventsMonitored)
|
|
{
|
|
await Task.Delay(20, timeout.Token).ConfigureAwait(false);
|
|
}
|
|
}
|
|
}
|
|
}
|