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.
159 lines
7.4 KiB
C#
159 lines
7.4 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.MachineTool.WMTP;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.MachineTool.Tests
|
|
{
|
|
/// <summary>
|
|
/// Exercises generated model proxies without a client or server runtime project.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("MachineTool")]
|
|
public sealed class ModelProxyTests
|
|
{
|
|
/// <summary>
|
|
/// The abstract Number argument retains its concrete numeric type and precision.
|
|
/// </summary>
|
|
[TestCase(false)]
|
|
[TestCase(true)]
|
|
public async Task MeasurementProxyPreservesAbstractNumberArguments(bool floatingPoint)
|
|
{
|
|
ServiceMessageContext context = ModelTestContext.CreateMessageContext(MachineToolParts.Wmtp);
|
|
Mock<ISessionClient> session = CreateSession(context, []);
|
|
var objectId = new NodeId("measurement", 1);
|
|
var proxy = new WMTPMeasurementTypeClient(session.Object, objectId, NUnitTelemetryContext.Create());
|
|
Variant value = floatingPoint ? new Variant(0.125) : new Variant(9007199254740993UL);
|
|
|
|
await proxy.SetDeltaConditionAsync(value).ConfigureAwait(false);
|
|
|
|
var methodId = NodeId.Create(7030, WMTP.Namespaces.WMTP, context.NamespaceUris);
|
|
session.Verify(client => client.CallAsync(
|
|
null,
|
|
It.Is<ArrayOf<CallMethodRequest>>(requests =>
|
|
requests.Count == 1 &&
|
|
requests[0].ObjectId == objectId &&
|
|
requests[0].MethodId == methodId &&
|
|
requests[0].InputArguments.Count == 1 &&
|
|
requests[0].InputArguments[0].TypeInfo == value.TypeInfo &&
|
|
requests[0].InputArguments[0] == value),
|
|
It.IsAny<CancellationToken>()), Times.Once);
|
|
}
|
|
|
|
/// <summary>
|
|
/// The published Any-rank work-cycle report preserves both scalar and array structure representations.
|
|
/// </summary>
|
|
[TestCase(false)]
|
|
[TestCase(true)]
|
|
public async Task WorkCycleProxyPreservesAnyRankStructureReports(bool array)
|
|
{
|
|
ServiceMessageContext context = ModelTestContext.CreateMessageContext(MachineToolParts.Wmtp);
|
|
var first = new ExtensionObject(new WMTPOutputDataType { ActualValue = 12.5, Index = 17 });
|
|
var second = new ExtensionObject(new WMTPOutputDataType { ActualValue = 13.75, Index = 18 });
|
|
ArrayOf<ExtensionObject> records = [first, second];
|
|
Variant expected = array ? new Variant(records) : new Variant(first);
|
|
Mock<ISessionClient> session = CreateSession(context, [expected]);
|
|
var objectId = new NodeId("work-cycle", 1);
|
|
var proxy = new WMTPWorkCycleDataTypeClient(session.Object, objectId, NUnitTelemetryContext.Create());
|
|
|
|
Variant actual = await proxy.CombinedReportAllAsync().ConfigureAwait(false);
|
|
|
|
Assert.That(actual, Is.EqualTo(expected));
|
|
if (array)
|
|
{
|
|
Assert.That(actual.TryGetValue(out ArrayOf<ExtensionObject> values), Is.True);
|
|
Assert.That(values.Count, Is.EqualTo(2));
|
|
Assert.That(values[1].TryGetValue(out WMTPOutputDataType? value), Is.True);
|
|
Assert.That(value!.Index, Is.EqualTo(18));
|
|
}
|
|
else
|
|
{
|
|
Assert.That(actual.TryGetValue<WMTPOutputDataType>(out WMTPOutputDataType? value, context), Is.True);
|
|
Assert.That(value!.Index, Is.EqualTo(17));
|
|
Assert.That(value.ActualValue, Is.EqualTo(12.5));
|
|
}
|
|
var methodId = NodeId.Create(7011, WMTP.Namespaces.WMTP, context.NamespaceUris);
|
|
session.Verify(client => client.CallAsync(
|
|
null,
|
|
It.Is<ArrayOf<CallMethodRequest>>(requests =>
|
|
requests.Count == 1 &&
|
|
requests[0].ObjectId == objectId &&
|
|
requests[0].MethodId == methodId &&
|
|
requests[0].InputArguments.Count == 0),
|
|
It.IsAny<CancellationToken>()), Times.Once);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Missing report output is an explicit bad response, not a successful empty record set.
|
|
/// </summary>
|
|
[Test]
|
|
public void WorkCycleProxyRejectsMissingReportOutput()
|
|
{
|
|
ServiceMessageContext context = ModelTestContext.CreateMessageContext(MachineToolParts.Wmtp);
|
|
Mock<ISessionClient> session = CreateSession(context, []);
|
|
var proxy = new WMTPWorkCycleDataTypeClient(
|
|
session.Object, new NodeId("work-cycle", 1), NUnitTelemetryContext.Create());
|
|
ServiceResultException exception = Assert.ThrowsAsync<ServiceResultException>(
|
|
async () => await proxy.CombinedReportAllAsync().ConfigureAwait(false))!;
|
|
Assert.That(exception.StatusCode, Is.EqualTo(StatusCodes.BadUnexpectedError));
|
|
}
|
|
|
|
private static Mock<ISessionClient> CreateSession(
|
|
ServiceMessageContext context,
|
|
ArrayOf<Variant> outputArguments)
|
|
{
|
|
var session = new Mock<ISessionClient>(MockBehavior.Strict);
|
|
session.SetupGet(client => client.MessageContext).Returns(context);
|
|
session.Setup(client => client.CallAsync(
|
|
null,
|
|
It.IsAny<ArrayOf<CallMethodRequest>>(),
|
|
It.IsAny<CancellationToken>())).Returns(
|
|
new ValueTask<CallResponse>(new CallResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results =
|
|
[
|
|
new CallMethodResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
OutputArguments = outputArguments
|
|
}
|
|
],
|
|
DiagnosticInfos = []
|
|
}));
|
|
return session;
|
|
}
|
|
}
|
|
}
|