mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 07:02:16 +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.
241 lines
12 KiB
C#
241 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;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Client.TestFramework;
|
|
using Opc.Ua.MachineTool.Client;
|
|
using Opc.Ua.MachineTool.Server;
|
|
using Opc.Ua.Tests;
|
|
|
|
namespace Opc.Ua.MachineTool.Tests
|
|
{
|
|
/// <summary>
|
|
/// Reads retained OPC 40501-1 section 8.4 state and inventory through the typed client and real services.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[NonParallelizable]
|
|
[Category("MachineTool")]
|
|
[Category("Integration")]
|
|
public sealed class MachineToolProductionClientTests
|
|
{
|
|
/// <summary>
|
|
/// Invalid aggregate bounds are rejected by the public options before any server operation.
|
|
/// </summary>
|
|
[TestCase(0)]
|
|
[TestCase(1)]
|
|
[TestCase(2)]
|
|
[TestCase(3)]
|
|
[TestCase(4)]
|
|
[TestCase(5)]
|
|
public void ProductionReadBoundsAreFiniteAndPositive(int scenario)
|
|
{
|
|
MachineToolProductionReadOptions options = scenario switch
|
|
{
|
|
0 => new() { MaximumElements = 0 },
|
|
1 => new() { MaximumElements = 65537 },
|
|
2 => new() { MaximumReferences = 0 },
|
|
3 => new() { MaximumReferences = 100001 },
|
|
4 => new() { MaximumPayloadBytes = 0 },
|
|
_ => new() { MaximumPayloadBytes = (1024 * 1024) + 1 }
|
|
};
|
|
|
|
Assert.That(options.Validate, Throws.TypeOf<ArgumentOutOfRangeException>());
|
|
}
|
|
|
|
/// <summary>
|
|
/// Optional absence is preserved, but access denial or a payload limit is never an empty Good result.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task MandatoryProductionPreservesOptionalAbsenceAndReadFailuresAsync()
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
var sample = new MachineToolSampleInfo(
|
|
new DateTime(2026, 8, 9, 10, 11, 12, DateTimeKind.Utc), StatusCodes.UncertainLastUsableValue);
|
|
await using MachineToolRuntime<MachineToolState> runtime = await fixture.Context.AddMachineTool("NoPlan")
|
|
.WithProvider(new InMemoryMachineToolProvider(new MachineToolSnapshot
|
|
{
|
|
ActiveProgram = new MachineToolProgram { Name = "Selected", Sample = sample }
|
|
})).WithIdentification(identity =>
|
|
{
|
|
identity.Manufacturer = new LocalizedText("Production client");
|
|
identity.SerialNumber = "NoPlan";
|
|
identity.ProductInstanceUri = "urn:production-client:no-plan";
|
|
}).BuildAsync().ConfigureAwait(false);
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
await using var transport = new ClientFixture(telemetry);
|
|
await transport.LoadClientConfigurationAsync(fixture.Root, "ProductionAbsence").ConfigureAwait(false);
|
|
using ISession session = await transport.ConnectAsync(fixture.Endpoint, SecurityPolicies.None)
|
|
.ConfigureAwait(false);
|
|
await using MachineToolClient client = session.CreateMachineToolClient(telemetry);
|
|
MachineToolProductionReadSnapshot read = await client.ReadProductionAsync(runtime.NodeId)
|
|
.ConfigureAwait(false);
|
|
Assert.That(read.ProductionPlanId.IsNull, Is.True);
|
|
Assert.That(read.NodeVersion.IsNull, Is.True);
|
|
Assert.That(read.Jobs.Count, Is.Zero);
|
|
Assert.That(read.PartsProducedInLifetime.IsNull, Is.True);
|
|
Assert.That(read.ActiveProgram.Name.StatusCode, Is.EqualTo(sample.StatusCode));
|
|
Assert.That(read.ActiveProgram.Name.SourceTimestamp, Is.EqualTo(sample.SourceTimestamp));
|
|
ServiceResultException oversized = Assert.ThrowsAsync<ServiceResultException>(async () =>
|
|
await client.ReadProductionAsync(runtime.NodeId,
|
|
new MachineToolProductionReadOptions { MaximumPayloadBytes = 1 }).ConfigureAwait(false))!;
|
|
Assert.That(oversized.StatusCode, Is.EqualTo(StatusCodes.BadEncodingLimitsExceeded));
|
|
runtime.State.Production!.ActiveProgram!.Name!.UserAccessLevel = AccessLevels.None;
|
|
ServiceResultException denied = Assert.ThrowsAsync<ServiceResultException>(async () =>
|
|
await client.ReadProductionAsync(runtime.NodeId).ConfigureAwait(false))!;
|
|
Assert.That(denied.StatusCode, Is.EqualTo(StatusCodes.BadUserAccessDenied));
|
|
await session.CloseAsync(CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// The workflow exposes actual jobs, programs, part sets, parts and LastTransition without executing them.
|
|
/// </summary>
|
|
[Test]
|
|
public async Task ProductionReadPreservesRetainedInventoryHistoryAndSampleMetadataAsync()
|
|
{
|
|
await using var fixture = new MachineToolRuntimeFixture();
|
|
await fixture.StartAsync().ConfigureAwait(false);
|
|
var sample = new MachineToolSampleInfo(
|
|
new DateTime(2026, 8, 9, 10, 11, 12, DateTimeKind.Utc), StatusCodes.UncertainLastUsableValue);
|
|
var program = new MachineToolProgram
|
|
{
|
|
Name = "MAIN.NC",
|
|
JobIdentifier = "Order1",
|
|
Phase = MachineToolProductionPhase.Running,
|
|
Sample = sample
|
|
};
|
|
var part = new MachineToolProductionPart
|
|
{
|
|
Key = "Part1",
|
|
Name = "Housing",
|
|
Identifier = "H1",
|
|
Phase = MachineToolProductionPhase.Running,
|
|
Sample = sample
|
|
};
|
|
var set = new MachineToolProductionPartSet
|
|
{
|
|
Key = "Lot",
|
|
Name = "Housings",
|
|
PartsPlannedPerRun = 1,
|
|
Parts = [part],
|
|
Sample = sample
|
|
};
|
|
var job = new MachineToolProductionJob
|
|
{
|
|
Identifier = "Order1",
|
|
Programs = [program],
|
|
PartSets = [set],
|
|
Phase = MachineToolProductionPhase.Running,
|
|
RunsPlanned = 1,
|
|
RunsPlannedIsValid = true,
|
|
Sample = sample
|
|
};
|
|
var initial = new MachineToolSnapshot
|
|
{
|
|
ActiveProgram = program,
|
|
Production = new MachineToolProductionObservation { Jobs = [job] }
|
|
};
|
|
var provider = new InMemoryMachineToolProvider(initial);
|
|
await using MachineToolRuntime<MachineToolState> runtime = await fixture.Context.AddMachineTool("ReadPlan")
|
|
.WithProvider(provider).WithProduction(new MachineToolProductionOptions
|
|
{
|
|
Features = MachineToolFeatures.Production | MachineToolFeatures.ProductionParts
|
|
})
|
|
.WithIdentification(identity =>
|
|
{
|
|
identity.Manufacturer = new LocalizedText("Client tests");
|
|
identity.SerialNumber = "ReadPlan";
|
|
identity.ProductInstanceUri = "urn:production-client:plan";
|
|
}).BuildAsync().ConfigureAwait(false);
|
|
program = program with { Phase = MachineToolProductionPhase.Ended, TransitionSequence = 1 };
|
|
part = part with
|
|
{
|
|
Phase = MachineToolProductionPhase.Ended,
|
|
TransitionSequence = 1,
|
|
Quality = PartQuality.Good
|
|
};
|
|
set = set with { PartsCompletedPerRun = 1, Parts = [part] };
|
|
job = job with
|
|
{
|
|
Phase = MachineToolProductionPhase.Ended,
|
|
TransitionSequence = 1,
|
|
RunsCompleted = 1,
|
|
PartsCompleted = 1,
|
|
PartsGood = 1,
|
|
Programs = [program],
|
|
PartSets = [set]
|
|
};
|
|
await provider.SetSnapshotAsync(initial with
|
|
{
|
|
Revision = 1,
|
|
ActiveProgram = program,
|
|
Production = new MachineToolProductionObservation { Jobs = [job] }
|
|
}).ConfigureAwait(false);
|
|
await runtime.RefreshAsync().ConfigureAwait(false);
|
|
ITelemetryContext telemetry = NUnitTelemetryContext.Create();
|
|
await using var transport = new ClientFixture(telemetry);
|
|
await transport.LoadClientConfigurationAsync(fixture.Root, "ProductionRead").ConfigureAwait(false);
|
|
using ISession session = await transport.ConnectAsync(fixture.Endpoint, SecurityPolicies.None)
|
|
.ConfigureAwait(false);
|
|
await using MachineToolClient client = session.CreateMachineToolClient(telemetry);
|
|
|
|
MachineToolProductionReadSnapshot read = await client.ReadProductionAsync(runtime.NodeId)
|
|
.ConfigureAwait(false);
|
|
Assert.That(runtime.State.Production!.ProductionPlan!.ReferenceTypeId,
|
|
Is.EqualTo(ReferenceTypeIds.HasComponent),
|
|
"The actual retained plan must use the released aggregate reference, not just HasNotifier.");
|
|
Assert.That(read.ProductionPlanId.IsNull, Is.False, "The generated optional plan must resolve.");
|
|
|
|
Assert.That(read.Jobs.Count, Is.EqualTo(1));
|
|
Assert.That(read.Jobs[0].Programs.Count, Is.EqualTo(1));
|
|
Assert.That(read.Jobs[0].PartSets.Count, Is.EqualTo(1));
|
|
Assert.That(read.Jobs[0].PartSets[0].Parts.Count, Is.EqualTo(1));
|
|
Assert.That(read.ActiveProgram.Name.WrappedValue.TryGetValue(out string name), Is.True);
|
|
Assert.That(name, Is.EqualTo("MAIN.NC"));
|
|
Assert.That(read.Jobs[0].PartsGood.WrappedValue.TryGetValue(out uint good), Is.True);
|
|
Assert.That(good, Is.EqualTo(1));
|
|
Assert.That(read.Jobs[0].Identifier.SourceTimestamp, Is.EqualTo(sample.SourceTimestamp));
|
|
Assert.That(read.Jobs[0].Identifier.StatusCode, Is.EqualTo(sample.StatusCode));
|
|
Assert.That(read.Jobs[0].State.LastTransitionTime.WrappedValue.TryGetValue(out DateTimeUtc transition),
|
|
Is.True);
|
|
Assert.That(transition, Is.EqualTo(sample.SourceTimestamp));
|
|
Assert.That(read.PartsProducedInLifetime.IsNull, Is.True);
|
|
ServiceResultException limit = Assert.ThrowsAsync<ServiceResultException>(async () =>
|
|
await client.ReadProductionAsync(runtime.NodeId,
|
|
new MachineToolProductionReadOptions { MaximumElements = 1 }).ConfigureAwait(false))!;
|
|
Assert.That(limit.StatusCode, Is.EqualTo(StatusCodes.BadEncodingLimitsExceeded));
|
|
await session.CloseAsync(CancellationToken.None).ConfigureAwait(false);
|
|
}
|
|
}
|
|
}
|