Catch-all commit for pending work on the task-galaxy-e2e branch that
wasn't part of the FOCAS migration. Grouping by topic so future per-topic
commits can be cherry-picked if needed.
TwinCAT
- src/.../Driver.TwinCAT/AdsTwinCATClient.cs + TwinCATDriverFactoryExtensions.cs:
factory-registration extensions + ADS client refinements.
- src/.../Driver.TwinCAT.Cli/Commands/BrowseCommand.cs: new browse command
for the TwinCAT test-client CLI.
- tests/.../Driver.TwinCAT.IntegrationTests/TwinCAT3SmokeTests.cs + TwinCatProject/:
fixture scaffold with a minimal POU + README pointing at the TCBSD/ESXi
VM for e2e.
- docs/Driver.TwinCAT.Cli.md + docs/drivers/TwinCAT-Test-Fixture.md:
documentation for the above.
- docs/v3/twincat-backlog.md: forward-looking backlog seed.
Admin UI + fleet status
- src/.../Admin/Components/Pages/Clusters/DriversTab.razor + Hosts.razor:
UI refresh for fleet-status rendering.
- src/.../Admin/Hubs/FleetStatusHub.cs + FleetStatusPoller.cs +
Admin/Program.cs: SignalR hub + poller plumbing for live fleet data.
- tests/.../Admin.Tests/FleetStatusPollerTests.cs: poller coverage.
Server + redundancy runtime (Phase 6.3 follow-ups)
- src/.../Server/Hosting/RedundancyPublisherHostedService.cs: HostedService
that owns the RedundancyStatePublisher lifecycle + wires peer reachability.
- src/.../Server/Redundancy/ServerRedundancyNodeWriter.cs: OPC UA
variable-node writer binding ServiceLevel + ServerUriArray to the
publisher's events.
- src/.../Server/Program.cs + Server.csproj: hosted-service registration.
- tests/.../Server.Tests/ServerRedundancyNodeWriterTests.cs +
Server.Tests.csproj: coverage for the above.
Configuration
- src/.../Configuration/Validation/DraftValidator.cs +
tests/.../Configuration.Tests/DraftValidatorTests.cs: draft-validation
refinements.
E2E scripts (shared infrastructure)
- scripts/e2e/README.md + _common.ps1 + test-all.ps1: shared helpers + the
all-drivers test-all runner.
- scripts/e2e/test-opcuaclient.ps1: OPC UA Client e2e runner.
Docs
- docs/v2/implementation/phase-6-{1,2,3,4}*.md + exit-gate-phase-{3,7}.md:
phase-gate + implementation doc updates.
- docs/v2/plan.md: top-level plan refresh.
- docs/v2/redundancy-interop-playbook.md: client interop playbook for the
Phase 6.3 redundancy-runtime work.
Two orphan FOCAS docs remain on disk but deliberately unstaged —
docs/v2/focas-deployment.md and docs/v2/implementation/focas-simulator-plan.md
describe the now-retired Tier-C topology and should either be rewritten
or deleted in a follow-up.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
215 lines
9.4 KiB
C#
215 lines
9.4 KiB
C#
using Microsoft.AspNetCore.SignalR;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using Shouldly;
|
|
using Xunit;
|
|
using ZB.MOM.WW.OtOpcUa.Admin.Hubs;
|
|
using ZB.MOM.WW.OtOpcUa.Admin.Services;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Admin.Tests;
|
|
|
|
[Trait("Category", "Integration")]
|
|
public sealed class FleetStatusPollerTests : IDisposable
|
|
{
|
|
private const string DefaultServer = "localhost,14330";
|
|
private const string DefaultSaPassword = "OtOpcUaDev_2026!";
|
|
|
|
private readonly string _databaseName = $"OtOpcUaPollerTest_{Guid.NewGuid():N}";
|
|
private readonly string _connectionString;
|
|
private readonly ServiceProvider _sp;
|
|
|
|
public FleetStatusPollerTests()
|
|
{
|
|
var server = Environment.GetEnvironmentVariable("OTOPCUA_CONFIG_TEST_SERVER") ?? DefaultServer;
|
|
var password = Environment.GetEnvironmentVariable("OTOPCUA_CONFIG_TEST_SA_PASSWORD") ?? DefaultSaPassword;
|
|
_connectionString =
|
|
$"Server={server};Database={_databaseName};User Id=sa;Password={password};TrustServerCertificate=True;Encrypt=False;";
|
|
|
|
var services = new ServiceCollection();
|
|
services.AddLogging();
|
|
services.AddSignalR();
|
|
services.AddDbContext<OtOpcUaConfigDbContext>(o => o.UseSqlServer(_connectionString));
|
|
_sp = services.BuildServiceProvider();
|
|
|
|
using var scope = _sp.CreateScope();
|
|
scope.ServiceProvider.GetRequiredService<OtOpcUaConfigDbContext>().Database.Migrate();
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
_sp.Dispose();
|
|
using var conn = new Microsoft.Data.SqlClient.SqlConnection(
|
|
new Microsoft.Data.SqlClient.SqlConnectionStringBuilder(_connectionString)
|
|
{ InitialCatalog = "master" }.ConnectionString);
|
|
conn.Open();
|
|
using var cmd = conn.CreateCommand();
|
|
cmd.CommandText = $@"
|
|
IF DB_ID(N'{_databaseName}') IS NOT NULL
|
|
BEGIN
|
|
ALTER DATABASE [{_databaseName}] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
|
|
DROP DATABASE [{_databaseName}];
|
|
END";
|
|
cmd.ExecuteNonQuery();
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Poller_detects_new_apply_state_and_pushes_to_fleet_hub()
|
|
{
|
|
// Seed a cluster + node + credential + generation + apply state.
|
|
using (var scope = _sp.CreateScope())
|
|
{
|
|
var db = scope.ServiceProvider.GetRequiredService<OtOpcUaConfigDbContext>();
|
|
db.ServerClusters.Add(new ServerCluster
|
|
{
|
|
ClusterId = "p-1", Name = "Poll test", Enterprise = "zb", Site = "dev",
|
|
NodeCount = 1, RedundancyMode = RedundancyMode.None, Enabled = true, CreatedBy = "t",
|
|
});
|
|
db.ClusterNodes.Add(new ClusterNode
|
|
{
|
|
NodeId = "p-1-a", ClusterId = "p-1", RedundancyRole = RedundancyRole.Primary,
|
|
Host = "localhost", OpcUaPort = 4840, DashboardPort = 5001,
|
|
ApplicationUri = "urn:p1:test", ServiceLevelBase = 200, Enabled = true, CreatedBy = "t",
|
|
});
|
|
var gen = new ConfigGeneration
|
|
{
|
|
ClusterId = "p-1", Status = GenerationStatus.Published, CreatedBy = "t",
|
|
PublishedBy = "t", PublishedAt = DateTime.UtcNow,
|
|
};
|
|
db.ConfigGenerations.Add(gen);
|
|
await db.SaveChangesAsync();
|
|
|
|
db.ClusterNodeGenerationStates.Add(new ClusterNodeGenerationState
|
|
{
|
|
NodeId = "p-1-a", CurrentGenerationId = gen.GenerationId,
|
|
LastAppliedStatus = NodeApplyStatus.Applied,
|
|
LastAppliedAt = DateTime.UtcNow, LastSeenAt = DateTime.UtcNow,
|
|
});
|
|
await db.SaveChangesAsync();
|
|
}
|
|
|
|
// Recording hub contexts — capture what would be pushed to clients.
|
|
var recorder = new RecordingHubClients();
|
|
var fleetHub = new RecordingHubContext<FleetStatusHub>(recorder);
|
|
var alertHub = new RecordingHubContext<AlertHub>(new RecordingHubClients());
|
|
|
|
var poller = new FleetStatusPoller(
|
|
_sp.GetRequiredService<IServiceScopeFactory>(),
|
|
fleetHub, alertHub, NullLogger<FleetStatusPoller>.Instance, new RedundancyMetrics());
|
|
|
|
await poller.PollOnceAsync(CancellationToken.None);
|
|
|
|
var match = recorder.SentMessages.FirstOrDefault(m =>
|
|
m.Method == "NodeStateChanged" &&
|
|
m.Args.Length > 0 &&
|
|
m.Args[0] is NodeStateChangedMessage msg &&
|
|
msg.NodeId == "p-1-a");
|
|
match.ShouldNotBeNull("poller should have pushed a NodeStateChanged for p-1-a");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Poller_raises_alert_on_transition_into_Failed()
|
|
{
|
|
using (var scope = _sp.CreateScope())
|
|
{
|
|
var db = scope.ServiceProvider.GetRequiredService<OtOpcUaConfigDbContext>();
|
|
db.ServerClusters.Add(new ServerCluster
|
|
{
|
|
ClusterId = "p-2", Name = "Fail test", Enterprise = "zb", Site = "dev",
|
|
NodeCount = 1, RedundancyMode = RedundancyMode.None, Enabled = true, CreatedBy = "t",
|
|
});
|
|
db.ClusterNodes.Add(new ClusterNode
|
|
{
|
|
NodeId = "p-2-a", ClusterId = "p-2", RedundancyRole = RedundancyRole.Primary,
|
|
Host = "localhost", OpcUaPort = 4840, DashboardPort = 5001,
|
|
ApplicationUri = "urn:p2:test", ServiceLevelBase = 200, Enabled = true, CreatedBy = "t",
|
|
});
|
|
db.ClusterNodeGenerationStates.Add(new ClusterNodeGenerationState
|
|
{
|
|
NodeId = "p-2-a",
|
|
LastAppliedStatus = NodeApplyStatus.Failed,
|
|
LastAppliedError = "simulated",
|
|
LastAppliedAt = DateTime.UtcNow, LastSeenAt = DateTime.UtcNow,
|
|
});
|
|
await db.SaveChangesAsync();
|
|
}
|
|
|
|
var alerts = new RecordingHubClients();
|
|
var alertHub = new RecordingHubContext<AlertHub>(alerts);
|
|
var fleetHub = new RecordingHubContext<FleetStatusHub>(new RecordingHubClients());
|
|
|
|
var poller = new FleetStatusPoller(
|
|
_sp.GetRequiredService<IServiceScopeFactory>(),
|
|
fleetHub, alertHub, NullLogger<FleetStatusPoller>.Instance, new RedundancyMetrics());
|
|
|
|
await poller.PollOnceAsync(CancellationToken.None);
|
|
|
|
var alertMatch = alerts.SentMessages.FirstOrDefault(m =>
|
|
m.Method == "AlertRaised" &&
|
|
m.Args.Length > 0 &&
|
|
m.Args[0] is AlertMessage alert && alert.NodeId == "p-2-a" && alert.Severity == "error");
|
|
alertMatch.ShouldNotBeNull("poller should have raised AlertRaised for p-2-a");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Poller_pushes_ResilienceStatusChanged_on_delta()
|
|
{
|
|
// Phase 6.1 Stream E.2 — DriverInstanceResilienceStatus row changes should surface
|
|
// on the fleet hub so /hosts updates without waiting for the 10s poll.
|
|
using (var scope = _sp.CreateScope())
|
|
{
|
|
var db = scope.ServiceProvider.GetRequiredService<OtOpcUaConfigDbContext>();
|
|
db.DriverInstanceResilienceStatuses.Add(new DriverInstanceResilienceStatus
|
|
{
|
|
DriverInstanceId = "drv-1", HostName = "plc.example.com",
|
|
ConsecutiveFailures = 2, CurrentBulkheadDepth = 1,
|
|
LastSampledUtc = DateTime.UtcNow,
|
|
});
|
|
await db.SaveChangesAsync();
|
|
}
|
|
|
|
var recorder = new RecordingHubClients();
|
|
var fleetHub = new RecordingHubContext<FleetStatusHub>(recorder);
|
|
var alertHub = new RecordingHubContext<AlertHub>(new RecordingHubClients());
|
|
|
|
var poller = new FleetStatusPoller(
|
|
_sp.GetRequiredService<IServiceScopeFactory>(),
|
|
fleetHub, alertHub, NullLogger<FleetStatusPoller>.Instance, new RedundancyMetrics());
|
|
|
|
await poller.PollOnceAsync(CancellationToken.None);
|
|
|
|
var match = recorder.SentMessages.FirstOrDefault(m =>
|
|
m.Method == "ResilienceStatusChanged" &&
|
|
m.Args.Length > 0 &&
|
|
m.Args[0] is ResilienceStatusChangedMessage r &&
|
|
r.DriverInstanceId == "drv-1" && r.HostName == "plc.example.com");
|
|
match.ShouldNotBeNull("poller should have pushed ResilienceStatusChanged on first observation");
|
|
|
|
// Same snapshot on the next tick — should NOT push again (delta-only push).
|
|
recorder.SentMessages.Clear();
|
|
await poller.PollOnceAsync(CancellationToken.None);
|
|
recorder.SentMessages.Any(m => m.Method == "ResilienceStatusChanged")
|
|
.ShouldBeFalse("unchanged snapshot must not fire another push");
|
|
|
|
// Mutate the row — delta should fire again.
|
|
using (var scope = _sp.CreateScope())
|
|
{
|
|
var db = scope.ServiceProvider.GetRequiredService<OtOpcUaConfigDbContext>();
|
|
var row = await db.DriverInstanceResilienceStatuses.SingleAsync();
|
|
row.ConsecutiveFailures = 5;
|
|
row.LastCircuitBreakerOpenUtc = DateTime.UtcNow;
|
|
await db.SaveChangesAsync();
|
|
}
|
|
|
|
await poller.PollOnceAsync(CancellationToken.None);
|
|
var mutatedMatch = recorder.SentMessages.FirstOrDefault(m =>
|
|
m.Method == "ResilienceStatusChanged" &&
|
|
m.Args.Length > 0 &&
|
|
m.Args[0] is ResilienceStatusChangedMessage r2 && r2.ConsecutiveFailures == 5);
|
|
mutatedMatch.ShouldNotBeNull("mutated row should produce a second ResilienceStatusChanged");
|
|
}
|
|
}
|