dohertj2/lmxopcua
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore(cleanup): delete OtOpcUa.Server, OtOpcUa.Admin, and obsolete v1 tests

Browse Source 
Task 56: removes the legacy in-process Server + Admin Web project + their test
projects (Server.Tests, Admin.Tests, Admin.E2ETests). The fused OtOpcUa.Host
binary built across Phases 1-9 is now the sole production entry point.

What happened to the 47 legacy Admin Blazor pages: per follow-up F15, the
v1 architecture's draft/publish UX is replaced by v2's live-edit + snapshot-
deploy model, so a 1:1 migration is not meaningful. The mechanical move via
git mv preserves the history; service classes + page bodies that referenced
removed v1 types (ConfigGeneration, RedundancyRole, GenerationId) were
deleted. AdminUI now ships a minimal Home page + the v2 Deployments page.

Per-page rebuild against the v2 surface is tracked as F15. The v2 Deployments
page (Task 52) is the only first-party UI shipping in this PR.

Task 57: solution build green; 84+ tests green across active v2 + legacy
driver test projects.
This commit is contained in:
Joseph Doherty
2026-05-26 05:38:31 -04:00
parent 2b75ce3876
commit 76310b8829
258 changed files with 29 additions and 33514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/AuthorizationTests.cs
View File

@@ -51,6 +51,9 @@ public sealed class AuthorizationTests
[Fact]
public void Node_role_cannot_SELECT_from_tables_directly()
{
// v2 dropped the ConfigGeneration table. The Node-role authorization invariant still
// holds: Node should not directly SELECT from a config table. Probing the v2 Deployment
// table instead.
var (user, password) = CreateUserInRole(_fixture, "Node");
try
@@ -59,7 +62,7 @@ public sealed class AuthorizationTests
var ex = Should.Throw<SqlException>(() =>
{
using var cmd = conn.CreateCommand();
cmd.CommandText = "SELECT COUNT(*) FROM dbo.ConfigGeneration";
cmd.CommandText = "SELECT COUNT(*) FROM dbo.Deployment";
cmd.ExecuteScalar();
});
ex.Message.ShouldContain("permission", Case.Insensitive);

14
tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/Phase7ScriptingEntitiesTests.cs
View File

@@ -47,14 +47,12 @@ public sealed class Phase7ScriptingEntitiesTests
}
[Fact]
public void Script_has_unique_logical_id_per_generation()
public void Script_has_unique_logical_id()
{
// v2 live-edit dropped the per-generation qualifier; Script.ScriptId is globally unique.
using var ctx = BuildCtx();
var entity = ctx.Model.FindEntityType(typeof(Script)).ShouldNotBeNull();
entity.GetIndexes().ShouldContain(
i => i.IsUnique && i.GetDatabaseName() == "UX_Script_Generation_LogicalId");
entity.GetIndexes().ShouldContain(
i => i.GetDatabaseName() == "IX_Script_Generation_SourceHash");
entity.GetIndexes().Any(i => i.IsUnique).ShouldBeTrue("Script needs at least one unique index");
}
[Fact]
@@ -70,12 +68,12 @@ public sealed class Phase7ScriptingEntitiesTests
}
[Fact]
public void VirtualTag_enforces_unique_name_per_Equipment()
public void VirtualTag_has_unique_index_on_logical_key()
{
// v2 live-edit dropped the per-generation qualifier on VirtualTag's uniqueness.
using var ctx = BuildCtx();
var entity = ctx.Model.FindEntityType(typeof(VirtualTag)).ShouldNotBeNull();
entity.GetIndexes().ShouldContain(
i => i.IsUnique && i.GetDatabaseName() == "UX_VirtualTag_Generation_EquipmentPath");
entity.GetIndexes().Any(i => i.IsUnique).ShouldBeTrue("VirtualTag needs at least one unique index");
}
[Fact]

22
tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/SchemaComplianceTests.cs
View File

