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.
201 lines
9.5 KiB
C#
201 lines
9.5 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.IO;
|
|
using Opc.Ua;
|
|
using Opc.Ua.MachineTool;
|
|
|
|
namespace MachineToolSample.Server
|
|
{
|
|
/// <summary>
|
|
/// Selects the model closure, independent instances and explicit simulation permissions.
|
|
/// </summary>
|
|
internal sealed record ServerOptions
|
|
{
|
|
/// <summary>
|
|
/// Gets the selected namespace closure, without forcing a CNC into WMTP-only hosting.
|
|
/// </summary>
|
|
public MachineToolParts Parts { get; private init; } = MachineToolParts.MachineTool;
|
|
|
|
/// <summary>
|
|
/// Gets the loopback port; zero selects a currently available port.
|
|
/// </summary>
|
|
public int Port { get; private init; } = 62558;
|
|
|
|
/// <summary>
|
|
/// Gets the acquisition window after actual OPC UA startup.
|
|
/// </summary>
|
|
public int Seconds { get; private init; } = 60;
|
|
|
|
/// <summary>
|
|
/// Gets the independent instance count per selected family.
|
|
/// </summary>
|
|
public int Instances { get; private init; } = 1;
|
|
|
|
/// <summary>
|
|
/// Gets whether optional monitoring, jobs/files and peripheral features are selected.
|
|
/// </summary>
|
|
public bool Advanced { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets explicit server consent to accept simulated state-changing requests from local anonymous sessions.
|
|
/// </summary>
|
|
public bool AllowCommands { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets whether simulated peripheral providers refuse every state-changing request.
|
|
/// </summary>
|
|
public bool RefuseCommands { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the explicitly selected machine on which an operator simulation may execute the declared job.
|
|
/// </summary>
|
|
public string? SimulateJob { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets whether sensors retain their first acquisition so the real age policy becomes observable.
|
|
/// </summary>
|
|
public bool FreezeMeasurements { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the optional whole-application cancellation timer, including startup.
|
|
/// </summary>
|
|
public int? CancelAfterMilliseconds { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the explicit loopback-only certificate trust exception.
|
|
/// </summary>
|
|
public bool DemoTrust { get; private init; }
|
|
|
|
/// <summary>
|
|
/// Gets the application-owned certificate-store root.
|
|
/// </summary>
|
|
public string PkiRoot { get; private init; } = Path.Combine("artifacts", "machinetool-pki", "server");
|
|
|
|
/// <summary>
|
|
/// Validates all selections before opening a host, listener or certificate store.
|
|
/// </summary>
|
|
internal static ServerOptions Parse(ArrayOf<string> arguments)
|
|
{
|
|
var options = new ServerOptions();
|
|
for (int i = 0; i < arguments.Count; i++)
|
|
{
|
|
options = arguments[i] switch
|
|
{
|
|
"--mode" => options with { Parts = ReadParts(arguments, ref i) },
|
|
"--port" => options with { Port = SampleArguments.ReadInteger(arguments, ref i, 0, 65535) },
|
|
"--seconds" => options with { Seconds = SampleArguments.ReadInteger(arguments, ref i, 1, 600) },
|
|
"--instances" => options with { Instances = SampleArguments.ReadInteger(arguments, ref i, 1, 4) },
|
|
"--pki" => options with { PkiRoot = SampleArguments.ReadValue(arguments, ref i) },
|
|
"--advanced" => options with { Advanced = true },
|
|
"--allow-commands" => options with { AllowCommands = true },
|
|
"--refuse-commands" => options with { RefuseCommands = true },
|
|
"--simulate-job" => options with { SimulateJob = SampleArguments.ReadValue(arguments, ref i) },
|
|
"--freeze-measurements" => options with { FreezeMeasurements = true },
|
|
"--demo-trust" => options with { DemoTrust = true },
|
|
"--cancel-after-ms" => options with
|
|
{
|
|
CancelAfterMilliseconds = SampleArguments.ReadInteger(arguments, ref i, 1, 60000)
|
|
},
|
|
_ => throw new ArgumentException($"Unknown option '{arguments[i]}'.", nameof(arguments))
|
|
};
|
|
}
|
|
if (options.AllowCommands && (!options.Advanced || !options.DemoTrust))
|
|
{
|
|
throw new ArgumentException(
|
|
"--allow-commands requires --advanced and --demo-trust.", nameof(arguments));
|
|
}
|
|
if (options.RefuseCommands && !options.AllowCommands)
|
|
{
|
|
throw new ArgumentException("--refuse-commands requires --allow-commands.", nameof(arguments));
|
|
}
|
|
if (options.FreezeMeasurements &&
|
|
(!options.Advanced || (options.Parts & MachineToolParts.Wmtp) == 0))
|
|
{
|
|
throw new ArgumentException("--freeze-measurements requires advanced WMTP.", nameof(arguments));
|
|
}
|
|
if (options.SimulateJob != null)
|
|
{
|
|
bool selected = false;
|
|
for (int i = 1; i <= options.Instances; i++)
|
|
{
|
|
selected |= options.SimulateJob == FormattableString.Invariant($"Machine{i}");
|
|
}
|
|
if (!options.AllowCommands || (options.Parts & MachineToolParts.MachineTool) == 0 || !selected)
|
|
{
|
|
throw new ArgumentException(
|
|
"--simulate-job requires --allow-commands and an existing Machine1..Machine4 target.",
|
|
nameof(arguments));
|
|
}
|
|
}
|
|
return options;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Describes the selected simulation and its bounds.
|
|
/// </summary>
|
|
internal static void PrintHelp()
|
|
{
|
|
Console.WriteLine("""
|
|
MachineToolServer [--mode machine|wmtp|mixed] [--advanced] [--instances 1..4]
|
|
[--port 0..65535] [--seconds 1..600] [--pki directory]
|
|
[--demo-trust] [--allow-commands] [--refuse-commands]
|
|
[--simulate-job Machine1] [--freeze-measurements]
|
|
[--cancel-after-ms 1..60000]
|
|
Defaults: mandatory-only MachineTool, one instance, port 62558, 60 seconds.
|
|
Binds 127.0.0.1 only; READY follows actual OPC UA startup, not Generic Host startup.
|
|
--advanced selects monitoring/jobs/files and all eight WMTP sensor kinds/records.
|
|
--allow-commands requires --advanced --demo-trust; authorization otherwise denies changes.
|
|
--simulate-job explicitly models one operator's execution/part observations, never hardware.
|
|
Each peripheral accepts one configuration/calibration/time/transfer of each kind;
|
|
later requests of the same kind are refused.
|
|
--demo-trust accepts unknown certificates ONLY FOR LOCAL SIMULATION; encryption stays required.
|
|
File contents are application-owned, read-only, bounded and not executable CNC programs.
|
|
Ctrl+C or the optional cancellation timer joins acquisition and disposes resources.
|
|
PKI is retained for certificate administration; never share it between the applications.
|
|
""");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Maps the explicit hosting mode to the existing model selection.
|
|
/// </summary>
|
|
private static MachineToolParts ReadParts(ArrayOf<string> arguments, ref int index)
|
|
{
|
|
return SampleArguments.ReadValue(arguments, ref index) switch
|
|
{
|
|
"machine" => MachineToolParts.MachineTool,
|
|
"wmtp" => MachineToolParts.Wmtp,
|
|
"mixed" => MachineToolParts.All,
|
|
_ => throw new ArgumentException("--mode must be machine, wmtp or mixed.", nameof(arguments))
|
|
};
|
|
}
|
|
}
|
|
}
|