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.
262 lines
12 KiB
C#
262 lines
12 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.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.MachineTool.Server;
|
|
|
|
namespace Opc.Ua.MachineTool.Tests
|
|
{
|
|
/// <summary>
|
|
/// Verifies complete prepublication validation of section 8.6.2 severity bands and bounded provider inventories.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[NonParallelizable]
|
|
[Category("MachineTool")]
|
|
public sealed class MachineToolNotificationValidationTests
|
|
{
|
|
/// <summary>
|
|
/// An invalid batch cannot allocate even the root factory or publish the valid prefix of its inventory.
|
|
/// </summary>
|
|
[TestCase(0)]
|
|
[TestCase(1)]
|
|
[TestCase(2)]
|
|
[TestCase(3)]
|
|
[TestCase(4)]
|
|
[TestCase(5)]
|
|
[TestCase(6)]
|
|
[TestCase(7)]
|
|
[TestCase(8)]
|
|
[TestCase(9)]
|
|
[TestCase(10)]
|
|
[TestCase(11)]
|
|
[TestCase(12)]
|
|
[TestCase(13)]
|
|
[TestCase(14)]
|
|
[TestCase(15)]
|
|
[TestCase(16)]
|
|
[TestCase(17)]
|
|
[TestCase(18)]
|
|
public async Task InvalidProviderBatchFailsBeforeFactoryAsync(int scenario)
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
MachineToolAlert alert = Alert();
|
|
MachineToolMessage message = Message(1);
|
|
MachineToolNotificationSnapshot snapshot = scenario switch
|
|
{
|
|
0 => null!,
|
|
1 => new() { Alerts = [alert with { Severity = 333 }] },
|
|
2 => new() { Alerts = [alert with { Severity = 1001 }] },
|
|
3 => new() { Alerts = [alert, alert] },
|
|
4 => new() { Alerts = [alert with { Key = string.Empty }] },
|
|
5 => new() { Alerts = [alert with { ErrorCode = string.Empty }] },
|
|
6 => new() { Alerts = [alert with { Message = LocalizedText.Null }] },
|
|
7 => new() { Alerts = [alert with { ConditionClassId = Ua.DataTypeIds.String }] },
|
|
8 => new() { Alerts = [alert with { Sample = new MachineToolSampleInfo(default, StatusCodes.Good) }] },
|
|
9 => new() { Messages = [message with { Sequence = 2 }] },
|
|
10 => new() { Messages = [message with { Severity = 334 }] },
|
|
11 => new() { Messages = [message with { Time = default }] },
|
|
12 => new() { Alerts = [alert, alert with { Key = "Other" }] },
|
|
13 => new() { Messages = [message, Message(2)] },
|
|
14 => new() { Alerts = [alert with { AllowedOperations = (MachineToolConditionOperations)16 }] },
|
|
15 => new() { Alerts = [alert with { ErrorCode = new string('x', 4097) }] },
|
|
16 => LargeBatch(alert),
|
|
17 => new() { Alerts = [null!] },
|
|
_ => new() { Messages = [null!] }
|
|
};
|
|
var provider = new MachineToolNotificationTests.NotificationProvider(snapshot);
|
|
var options = new MachineToolNotificationOptions
|
|
{
|
|
Provider = provider,
|
|
MaximumAlerts = scenario == 12 ? 1 : 128,
|
|
MaximumMessages = scenario == 13 ? 1 : 128,
|
|
MaximumTextLength = scenario == 16 ? 65536 : 4096
|
|
};
|
|
bool factoryCalled = false;
|
|
MachineToolBuilder<MachineToolState> builder = fixture.Context.AddMachineTool("Invalid",
|
|
(context, parent, name) =>
|
|
{
|
|
factoryCalled = true;
|
|
return context.CreateInstanceOfMachineToolType(parent, name);
|
|
}).WithProvider(new InMemoryMachineToolProvider(new MachineToolSnapshot()))
|
|
.WithIdentification(identity =>
|
|
{
|
|
identity.Manufacturer = new LocalizedText("Validation");
|
|
identity.SerialNumber = "Invalid";
|
|
identity.ProductInstanceUri = "urn:notification-validation";
|
|
}).WithNotifications(options);
|
|
|
|
ServiceResultException error = Assert.ThrowsAsync<ServiceResultException>(async () =>
|
|
await builder.BuildAsync().ConfigureAwait(false))!;
|
|
|
|
StatusCode expected = scenario switch
|
|
{
|
|
0 => StatusCodes.BadNoData,
|
|
12 or 13 or 16 => StatusCodes.BadEncodingLimitsExceeded,
|
|
_ => StatusCodes.BadInvalidState
|
|
};
|
|
Assert.That(error.StatusCode, Is.EqualTo(expected));
|
|
Assert.That(factoryCalled, Is.False);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Every invalid configuration is rejected before any provider-driven node is published.
|
|
/// </summary>
|
|
[TestCase(0)]
|
|
[TestCase(1)]
|
|
[TestCase(2)]
|
|
[TestCase(3)]
|
|
[TestCase(4)]
|
|
[TestCase(5)]
|
|
public async Task InvalidBoundsRejectSelectionAsync(int scenario)
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
var options = new MachineToolNotificationOptions
|
|
{
|
|
Provider = new MachineToolNotificationTests.NotificationProvider(new MachineToolNotificationSnapshot())
|
|
};
|
|
options = scenario switch
|
|
{
|
|
0 => options with { MaximumAlerts = 0 },
|
|
1 => options with { MaximumMessages = 1025 },
|
|
2 => options with { MaximumTextLength = 0 },
|
|
3 => options with { MaximumTextLength = 65537 },
|
|
4 => options with { RefreshTimeout = TimeSpan.Zero },
|
|
_ => options with { RefreshTimeout = TimeSpan.FromMinutes(2) }
|
|
};
|
|
MachineToolBuilder<MachineToolState> builder = fixture.Context.AddMachineTool("Limits")
|
|
.WithProvider(new InMemoryMachineToolProvider(new MachineToolSnapshot()))
|
|
.WithIdentification(identity =>
|
|
{
|
|
identity.Manufacturer = new LocalizedText("Validation");
|
|
identity.SerialNumber = "Limits";
|
|
identity.ProductInstanceUri = "urn:notification-limits";
|
|
}).WithNotifications(options);
|
|
|
|
ServiceResultException error = Assert.ThrowsAsync<ServiceResultException>(async () =>
|
|
await builder.BuildAsync().ConfigureAwait(false))!;
|
|
|
|
Assert.That(error.StatusCode, Is.EqualTo(StatusCodes.BadConfigurationError));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Existing alert state and event identity are unchanged by an invalid later inventory.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task RejectedRefreshPreservesExistingAlertAndPendingRetentionAsync()
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
MachineToolAlert alert = 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);
|
|
ByteString eventId = state!.EventId!.Value;
|
|
provider.Snapshot = new MachineToolNotificationSnapshot
|
|
{
|
|
Revision = 1,
|
|
Alerts = [alert with { Severity = 800 }, alert with { Key = "Invalid", Severity = 1 }]
|
|
};
|
|
Assert.ThrowsAsync<ServiceResultException>(async () =>
|
|
await runtime.RefreshNotificationsAsync().ConfigureAwait(false));
|
|
Assert.That(state.Severity!.Value, Is.EqualTo(500));
|
|
Assert.That(state.EventId.Value, Is.EqualTo(eventId));
|
|
provider.Snapshot = new MachineToolNotificationSnapshot { Revision = 1 };
|
|
Assert.ThrowsAsync<ServiceResultException>(async () =>
|
|
await runtime.RefreshNotificationsAsync().ConfigureAwait(false));
|
|
Assert.That(runtime.Notifications.TryGetAlert(alert.Key, out _), Is.True);
|
|
provider.Snapshot = new MachineToolNotificationSnapshot
|
|
{
|
|
Revision = 1,
|
|
Alerts = [alert with { Severity = 800 }]
|
|
};
|
|
await runtime.RefreshNotificationsAsync().ConfigureAwait(false);
|
|
provider.Snapshot = new MachineToolNotificationSnapshot { Alerts = [alert] };
|
|
Assert.ThrowsAsync<ServiceResultException>(async () =>
|
|
await runtime.RefreshNotificationsAsync().ConfigureAwait(false));
|
|
Assert.That(state.Severity.Value, Is.EqualTo(800));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Supplies one deterministic valid warning.
|
|
/// </summary>
|
|
internal static MachineToolAlert Alert()
|
|
{
|
|
return new()
|
|
{
|
|
Key = "Warning",
|
|
ErrorCode = "W1",
|
|
Message = new LocalizedText("Warning"),
|
|
Severity = 500,
|
|
IsActive = true,
|
|
Sample = new MachineToolSampleInfo(
|
|
new DateTime(2026, 8, 1, 2, 3, 4, DateTimeKind.Utc), StatusCodes.Good)
|
|
};
|
|
}
|
|
|
|
/// <summary>
|
|
/// Supplies one deterministic informational notification.
|
|
/// </summary>
|
|
internal static MachineToolMessage Message(ulong sequence)
|
|
{
|
|
return new()
|
|
{
|
|
Sequence = sequence,
|
|
Identifier = "M1",
|
|
Message = new LocalizedText("Ready"),
|
|
Severity = 100,
|
|
Time = new DateTime(2026, 8, 1, 2, 3, 4, DateTimeKind.Utc)
|
|
};
|
|
}
|
|
|
|
/// <summary>
|
|
/// Exceeds the aggregate bound without exceeding an individual field's configured bound.
|
|
/// </summary>
|
|
private static MachineToolNotificationSnapshot LargeBatch(MachineToolAlert alert)
|
|
{
|
|
var alerts = new MachineToolAlert[17];
|
|
string text = new('x', 65536);
|
|
for (int index = 0; index < alerts.Length; index++)
|
|
{
|
|
alerts[index] = alert with
|
|
{
|
|
Key = index.ToString(System.Globalization.CultureInfo.InvariantCulture),
|
|
Message = new LocalizedText(text)
|
|
};
|
|
}
|
|
return new MachineToolNotificationSnapshot { Alerts = alerts.ToArrayOf() };
|
|
}
|
|
}
|
|
}
|