Joseph Doherty
4d39b98564
DbContext (OtOpcUaConfigDbContext): - Drop Namespace/EquipmentImportBatch/EquipmentImportRow DbSets + Configure methods. - Add RawFolder/TagGroup/UnsTagReference DbSets + Configure methods with sibling-name filtered unique indexes over nullable parents (two-filtered pattern per level). - Reshape DriverInstance (RawFolderId + UX_DriverInstance_Folder_Name/_ClusterRoot_Name), Tag (required DeviceId, nullable TagGroupId, UX_Tag_Group_Name/_Device_Name, IX_Tag_Device), Equipment (drop DriverInstanceId/DeviceId + IX_Equipment_Driver), Device (UX_Device_Driver_Name). Migration squash -> V3Initial: - Delete the whole Migrations/ folder; scaffold one V3Initial (applies clean to a fresh DB). - Port the hand-written procs + AuthorizationGrants into V3Initial.StoredProcedures.cs. The v1 generation-model procs (ConfigGeneration/GenerationId, dead since V2HostingAlignment) are rewritten as v3-schema-valid retirement stubs that preserve the two-role EXECUTE-grant surface + AuthorizationTests behaviors; sp_ComputeGenerationDiff now references the v3 tables; sp_ReleaseExternalIdReservation ported verbatim. Compile-fixes for the build gate (Wave-C-owned, minimal + TODO(v3 WP4) markers): - DraftSnapshot/DraftSnapshotFactory: drop the retired Namespaces list. - DraftValidator: delete namespace-binding + Galaxy-FullName rules; collision rule now VirtualTag-only. Seeds -> v3 schema: - seed-clusters.sql summary SELECTs; all 5 scripts/smoke/seed-*.sql rewritten (DriverInstance RawFolderId, Device+DeviceConfig endpoint, Tag DeviceId, UnsTagReference; no ConfigGeneration/ Namespace/sp_PublishGeneration). Verified: all seeds apply clean against a fresh V3Initial DB. Tests (Configuration.Tests, 107 pass): - SchemaComplianceTests rewritten to v3 tables + filtered indexes. - New RawSchemaIntegrityTests: DB-enforced sibling-name uniqueness per raw level + UnsTagReference (Equipment,Tag) uniqueness. - Delete DraftValidatorGalaxyFullNameCorpusTests (WP2/WP6 replaces); fix DraftValidatorTests + DraftSnapshotFactoryTests to v3 shapes; repoint scripting-migration existence test to V3Initial.
102 lines
5.5 KiB
Transact-SQL
102 lines
5.5 KiB
Transact-SQL
-- Modbus e2e smoke seed — v3 schema (Raw tree: DriverInstance → Device → Tag; UNS by reference).
|
|
--
|
|
-- Idempotent — DELETE-and-recreate of one cluster's worth of Modbus test config:
|
|
-- * 1 ServerCluster ('modbus-smoke') + ClusterNode ('modbus-smoke-node') + SqlLogin credential
|
|
-- * 1 Modbus DriverInstance at the cluster root (RawFolderId NULL)
|
|
-- * 1 Device carrying the pymodbus endpoint in DeviceConfig
|
|
-- * 1 Tag at HR[200]:UInt16 under the device (HR[100] is auto-increment in standard.json,
|
|
-- unusable as a write target — the e2e script uses HR[200] for that reason)
|
|
-- * 1 UnsArea/UnsLine/Equipment + a UnsTagReference projecting the raw tag into UNS
|
|
--
|
|
-- v3 changes vs. the pre-v2 original: the ConfigGeneration/GenerationId/Namespace model and the
|
|
-- sp_PublishGeneration publish step are gone (deploy is a C# ControlPlane operation now); the
|
|
-- connection endpoint moved from DriverConfig into the Device's DeviceConfig.
|
|
--
|
|
-- Usage:
|
|
-- sqlcmd -S "10.100.0.35,14330" -d <cfgdb> -U sa -P "<pw>" -i scripts/smoke/seed-modbus-smoke.sql
|
|
|
|
SET NOCOUNT ON;
|
|
SET XACT_ABORT ON;
|
|
SET QUOTED_IDENTIFIER ON;
|
|
SET ANSI_NULLS ON;
|
|
|
|
DECLARE @ClusterId nvarchar(64) = 'modbus-smoke';
|
|
DECLARE @NodeId nvarchar(64) = 'modbus-smoke-node';
|
|
DECLARE @DrvId nvarchar(64) = 'modbus-smoke-drv';
|
|
DECLARE @DevId nvarchar(64) = 'modbus-smoke-dev';
|
|
DECLARE @AreaId nvarchar(64) = 'modbus-smoke-area';
|
|
DECLARE @LineId nvarchar(64) = 'modbus-smoke-line';
|
|
DECLARE @EqId nvarchar(64) = 'modbus-smoke-eq';
|
|
DECLARE @EqUuid uniqueidentifier = '72BD5A10-72BD-45A1-B72B-D5A1072BD5A1';
|
|
DECLARE @TagHr200 nvarchar(64) = 'modbus-smoke-tag-hr200';
|
|
DECLARE @RefId nvarchar(64) = 'modbus-smoke-ref-hr200';
|
|
|
|
BEGIN TRAN;
|
|
|
|
-- Clean prior smoke state (child rows first).
|
|
DELETE FROM dbo.UnsTagReference WHERE UnsTagReferenceId = @RefId;
|
|
DELETE FROM dbo.Tag WHERE TagId = @TagHr200;
|
|
DELETE FROM dbo.Equipment WHERE EquipmentId = @EqId;
|
|
DELETE FROM dbo.UnsLine WHERE UnsLineId = @LineId;
|
|
DELETE FROM dbo.UnsArea WHERE UnsAreaId = @AreaId;
|
|
DELETE FROM dbo.Device WHERE DeviceId = @DevId;
|
|
DELETE FROM dbo.DriverInstance WHERE DriverInstanceId = @DrvId;
|
|
DELETE FROM dbo.ClusterNodeCredential WHERE NodeId = @NodeId;
|
|
DELETE FROM dbo.ClusterNode WHERE NodeId = @NodeId;
|
|
DELETE FROM dbo.ServerCluster WHERE ClusterId = @ClusterId;
|
|
|
|
-- `UX_ClusterNodeCredential_Value` is a unique index on (Kind, Value) WHERE Enabled=1, so the
|
|
-- `sa` login can only bind to one node at a time. Drop any prior smoke binding first.
|
|
DELETE FROM dbo.ClusterNodeCredential WHERE Kind = 'SqlLogin' AND Value = 'sa';
|
|
|
|
-- 1. Cluster + Node + credential binding.
|
|
INSERT dbo.ServerCluster(ClusterId, Name, Enterprise, Site, NodeCount, RedundancyMode, Enabled, CreatedBy)
|
|
VALUES (@ClusterId, 'Modbus Smoke', 'zb', 'lab', 1, 'None', 1, 'modbus-smoke');
|
|
|
|
INSERT dbo.ClusterNode(NodeId, ClusterId, Host, OpcUaPort, DashboardPort,
|
|
ApplicationUri, ServiceLevelBase, Enabled, CreatedBy)
|
|
VALUES (@NodeId, @ClusterId, 'localhost', 4840, 15050,
|
|
'urn:OtOpcUa:modbus-smoke-node', 200, 1, 'modbus-smoke');
|
|
|
|
INSERT dbo.ClusterNodeCredential(NodeId, Kind, Value, Enabled, CreatedBy)
|
|
VALUES (@NodeId, 'SqlLogin', 'sa', 1, 'modbus-smoke');
|
|
|
|
-- 2. Modbus DriverInstance at the cluster root (RawFolderId NULL). DriverConfig keeps protocol/
|
|
-- channel settings only — the endpoint (Host/Port/UnitId) now lives in the Device's DeviceConfig.
|
|
INSERT dbo.DriverInstance(DriverInstanceId, ClusterId, RawFolderId, Name, DriverType, DriverConfig, Enabled)
|
|
VALUES (@DrvId, @ClusterId, NULL, 'pymodbus-smoke', 'Modbus', N'{
|
|
"TimeoutMs": 2000,
|
|
"AutoReconnect": true,
|
|
"Probe": { "Enabled": true, "IntervalMs": 5000, "TimeoutMs": 2000, "ProbeAddress": 0 }
|
|
}', 1);
|
|
|
|
-- 3. Device — endpoint. DeviceConfig shape finalized against reworked options in Wave B (WP5).
|
|
INSERT dbo.Device(DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig)
|
|
VALUES (@DevId, @DrvId, 'plc', 1, N'{ "Host": "127.0.0.1", "Port": 5020, "UnitId": 1 }');
|
|
|
|
-- 4. Raw tag under the device (identity = RawPath; TagConfig carries the driver address only).
|
|
INSERT dbo.Tag(TagId, DeviceId, TagGroupId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
|
|
VALUES (@TagHr200, @DevId, NULL, 'HR200', 'UInt16', 'ReadWrite', 1,
|
|
N'{ "region": "HoldingRegisters", "address": 200, "dataType": "UInt16", "writable": true }');
|
|
|
|
-- 5. UNS hierarchy + a reference projecting the raw tag into the equipment.
|
|
INSERT dbo.UnsArea(UnsAreaId, ClusterId, Name) VALUES (@AreaId, @ClusterId, 'lab-floor');
|
|
INSERT dbo.UnsLine(UnsLineId, UnsAreaId, Name) VALUES (@LineId, @AreaId, 'modbus-line');
|
|
INSERT dbo.Equipment(EquipmentId, EquipmentUuid, UnsLineId, Name, MachineCode, Enabled)
|
|
VALUES (@EqId, @EqUuid, @LineId, 'modbus-sim', 'modbus-001', 1);
|
|
|
|
INSERT dbo.UnsTagReference(UnsTagReferenceId, EquipmentId, TagId, SortOrder)
|
|
VALUES (@RefId, @EqId, @TagHr200, 0);
|
|
|
|
COMMIT;
|
|
|
|
PRINT '';
|
|
PRINT 'Modbus smoke seed complete (v3 schema).';
|
|
PRINT ' Cluster: ' + @ClusterId + ' Node: ' + @NodeId;
|
|
PRINT '';
|
|
PRINT 'Next steps:';
|
|
PRINT ' 1. Set Server appsettings Node:NodeId = "modbus-smoke-node" / Node:ClusterId = "modbus-smoke"';
|
|
PRINT ' 2. docker compose -f tests/.../Modbus.IntegrationTests/Docker/docker-compose.yml --profile standard up -d';
|
|
PRINT ' 3. dotnet run --project src/Server/ZB.MOM.WW.OtOpcUa.Server';
|
|
PRINT ' 4. Deploy the config via the AdminUI/ControlPlane, then ./scripts/e2e/test-modbus.ps1';
|