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

feat(validation): require TagConfig.FullName on Galaxy alias tags; reframe Tag doc

Browse Source
This commit is contained in:
Joseph Doherty
2026-06-11 21:21:32 -04:00
parent 53116bdd83
commit 9f13101896
3 changed files with 99 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs
+59 -3
View File
@@ -405,16 +405,21 @@ public sealed class DraftValidatorTests
DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "EquipmentSignalNameCollision");
}
private static Tag BuildTag(string? equipmentId, string name, string? folderPath) => new()
private static Tag BuildTag(
string? equipmentId,
string name,
string? folderPath,
string driverInstanceId = "d",
string tagConfig = "{}") => new()
{
TagId = $"tag-{name}",
DriverInstanceId = "d",
DriverInstanceId = driverInstanceId,
EquipmentId = equipmentId,
Name = name,
FolderPath = folderPath,
DataType = "Float",
AccessLevel = TagAccessLevel.Read,
TagConfig = "{}",
TagConfig = tagConfig,
};
private static VirtualTag BuildVirtualTag(string equipmentId, string name) => new()
@@ -426,6 +431,57 @@ public sealed class DraftValidatorTests
ScriptId = "s-1",
};
// ------------------------------------------------------------------------------------
// ValidateAliasTagFullName — Galaxy alias tags must carry TagConfig.FullName
// ------------------------------------------------------------------------------------
/// <summary>Verifies that an equipment-scoped Tag bound to a GalaxyMxGateway driver whose
/// TagConfig has no FullName (an alias with no Galaxy reference) is rejected — it would
/// subscribe to nothing.</summary>
[Fact]
public void AliasTag_missing_FullName_is_rejected()
{
var draft = new DraftSnapshot
{
GenerationId = 1, ClusterId = "c",
DriverInstances = [new DriverInstance { DriverInstanceId = "d-galaxy", ClusterId = "c", NamespaceId = "ns-1", Name = "Galaxy", DriverType = "GalaxyMxGateway", DriverConfig = "{}" }],
Tags = [BuildTag(equipmentId: "eq-1", name: "alias", folderPath: null, driverInstanceId: "d-galaxy", tagConfig: "{}")],
};
DraftValidator.Validate(draft).ShouldContain(e => e.Code == "AliasTagMissingReference" && e.Context == "tag-alias");
}
/// <summary>Verifies that an equipment-scoped Galaxy alias tag carrying a TagConfig.FullName
/// reference is accepted.</summary>
[Fact]
public void AliasTag_with_FullName_is_accepted()
{
var draft = new DraftSnapshot
{
GenerationId = 1, ClusterId = "c",
DriverInstances = [new DriverInstance { DriverInstanceId = "d-galaxy", ClusterId = "c", NamespaceId = "ns-1", Name = "Galaxy", DriverType = "GalaxyMxGateway", DriverConfig = "{}" }],
Tags = [BuildTag(equipmentId: "eq-1", name: "alias", folderPath: null, driverInstanceId: "d-galaxy", tagConfig: "{\"FullName\":\"X.Y\"}")],
};
DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "AliasTagMissingReference");
}
/// <summary>Verifies that an equipment-scoped Tag bound to a NON-Galaxy driver with an empty
/// TagConfig is NOT flagged as an alias missing its reference — only GalaxyMxGateway-bound
/// equipment tags are aliases.</summary>
[Fact]
public void AliasTag_check_skips_nonGalaxy_equipment_tag()
{
var draft = new DraftSnapshot
{
GenerationId = 1, ClusterId = "c",
DriverInstances = [new DriverInstance { DriverInstanceId = "d-modbus", ClusterId = "c", NamespaceId = "ns-1", Name = "Modbus", DriverType = "Modbus", DriverConfig = "{}" }],
Tags = [BuildTag(equipmentId: "eq-1", name: "alias", folderPath: null, driverInstanceId: "d-modbus", tagConfig: "{}")],
};
DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "AliasTagMissingReference");
}
// ------------------------------------------------------------------------------------
// Phase 6.3 task #148 part 2 — ValidateClusterTopology
// ------------------------------------------------------------------------------------