Group all 69 projects into category subfolders under src/ and tests/ so the Rider Solution Explorer mirrors the module structure. Folders: Core, Server, Drivers (with a nested Driver CLIs subfolder), Client, Tooling. - Move every project folder on disk with git mv (history preserved as renames). - Recompute relative paths in 57 .csproj files: cross-category ProjectReferences, the lib/ HintPath+None refs in Driver.Historian.Wonderware, and the external mxaccessgw refs in Driver.Galaxy and its test project. - Rebuild ZB.MOM.WW.OtOpcUa.slnx with nested solution folders. - Re-prefix project paths in functional scripts (e2e, compliance, smoke SQL, integration, install). Build green (0 errors); unit tests pass. Docs left for a separate pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
101 lines
3.2 KiB
PowerShell
101 lines
3.2 KiB
PowerShell
#Requires -Version 7.0
|
|
<#
|
|
.SYNOPSIS
|
|
End-to-end CLI test for the Siemens S7 driver bridged through the OtOpcUa server.
|
|
|
|
.DESCRIPTION
|
|
Five assertions (probe / driver-loopback / forward-bridge / reverse-bridge /
|
|
subscribe-sees-change) against a Siemens S7-300/400/1200/1500 or compatible
|
|
soft-PLC. python-snap7 simulator (task #216) or real hardware both work.
|
|
|
|
Prereqs:
|
|
- S7 simulator / PLC on $S7Host:$S7Port
|
|
- On real S7-1200/1500: PUT/GET communication enabled in TIA Portal.
|
|
- OtOpcUa server running with an S7 DriverInstance bound to the same
|
|
endpoint + a Tag at DB1.DBW0 Int16 published under -BridgeNodeId.
|
|
|
|
.PARAMETER S7Host
|
|
Host:port of the S7 simulator / PLC. Default 127.0.0.1:102.
|
|
|
|
.PARAMETER Cpu
|
|
S7200 / S7200Smart / S7300 / S7400 / S71200 / S71500 (default S71500).
|
|
|
|
.PARAMETER Slot
|
|
CPU slot. Default 0 (S7-1200/1500). S7-300 uses 2.
|
|
|
|
.PARAMETER Address
|
|
S7 address to exercise. Default DB1.DBW0.
|
|
|
|
.PARAMETER OpcUaUrl
|
|
OtOpcUa server endpoint.
|
|
|
|
.PARAMETER BridgeNodeId
|
|
NodeId at which the server publishes the Address.
|
|
#>
|
|
|
|
param(
|
|
[string]$S7Host = "127.0.0.1:102",
|
|
[string]$Cpu = "S71500",
|
|
[int]$Slot = 0,
|
|
[string]$Address = "DB1.DBW0",
|
|
[string]$OpcUaUrl = "opc.tcp://localhost:4840",
|
|
[Parameter(Mandatory)] [string]$BridgeNodeId
|
|
)
|
|
|
|
$ErrorActionPreference = "Stop"
|
|
. "$PSScriptRoot/_common.ps1"
|
|
|
|
$hostPart, $portPart = $S7Host.Split(":")
|
|
$port = [int]$portPart
|
|
|
|
$s7Cli = Get-CliInvocation `
|
|
-ProjectFolder "src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli" `
|
|
-ExeName "otopcua-s7-cli"
|
|
$opcUaCli = Get-CliInvocation `
|
|
-ProjectFolder "src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI" `
|
|
-ExeName "otopcua-cli"
|
|
|
|
$commonS7 = @("-h", $hostPart, "-p", $port, "-c", $Cpu, "--slot", $Slot)
|
|
$results = @()
|
|
|
|
$results += Test-Probe `
|
|
-Cli $s7Cli `
|
|
-ProbeArgs (@("probe") + $commonS7)
|
|
|
|
$writeValue = Get-Random -Minimum 1 -Maximum 9999
|
|
$results += Test-DriverLoopback `
|
|
-Cli $s7Cli `
|
|
-WriteArgs (@("write") + $commonS7 + @("-a", $Address, "-t", "Int16", "-v", $writeValue)) `
|
|
-ReadArgs (@("read") + $commonS7 + @("-a", $Address, "-t", "Int16")) `
|
|
-ExpectedValue "$writeValue"
|
|
|
|
$bridgeValue = Get-Random -Minimum 10000 -Maximum 19999
|
|
$results += Test-ServerBridge `
|
|
-DriverCli $s7Cli `
|
|
-DriverWriteArgs (@("write") + $commonS7 + @("-a", $Address, "-t", "Int16", "-v", $bridgeValue)) `
|
|
-OpcUaCli $opcUaCli `
|
|
-OpcUaUrl $OpcUaUrl `
|
|
-OpcUaNodeId $BridgeNodeId `
|
|
-ExpectedValue "$bridgeValue"
|
|
|
|
$reverseValue = Get-Random -Minimum 20000 -Maximum 29999
|
|
$results += Test-OpcUaWriteBridge `
|
|
-OpcUaCli $opcUaCli `
|
|
-OpcUaUrl $OpcUaUrl `
|
|
-OpcUaNodeId $BridgeNodeId `
|
|
-DriverCli $s7Cli `
|
|
-DriverReadArgs (@("read") + $commonS7 + @("-a", $Address, "-t", "Int16")) `
|
|
-ExpectedValue "$reverseValue"
|
|
|
|
$subValue = Get-Random -Minimum 30000 -Maximum 32766
|
|
$results += Test-SubscribeSeesChange `
|
|
-OpcUaCli $opcUaCli `
|
|
-OpcUaUrl $OpcUaUrl `
|
|
-OpcUaNodeId $BridgeNodeId `
|
|
-DriverCli $s7Cli `
|
|
-DriverWriteArgs (@("write") + $commonS7 + @("-a", $Address, "-t", "Int16", "-v", $subValue)) `
|
|
-ExpectedValue "$subValue"
|
|
|
|
Write-Summary -Title "S7 e2e" -Results $results
|
|
if ($results | Where-Object { -not $_.Passed }) { exit 1 }
|