8d92e00e38
The driver-layer integration tests confirm the driver sees the PLC, and
the Client.CLI tests confirm the client sees the server. Nothing glued
them end-to-end until this PR.
- scripts/e2e/_common.ps1: shared helpers — CLI invocation (published-
binary OR `dotnet run` fallback), Test-Probe / Test-DriverLoopback /
Test-ServerBridge (all return @{Passed;Reason} hashtables).
- scripts/e2e/test-<modbus|abcip|ablegacy|s7|focas|twincat>.ps1: per-
driver three-stage script (probe → driver-loopback → server-bridge).
AB Legacy / FOCAS / TwinCAT are gated behind *_TRUST_WIRE env vars
since they need real hardware (#222) or a licensed runtime (#221).
- scripts/e2e/test-phase7-virtualtags.ps1: writes a Modbus HR, reads
the server-side VirtualTag (VT = input * 2) back via OPC UA, triggers
+ clears a scripted alarm. Exercises the Phase 7 CachedTagUpstreamSource
+ ScriptedAlarmEngine path.
- scripts/e2e/test-all.ps1: reads e2e-config.json sidecar, runs each
present driver, prints a FINAL MATRIX (PASS/FAIL/SKIP). Missing
sections SKIP rather than fail hard.
- scripts/e2e/e2e-config.sample.json: commented sample — each dev's
NodeIds are local-seed-specific so e2e-config.json is .gitignore-d.
- scripts/e2e/README.md: full walkthrough — prereqs, three-stage design,
env-var gates, expected matrix, why this is separate from `dotnet test`.
Tasks #249-#251 shipped Modbus/AbCip/AbLegacy/S7/TwinCAT CLIs but left
FOCAS out. Since test-focas.ps1 needs it, the 6th CLI ships here:
- src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli: probe/read/write/subscribe
commands, AssemblyName `otopcua-focas-cli`. WriteCommand.ParseValue
handles the full FocasDataType enum (Bit/Byte/Int16/Int32/Float32/
Float64/String — no UInt variants; the FOCAS protocol exposes signed
PMC + Fanuc-Float only). Default DataType is Int16 to match the PMC
register convention.
Full-solution build clean (0 errors). FOCAS CLI wired into
ZB.MOM.WW.OtOpcUa.slnx. No .Tests project for the FOCAS CLI yet —
symmetric with how ProbeCommand has no unit-testable pure logic in the
other 5 CLIs either; WriteCommand.ParseValue parity will land in a
follow-up to keep this PR scoped.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
75 lines
2.6 KiB
PowerShell
75 lines
2.6 KiB
PowerShell
#Requires -Version 7.0
|
|
<#
|
|
.SYNOPSIS
|
|
End-to-end CLI test for the Modbus-TCP driver bridged through the OtOpcUa server.
|
|
|
|
.DESCRIPTION
|
|
Three assertions:
|
|
1. `otopcua-modbus-cli probe` hits the simulator
|
|
2. Driver-loopback write + read-back via modbus-cli
|
|
3. Bridge: modbus-cli writes HR[100], OPC UA client reads the bridged NodeId
|
|
|
|
Requires a running Modbus simulator on localhost:5502 (the pymodbus fixture
|
|
default per docs/drivers/Modbus-Test-Fixture.md) and a running OtOpcUa server
|
|
whose config DB has a Modbus DriverInstance bound to that simulator + a Tag
|
|
at HR[100] Int16 published under the NodeId passed via -BridgeNodeId.
|
|
|
|
.PARAMETER ModbusHost
|
|
Host:port of the Modbus simulator. Default 127.0.0.1:5502.
|
|
|
|
.PARAMETER OpcUaUrl
|
|
Endpoint URL of the OtOpcUa server. Default opc.tcp://localhost:4840.
|
|
|
|
.PARAMETER BridgeNodeId
|
|
OPC UA NodeId the OtOpcUa server publishes the HR[100] tag at. Set per your
|
|
server config — e.g. 'ns=2;s=/warsaw/modbus-sim/HR_100'. Required.
|
|
|
|
.EXAMPLE
|
|
.\test-modbus.ps1 -BridgeNodeId "ns=2;s=/warsaw/modbus-sim/HR_100"
|
|
#>
|
|
|
|
param(
|
|
[string]$ModbusHost = "127.0.0.1:5502",
|
|
[string]$OpcUaUrl = "opc.tcp://localhost:4840",
|
|
[Parameter(Mandatory)] [string]$BridgeNodeId
|
|
)
|
|
|
|
$ErrorActionPreference = "Stop"
|
|
. "$PSScriptRoot/_common.ps1"
|
|
|
|
$hostPart, $portPart = $ModbusHost.Split(":")
|
|
$port = [int]$portPart
|
|
|
|
$modbusCli = Get-CliInvocation `
|
|
-ProjectFolder "src/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli" `
|
|
-ExeName "otopcua-modbus-cli"
|
|
$opcUaCli = Get-CliInvocation `
|
|
-ProjectFolder "src/ZB.MOM.WW.OtOpcUa.Client.CLI" `
|
|
-ExeName "otopcua-cli"
|
|
|
|
$commonModbus = @("-h", $hostPart, "-p", $port)
|
|
$results = @()
|
|
|
|
$results += Test-Probe `
|
|
-Cli $modbusCli `
|
|
-ProbeArgs (@("probe") + $commonModbus)
|
|
|
|
$writeValue = Get-Random -Minimum 1 -Maximum 9999
|
|
$results += Test-DriverLoopback `
|
|
-Cli $modbusCli `
|
|
-WriteArgs (@("write") + $commonModbus + @("-r", "HoldingRegisters", "-a", "100", "-t", "UInt16", "-v", $writeValue)) `
|
|
-ReadArgs (@("read") + $commonModbus + @("-r", "HoldingRegisters", "-a", "100", "-t", "UInt16")) `
|
|
-ExpectedValue "$writeValue"
|
|
|
|
$bridgeValue = Get-Random -Minimum 10000 -Maximum 19999
|
|
$results += Test-ServerBridge `
|
|
-DriverCli $modbusCli `
|
|
-DriverWriteArgs (@("write") + $commonModbus + @("-r", "HoldingRegisters", "-a", "100", "-t", "UInt16", "-v", $bridgeValue)) `
|
|
-OpcUaCli $opcUaCli `
|
|
-OpcUaUrl $OpcUaUrl `
|
|
-OpcUaNodeId $BridgeNodeId `
|
|
-ExpectedValue "$bridgeValue"
|
|
|
|
Write-Summary -Title "Modbus e2e" -Results $results
|
|
if ($results | Where-Object { -not $_.Passed }) { exit 1 }
|