mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-29 15:11:53 +08:00
# 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.
264 lines
13 KiB
C#
264 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;
|
|
using System.Collections.Generic;
|
|
using System.Globalization;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Xml.Linq;
|
|
using NUnit.Framework;
|
|
|
|
namespace Opc.Ua.GMS.Tests
|
|
{
|
|
/// <summary>
|
|
/// Compares generated public model behavior to the independently pinned normative XML.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("GMS")]
|
|
public sealed class ModelDeclarationTests
|
|
{
|
|
/// <summary>
|
|
/// All 273 canonical declarations retain their identity, class and exact browse-name namespace.
|
|
/// </summary>
|
|
[TestCase(false)]
|
|
[TestCase(true)]
|
|
public void LoaderPreservesEveryCanonicalIdentityAndQualifiedBrowseName(bool reverseNamespaces)
|
|
{
|
|
SystemContext context = ModelTestContext.CreateSystemContext(reverseNamespaces: reverseNamespaces);
|
|
Dictionary<NodeId, NodeState> nodes = LoadNodes(context);
|
|
XElement root = ReadModel();
|
|
string[] namespaces = ReadNamespaces(root);
|
|
XElement[] declarations = [.. root.Elements().Where(node => node.Attribute("NodeId") != null)];
|
|
NodeId[] expectedIds =
|
|
[
|
|
.. declarations.Select(node => Resolve((string)node.Attribute("NodeId")!, namespaces, context))
|
|
];
|
|
NodeId[] numericIds =
|
|
[
|
|
.. nodes.Keys.Where(id => id.NamespaceIndex == context.NamespaceUris.GetIndex(GmsModel.NamespaceUri) &&
|
|
id.TryGetValue(out uint _))
|
|
];
|
|
Assert.That(numericIds, Is.EquivalentTo(expectedIds));
|
|
Assert.That(numericIds, Has.Length.EqualTo(273));
|
|
|
|
foreach (XElement declaration in declarations)
|
|
{
|
|
NodeId id = Resolve((string)declaration.Attribute("NodeId")!, namespaces, context);
|
|
NodeState node = nodes[id];
|
|
QualifiedName browseName = ResolveBrowseName(
|
|
(string)declaration.Attribute("BrowseName")!, namespaces, context);
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(node.NodeClass.ToString(), Is.EqualTo(declaration.Name.LocalName[2..]),
|
|
$"NodeClass of {id}");
|
|
Assert.That(node.BrowseName, Is.EqualTo(browseName), $"BrowseName of {id}");
|
|
});
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Browsing every declaration preserves each published reference, including direction and external targets.
|
|
/// </summary>
|
|
[TestCase(false)]
|
|
[TestCase(true)]
|
|
public void LoaderPreservesAllCanonicalReferences(bool reverseNamespaces)
|
|
{
|
|
SystemContext context = ModelTestContext.CreateSystemContext(reverseNamespaces: reverseNamespaces);
|
|
Dictionary<NodeId, NodeState> nodes = LoadNodes(context);
|
|
XElement root = ReadModel();
|
|
string[] namespaces = ReadNamespaces(root);
|
|
Dictionary<string, string> aliases = root.Element(s_ns + "Aliases")!.Elements()
|
|
.ToDictionary(alias => (string)alias.Attribute("Alias")!, alias => alias.Value);
|
|
var missing = new List<string>();
|
|
|
|
foreach (XElement declaration in root.Elements().Where(node => node.Attribute("NodeId") != null))
|
|
{
|
|
NodeId id = Resolve((string)declaration.Attribute("NodeId")!, namespaces, context);
|
|
Assert.That(nodes.TryGetValue(id, out NodeState? node), Is.True, $"Missing declaration {id}");
|
|
using INodeBrowser browser = node!.CreateBrowser(
|
|
context, null, NodeId.Null, false, BrowseDirection.Both, QualifiedName.Null, null, true);
|
|
var actual = new HashSet<(NodeId ReferenceType, bool Inverse, NodeId Target)>();
|
|
for (IReference? reference = browser.Next(); reference != null; reference = browser.Next())
|
|
{
|
|
actual.Add((reference.ReferenceTypeId, reference.IsInverse,
|
|
ExpandedNodeId.ToNodeId(reference.TargetId, context.NamespaceUris)));
|
|
}
|
|
foreach (XElement reference in declaration.Element(s_ns + "References")!.Elements())
|
|
{
|
|
string referenceType = (string)reference.Attribute("ReferenceType")!;
|
|
NodeId typeId = Resolve(aliases.TryGetValue(referenceType, out string? alias)
|
|
? alias : referenceType, namespaces, context);
|
|
NodeId target = Resolve(reference.Value, namespaces, context);
|
|
bool inverse = (string?)reference.Attribute("IsForward") == "false";
|
|
if (!actual.Contains((typeId, inverse, target)))
|
|
{
|
|
missing.Add($"{id}: {typeId} inverse={inverse} target={target}");
|
|
}
|
|
}
|
|
}
|
|
Assert.That(missing, Is.Empty, "All published references must be browseable without changing direction.");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Variable declarations keep their wire data type and rank, including abstract Number values.
|
|
/// </summary>
|
|
[Test]
|
|
public void LoaderPreservesAllVariableDataTypesAndRanks()
|
|
{
|
|
SystemContext context = ModelTestContext.CreateSystemContext(reverseNamespaces: true);
|
|
Dictionary<NodeId, NodeState> nodes = LoadNodes(context);
|
|
XElement root = ReadModel();
|
|
string[] namespaces = ReadNamespaces(root);
|
|
Dictionary<string, string> aliases = root.Element(s_ns + "Aliases")!.Elements()
|
|
.ToDictionary(alias => (string)alias.Attribute("Alias")!, alias => alias.Value);
|
|
|
|
foreach (XElement declaration in root.Elements().Where(node =>
|
|
node.Name == s_ns + "UAVariable" || node.Name == s_ns + "UAVariableType"))
|
|
{
|
|
NodeId id = Resolve((string)declaration.Attribute("NodeId")!, namespaces, context);
|
|
NodeState node = nodes[id];
|
|
string originalType = (string?)declaration.Attribute("DataType") ?? "i=24";
|
|
NodeId typeId = Resolve(aliases.TryGetValue(originalType, out string? alias)
|
|
? alias : originalType, namespaces, context);
|
|
(NodeId actualType, int actualRank) = node switch
|
|
{
|
|
BaseVariableState variable => (variable.DataType, variable.ValueRank),
|
|
BaseVariableTypeState variableType => (variableType.DataType, variableType.ValueRank),
|
|
_ => throw new InvalidOperationException($"Expected a variable at {id}.")
|
|
};
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(actualType, Is.EqualTo(typeId), $"DataType of {id}");
|
|
Assert.That(actualRank, Is.EqualTo((int?)declaration.Attribute("ValueRank") ?? ValueRanks.Scalar),
|
|
$"ValueRank of {id}");
|
|
});
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Redeclared GMS methods retain their original Machinery Result or core declaration identity.
|
|
/// </summary>
|
|
[TestCase(7001u, 7008u, "http://opcfoundation.org/UA/Machinery/Result/")]
|
|
[TestCase(7002u, 7005u, "http://opcfoundation.org/UA/Machinery/Result/")]
|
|
[TestCase(7003u, 7006u, "http://opcfoundation.org/UA/Machinery/Result/")]
|
|
[TestCase(7004u, 7007u, "http://opcfoundation.org/UA/Machinery/Result/")]
|
|
[TestCase(7005u, 15751u, "http://opcfoundation.org/UA/")]
|
|
[TestCase(7006u, 7001u, "http://opcfoundation.org/UA/Machinery/Result/")]
|
|
[TestCase(7007u, 15749u, "http://opcfoundation.org/UA/")]
|
|
public void MethodDeclarationsRetainInheritedIdentity(uint identifier, uint declarationId, string namespaceUri)
|
|
{
|
|
SystemContext context = ModelTestContext.CreateSystemContext(reverseNamespaces: true);
|
|
Dictionary<NodeId, NodeState> nodes = LoadNodes(context);
|
|
var method = (MethodState)nodes[NodeId.Create(identifier, GmsModel.NamespaceUri, context.NamespaceUris)];
|
|
Assert.That(method.MethodDeclarationId,
|
|
Is.EqualTo(NodeId.Create(declarationId, namespaceUri, context.NamespaceUris)));
|
|
}
|
|
|
|
/// <summary>
|
|
/// All seven methods preserve argument names, order, data types and ranks from the released NodeSet.
|
|
/// </summary>
|
|
[Test]
|
|
public void MethodArgumentsMatchTheReleasedContracts()
|
|
{
|
|
SystemContext context = ModelTestContext.CreateSystemContext(reverseNamespaces: true);
|
|
Dictionary<NodeId, NodeState> nodes = LoadNodes(context);
|
|
XElement root = ReadModel();
|
|
string[] namespaces = ReadNamespaces(root);
|
|
foreach (XElement declaration in root.Elements(s_ns + "UAVariable")
|
|
.Where(node => (string?)node.Attribute("DataType") == "Argument"))
|
|
{
|
|
NodeId id = Resolve((string)declaration.Attribute("NodeId")!, namespaces, context);
|
|
var property = (PropertyState<ArrayOf<Argument>>)nodes[id];
|
|
XElement[] expected = [.. declaration.Descendants(s_uax + "Argument")];
|
|
Assert.That(property.Value.Count, Is.EqualTo(expected.Length), $"Argument count of {id}");
|
|
for (int index = 0; index < expected.Length; index++)
|
|
{
|
|
XElement argument = expected[index];
|
|
Argument actual = property.Value[index];
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(actual.Name, Is.EqualTo(argument.Element(s_uax + "Name")!.Value),
|
|
$"Argument {index} name of {id}");
|
|
Assert.That(actual.DataType,
|
|
Is.EqualTo(Resolve(argument.Element(s_uax + "DataType")!
|
|
.Element(s_uax + "Identifier")!.Value, namespaces, context)),
|
|
$"Argument {index} data type of {id}");
|
|
Assert.That(actual.ValueRank,
|
|
Is.EqualTo((int)argument.Element(s_uax + "ValueRank")!),
|
|
$"Argument {index} rank of {id}");
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
private static Dictionary<NodeId, NodeState> LoadNodes(SystemContext context)
|
|
{
|
|
return ModelTestContext.IndexNodes(context, new NodeStateCollection().AddGmsTypeSystem(context));
|
|
}
|
|
|
|
private static XElement ReadModel()
|
|
{
|
|
return XDocument.Load(Path.Combine(
|
|
TestContext.CurrentContext.TestDirectory, "Model", "opc.ua.gms.nodeset2.xml")).Root!;
|
|
}
|
|
|
|
private static string[] ReadNamespaces(XElement root)
|
|
{
|
|
return
|
|
[
|
|
Opc.Ua.Namespaces.OpcUa,
|
|
.. root.Element(s_ns + "NamespaceUris")!.Elements().Select(uri => uri.Value)
|
|
];
|
|
}
|
|
|
|
private static NodeId Resolve(string value, string[] namespaces, SystemContext context)
|
|
{
|
|
var original = NodeId.Parse(value);
|
|
Assert.That(original.TryGetValue(out uint identifier), Is.True,
|
|
$"Expected a numeric publication id: {value}");
|
|
return NodeId.Create(identifier, namespaces[original.NamespaceIndex], context.NamespaceUris);
|
|
}
|
|
|
|
private static QualifiedName ResolveBrowseName(
|
|
string value,
|
|
string[] namespaces,
|
|
SystemContext context)
|
|
{
|
|
int colon = value.AsSpan().IndexOf(':');
|
|
int index = colon < 0 ? 0 : int.Parse(value[..colon], CultureInfo.InvariantCulture);
|
|
string name = colon < 0 ? value : value[(colon + 1)..];
|
|
return new QualifiedName(name, context.NamespaceUris.GetIndexOrAppend(namespaces[index]));
|
|
}
|
|
|
|
private static readonly XNamespace s_ns = "http://opcfoundation.org/UA/2011/03/UANodeSet.xsd";
|
|
private static readonly XNamespace s_uax = "http://opcfoundation.org/UA/2008/02/Types.xsd";
|
|
}
|
|
}
|