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.
121 lines
6.6 KiB
Transact-SQL
121 lines
6.6 KiB
Transact-SQL
-- Phase 7 live OPC UA E2E smoke seed — v3 schema (Raw tree + UNS-by-reference + scripting).
|
|
--
|
|
-- Idempotent DELETE-and-recreate of one cluster's worth of test config:
|
|
-- * 1 ServerCluster ('p7-smoke') + ClusterNode + SqlLogin credential
|
|
-- * 1 Galaxy (GalaxyMxGateway) DriverInstance at the cluster root + 1 Device (gateway endpoint)
|
|
-- * 1 raw Tag bound to a Galaxy attribute (identity = RawPath; address in TagConfig.attributeRef)
|
|
-- * 1 UnsArea / UnsLine / Equipment + a UnsTagReference projecting the raw tag into UNS
|
|
-- * 1 Script + 1 VirtualTag using it; 1 Script + 1 ScriptedAlarm using it
|
|
--
|
|
-- v3 changes: ConfigGeneration/GenerationId/Namespace model + sp_PublishGeneration are gone (deploy
|
|
-- is a C# ControlPlane operation); Galaxy driver type is 'GalaxyMxGateway'; the gateway endpoint
|
|
-- lives in the Device's DeviceConfig; ctx.GetTag / alarm-message tokens take a RawPath. The exact
|
|
-- Galaxy TagConfig key ('attributeRef') + scripting RawPath contract are finalized in WP2/WP3/WP4.
|
|
|
|
SET NOCOUNT ON;
|
|
SET XACT_ABORT ON;
|
|
SET QUOTED_IDENTIFIER ON;
|
|
SET ANSI_NULLS ON;
|
|
|
|
DECLARE @ClusterId nvarchar(64) = 'p7-smoke';
|
|
DECLARE @NodeId nvarchar(64) = 'p7-smoke-node';
|
|
DECLARE @DrvId nvarchar(64) = 'p7-smoke-galaxy';
|
|
DECLARE @DevId nvarchar(64) = 'p7-smoke-dev';
|
|
DECLARE @AreaId nvarchar(64) = 'p7-smoke-area';
|
|
DECLARE @LineId nvarchar(64) = 'p7-smoke-line';
|
|
DECLARE @EqId nvarchar(64) = 'p7-smoke-eq';
|
|
DECLARE @EqUuid uniqueidentifier = '5B2CF10D-5B2C-4F10-B5B2-CF10D5B2CF10';
|
|
DECLARE @TagId nvarchar(64) = 'p7-smoke-tag-source';
|
|
DECLARE @RefId nvarchar(64) = 'p7-smoke-ref-source';
|
|
DECLARE @VtScript nvarchar(64) = 'p7-smoke-script-vt';
|
|
DECLARE @AlScript nvarchar(64) = 'p7-smoke-script-al';
|
|
DECLARE @VtId nvarchar(64) = 'p7-smoke-vt-derived';
|
|
DECLARE @AlId nvarchar(64) = 'p7-smoke-al-overtemp';
|
|
|
|
-- RawPath of the source tag: <driver>/<device>/<tag> (cluster root, no folder/group).
|
|
DECLARE @RawPath nvarchar(256) = N'galaxy-smoke/plc/Source';
|
|
|
|
BEGIN TRAN;
|
|
|
|
-- Wipe prior smoke state. Order matters: child rows first.
|
|
DELETE FROM dbo.ScriptedAlarmState WHERE ScriptedAlarmId = @AlId;
|
|
DELETE FROM dbo.ScriptedAlarm WHERE ScriptedAlarmId = @AlId;
|
|
DELETE FROM dbo.VirtualTag WHERE VirtualTagId = @VtId;
|
|
DELETE FROM dbo.Script WHERE ScriptId IN (@VtScript, @AlScript);
|
|
DELETE FROM dbo.UnsTagReference WHERE UnsTagReferenceId = @RefId;
|
|
DELETE FROM dbo.Tag WHERE TagId = @TagId;
|
|
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;
|
|
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, 'P7 Smoke', 'zb', 'lab', 1, 'None', 1, 'p7-smoke');
|
|
|
|
INSERT dbo.ClusterNode(NodeId, ClusterId, Host, OpcUaPort, DashboardPort,
|
|
ApplicationUri, ServiceLevelBase, Enabled, CreatedBy)
|
|
VALUES (@NodeId, @ClusterId, 'localhost', 4840, 5000, 'urn:OtOpcUa:p7-smoke-node', 200, 1, 'p7-smoke');
|
|
|
|
INSERT dbo.ClusterNodeCredential(NodeId, Kind, Value, Enabled, CreatedBy)
|
|
VALUES (@NodeId, N'SqlLogin', N'sa', 1, N'p7-smoke');
|
|
|
|
-- 2. Galaxy driver at the cluster root. DriverConfig keeps non-endpoint settings; the mxaccessgw
|
|
-- gateway endpoint lives in the Device's DeviceConfig (shape finalized in Wave B / WP5).
|
|
INSERT dbo.DriverInstance(DriverInstanceId, ClusterId, RawFolderId, Name, DriverType, DriverConfig, Enabled)
|
|
VALUES (@DrvId, @ClusterId, NULL, 'galaxy-smoke', 'GalaxyMxGateway', N'{
|
|
"ConnectTimeoutMs": 10000
|
|
}', 1);
|
|
|
|
INSERT dbo.Device(DeviceId, DriverInstanceId, Name, Enabled, DeviceConfig)
|
|
VALUES (@DevId, @DrvId, 'plc', 1, N'{ "GatewayAddress": "http://127.0.0.1:5001", "ClientName": "p7-smoke" }');
|
|
|
|
-- 3. Raw tag bound to a Galaxy attribute. Identity is its RawPath; the MXAccess reference lives in
|
|
-- TagConfig.attributeRef (v3 Galaxy address key; finalized in WP2/WP3).
|
|
INSERT dbo.Tag(TagId, DeviceId, TagGroupId, Name, DataType, AccessLevel, WriteIdempotent, TagConfig)
|
|
VALUES (@TagId, @DevId, NULL, 'Source', 'Int32', 'ReadWrite', 0,
|
|
N'{ "attributeRef": "TestMachine_001.TestHistoryValue", "dataType": "Int32" }');
|
|
|
|
-- 4. UNS hierarchy + reference into the equipment.
|
|
INSERT dbo.UnsArea(UnsAreaId, ClusterId, Name) VALUES (@AreaId, @ClusterId, 'lab-floor');
|
|
INSERT dbo.UnsLine(UnsLineId, UnsAreaId, Name) VALUES (@LineId, @AreaId, 'galaxy-line');
|
|
INSERT dbo.Equipment(EquipmentId, EquipmentUuid, UnsLineId, Name, MachineCode, Enabled)
|
|
VALUES (@EqId, @EqUuid, @LineId, 'reactor-1', 'p7-rx-001', 1);
|
|
|
|
INSERT dbo.UnsTagReference(UnsTagReferenceId, EquipmentId, TagId, SortOrder)
|
|
VALUES (@RefId, @EqId, @TagId, 0);
|
|
|
|
-- 5. Scripts. ctx.GetTag takes a RawPath in v3 (SourceHash placeholder; the engine recomputes).
|
|
INSERT dbo.Script(ScriptId, Name, SourceCode, SourceHash, Language)
|
|
VALUES
|
|
(@VtScript, 'machine-status-predicate',
|
|
N'return System.Convert.ToInt32(ctx.GetTag("' + @RawPath + N'").Value) > 0;',
|
|
'0000000000000000000000000000000000000000000000000000000000000000', 'CSharp'),
|
|
(@AlScript, 'overtemp-predicate',
|
|
N'return System.Convert.ToInt32(ctx.GetTag("' + @RawPath + N'").Value) > 50;',
|
|
'0000000000000000000000000000000000000000000000000000000000000000', 'CSharp');
|
|
|
|
-- 6. VirtualTag — MachineStatus boolean computed on each Source change.
|
|
INSERT dbo.VirtualTag(VirtualTagId, EquipmentId, Name, DataType,
|
|
ScriptId, ChangeTriggered, TimerIntervalMs, Historize, Enabled)
|
|
VALUES (@VtId, @EqId, 'MachineStatus', 'Boolean', @VtScript, 1, NULL, 1, 1);
|
|
|
|
-- 7. ScriptedAlarm — Active when Source > 50. {token} is a RawPath in v3.
|
|
INSERT dbo.ScriptedAlarm(ScriptedAlarmId, EquipmentId, Name, AlarmType,
|
|
Severity, MessageTemplate, PredicateScriptId,
|
|
HistorizeToAveva, Retain, Enabled)
|
|
VALUES (@AlId, @EqId, 'OverTemp', 'LimitAlarm', 800,
|
|
N'Reactor source value {' + @RawPath + N'} exceeded 50',
|
|
@AlScript, 1, 1, 1);
|
|
|
|
COMMIT;
|
|
|
|
PRINT '';
|
|
PRINT 'Phase 7 smoke seed complete (v3 schema). Cluster: ' + @ClusterId + ' Node: ' + @NodeId;
|
|
PRINT 'Next: set Server Node:NodeId/ClusterId, deploy via the ControlPlane, then run the Client.CLI checks.';
|