Joseph Doherty
7fd5cb2b56
ClusterClient→gRPC migration Phase 4 (docs/plans/2026-07-22-clusterclient-to-grpc-plan.md). Phases 2/3 proved both directions on gRPC; this removes the Akka transport underneath. Deleted: - AkkaCentralTransport, AkkaSiteTransport (+ their dedicated tests) - ISiteClientFactory + DefaultSiteClientFactory; CentralCommunicationActor legacy ctor + SelectTransport (Host now builds GrpcSiteTransport and injects it) - ClusterClient creation + both ClusterClientReceptionist.RegisterService calls in AkkaHostedService; the RegisterCentralClient message + receive block - CommunicationOptions.CentralContactPoints; the CentralTransport/SiteTransport coexistence flags; the CentralTransportMode/SiteTransportKind enums gRPC is now the only site↔central transport (site→central CentralControlService via GrpcCentralTransport; central→site SiteCommandService via GrpcSiteTransport), both built unconditionally by the Host. NoOpCentralTransport is the fail-loud null-default so TestKit command-dispatch suites still construct the site actor without a wired transport; production always injects GrpcCentralTransport. Config: CentralGrpcEndpoints is now unconditional — CommunicationOptionsValidator rejects blank entries (role-agnostic), and StartupValidator requires a Site node to list >=1 endpoint (fail-fast, mirrors GrpcPsk). Rig configs moved CentralContactPoints -> CentralGrpcEndpoints (docker x6, docker-env2 x2, Host default, deploy/wonder-app-vd03). Kept Akka.Cluster.Tools (ClusterSingleton still used). Tests: build 0/0; Communication.Tests 640, Host.Tests 421 green. Removed the ClusterClient.Send per-site-routing tests (covered by the transport suites), swapped the ISiteClientFactory-based ctors to a substitute ISiteCommandTransport, converted the audit-push integration relay to an in-process bridge transport. Docs: Component-Communication/Host/StoreAndForward, components/Communication, topology-guide, grpc_streams (SUPERSEDED note), the frame-size known-issue (retired amendment), and CLAUDE.md transport decisions. Not included: the dead IntegrationCallRequest path (#32) is a separate user-owned behavioral decision — SiteEnvelope routing is transport-agnostic so it still compiles.
53 lines
2.5 KiB
C#
53 lines
2.5 KiB
C#
using Akka.Actor;
|
|
using Akka.TestKit.Xunit2;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Entities.Sites;
|
|
using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Repositories;
|
|
using ZB.MOM.WW.ScadaBridge.Communication.Actors;
|
|
using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.Communication.Tests;
|
|
|
|
/// <summary>
|
|
/// Transport-agnostic refresh behaviour of <see cref="CentralCommunicationActor"/>: the periodic
|
|
/// DB refresh evicts deleted sites from the health aggregator. The two former tests here —
|
|
/// per-site ClusterClient recreate-without-restart-loop and factory-throw resilience — asserted
|
|
/// Akka <c>AkkaSiteTransport</c> internals (InvalidActorNameException, "No ClusterClient for site")
|
|
/// and were removed with that transport in the ClusterClient→gRPC migration's Phase 4; the
|
|
/// equivalent gRPC channel reconcile is covered by the <c>GrpcSiteTransport</c> suites.
|
|
/// </summary>
|
|
public class CentralCommunicationActorClientLifecycleTests : TestKit
|
|
{
|
|
[Fact]
|
|
public void PeriodicRefresh_PrunesDeletedSites_FromHealthAggregator()
|
|
{
|
|
// PLAN-01 Task 18: the periodic site refresh feeds the currently-configured
|
|
// site ids to the aggregator so a deleted site is evicted within one
|
|
// refresh interval. Repo returns only "site-a".
|
|
var siteRepo = Substitute.For<ISiteRepository>();
|
|
siteRepo.GetAllSitesAsync(Arg.Any<CancellationToken>())
|
|
.Returns(new List<Site> { new("Site A", "site-a") });
|
|
var aggregator = Substitute.For<ICentralHealthAggregator>();
|
|
var services = new ServiceCollection();
|
|
services.AddScoped(_ => siteRepo);
|
|
services.AddSingleton(aggregator);
|
|
var provider = services.BuildServiceProvider();
|
|
|
|
var transport = Substitute.For<ISiteCommandTransport>();
|
|
var actor = Sys.ActorOf(Props.Create(() => new CentralCommunicationActor(
|
|
provider, transport, (TimeSpan?)null)));
|
|
|
|
// Trigger the refresh (also fires at PreStart, but drive it explicitly so
|
|
// the assertion is deterministic). The load runs on a detached task and
|
|
// pipes SiteAddressCacheLoaded back to the actor, which then prunes.
|
|
actor.Tell(new RefreshSiteAddresses());
|
|
|
|
AwaitAssert(
|
|
() => aggregator.Received().PruneUnknownSites(
|
|
Arg.Is<IReadOnlyCollection<string>>(ids => ids.Contains("site-a"))),
|
|
TimeSpan.FromSeconds(3));
|
|
}
|
|
}
|