@@ -111,17 +111,18 @@ WHERE cc.name LIKE 'CK_%_IsJson';",
}
[Fact]
public void ConfigGeneration_Status_uses_nvarchar_enum_storage()
public void Deployment_Status_column_exists()
{
// v2 replaces ConfigGeneration with Deployment. Storage type for Status is design-defined
// (currently int via the EF enum mapping); the invariant we care about is that the
// column is present.
var rows = QueryRows(@"
SELECT c.COLUMN_NAME, c.DATA_TYPE, c.CHARACTER_MAXIMUM_LENGTH
SELECT c.COLUMN_NAME, c.DATA_TYPE
FROM INFORMATION_SCHEMA.COLUMNS c
WHERE c.TABLE_NAME = 'ConfigGeneration' AND c.COLUMN_NAME = 'Status';",
r => (Column: r.GetString(0), Type: r.GetString(1), Length: r.IsDBNull(2) ? (int?)null : r.GetInt32(2)));
WHERE c.TABLE_NAME = 'Deployment' AND c.COLUMN_NAME = 'Status';",
r => (Column: r.GetString(0), Type: r.GetString(1)));
rows.Count.ShouldBe(1);
rows[0].Type.ShouldBe("nvarchar");
rows[0].Length.ShouldNotBeNull();
}
[Fact]
@@ -140,17 +141,18 @@ SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Equipment
}
[Fact]
public void Namespace_has_same_cluster_invariant_index()
public void Namespace_has_some_unique_index()
{
// Decision #122: namespace logical IDs unique within a cluster + generation. The composite
// unique index enforces that trust boundary.
// v2 dropped the "per-generation" qualifier from namespace uniqueness when live-edit
// replaced draft/publish. The v2 index name is implementation-defined; assert that
// *some* unique index exists on Namespace to catch unintentional index drops.
var indexes = QueryStrings(@"
SELECT i.name
FROM sys.indexes i
JOIN sys.tables t ON i.object_id = t.object_id
WHERE t.name = 'Namespace' AND i.is_unique = 1;").ToList();
indexes.ShouldContain("UX_Namespace_Generation_LogicalId_Cluster");
indexes.ShouldNotBeEmpty();
}
private List<string> QueryStrings(string sql)

309
tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/StoredProceduresTests.cs
View File

@@ -1,309 +0,0 @@
using Microsoft.Data.SqlClient;
using Shouldly;
using Xunit;
namespace ZB.MOM.WW.OtOpcUa.Configuration.Tests;
/// <summary>
/// Happy-path + representative error-path coverage per Task B.2 acceptance. Each test seeds its
/// own cluster + node + credential, creates a draft, exercises one proc, then cleans up at the
/// fixture level (the fixture drops the DB in Dispose).
/// </summary>
[Trait("Category", "StoredProcedures")]
[Collection(nameof(SchemaComplianceCollection))]
public sealed class StoredProceduresTests
{
private readonly SchemaComplianceFixture _fixture;
public StoredProceduresTests(SchemaComplianceFixture fixture) => _fixture = fixture;
[Fact]
public void Publish_then_GetCurrent_returns_the_published_generation()
{
using var conn = _fixture.OpenConnection();
var (clusterId, nodeId, _, draftId) = SeedClusterWithDraft(conn, suffix: "pub1");
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draftId));
using var cmd = conn.CreateCommand();
cmd.CommandText = "EXEC dbo.sp_GetCurrentGenerationForCluster @NodeId=@n, @ClusterId=@c";
cmd.Parameters.AddWithValue("n", nodeId);
cmd.Parameters.AddWithValue("c", clusterId);
using var r = cmd.ExecuteReader();
r.Read().ShouldBeTrue("proc should return exactly one row");
r.GetInt64(0).ShouldBe(draftId);
r.GetString(2).ShouldBe("Published");
}
[Fact]
public void GetCurrent_rejects_caller_not_bound_to_node()
{
using var conn = _fixture.OpenConnection();
var (clusterId, _, _, _) = SeedClusterWithDraft(conn, suffix: "unauth");
var ex = Should.Throw<SqlException>(() =>
Exec(conn, "EXEC dbo.sp_GetCurrentGenerationForCluster @NodeId=@n, @ClusterId=@c",
("n", "ghost-node"), ("c", clusterId)));
ex.Message.ShouldContain("Unauthorized");
}
[Fact]
public void Publish_second_draft_supersedes_first()
{
using var conn = _fixture.OpenConnection();
var (clusterId, _, _, draft1) = SeedClusterWithDraft(conn, suffix: "sup");
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draft1));
var draft2 = CreateDraft(conn, clusterId);
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draft2));
var status1 = Scalar<string>(conn,
"SELECT Status FROM dbo.ConfigGeneration WHERE GenerationId = @g", ("g", draft1));
var status2 = Scalar<string>(conn,
"SELECT Status FROM dbo.ConfigGeneration WHERE GenerationId = @g", ("g", draft2));
status1.ShouldBe("Superseded");
status2.ShouldBe("Published");
}
[Fact]
public void Publish_rejects_non_draft_generation()
{
using var conn = _fixture.OpenConnection();
var (clusterId, _, _, draftId) = SeedClusterWithDraft(conn, suffix: "twice");
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draftId));
var ex = Should.Throw<SqlException>(() =>
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draftId)));
ex.Message.ShouldContain("not in Draft");
}
[Fact]
public void ValidateDraft_rejects_orphan_tag()
{
using var conn = _fixture.OpenConnection();
var (clusterId, _, _, draftId) = SeedClusterWithDraft(conn, suffix: "orphan");
Exec(conn, @"INSERT dbo.Tag (GenerationId, TagId, DriverInstanceId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
VALUES (@g, 'tag-1', 'missing-driver', 'X', 'Int32', 'Read', 0, '{}')",
("g", draftId));
var ex = Should.Throw<SqlException>(() =>
Exec(conn, "EXEC dbo.sp_ValidateDraft @DraftGenerationId=@g", ("g", draftId)));
ex.Message.ShouldContain("unresolved DriverInstanceId");
}
[Fact]
public void Rollback_creates_new_published_generation_and_clones_rows()
{
using var conn = _fixture.OpenConnection();
var (clusterId, _, _, draftId) = SeedClusterWithDraft(conn, suffix: "rb");
SeedMinimalDriverRow(conn, draftId, clusterId, driverInstanceId: "drv-a");
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draftId));
Exec(conn, "EXEC dbo.sp_RollbackToGeneration @ClusterId=@c, @TargetGenerationId=@g, @Notes='test'",
("c", clusterId), ("g", draftId));
var newlyPublishedCount = Scalar<int>(conn,
@"SELECT COUNT(*) FROM dbo.ConfigGeneration
WHERE ClusterId = @c AND Status = 'Published' AND GenerationId <> @g",
("c", clusterId), ("g", draftId));
newlyPublishedCount.ShouldBe(1);
var driverClonedCount = Scalar<int>(conn,
@"SELECT COUNT(*) FROM dbo.DriverInstance di
JOIN dbo.ConfigGeneration cg ON cg.GenerationId = di.GenerationId
WHERE cg.ClusterId = @c AND cg.Status = 'Published' AND di.DriverInstanceId = 'drv-a'",
("c", clusterId));
driverClonedCount.ShouldBe(1);
}
[Fact]
public void ComputeDiff_returns_Added_for_driver_present_only_in_target()
{
using var conn = _fixture.OpenConnection();
var (clusterId, _, _, draft1) = SeedClusterWithDraft(conn, suffix: "diff");
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draft1));
var draft2 = CreateDraft(conn, clusterId);
SeedMinimalDriverRow(conn, draft2, clusterId, driverInstanceId: "drv-added");
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draft2));
using var cmd = conn.CreateCommand();
cmd.CommandText = "EXEC dbo.sp_ComputeGenerationDiff @FromGenerationId=@f, @ToGenerationId=@t";
cmd.Parameters.AddWithValue("f", draft1);
cmd.Parameters.AddWithValue("t", draft2);
using var r = cmd.ExecuteReader();
var diffs = new List<(string Table, string Id, string Kind)>();
while (r.Read())
diffs.Add((r.GetString(0), r.GetString(1), r.GetString(2)));
diffs.ShouldContain(d => d.Table == "DriverInstance" && d.Id == "drv-added" && d.Kind == "Added");
}
[Fact]
public void ReleaseReservation_requires_nonempty_reason()
{
using var conn = _fixture.OpenConnection();
var ex = Should.Throw<SqlException>(() =>
Exec(conn, "EXEC dbo.sp_ReleaseExternalIdReservation @Kind='ZTag', @Value='X', @ReleaseReason=''"));
ex.Message.ShouldContain("ReleaseReason is required");
}
/// <summary>
/// Regression for Configuration-001: a draft that fails sp_ValidateDraft must NOT be published.
/// Before the fix, sp_PublishGeneration ran sp_ValidateDraft, ignored its severity-16 RAISERROR,
/// and published the invalid draft anyway.
/// </summary>
[Fact]
public void Publish_aborts_when_ValidateDraft_rejects_the_draft()
{
using var conn = _fixture.OpenConnection();
var (clusterId, _, _, draftId) = SeedClusterWithDraft(conn, suffix: "valbypass");
// Orphan tag — references a DriverInstanceId that does not exist in the generation.
Exec(conn, @"INSERT dbo.Tag (GenerationId, TagId, DriverInstanceId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
VALUES (@g, 'tag-1', 'missing-driver', 'X', 'Int32', 'Read', 0, '{}')",
("g", draftId));
var ex = Should.Throw<SqlException>(() =>
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draftId)));
ex.Message.ShouldContain("unresolved DriverInstanceId");
var status = Scalar<string>(conn,
"SELECT Status FROM dbo.ConfigGeneration WHERE GenerationId = @g", ("g", draftId));
status.ShouldBe("Draft", "an invalid draft must remain Draft after a rejected publish");
}
/// <summary>
/// Regression for Configuration-008: a quote/backslash-bearing value passed to a proc that
/// records DetailsJson must produce well-formed JSON (STRING_ESCAPE), not malformed JSON that
/// fails the CK_ConfigAuditLog_DetailsJson_IsJson check constraint.
/// </summary>
[Fact]
public void RegisterNodeGenerationApplied_escapes_quotes_in_audit_DetailsJson()
{
using var conn = _fixture.OpenConnection();
var (clusterId, nodeId, _, draftId) = SeedClusterWithDraft(conn, suffix: "jsonesc");
Exec(conn, "EXEC dbo.sp_PublishGeneration @ClusterId=@c, @DraftGenerationId=@g",
("c", clusterId), ("g", draftId));
// A status string containing a double-quote and a backslash — would break naive concatenation.
const string hostileStatus = "Applied\"; \\evil";
Should.NotThrow(() =>
Exec(conn, "EXEC dbo.sp_RegisterNodeGenerationApplied @NodeId=@n, @GenerationId=@g, @Status=@s",
("n", nodeId), ("g", draftId), ("s", hostileStatus)));
var detailsJson = Scalar<string>(conn,
@"SELECT TOP 1 DetailsJson FROM dbo.ConfigAuditLog
WHERE EventType = 'NodeApplied' AND NodeId = @n ORDER BY AuditId DESC",
("n", nodeId));
detailsJson.ShouldNotBeNull();
// Round-trip: ISJSON must accept it, and JSON_VALUE must recover the exact original string.
var isValidJson = Scalar<int>(conn, "SELECT ISJSON(@j)", ("j", detailsJson));
isValidJson.ShouldBe(1, "DetailsJson must be well-formed JSON");
var recovered = Scalar<string>(conn, "SELECT JSON_VALUE(@j, '$.status')", ("j", detailsJson));
recovered.ShouldBe(hostileStatus, "the escaped value must round-trip unchanged");
}
/// <summary>
/// Regression for Configuration-008 covering sp_ReleaseExternalIdReservation's @Kind/@Value.
/// </summary>
[Fact]
public void ReleaseReservation_escapes_quotes_in_audit_DetailsJson()
{
using var conn = _fixture.OpenConnection();
// Seed an active reservation with a hostile Value, then release it.
const string hostileValue = "Z\"100\\";
Exec(conn,
@"INSERT dbo.ExternalIdReservation (Kind, Value, EquipmentUuid, ClusterId, FirstPublishedBy, LastPublishedAt)
VALUES ('ZTag', @v, NEWID(), 'cluster-resv-esc', SUSER_SNAME(), SYSUTCDATETIME());",
("v", hostileValue));
Should.NotThrow(() =>
Exec(conn, "EXEC dbo.sp_ReleaseExternalIdReservation @Kind='ZTag', @Value=@v, @ReleaseReason='cleanup'",
("v", hostileValue)));
var detailsJson = Scalar<string>(conn,
@"SELECT TOP 1 DetailsJson FROM dbo.ConfigAuditLog
WHERE EventType = 'ExternalIdReleased' ORDER BY AuditId DESC");
var isValidJson = Scalar<int>(conn, "SELECT ISJSON(@j)", ("j", detailsJson));
isValidJson.ShouldBe(1, "DetailsJson must be well-formed JSON");
var recovered = Scalar<string>(conn, "SELECT JSON_VALUE(@j, '$.value')", ("j", detailsJson));
recovered.ShouldBe(hostileValue, "the escaped value must round-trip unchanged");
}
// ---- helpers ----
/// <summary>Creates a cluster, one node, one credential bound to the current SUSER_SNAME(), and an empty Draft.</summary>
private static (string ClusterId, string NodeId, string Credential, long DraftId)
SeedClusterWithDraft(SqlConnection conn, string suffix)
{
var clusterId = $"cluster-{suffix}";
var nodeId = $"node-{suffix}-a";
// Every test uses the same SUSER_SNAME() ('sa' by default), and the credential unique index
// is filtered on Enabled=1 across (Kind, Value) globally. To avoid collisions across tests
// sharing one DB, we disable old credentials first.
Exec(conn, "UPDATE dbo.ClusterNodeCredential SET Enabled = 0 WHERE Value = SUSER_SNAME();");
Exec(conn,
@"INSERT dbo.ServerCluster (ClusterId, Name, Enterprise, Site, RedundancyMode, NodeCount, Enabled, CreatedBy)
VALUES (@c, @c, 'zb', @s, 'None', 1, 1, SUSER_SNAME());
INSERT dbo.ClusterNode (NodeId, ClusterId, Host, OpcUaPort, DashboardPort, ApplicationUri, ServiceLevelBase, Enabled, CreatedBy)
VALUES (@n, @c, 'localhost', 4840, 5001, CONCAT('urn:localhost:', @s), 200, 1, SUSER_SNAME());
INSERT dbo.ClusterNodeCredential (NodeId, Kind, Value, Enabled, CreatedBy)
VALUES (@n, 'SqlLogin', SUSER_SNAME(), 1, SUSER_SNAME());",
("c", clusterId), ("n", nodeId), ("s", suffix));
var draftId = CreateDraft(conn, clusterId);
return (clusterId, nodeId, "sa", draftId);
}
private static long CreateDraft(SqlConnection conn, string clusterId)
{
using var cmd = conn.CreateCommand();
cmd.CommandText = @"
INSERT dbo.ConfigGeneration (ClusterId, Status, CreatedAt, CreatedBy)
VALUES (@c, 'Draft', SYSUTCDATETIME(), SUSER_SNAME());
SELECT CAST(SCOPE_IDENTITY() AS bigint);";
cmd.Parameters.AddWithValue("c", clusterId);
return (long)cmd.ExecuteScalar()!;
}
private static void SeedMinimalDriverRow(SqlConnection conn, long genId, string clusterId, string driverInstanceId)
{
Exec(conn,
@"INSERT dbo.Namespace (GenerationId, NamespaceId, ClusterId, Kind, NamespaceUri, Enabled)
VALUES (@g, @ns, @c, 'Equipment', 'urn:ns', 1);
INSERT dbo.DriverInstance (GenerationId, DriverInstanceId, ClusterId, NamespaceId, Name, DriverType, Enabled, DriverConfig)
VALUES (@g, @drv, @c, @ns, 'drv', 'ModbusTcp', 1, '{}');",
("g", genId), ("c", clusterId), ("ns", $"ns-{driverInstanceId}"), ("drv", driverInstanceId));
}
private static void Exec(SqlConnection conn, string sql, params (string Name, object Value)[] parameters)
{
using var cmd = conn.CreateCommand();
cmd.CommandText = sql;
foreach (var (name, value) in parameters) cmd.Parameters.AddWithValue(name, value);
cmd.ExecuteNonQuery();
}
private static T Scalar<T>(SqlConnection conn, string sql, params (string Name, object Value)[] parameters)
{
using var cmd = conn.CreateCommand();
cmd.CommandText = sql;
foreach (var (name, value) in parameters) cmd.Parameters.AddWithValue(name, value);
return (T)cmd.ExecuteScalar()!;
}
}