mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 06:31:35 +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.
290 lines
12 KiB
C#
290 lines
12 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 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.Tests;
|
|
|
|
namespace Opc.Ua.Client.Tests
|
|
{
|
|
/// <summary>
|
|
/// Tests for the <see cref="ObjectTypeClient"/> method-call
|
|
/// interoperability fallback (issue #3914). Calling a method with the
|
|
/// type-declaration MethodId is spec-conformant (OPC UA Part 4
|
|
/// §5.12.2.2) and is the zero-cost happy path. When a non-conformant
|
|
/// server rejects it with <see cref="StatusCodes.BadMethodInvalid"/>,
|
|
/// the instance MethodId is resolved via a HasComponent browse path,
|
|
/// cached, and the call is retried.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Client")]
|
|
[Parallelizable]
|
|
public sealed class ObjectTypeClientCallFallbackTests
|
|
{
|
|
private const string kMethodNamespaceUri = "http://test.org/UA/fallback/";
|
|
private const string kMethodBrowseName = "DoIt";
|
|
|
|
private Mock<ISessionClient> m_sessionMock = null!;
|
|
private NodeId m_objectId;
|
|
private NodeId m_typeMethodId;
|
|
private NodeId m_instanceMethodId;
|
|
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
var messageContext = ServiceMessageContext.Create(telemetry);
|
|
ushort nsIndex = messageContext.NamespaceUris.GetIndexOrAppend(kMethodNamespaceUri);
|
|
|
|
m_objectId = new NodeId(100u, nsIndex);
|
|
m_typeMethodId = new NodeId(26u, nsIndex);
|
|
m_instanceMethodId = new NodeId(32u, nsIndex);
|
|
|
|
m_sessionMock = new Mock<ISessionClient>(MockBehavior.Strict);
|
|
m_sessionMock.SetupGet(s => s.MessageContext).Returns(messageContext);
|
|
}
|
|
|
|
[Test]
|
|
public async Task ConformantServerCallsOnceWithTypeMethodIdAndDoesNotResolveAsync()
|
|
{
|
|
SetupCall(_ => Good(new Variant(42)));
|
|
TestObjectTypeClient client = CreateClient();
|
|
|
|
ArrayOf<Variant> outputs = await client
|
|
.InvokeAsync(m_typeMethodId, kMethodNamespaceUri, kMethodBrowseName, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(outputs.Count, Is.EqualTo(1));
|
|
VerifyCallCount(Times.Once());
|
|
VerifyTranslateCount(Times.Never());
|
|
}
|
|
|
|
[Test]
|
|
[Category("Programs")]
|
|
public void BadServiceEnvelopeCannotBeInterpretedAsSuccessfulMethodOutput()
|
|
{
|
|
m_sessionMock.Setup(session => session.CallAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<CallMethodRequest>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync(new CallResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader { ServiceResult = StatusCodes.BadSessionClosed },
|
|
Results = [Good(new Variant(42))]
|
|
});
|
|
TestObjectTypeClient client = CreateClient();
|
|
|
|
ServiceResultException exception = Assert.ThrowsAsync<ServiceResultException>(
|
|
async () => await client.InvokeAsync(
|
|
m_typeMethodId, kMethodNamespaceUri, kMethodBrowseName, CancellationToken.None)
|
|
.ConfigureAwait(false))!;
|
|
|
|
Assert.That(exception.StatusCode, Is.EqualTo(StatusCodes.BadSessionClosed));
|
|
VerifyCallCount(Times.Once());
|
|
VerifyTranslateCount(Times.Never());
|
|
}
|
|
|
|
[Test]
|
|
public async Task NonConformantServerResolvesInstanceMethodIdAndRetriesAsync()
|
|
{
|
|
SetupCall(req => req.MethodId.Equals(m_typeMethodId) ? BadMethodInvalid() : Good(new Variant(7)));
|
|
SetupTranslate(m_instanceMethodId);
|
|
TestObjectTypeClient client = CreateClient();
|
|
|
|
ArrayOf<Variant> outputs = await client
|
|
.InvokeAsync(m_typeMethodId, kMethodNamespaceUri, kMethodBrowseName, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
Assert.That(outputs.Count, Is.EqualTo(1));
|
|
VerifyTranslateCount(Times.Once());
|
|
VerifyCallCount(Times.Exactly(2));
|
|
}
|
|
|
|
[Test]
|
|
public async Task ResolvedInstanceMethodIdIsCachedAcrossCallsAsync()
|
|
{
|
|
SetupCall(req => req.MethodId.Equals(m_typeMethodId) ? BadMethodInvalid() : Good(new Variant(1)));
|
|
SetupTranslate(m_instanceMethodId);
|
|
TestObjectTypeClient client = CreateClient();
|
|
|
|
_ = await client
|
|
.InvokeAsync(m_typeMethodId, kMethodNamespaceUri, kMethodBrowseName, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
_ = await client
|
|
.InvokeAsync(m_typeMethodId, kMethodNamespaceUri, kMethodBrowseName, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
// Exactly one resolution total. The first invocation tries the
|
|
// type MethodId then the instance MethodId (2 calls); the second
|
|
// invocation uses the cached instance MethodId directly (1 call).
|
|
VerifyTranslateCount(Times.Once());
|
|
VerifyCallCount(Times.Exactly(3));
|
|
}
|
|
|
|
[Test]
|
|
public void UnresolvedInstanceMethodIdSurfacesOriginalBadMethodInvalid()
|
|
{
|
|
SetupCall(_ => BadMethodInvalid());
|
|
SetupTranslate(NodeId.Null);
|
|
TestObjectTypeClient client = CreateClient();
|
|
|
|
ServiceResultException ex = Assert.ThrowsAsync<ServiceResultException>(
|
|
async () => await client
|
|
.InvokeAsync(m_typeMethodId, kMethodNamespaceUri, kMethodBrowseName, CancellationToken.None)
|
|
.ConfigureAwait(false))!;
|
|
|
|
Assert.That(ex.StatusCode, Is.EqualTo(StatusCodes.BadMethodInvalid));
|
|
// Only the initial attempt is made; the missed resolution means no retry.
|
|
VerifyCallCount(Times.Once());
|
|
VerifyTranslateCount(Times.Once());
|
|
}
|
|
|
|
private TestObjectTypeClient CreateClient()
|
|
{
|
|
return new TestObjectTypeClient(
|
|
m_sessionMock.Object,
|
|
m_objectId,
|
|
NUnitTelemetryContext.Create());
|
|
}
|
|
|
|
private void SetupCall(Func<CallMethodRequest, CallMethodResult> handler)
|
|
{
|
|
m_sessionMock
|
|
.Setup(s => s.CallAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<CallMethodRequest>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns<RequestHeader, ArrayOf<CallMethodRequest>, CancellationToken>(
|
|
(_, requests, _) =>
|
|
{
|
|
CallMethodResult result = handler(requests[0]);
|
|
return new ValueTask<CallResponse>(new CallResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = ArrayOf.Wrapped([result]),
|
|
DiagnosticInfos = default
|
|
});
|
|
});
|
|
}
|
|
|
|
private void SetupTranslate(NodeId resolved)
|
|
{
|
|
BrowsePathResult result = resolved.IsNull
|
|
? new BrowsePathResult { StatusCode = StatusCodes.BadNoMatch, Targets = default }
|
|
: new BrowsePathResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
Targets = ArrayOf.Wrapped(
|
|
[
|
|
new BrowsePathTarget
|
|
{
|
|
TargetId = new ExpandedNodeId(resolved),
|
|
RemainingPathIndex = uint.MaxValue
|
|
}
|
|
])
|
|
};
|
|
|
|
m_sessionMock
|
|
.Setup(s => s.TranslateBrowsePathsToNodeIdsAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<BrowsePath>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns(new ValueTask<TranslateBrowsePathsToNodeIdsResponse>(
|
|
new TranslateBrowsePathsToNodeIdsResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = ArrayOf.Wrapped([result]),
|
|
DiagnosticInfos = default
|
|
}));
|
|
}
|
|
|
|
private void VerifyCallCount(Times times)
|
|
{
|
|
m_sessionMock.Verify(s => s.CallAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<CallMethodRequest>>(),
|
|
It.IsAny<CancellationToken>()), times);
|
|
}
|
|
|
|
private void VerifyTranslateCount(Times times)
|
|
{
|
|
m_sessionMock.Verify(s => s.TranslateBrowsePathsToNodeIdsAsync(
|
|
It.IsAny<RequestHeader>(),
|
|
It.IsAny<ArrayOf<BrowsePath>>(),
|
|
It.IsAny<CancellationToken>()), times);
|
|
}
|
|
|
|
private static CallMethodResult Good(params Variant[] outputs)
|
|
{
|
|
return new CallMethodResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
OutputArguments = ArrayOf.Wrapped(outputs)
|
|
};
|
|
}
|
|
|
|
private static CallMethodResult BadMethodInvalid()
|
|
{
|
|
return new CallMethodResult
|
|
{
|
|
StatusCode = StatusCodes.BadMethodInvalid,
|
|
OutputArguments = default
|
|
};
|
|
}
|
|
|
|
/// <summary>
|
|
/// Minimal concrete proxy exposing the protected fallback overload
|
|
/// of <see cref="ObjectTypeClient.CallMethodAsync(NodeId, string, string, CancellationToken, Variant[])"/>.
|
|
/// </summary>
|
|
private sealed class TestObjectTypeClient : ObjectTypeClient
|
|
{
|
|
public TestObjectTypeClient(
|
|
ISessionClient session,
|
|
NodeId objectId,
|
|
ITelemetryContext telemetry)
|
|
: base(session, objectId, telemetry)
|
|
{
|
|
}
|
|
|
|
public ValueTask<ArrayOf<Variant>> InvokeAsync(
|
|
NodeId methodId,
|
|
string methodNamespaceUri,
|
|
string methodBrowseName,
|
|
CancellationToken ct,
|
|
params Variant[] args)
|
|
{
|
|
return CallMethodAsync(methodId, methodNamespaceUri, methodBrowseName, ct, args);
|
|
}
|
|
}
|
|
}
|
|
}
|