mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-29 07:07:24 +08:00
This PR implements the **OPC UA Device Integration (DI, OPC 10000-100)** companion-spec library trio (`Opc.Ua.Di` / `Opc.Ua.Di.Server` / `Opc.Ua.Di.Client`) plus a worked example (`Applications/MinimalPumpServer`) demonstrating the OPC 40223 Pumps companion specification end-to-end with full simulation. It also closes 11 fluent-API gaps in `Opc.Ua.Server.Fluent`, three source-generator bugs, integrates the DI layer into the unified `services.AddOpcUa()` Microsoft.Extensions DI hosting pattern, and adds 250+ new tests. **Worked example — `Applications/MinimalPumpServer/`** - AOT-compatible console host using `Host.CreateApplicationBuilder` + `AddOpcUa()`. - `PumpNodeManager` inherits from `DiNodeManager`; multi-namespace (DI + Machinery + Pumps) via runtime NodeSet2 loading and `ModelLoaderBuilder`. - Demonstrates declarative second-pump creation via `.ConfigureDevicesFor<PumpNodeManager>(...)` and software-package seeding from the same configurator. - Full simulation: pressure, temperatures, power, flow, efficiency, level, cavitation/overheat fault injection, alarm setup, NAMUR-style supervision. **Documentation** - `Docs/Opc.Ua.Di/` — README, DeviceBuilder, Hosting, LockService, SoftwareUpdate, ClientHelpers (6 new developer guides). - `Docs/Opc.Ua.Di/ComplianceMatrix.md` — every DI declaration mapped to In-v1 / Generated / Deferred / Excluded. - `Docs/CompanionSpecLibraries.md` — packaging guide for new companion-spec libraries. - `Docs/FluentApiGaps.md` — historical record of G1–G11. - `Docs/SourceGeneratedNodeManagers.md` updated for richer node managers. - `Docs/plans/StateMachineBuilder.md` — deferred state-machine builder design.
202 lines
7.9 KiB
C#
202 lines
7.9 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.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Di.Client;
|
|
using Opc.Ua.Di.Client.Hosting;
|
|
|
|
namespace Opc.Ua.Di.Tests
|
|
{
|
|
/// <summary>
|
|
/// Direct unit tests for
|
|
/// <see cref="OpcUaClientDiBuilderExtensions"/> — verifies the four
|
|
/// factory registrations and the AddClient() prerequisite check.
|
|
/// Resolution is performed against a built ServiceProvider but no
|
|
/// real session is opened: the factories are returned as
|
|
/// delegate-typed singletons.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("DI")]
|
|
[Category("Hosting")]
|
|
public sealed class OpcUaClientDiBuilderExtensionsTests
|
|
{
|
|
[Test]
|
|
public void AddOpcUaDiThrowsOnNullBuilder()
|
|
{
|
|
ArgumentNullException ex = Assert.Throws<ArgumentNullException>(
|
|
() => OpcUaClientDiBuilderExtensions.AddOpcUaDi(builder: null!))!;
|
|
Assert.That(ex.ParamName, Is.EqualTo("builder"));
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDiRegistersDiDiscoveryService()
|
|
{
|
|
ServiceProvider provider = BuildClientProvider();
|
|
var service = provider.GetService<IDiDiscoveryService>();
|
|
|
|
Assert.That(service, Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDiRegistersDiDeviceClientFactory()
|
|
{
|
|
ServiceProvider provider = BuildClientProvider();
|
|
var factory = provider.GetService<
|
|
Func<NodeId, CancellationToken, ValueTask<DiDeviceClient>>>();
|
|
|
|
Assert.That(factory, Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDiRegistersDiLockClientFactory()
|
|
{
|
|
ServiceProvider provider = BuildClientProvider();
|
|
var factory = provider.GetService<
|
|
Func<NodeId, CancellationToken, ValueTask<DiLockClient>>>();
|
|
|
|
Assert.That(factory, Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDiRegistersDiTopologyClientFactory()
|
|
{
|
|
ServiceProvider provider = BuildClientProvider();
|
|
var factory = provider.GetService<
|
|
Func<CancellationToken, ValueTask<DiTopologyClient>>>();
|
|
|
|
Assert.That(factory, Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDiRegistersSoftwareUpdateClientFactory()
|
|
{
|
|
ServiceProvider provider = BuildClientProvider();
|
|
var factory = provider.GetService<
|
|
Func<NodeId, CancellationToken, ValueTask<SoftwareUpdateClient>>>();
|
|
|
|
Assert.That(factory, Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void ResolvingDiDiscoveryServiceWithoutAddClientThrows()
|
|
{
|
|
// Skip AddClient() — the IDiDiscoveryService factory must
|
|
// throw InvalidOperationException pointing the user at the
|
|
// missing AddClient() call.
|
|
IServiceCollection services = new ServiceCollection();
|
|
services.AddOpcUa();
|
|
var clientBuilder = new StubClientBuilder(services);
|
|
clientBuilder.AddOpcUaDi();
|
|
|
|
ServiceProvider provider = services.BuildServiceProvider();
|
|
|
|
InvalidOperationException ex = Assert.Throws<InvalidOperationException>(
|
|
() => provider.GetService<IDiDiscoveryService>())!;
|
|
Assert.That(ex.Message, Does.Contain("AddClient"));
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDiCalledTwiceDoesNotDuplicateRegistrations()
|
|
{
|
|
// TryAddSingleton semantics: second AddOpcUaDi() should
|
|
// silently no-op for each of the four factory types.
|
|
IServiceCollection services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddClient(o => { });
|
|
var clientBuilder = new StubClientBuilder(services);
|
|
|
|
clientBuilder.AddOpcUaDi();
|
|
clientBuilder.AddOpcUaDi();
|
|
|
|
int discoveryCount = services.Count(
|
|
d => d.ServiceType == typeof(IDiDiscoveryService));
|
|
int deviceFactoryCount = services.Count(
|
|
d => d.ServiceType ==
|
|
typeof(Func<NodeId, CancellationToken, ValueTask<DiDeviceClient>>));
|
|
int lockFactoryCount = services.Count(
|
|
d => d.ServiceType ==
|
|
typeof(Func<NodeId, CancellationToken, ValueTask<DiLockClient>>));
|
|
int topologyFactoryCount = services.Count(
|
|
d => d.ServiceType ==
|
|
typeof(Func<CancellationToken, ValueTask<DiTopologyClient>>));
|
|
int softwareUpdateFactoryCount = services.Count(
|
|
d => d.ServiceType ==
|
|
typeof(Func<NodeId, CancellationToken, ValueTask<SoftwareUpdateClient>>));
|
|
|
|
Assert.That(discoveryCount, Is.EqualTo(1));
|
|
Assert.That(deviceFactoryCount, Is.EqualTo(1));
|
|
Assert.That(lockFactoryCount, Is.EqualTo(1));
|
|
Assert.That(topologyFactoryCount, Is.EqualTo(1));
|
|
Assert.That(softwareUpdateFactoryCount, Is.EqualTo(1));
|
|
}
|
|
|
|
// ---------------------------------------------------------------
|
|
// Test helpers
|
|
// ---------------------------------------------------------------
|
|
|
|
/// <summary>
|
|
/// Builds a ServiceProvider with the standard AddClient +
|
|
/// AddOpcUaDi pipeline. The action-overload of AddClient does
|
|
/// not require a non-null Configuration / Endpoint to register
|
|
/// the core services consumed by the DI factories
|
|
/// (ITelemetryContext and the managed-session accessor).
|
|
/// </summary>
|
|
private static ServiceProvider BuildClientProvider()
|
|
{
|
|
IServiceCollection services = new ServiceCollection();
|
|
services.AddOpcUa()
|
|
.AddClient(o => { });
|
|
var clientBuilder = new StubClientBuilder(services);
|
|
clientBuilder.AddOpcUaDi();
|
|
return services.BuildServiceProvider();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Minimal <see cref="IOpcUaClientBuilder"/> implementation used
|
|
/// for tests — the concrete builder returned by
|
|
/// <c>AddClient(...)</c> is internal to the client assembly.
|
|
/// </summary>
|
|
private sealed class StubClientBuilder : IOpcUaClientBuilder
|
|
{
|
|
public StubClientBuilder(IServiceCollection services)
|
|
{
|
|
Services = services;
|
|
}
|
|
|
|
public IServiceCollection Services { get; }
|
|
}
|
|
}
|
|
}
|