859d63178a
Integration-sweep follow-up #6 (SQL leg). The sweep flagged 7 heavy 2-node deploy/failover/reconnect E2E tests as 'time out under amd64-emulated SQL' and suggested raising deadlines. That diagnosis was WRONG: run against real (native-amd64) SQL on the Docker host, they still hang — even at 4x deadline. Root cause is that these tests had never actually run against real SQL, only the EF in-memory provider, which does NOT enforce foreign keys. Two distinct defects, both hidden by in-memory: 1. Missing FK-parent seed (5 tests). The deploy records a NodeDeploymentState row per node, FK'd to ClusterNode (FK_NodeDeploymentState_ClusterNode_NodeId). The tests never seeded ServerCluster + ClusterNode, so on SQL each node-state INSERT throws and the deploy never seals (waits the full deadline regardless of size). Added TwoNodeClusterHarness.SeedDefaultClusterAsync (seeds a ServerCluster + a ClusterNode per node; Warm/NodeCount=2 to satisfy the SQL CHECK constraint CK_ServerCluster_RedundancyMode_NodeCount AND the ClusterEnabledNodeCountMismatch validator). Called it in DeployHappyPath x2 / Failover / FleetDiagnostics / EquipmentNamespace; fixed DriverReconnect to seed node B + NodeCount=2. 2. Stale EquipmentId (EquipmentNamespace test; pre-existing on BOTH providers). Seeded EquipmentId='eq-1', but the later-added EquipmentIdNotDerived validator requires EquipmentId == DeriveEquipmentId(EquipmentUuid) ('EQ-'+first 12 hex). Fixed the seed to a canonical id + matching UUID. Only surfaced once the FK fix let the deploy reach equipment validation. Also added OTOPCUA_HARNESS_SQL_HOST / OTOPCUA_HARNESS_LDAP_HOST overrides so the harness fixtures can run on the native-amd64 Docker host (avoids arm64 mssql emulation entirely). Verified: the 5 SQL-backed classes go 11/11 green vs native SQL; in-memory default unregressed (12/12). RoslynVirtualTagEvaluatorTests racing test is a pre-existing flaky race (not SQL-backed; passes in isolation) — left as-is.
139 lines
6.8 KiB
C#
139 lines
6.8 KiB
C#
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Shouldly;
|
|
using Xunit;
|
|
using ZB.MOM.WW.OtOpcUa.Commons.Interfaces;
|
|
using ZB.MOM.WW.OtOpcUa.Commons.Messages.Admin;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
|
|
using ZB.MOM.WW.OtOpcUa.Configuration.Validation;
|
|
using ZB.MOM.WW.OtOpcUa.Runtime.Drivers;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Host.IntegrationTests;
|
|
|
|
/// <summary>
|
|
/// End-to-end deploy of an Equipment-kind namespace through the <b>real</b>
|
|
/// <c>ConfigComposer</c>: seed a 1-area / 1-line / 1-equipment / 1-tag Equipment namespace,
|
|
/// <c>StartDeployment</c>, then assert the deployment's persisted artifact decodes (via
|
|
/// <see cref="DeploymentArtifact.ParseComposition"/>) to the equipment signal + the friendly
|
|
/// UNS folder name. This covers the <c>ConfigComposer → ArtifactBlob → ParseComposition.EquipmentTags</c>
|
|
/// seam that the OpcUaServer unit tests only approximate with hand-built JSON.
|
|
/// <para>
|
|
/// The OPC UA address-space browse is exercised separately against a real SDK node manager in
|
|
/// <c>AddressSpaceApplierHierarchyTests.Equipment_namespace_structure_materialises_end_to_end_against_real_SDK</c>,
|
|
/// because the in-process <see cref="TwoNodeClusterHarness"/> binds the no-op address-space sink.
|
|
/// </para>
|
|
/// </summary>
|
|
public sealed class EquipmentNamespaceMaterializationTests
|
|
{
|
|
private static CancellationToken Ct => TestContext.Current.CancellationToken;
|
|
|
|
// Equipment.EquipmentId must equal DraftValidator.DeriveEquipmentId(EquipmentUuid) — the
|
|
// 'EquipmentIdNotDerived' rule (EquipmentId = 'EQ-' + first 12 hex of the UUID). A fixed UUID
|
|
// keeps the derived id stable for the assertions below.
|
|
private static readonly Guid EquipmentUuid = Guid.Parse("11111111-1111-1111-1111-111111111111");
|
|
private static readonly string EquipmentId = DraftValidator.DeriveEquipmentId(EquipmentUuid); // EQ-111111111111
|
|
|
|
/// <summary>Verifies a deployed Equipment namespace carries its signal into the composed artifact.</summary>
|
|
[Fact]
|
|
public async Task Deploying_an_equipment_namespace_carries_the_signal_into_the_artifact()
|
|
{
|
|
await using var harness = await TwoNodeClusterHarness.StartAsync();
|
|
|
|
// Seed the parent ServerCluster + ClusterNode rows the SQL FKs require (the c1 config below
|
|
// FKs to ServerCluster; on the in-memory provider this is unnecessary — FKs aren't enforced).
|
|
await harness.SeedDefaultClusterAsync("c1");
|
|
await SeedEquipmentNamespaceAsync(harness);
|
|
|
|
await using var scope = harness.NodeA.Services.CreateAsyncScope();
|
|
var client = scope.ServiceProvider.GetRequiredService<IAdminOperationsClient>();
|
|
|
|
var result = await client.StartDeploymentAsync(createdBy: "alice@test", Ct);
|
|
result.Outcome.ShouldBe(StartDeploymentOutcome.Accepted, $"Deploy not accepted: {result.Message}");
|
|
var deploymentId = result.DeploymentId!.Value.Value;
|
|
|
|
// The artifact is composed + persisted at dispatch time; assert on it without waiting for
|
|
// Seal (sealing depends on driver-node acks, orthogonal to composition correctness).
|
|
var artifact = Array.Empty<byte>();
|
|
await WaitForAsync(async () =>
|
|
{
|
|
await using var db = await CreateDbAsync(harness);
|
|
var d = await db.Deployments.AsNoTracking()
|
|
.FirstOrDefaultAsync(x => x.DeploymentId == deploymentId, Ct);
|
|
if (d is { ArtifactBlob.Length: > 0 })
|
|
{
|
|
artifact = d.ArtifactBlob;
|
|
return true;
|
|
}
|
|
return false;
|
|
}, TimeSpan.FromSeconds(15));
|
|
|
|
var composition = DeploymentArtifact.ParseComposition(artifact);
|
|
|
|
// The real ConfigComposer serialised the equipment Tag (incl. its TagConfig), and
|
|
// ParseComposition extracted it as an EquipmentTag with FullName pulled from TagConfig.
|
|
var tag = composition.EquipmentTags.ShouldHaveSingleItem();
|
|
tag.TagId.ShouldBe("tag-speed");
|
|
tag.EquipmentId.ShouldBe(EquipmentId);
|
|
tag.Name.ShouldBe("Speed");
|
|
tag.DataType.ShouldBe("Float");
|
|
tag.FullName.ShouldBe("40001");
|
|
|
|
// The equipment folder browses by its friendly UNS Name, not the MachineCode.
|
|
composition.EquipmentNodes.ShouldContain(e => e.EquipmentId == EquipmentId && e.DisplayName == "station-1");
|
|
composition.UnsAreas.ShouldContain(a => a.UnsAreaId == "nw-area-filling" && a.DisplayName == "filling");
|
|
composition.UnsLines.ShouldContain(l => l.UnsLineId == "nw-line-1" && l.DisplayName == "line-1");
|
|
}
|
|
|
|
private static async Task SeedEquipmentNamespaceAsync(TwoNodeClusterHarness harness)
|
|
{
|
|
await using var db = await CreateDbAsync(harness);
|
|
|
|
db.Namespaces.Add(new Namespace
|
|
{
|
|
NamespaceId = "ns-eq", ClusterId = "c1", Kind = NamespaceKind.Equipment, NamespaceUri = "urn:eq",
|
|
});
|
|
// Disabled so the driver-role nodes don't spawn a live Modbus driver (no endpoint to reach);
|
|
// the composition still carries the instance (ParseComposition does not filter on Enabled).
|
|
db.DriverInstances.Add(new DriverInstance
|
|
{
|
|
DriverInstanceId = "drv-modbus", ClusterId = "c1", NamespaceId = "ns-eq",
|
|
Name = "Modbus", DriverType = "Modbus", DriverConfig = "{}", Enabled = false,
|
|
});
|
|
db.UnsAreas.Add(new UnsArea { UnsAreaId = "nw-area-filling", ClusterId = "c1", Name = "filling" });
|
|
db.UnsLines.Add(new UnsLine { UnsLineId = "nw-line-1", UnsAreaId = "nw-area-filling", Name = "line-1" });
|
|
db.Equipment.Add(new Equipment
|
|
{
|
|
EquipmentId = EquipmentId, EquipmentUuid = EquipmentUuid,
|
|
DriverInstanceId = "drv-modbus", UnsLineId = "nw-line-1",
|
|
Name = "station-1", MachineCode = "STATION_001",
|
|
});
|
|
db.Tags.Add(new Tag
|
|
{
|
|
TagId = "tag-speed", DriverInstanceId = "drv-modbus", EquipmentId = EquipmentId,
|
|
Name = "Speed", DataType = "Float", AccessLevel = TagAccessLevel.Read,
|
|
TagConfig = "{\"FullName\":\"40001\"}",
|
|
});
|
|
|
|
await db.SaveChangesAsync(Ct);
|
|
}
|
|
|
|
private static async Task<OtOpcUaConfigDbContext> CreateDbAsync(TwoNodeClusterHarness harness)
|
|
{
|
|
var factory = harness.NodeA.Services.GetRequiredService<IDbContextFactory<OtOpcUaConfigDbContext>>();
|
|
return await factory.CreateDbContextAsync();
|
|
}
|
|
|
|
private static async Task WaitForAsync(Func<Task<bool>> condition, TimeSpan timeout)
|
|
{
|
|
var deadline = DateTime.UtcNow + timeout;
|
|
while (DateTime.UtcNow < deadline)
|
|
{
|
|
if (await condition()) return;
|
|
await Task.Delay(200);
|
|
}
|
|
throw new TimeoutException($"Condition not met within {timeout}");
|
|
}
|
|
}
|