mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 00:56:28 +08:00
01d6b5d26c
> Tracking issue #4576. #4577 is merged, so this branch is rebased onto > `master` and contains only the Machinery commits. ## Summary Second of four stacked PRs. Adds the OPC UA for Machinery series as model packages plus a server and a client SDK, following the companion pattern of DI and Robotics, and the two models it depends on that the repository does not carry yet. | Package | Content | |---|---| | `Opc.Ua.IA` | OPC 10000-200 IA 1.01.4, **moved out of `Opc.Ua.Robotics`** (see below) | | `Opc.Ua.ECM` | OPC 34100 Energy Consumption Management 1.0.1 | | `Opc.Ua.PADIM` | OPC 30081 PA-DIM 1.02.0 with the IRDI dictionary | | `Opc.Ua.Machinery` | OPC 40001-1 Basic Building Blocks 1.04.1 | | `Opc.Ua.Machinery.ProcessValues` | OPC 40001-2 Process Values 1.00.0 | | `Opc.Ua.Machinery.Jobs` | OPC 40001-3 Job Management 1.0.1 | | `Opc.Ua.Machinery.Energy` | OPC 40001-4 Energy 1.00 | | `Opc.Ua.Machinery.Result` | OPC 40001-101 Result Transfer 1.01.0 | | `Opc.Ua.Machinery.Server` | `AddMachinery()` / `ConfigureMachinery(...)`, fluent machine builder, server-driven state machines, process values, job management over the shared ISA-95 V2 binder, energy, result management incl. `GenerateFileForRead` | | `Opc.Ua.Machinery.Client` | machine discovery, identification, state observation, process values, job and result access | OPC 40001-101 `ResultTransferType` redeclares `GenerateFileForRead` with its own arguments; the generator fix for such overrides, merged with #4577, is what makes it appear on the `ResultTransfer` instances. All NodeSets are byte-identical to `UA-Nodeset/latest`. Each model carries a pinned `Model/*.NodeIds.csv` the generator validates, next to the unmodified upstream table; `tools/nodesets/derive-identifier-table.py` derives the former from the latter. ## Changes to existing code - **IA moves out of Robotics.** Machinery needs IA as well (OPC 40001-1 types `Stacklight` with `BasicStacklightType`), and two assemblies generating the same model under the same prefix collide at any consumer referencing both. The NodeSet moves verbatim, so no generated type changes; the prefix stays `Opc.Ua.IA`. Source-compatible, but IA types now live in `Opc.Ua.IA.dll` rather than `Opc.Ua.Robotics.dll` — binary-breaking for consumers of the Robotics package. - **`samples/OpenUsd/GeneratorServer`** drops its hand-reduced Machinery NodeSet copy and the script that produced it (a workaround for the generator defect fixed by #4577) and references `Opc.Ua.Machinery` instead. - `README.md` and `docs/README.md` list the new models; the README also corrects the Industrial Automation entry (Part 200, not OPC 40001-1). ## Review follow-ups Separate commits after the docs/samples commit, so the reviewed state stays comparable. Each fix comes with a test that fails without it. - Copilot review: a transition is committed only while the state machine is still in its source state; optional Jobs/Result namespaces the server does not load are reported as absent, as documented; resources of registered machines (result transfer, job-management change pumps) are released with the node manager (`DisposeMachineryResourcesAsync` for a custom DI manager); `NodeId`/`LocalizedText` use their null sentinels instead of `Nullable<T>`. - Own review with the rubric in `.github/copilot-instructions.md`: a failed browse call propagates from the client instead of reading as "no children"; the predefined result metadata compares `CreationTime` against the `DateTimeUtc` sentinels (the `DateTime` conversion shifted `DateTime.MaxValue` by the host's UTC offset); process values below `Monitoring` are found; a second metering point named `Main` is rejected; the zero-point event is reported when the handler throws; smaller state-sharing and documentation corrections. ## Testing - `tests/Opc.Ua.Machinery.Tests`: 162 tests on net8 and net10 and with the netstandard2.1 libraries; the integration tests connect a real client session over `opc.tcp` to a hosted server. - With IA extracted: Robotics 636, OpenUsd 921, DI 433 and SourceGeneration 263 tests pass. - `UA.slnx` builds for net472, net48, netstandard2.0/2.1 and net8/9/10 with SDK 10.0.401 and no warnings. - Changed-line coverage of this layer (`check-coverage.ps1`): 91.68 % (6059 of 6609 changed lines, against `master`). - Fork CI, full PR matrix incl. macOS, on the current master: green, all 184 jobs ([run 36582685653](https://github.com/biancode/UA-.NETStandard/actions/runs/36582685653)). CodeQL: green ([run 36582689589](https://github.com/biancode/UA-.NETStandard/actions/runs/36582689589)). - Beyond the in-repo tests the implementation has been validated end to end against a separate, non-public OPC UA client and server. ## Reviewing Commits are ordered so each builds: IA extraction → identifier-table tool → ECM/PA-DIM → Machinery models → server → client → tests → docs/samples → GeneratorServer sample → review follow-ups. The model commits are large only because of the NodeSets and identifier tables; the hand-written code starts at the server commit. --------- Co-authored-by: Marc Schier <marcschier@users.noreply.github.com>
319 lines
13 KiB
C#
319 lines
13 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.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Moq;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.Machinery.Tests
|
|
{
|
|
/// <summary>
|
|
/// Builds a Moq-backed <see cref="ISession"/> that dispatches browse,
|
|
/// read, browse-path translation and method calls straight into a
|
|
/// <see cref="MachineryServerFixture"/>'s in-process address space, so the
|
|
/// client surface can be exercised end to end without a TCP server.
|
|
/// </summary>
|
|
internal static class MachineryInProcessSessionBridge
|
|
{
|
|
public static Mock<ISession> Build(MachineryServerFixture fixture)
|
|
{
|
|
var mock = new Mock<ISession>();
|
|
NamespaceTable namespaceUris = fixture.Manager.Server.NamespaceUris;
|
|
mock.SetupGet(session => session.NamespaceUris).Returns(namespaceUris);
|
|
|
|
ServiceMessageContext context = ServiceMessageContext.Create(
|
|
NUnitTelemetryContext.Create());
|
|
context.NamespaceUris = namespaceUris;
|
|
mock.SetupGet(session => session.MessageContext).Returns(context);
|
|
|
|
// Browser (used by MachineryClient's own browse helper, and by
|
|
// BrowseNext-aware fixes to it) reads these three properties the
|
|
// moment a Browser is attached to a session, regardless of
|
|
// whether pagination is ever exercised. ISession declares
|
|
// OperationLimits and ServerCapabilities non-nullable, so a real
|
|
// session always has them; this bridge must too.
|
|
// Type checks go through the node cache; answer them from the
|
|
// server's own type tree.
|
|
TypeTable typeTree = fixture.Manager.Server.TypeTree;
|
|
var nodeCache = new Mock<INodeCache>();
|
|
nodeCache
|
|
.Setup(cache => cache.IsTypeOfAsync(
|
|
It.IsAny<NodeId>(),
|
|
It.IsAny<NodeId>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.Returns((NodeId subType, NodeId superType, CancellationToken _) =>
|
|
new ValueTask<bool>(typeTree.IsTypeOf(subType, superType)));
|
|
mock.SetupGet(session => session.NodeCache).Returns(nodeCache.Object);
|
|
|
|
mock.SetupGet(session => session.OperationLimits).Returns(new OperationLimits());
|
|
mock.SetupGet(session => session.ServerCapabilities).Returns(new ServerCapabilities());
|
|
mock.SetupGet(session => session.ContinuationPointPolicy)
|
|
.Returns(ContinuationPointPolicy.Default);
|
|
|
|
mock.Setup(session => session.TranslateBrowsePathsToNodeIdsAsync(
|
|
It.IsAny<RequestHeader?>(),
|
|
It.IsAny<ArrayOf<BrowsePath>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync((RequestHeader? _, ArrayOf<BrowsePath> paths, CancellationToken _) =>
|
|
{
|
|
var results = new BrowsePathResult[paths.Count];
|
|
for (int ii = 0; ii < paths.Count; ii++)
|
|
{
|
|
results[ii] = ResolveBrowsePath(fixture, paths[ii]);
|
|
}
|
|
return new TranslateBrowsePathsToNodeIdsResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = ArrayOf.Wrapped(results),
|
|
DiagnosticInfos = default
|
|
};
|
|
});
|
|
|
|
mock.Setup(session => session.ReadAsync(
|
|
It.IsAny<RequestHeader?>(),
|
|
It.IsAny<double>(),
|
|
It.IsAny<TimestampsToReturn>(),
|
|
It.IsAny<ArrayOf<ReadValueId>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync((
|
|
RequestHeader? _,
|
|
double _,
|
|
TimestampsToReturn _,
|
|
ArrayOf<ReadValueId> nodesToRead,
|
|
CancellationToken _) =>
|
|
{
|
|
var results = new DataValue[nodesToRead.Count];
|
|
for (int ii = 0; ii < nodesToRead.Count; ii++)
|
|
{
|
|
results[ii] = ReadValue(fixture, nodesToRead[ii]);
|
|
}
|
|
return new ReadResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = ArrayOf.Wrapped(results),
|
|
DiagnosticInfos = default
|
|
};
|
|
});
|
|
|
|
mock.Setup(session => session.BrowseAsync(
|
|
It.IsAny<RequestHeader?>(),
|
|
It.IsAny<ViewDescription?>(),
|
|
It.IsAny<uint>(),
|
|
It.IsAny<ArrayOf<BrowseDescription>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync((
|
|
RequestHeader? _,
|
|
ViewDescription? _,
|
|
uint _,
|
|
ArrayOf<BrowseDescription> nodesToBrowse,
|
|
CancellationToken _) =>
|
|
{
|
|
var results = new BrowseResult[nodesToBrowse.Count];
|
|
for (int ii = 0; ii < nodesToBrowse.Count; ii++)
|
|
{
|
|
results[ii] = Browse(fixture, nodesToBrowse[ii]);
|
|
}
|
|
return new BrowseResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = ArrayOf.Wrapped(results),
|
|
DiagnosticInfos = default
|
|
};
|
|
});
|
|
|
|
mock.Setup(session => session.CallAsync(
|
|
It.IsAny<RequestHeader?>(),
|
|
It.IsAny<ArrayOf<CallMethodRequest>>(),
|
|
It.IsAny<CancellationToken>()))
|
|
.ReturnsAsync((
|
|
RequestHeader? _,
|
|
ArrayOf<CallMethodRequest> calls,
|
|
CancellationToken _) =>
|
|
{
|
|
var results = new CallMethodResult[calls.Count];
|
|
for (int ii = 0; ii < calls.Count; ii++)
|
|
{
|
|
results[ii] = InvokeCall(fixture, calls[ii]);
|
|
}
|
|
return new CallResponse
|
|
{
|
|
ResponseHeader = new ResponseHeader(),
|
|
Results = ArrayOf.Wrapped(results),
|
|
DiagnosticInfos = default
|
|
};
|
|
});
|
|
|
|
return mock;
|
|
}
|
|
|
|
private static BrowsePathResult ResolveBrowsePath(
|
|
MachineryServerFixture fixture,
|
|
BrowsePath path)
|
|
{
|
|
NodeState? current = fixture.Manager.FindPredefinedNode(path.StartingNode);
|
|
if (current is null)
|
|
{
|
|
return new BrowsePathResult
|
|
{
|
|
StatusCode = StatusCodes.BadNodeIdUnknown,
|
|
Targets = []
|
|
};
|
|
}
|
|
foreach (RelativePathElement element in path.RelativePath.Elements)
|
|
{
|
|
NodeState? next = current.FindChild(
|
|
fixture.Manager.SystemContext,
|
|
element.TargetName);
|
|
if (next is null)
|
|
{
|
|
return new BrowsePathResult
|
|
{
|
|
StatusCode = StatusCodes.BadNoMatch,
|
|
Targets = []
|
|
};
|
|
}
|
|
current = next;
|
|
}
|
|
return new BrowsePathResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
Targets = ArrayOf.Wrapped(
|
|
[
|
|
new BrowsePathTarget
|
|
{
|
|
TargetId = (ExpandedNodeId)current.NodeId,
|
|
RemainingPathIndex = uint.MaxValue
|
|
}
|
|
])
|
|
};
|
|
}
|
|
|
|
private static DataValue ReadValue(
|
|
MachineryServerFixture fixture,
|
|
ReadValueId nodeToRead)
|
|
{
|
|
NodeState? node = fixture.Manager.FindPredefinedNode(nodeToRead.NodeId);
|
|
return node is BaseVariableState variable
|
|
? new DataValue(variable.WrappedValue, StatusCodes.Good)
|
|
: DataValue.FromStatusCode(StatusCodes.BadNodeIdUnknown);
|
|
}
|
|
|
|
private static BrowseResult Browse(
|
|
MachineryServerFixture fixture,
|
|
BrowseDescription description)
|
|
{
|
|
NodeState? node = fixture.Manager.FindPredefinedNode(description.NodeId);
|
|
if (node is null)
|
|
{
|
|
return new BrowseResult
|
|
{
|
|
StatusCode = StatusCodes.BadNodeIdUnknown,
|
|
References = []
|
|
};
|
|
}
|
|
|
|
var children = new List<BaseInstanceState>();
|
|
node.GetChildren(fixture.Manager.SystemContext, children);
|
|
var references = new List<ReferenceDescription>();
|
|
foreach (BaseInstanceState child in children)
|
|
{
|
|
if (description.NodeClassMask != 0 &&
|
|
(description.NodeClassMask & (uint)child.NodeClass) == 0)
|
|
{
|
|
continue;
|
|
}
|
|
references.Add(new ReferenceDescription
|
|
{
|
|
NodeId = (ExpandedNodeId)child.NodeId,
|
|
BrowseName = child.BrowseName,
|
|
DisplayName = child.DisplayName,
|
|
NodeClass = child.NodeClass,
|
|
ReferenceTypeId = child.ReferenceTypeId,
|
|
IsForward = true,
|
|
TypeDefinition = child is BaseObjectState objectState
|
|
? (ExpandedNodeId)objectState.TypeDefinitionId
|
|
: ExpandedNodeId.Null
|
|
});
|
|
}
|
|
|
|
return new BrowseResult
|
|
{
|
|
StatusCode = StatusCodes.Good,
|
|
References = ArrayOf.Wrapped(references.ToArray())
|
|
};
|
|
}
|
|
|
|
private static CallMethodResult InvokeCall(
|
|
MachineryServerFixture fixture,
|
|
CallMethodRequest call)
|
|
{
|
|
NodeState? node = fixture.Manager.FindPredefinedNode(call.MethodId);
|
|
if (node is not MethodState method)
|
|
{
|
|
return new CallMethodResult
|
|
{
|
|
StatusCode = StatusCodes.BadMethodInvalid,
|
|
InputArgumentResults = [],
|
|
InputArgumentDiagnosticInfos = default,
|
|
OutputArguments = []
|
|
};
|
|
}
|
|
|
|
var outputs = new List<Variant>();
|
|
var argumentErrors = new List<ServiceResult>();
|
|
ServiceResult status = method
|
|
.CallAsync(
|
|
fixture.Manager.SystemContext,
|
|
call.ObjectId,
|
|
call.InputArguments,
|
|
argumentErrors,
|
|
outputs)
|
|
.AsTask()
|
|
.GetAwaiter()
|
|
.GetResult();
|
|
|
|
var inputResults = new StatusCode[argumentErrors.Count];
|
|
for (int ii = 0; ii < argumentErrors.Count; ii++)
|
|
{
|
|
inputResults[ii] = argumentErrors[ii].StatusCode;
|
|
}
|
|
return new CallMethodResult
|
|
{
|
|
StatusCode = status.StatusCode,
|
|
InputArgumentResults = ArrayOf.Wrapped(inputResults),
|
|
InputArgumentDiagnosticInfos = default,
|
|
OutputArguments = ArrayOf.Wrapped(outputs.ToArray())
|
|
};
|
|
}
|
|
}
|
|
}
|