1d3544f18e
S7 integration — AbCip/Modbus already have real-simulator integration suites; S7 had zero wire-level coverage despite being a Tier-A driver (all unit tests mocked IS7Client). Picked python-snap7's `snap7.server.Server` over raw Snap7 C library because `pip install` beats per-OS binary-pin maintenance, the package ships a Python __main__ shim that mirrors our existing pymodbus serve.ps1 + *.json pattern structurally, and the python-snap7 project is actively maintained. New project `tests/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/` with four moving parts: (a) `Snap7ServerFixture` — collection-scoped TCP probe on `localhost:1102` that sets `SkipReason` when the simulator's not running, matching the `ModbusSimulatorFixture` shape one directory over (same S7_SIM_ENDPOINT env var override convention for pointing at a real S7 CPU on port 102); (b) `PythonSnap7/` — `serve.ps1` wrapper + `server.py` shim + `s7_1500.json` seed profile + `README.md` documenting install / run / known limitations; (c) `S7_1500/S7_1500Profile.cs` — driver-side `S7DriverOptions` whose tag addresses map 1:1 to the JSON profile's seed offsets (DB1.DBW0 u16, DB1.DBW10 i16, DB1.DBD20 i32, DB1.DBD30 f32, DB1.DBX50.3 bool, DB1.DBW100 scratch); (d) `S7_1500SmokeTests` — three tests proving typed reads + write-then-read round-trip work through real S7netplus + real ISO-on-TCP + real snap7 server. Picked port 1102 default instead of S7-standard 102 because 102 is privileged on Linux + triggers Windows Firewall prompt; S7netplus 0.20 has a 5-arg `Plc(CpuType, host, port, rack, slot)` ctor that lets the driver honour `S7DriverOptions.Port`, but the existing driver code called the 4-arg overload + silently hardcoded 102. One-line driver fix (S7Driver.cs:87) threads `_options.Port` through — the S7 unit suite (58/58) still passes unchanged because every unit test uses a fake IS7Client that never sees the real ctor. Server seed-type matrix in `server.py` covers u8 / i8 / u16 / i16 / u32 / i32 / f32 / bool-with-bit / ascii (S7 STRING with max_len header). register_area takes the SrvArea enum value, not the string name — a 15-minute debug after the first test run caught that; documented inline. Per-driver test-fixture coverage docs — eight new files in `docs/drivers/` laying out what each driver's harness actually benchmarks vs. what's trusted from field deployments. Pattern mirrors the AbServer-Test-Fixture.md doc that shipped earlier in this arc: TL;DR → What the fixture is → What it actually covers → What it does NOT cover → When-to-trust table → Follow-up candidates → Key files. Ugly truth the survey made visible: Galaxy + Modbus + (now) S7 + AB CIP have real wire-level coverage; AB Legacy / TwinCAT / FOCAS / OpcUaClient are still contract-only because their libraries ship no fake + no open-source simulator exists (AB Legacy PCCC), no public simulator exists (FOCAS), the vendor SDK has no in-process fake (TwinCAT/ADS.NET), or the test wiring just hasn't happened yet (OpcUaClient could trivially loopback against this repo's own server — flagged as #215). Each doc names the specific follow-up route: Snap7 server for S7 (done), TwinCAT 3 developer-runtime auto-restart for TwinCAT, Tier-C out-of-process Host for FOCAS, lab rigs for AB Legacy + hardware-gated bits of the others. `docs/drivers/README.md` gains a coverage-map section linking all eight. Tracking tasks #215-#222 filed for each PR-able follow-up. Build clean (driver + integration project + docs); S7.Tests 58/58 (unchanged); S7.IntegrationTests 3/3 (new, verified end-to-end against a live python-snap7 server: `driver_reads_seeded_u16_through_real_S7comm`, `driver_reads_seeded_typed_batch`, `driver_write_then_read_round_trip_on_scratch_word`). Next fixture follow-up is #215 (OpcUaClient loopback against own server) — highest ROI of the remaining set, zero external deps. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
54 lines
2.1 KiB
C#
54 lines
2.1 KiB
C#
using S7NetCpuType = global::S7.Net.CpuType;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests.S7_1500;
|
|
|
|
/// <summary>
|
|
/// Driver-side configuration matching what <c>PythonSnap7/s7_1500.json</c> seeds
|
|
/// into the simulator's DB1 + MB areas. Tag names here become the full references
|
|
/// the smoke tests read/write against; addresses map 1:1 to the JSON profile's
|
|
/// seed offsets so a seed drift in the JSON surfaces as a driver-side read
|
|
/// mismatch, not a mystery test failure.
|
|
/// </summary>
|
|
public static class S7_1500Profile
|
|
{
|
|
public const string ProbeTag = "ProbeProbeWord";
|
|
public const int ProbeSeedValue = 4242;
|
|
|
|
public const string SmokeI16Tag = "SmokeI16";
|
|
public const short SmokeI16SeedValue = -12345;
|
|
|
|
public const string SmokeI32Tag = "SmokeI32";
|
|
public const int SmokeI32SeedValue = 1234567890;
|
|
|
|
public const string SmokeF32Tag = "SmokeF32";
|
|
public const float SmokeF32SeedValue = 3.14159f;
|
|
|
|
public const string SmokeBoolTag = "SmokeBool";
|
|
|
|
public const string WriteScratchTag = "WriteScratch";
|
|
|
|
public static S7DriverOptions BuildOptions(string host, int port) => new()
|
|
{
|
|
Host = host,
|
|
Port = port,
|
|
CpuType = S7NetCpuType.S71500,
|
|
Rack = 0,
|
|
Slot = 0,
|
|
Timeout = TimeSpan.FromSeconds(5),
|
|
// Disable the probe loop — the integration tests run their own reads +
|
|
// a background probe would race with them for the S7netplus mailbox
|
|
// gate, injecting flakiness that has nothing to do with the code
|
|
// under test.
|
|
Probe = new S7ProbeOptions { Enabled = false },
|
|
Tags =
|
|
[
|
|
new S7TagDefinition(ProbeTag, "DB1.DBW0", S7DataType.UInt16),
|
|
new S7TagDefinition(SmokeI16Tag, "DB1.DBW10", S7DataType.Int16),
|
|
new S7TagDefinition(SmokeI32Tag, "DB1.DBD20", S7DataType.Int32),
|
|
new S7TagDefinition(SmokeF32Tag, "DB1.DBD30", S7DataType.Float32),
|
|
new S7TagDefinition(SmokeBoolTag, "DB1.DBX50.3", S7DataType.Bool),
|
|
new S7TagDefinition(WriteScratchTag, "DB1.DBW100", S7DataType.UInt16),
|
|
],
|
|
};
|
|
}
|