mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 08:41:51 +08:00
4756e7c245
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.
155 lines
8.3 KiB
Markdown
155 lines
8.3 KiB
Markdown
# PumpDeviceIntegrationServer
|
|
|
|
A self-contained, NativeAOT-friendly OPC UA server that demonstrates
|
|
the [OPC 40223 Pumps companion specification](https://reference.opcfoundation.org/specs/OPC-40223)
|
|
with a full live simulation **and** the
|
|
[OPC 10000-100 (Device Integration) software-update facet](https://reference.opcfoundation.org/specs/OPC-10000-100),
|
|
wired entirely through the fluent `INodeManagerBuilder` API and the
|
|
DI hosting integration.
|
|
|
|
The pump sample is the integration test for every fluent API extension
|
|
shipped under `Libraries/Opc.Ua.Server/Fluent/`. Each extension is
|
|
documented in
|
|
[Source-generated NodeManagers — Building richer node managers](../../Docs/SourceGeneratedNodeManagers.md#building-richer-node-managers--the-fluent-extension-surface).
|
|
|
|
## Running the sample
|
|
|
|
```pwsh
|
|
cd Applications/PumpDeviceIntegrationServer
|
|
dotnet run -c Release
|
|
```
|
|
|
|
The server listens on `opc.tcp://localhost:62542/PumpDeviceIntegrationServer`
|
|
by default. Override with `--port 62550`.
|
|
|
|
Sample console output:
|
|
|
|
```
|
|
info: Opc.Ua.Server.MasterNodeManager
|
|
MasterNodeManager.Startup - NodeManagers=3
|
|
info: Pumps.PumpNodeManager
|
|
Configuring PumpNodeManager fluent wiring...
|
|
info: Pumps.PumpNodeManager
|
|
PumpNodeManager: address space ready (10330 predefined nodes).
|
|
info: Opc.Ua.Server.StandardServer
|
|
OPC UA server listening at opc.tcp://localhost:62542/PumpDeviceIntegrationServer.
|
|
```
|
|
|
|
Browse to `Objects > DeviceSet > Pump #1` in any OPC UA client (e.g.
|
|
UaExpert) to explore the simulated pump. A second declarative pump,
|
|
`Pump #2`, sits alongside under the same `DeviceSet` parent — it
|
|
demonstrates the DI hosting `ConfigureDevicesFor` flow without the
|
|
hand-wired fluent simulation, and additionally exposes the OPC
|
|
10000-100 software-update facet (`Pump #2 > SoftwareUpdate`) backed
|
|
by an in-memory `ISoftwarePackageStore` seeded with two demo
|
|
firmware payloads.
|
|
|
|
## What the sample demonstrates
|
|
|
|
| Feature | Where |
|
|
|---------|-------|
|
|
| `AddOpcUa().AddServer(...).AddNodeManager<T>()` hosting | `Program.cs` |
|
|
| Multi-model composition (DI library + locally source-generated Machinery + Pumps) | `PumpNodeManager.cs` `LoadPredefinedNodesAsync` |
|
|
| Identification properties via `WithProperty(name, value)` | `PumpNodeManager.Configure.cs` `WithIdentification` |
|
|
| Optional-child materialisation via generator-emitted `AddXxx(context)` helpers (Operational / Measurements / Events / SupervisionProcessFluid / SupervisionPumpOperation / Maintenance) | `PumpNodeManager.cs` `MaterialisePumpOptionalChildren` |
|
|
| Engineering units / EURange via `WithEngineeringUnits` / `WithEURange` | `WithMeasurements` |
|
|
| Discrete `NumberOfStarts` counter wired via `Variable<uint>(...).OnRead(...)` | `WithMeasurements` |
|
|
| 250 ms simulation tick via `Simulation(...).OnTick(...)` | `Configure` → `AdvanceSimulation` |
|
|
| Limit alarm with thresholds and acknowledge handler via `CreateLimitAlarm(...).WithLimits(...)` | `WithSupervision` |
|
|
| Boolean supervision (TwoStateDiscreteState) → alarm activation via `.ActivatesAlarm(...)` | `WithSupervision` |
|
|
| Cross-namespace path resolution (Pump #1 in Pumps NS → Operational in Machinery NS → Measurements in Pumps NS, all in one unqualified browse path) | `Libraries/Opc.Ua.Server/Fluent/BrowsePathResolver.cs` |
|
|
| Cross-pump device-health simulation via `RegisterSupervisedDeviceHealth` + `WithDeviceHealth` | `PumpNodeManager.cs` + `Program.cs` (`Pump #2`) |
|
|
| DI declarative device + `WithIdentification` | `Program.cs` (`Pump #2`) |
|
|
| Software-update facet (`ISoftwarePackageStore` + `WithSoftwareUpdate`) | `Program.cs` (`Pump #2`), `SoftwarePackageSeeder.cs` |
|
|
|
|
## Architecture
|
|
|
|
```
|
|
PumpDeviceIntegrationServer/
|
|
├── Program.cs # AddOpcUa().AddServer(...).AddNodeManager<T>()
|
|
│ # + ConfigureDevicesFor declarative Pump #2 + SU
|
|
├── PumpNodeManager.cs # Hand-written FluentNodeManagerBase
|
|
│ # + LoadPredefinedNodesAsync (multi-model)
|
|
│ # + CreateAddressSpaceAsync (builder setup)
|
|
├── PumpNodeManager.Configure.cs # partial — fluent wiring + simulation tick
|
|
├── SoftwarePackageSeeder.cs # seeds demo firmware payloads
|
|
├── PumpDeviceIntegrationServer.csproj # ProjectReference to Opc.Ua.Di model lib
|
|
│ # AdditionalFiles for Machinery + Pumps
|
|
│ # NodeSet2 (consumed by source generator)
|
|
├── Model/
|
|
│ ├── Opc.Ua.Machinery.NodeSet2.xml # AdditionalFiles — build-time only
|
|
│ └── Opc.Ua.Pumps.NodeSet2.xml # AdditionalFiles — build-time only
|
|
└── Properties/AssemblyInfo.cs
|
|
```
|
|
|
|
The `Opc.Ua.Di` model library is consumed as a project reference (its
|
|
types live under the `Opc.Ua.Di` namespace and are source-generated
|
|
from the ModelDesign XML). Cross-namespace references from Machinery
|
|
and Pumps to DI types resolve through the
|
|
`[assembly: ModelDependencyAttribute]` carried in the `Opc.Ua.Di`
|
|
assembly — no DI NodeSet2 XML needed in this project. The unified
|
|
attribute carries the compact type-table payload that the consumer's
|
|
source generator imports at compile time; see
|
|
[ModelDependencies.md](../../Docs/ModelDependencies.md) for the wire
|
|
format and consumer-side flow.
|
|
|
|
The Machinery and Pumps NodeSet2 XMLs are **source-generated locally
|
|
inside this assembly** via the `<AdditionalFiles>` plumbing in the
|
|
`.csproj`. The generator emits typed `*State` classes, NodeId tables,
|
|
and the `AddOpcUaMachinery` / `AddOpcUaPumps` extension methods that
|
|
`LoadPredefinedNodesAsync` calls. No runtime XML loading happens — the
|
|
`Model/` folder is a build-time input only. Consumer assemblies that
|
|
want to reference Machinery or Pumps the same way they reference
|
|
`Opc.Ua.Di` should source-generate against the model XML inside their
|
|
own assembly using the same `<AdditionalFiles>` pattern.
|
|
|
|
## Extending the sample
|
|
|
|
- **Add a measurement**: open `PumpNodeManager.Configure.cs`, add a
|
|
call to `AddMeasurement(builder, browsePath, getter, units, min, max)`
|
|
inside `WithMeasurements`, then add a field + line to
|
|
`AdvanceSimulation` that updates the value each tick.
|
|
- **Add an alarm**: inside `WithSupervision`, chain another
|
|
`builder.Node("Pump #1/Events").CreateLimitAlarm(...).WithLimits(...)`
|
|
and wire the triggering boolean variable via `.ActivatesAlarm(...)`.
|
|
- **Add a second pump**: two patterns are demonstrated in the sample.
|
|
- **Hand-rolled** (used for `Pump #1`): in `PumpNodeManager.CreatePumpInstanceAsync`, call `context.CreateInstanceOfPumpType(deviceSet, browseName)`, attach it to the DI `DeviceSet`, and `AddPredefinedNodeAsync(pump)`. The fluent `Configure.cs` then wires its measurements, alarms, and simulation by browse path.
|
|
- **DI declarative** (used for `Pump #2`): in `Program.cs`, call `ctx.CreateDeviceAsync(new QualifiedName("Pump #N", ctx.Manager.DiNamespaceIndex))` from a `ConfigureDevicesFor<PumpNodeManager>` block, then call `pump.WithIdentification(...)` for the nameplate. This route exercises the `Opc.Ua.Di.Server` builder surface.
|
|
- **Swap the software-update store**: replace the singleton
|
|
`ISoftwarePackageStore` registration in `Program.cs` with a
|
|
`FileSystemPackageStore` over an `IFileSystemProvider` for
|
|
on-disk persistence:
|
|
|
|
```csharp
|
|
builder.Services.AddSingleton<ISoftwarePackageStore>(_ =>
|
|
{
|
|
var provider = new PhysicalFileSystemProvider(
|
|
rootDirectory: "/var/lib/sw-update",
|
|
mountName: "Packages",
|
|
isWritable: true);
|
|
return new FileSystemPackageStore(provider, rootPath: "/SoftwarePackages");
|
|
});
|
|
```
|
|
|
|
## NativeAOT publishing
|
|
|
|
```pwsh
|
|
cd Applications/PumpDeviceIntegrationServer
|
|
dotnet publish -c Release -r win-x64
|
|
```
|
|
|
|
The pump server publishes cleanly under NativeAOT — no trim or AOT
|
|
warnings — because every fluent extension is reflection-free and the
|
|
generated model factories are statically rooted.
|
|
|
|
## See also
|
|
|
|
- [`Docs/DeviceIntegration.md`](../../Docs/DeviceIntegration.md) —
|
|
full developer guide for the DI library trio (device builder,
|
|
hosting integration, lock service, software-update package store,
|
|
client helpers).
|
|
- [`Docs/SoftwareUpdate.md`](../../Docs/SoftwareUpdate.md) —
|
|
in-depth coverage of the software-update facet wiring, file-transfer
|
|
pipeline, and client `UploadPackageAsync`.
|
|
|