Captures uncommitted work that lived in the working tree on
v2-mxgw-integration but was orthogonal to the migration. Stashed
during the v2-mxgw merge to master (2026-04-30) and replanted here on
a feature branch off master so it's git-visible rather than living in
the stash list.
Two distinct buckets:
1. Tracked fixture/config refinements (10 files, ~36 lines):
- scripts/e2e/test-opcuaclient.ps1
- src/ZB.MOM.WW.OtOpcUa.Admin/appsettings.json
- 5 docker-compose.yml under tests/.../IntegrationTests/Docker/
(AbCip, Modbus, OpcUaClient, S7)
- 4 fixture .cs files (AbServerFixture, ModbusSimulatorFixture,
OpcPlcFixture, Snap7ServerFixture)
2. Untracked driver-gaps queue artifacts (~8000 lines):
- docs/plans/{abcip,ablegacy,focas,opcuaclient,s7,twincat}-plan.md
— per-driver gap plans
- docs/featuregaps.md — cross-cutting analysis
- docs/v2/focas-deployment.md, docs/v2/implementation/focas-simulator-plan.md
- followup.md — auto/driver-gaps queue follow-ups
- scripts/queue/ — PR-queue automation tooling (12 files including
pr-manifest.yaml at 1473 lines)
This commit is a snapshot for recoverability — review and split into
focused PRs (or discard) before merging anywhere downstream.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
84 lines
4.2 KiB
C#
84 lines
4.2 KiB
C#
using System.Net.Sockets;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests;
|
|
|
|
/// <summary>
|
|
/// Reachability probe for a Modbus TCP simulator (pymodbus in Docker, see
|
|
/// <c>Docker/docker-compose.yml</c>) or a real PLC. Parses
|
|
/// <c>MODBUS_SIM_ENDPOINT</c> (default <c>10.100.0.35:5020</c>) and TCP-connects once at
|
|
/// fixture construction. Each test checks <see cref="SkipReason"/> and calls
|
|
/// <c>Assert.Skip</c> when the endpoint was unreachable, so a dev box without a running
|
|
/// simulator still passes `dotnet test` cleanly — matches the Galaxy live-smoke pattern in
|
|
/// <c>GalaxyRepositoryLiveSmokeTests</c>.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// Do NOT keep the probe socket open for the life of the fixture. The probe is a
|
|
/// one-shot liveness check; tests open their own transports (the real
|
|
/// <see cref="ModbusTcpTransport"/>) against the same endpoint. Sharing a socket
|
|
/// across tests would serialize them on a single TCP stream.
|
|
/// </para>
|
|
/// <para>
|
|
/// The fixture is a collection fixture so the reachability probe runs once per test
|
|
/// session, not per test — checking every test would waste several seconds against a
|
|
/// firewalled endpoint that times out each attempt.
|
|
/// </para>
|
|
/// </remarks>
|
|
public sealed class ModbusSimulatorFixture : IAsyncDisposable
|
|
{
|
|
// PR 43: default port is 5020 (pymodbus convention) instead of 502 (Modbus standard).
|
|
// Picking 5020 sidesteps the privileged-port admin requirement on Windows + matches the
|
|
// port baked into the pymodbus simulator JSON profiles in Docker/profiles/. Override with
|
|
// MODBUS_SIM_ENDPOINT to point at a real PLC on its native port 502.
|
|
private const string DefaultEndpoint = "10.100.0.35:5020";
|
|
private const string EndpointEnvVar = "MODBUS_SIM_ENDPOINT";
|
|
|
|
public string Host { get; }
|
|
public int Port { get; }
|
|
public string? SkipReason { get; }
|
|
|
|
public ModbusSimulatorFixture()
|
|
{
|
|
var raw = Environment.GetEnvironmentVariable(EndpointEnvVar) ?? DefaultEndpoint;
|
|
var parts = raw.Split(':', 2);
|
|
Host = parts[0];
|
|
Port = parts.Length == 2 && int.TryParse(parts[1], out var p) ? p : 502;
|
|
|
|
try
|
|
{
|
|
// Force IPv4 family on the probe — pymodbus's TCP server binds 0.0.0.0 (IPv4 only)
|
|
// while .NET's TcpClient default-resolves "localhost" → IPv6 ::1 first, fails to
|
|
// connect, and only then tries IPv4. Under .NET 10 the IPv6 fail surfaces as a
|
|
// 2s timeout (no graceful fallback by default), so the C# probe times out even
|
|
// though a PowerShell probe of the same endpoint succeeds. Resolving + dialing
|
|
// explicit IPv4 sidesteps the dual-stack ordering.
|
|
using var client = new TcpClient(System.Net.Sockets.AddressFamily.InterNetwork);
|
|
var task = client.ConnectAsync(
|
|
System.Net.Dns.GetHostAddresses(Host)
|
|
.FirstOrDefault(a => a.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
|
|
?? System.Net.IPAddress.Loopback,
|
|
Port);
|
|
if (!task.Wait(TimeSpan.FromSeconds(2)) || !client.Connected)
|
|
{
|
|
SkipReason = $"Modbus simulator at {Host}:{Port} did not accept a TCP connection within 2s. " +
|
|
$"Start the pymodbus Docker container (docker compose -f Docker/docker-compose.yml --profile standard up -d) " +
|
|
$"or override {EndpointEnvVar}, then re-run.";
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
SkipReason = $"Modbus simulator at {Host}:{Port} unreachable: {ex.GetType().Name}: {ex.Message}. " +
|
|
$"Start the pymodbus Docker container (docker compose -f Docker/docker-compose.yml --profile standard up -d) " +
|
|
$"or override {EndpointEnvVar}, then re-run.";
|
|
}
|
|
}
|
|
|
|
public ValueTask DisposeAsync() => ValueTask.CompletedTask;
|
|
}
|
|
|
|
[Xunit.CollectionDefinition(Name)]
|
|
public sealed class ModbusSimulatorCollection : Xunit.ICollectionFixture<ModbusSimulatorFixture>
|
|
{
|
|
public const string Name = "ModbusSimulator";
|
|
}
|