Compare commits
6 Commits
phase-7-fu
...
phase-7-fu
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
98a8031772 | ||
| efdf04320a | |||
|
|
bb10ba7108 | ||
| 42f3b17c4a | |||
|
|
7352db28a6 | ||
| 8388ddc033 |
157
docs/v2/implementation/phase-7-e2e-smoke.md
Normal file
157
docs/v2/implementation/phase-7-e2e-smoke.md
Normal file
@@ -0,0 +1,157 @@
|
|||||||
|
# Phase 7 Live OPC UA E2E Smoke (task #240)
|
||||||
|
|
||||||
|
End-to-end validation that the Phase 7 production wiring chain (#243 / #244 / #245 / #246 / #247) actually serves virtual tags + scripted alarms over OPC UA against a real Galaxy + Aveva Historian.
|
||||||
|
|
||||||
|
> **Scope.** Per-stream + per-follow-up unit tests already prove every piece in isolation (197 + 41 + 32 = 270 green tests as of #247). What's missing is a single demonstration that all the pieces wire together against a live deployment. This runbook is that demonstration.
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
| Component | How to verify |
|
||||||
|
|-----------|---------------|
|
||||||
|
| AVEVA Galaxy + MXAccess installed | `Get-Service ArchestrA*` returns at least one running service |
|
||||||
|
| `OtOpcUaGalaxyHost` Windows service running | `sc query OtOpcUaGalaxyHost` → `STATE: 4 RUNNING` |
|
||||||
|
| Galaxy.Host shared secret matches `.local/galaxy-host-secret.txt` | Set during NSSM install — see `docs/ServiceHosting.md` |
|
||||||
|
| SQL Server reachable, `OtOpcUaConfig` DB exists with all migrations applied | `sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "..." -Q "SELECT COUNT(*) FROM dbo.__EFMigrationsHistory"` returns ≥ 11 |
|
||||||
|
| Server's `appsettings.json` `Node:ConfigDbConnectionString` matches your SQL Server | `cat src/ZB.MOM.WW.OtOpcUa.Server/appsettings.json` |
|
||||||
|
|
||||||
|
> **Galaxy.Host pipe ACL.** Per `docs/ServiceHosting.md`, the pipe ACL deliberately denies `BUILTIN\Administrators`. **Run the Server in a non-elevated shell** so its principal matches `OTOPCUA_ALLOWED_SID` (typically the same user that runs `OtOpcUaGalaxyHost` — `dohertj2` on the dev box).
|
||||||
|
|
||||||
|
## Setup
|
||||||
|
|
||||||
|
### 1. Migrate the Config DB
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
cd src/ZB.MOM.WW.OtOpcUa.Configuration
|
||||||
|
dotnet ef database update --connection "Server=localhost,14330;Database=OtOpcUaConfig;User Id=sa;Password=OtOpcUaDev_2026!;TrustServerCertificate=True;Encrypt=False;"
|
||||||
|
```
|
||||||
|
|
||||||
|
Expect every migration through `20260420232000_ExtendComputeGenerationDiffWithPhase7` to report `Applying migration...`. Re-running is a no-op.
|
||||||
|
|
||||||
|
### 2. Seed the smoke fixture
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "OtOpcUaDev_2026!" `
|
||||||
|
-I -i scripts/smoke/seed-phase-7-smoke.sql
|
||||||
|
```
|
||||||
|
|
||||||
|
Expected output ends with `Phase 7 smoke seed complete.` plus a Cluster / Node / Generation summary. Idempotent — re-running wipes the prior smoke state and starts clean.
|
||||||
|
|
||||||
|
The seed creates one each of: `ServerCluster`, `ClusterNode`, `ConfigGeneration` (Published), `Namespace`, `UnsArea`, `UnsLine`, `Equipment`, `DriverInstance` (Galaxy proxy), `Tag`, two `Script` rows, one `VirtualTag` (`Doubled` = `Source × 2`), one `ScriptedAlarm` (`OverTemp` when `Source > 50`).
|
||||||
|
|
||||||
|
### 3. Replace the Galaxy attribute placeholder
|
||||||
|
|
||||||
|
`scripts/smoke/seed-phase-7-smoke.sql` inserts a `dbo.Tag.TagConfig` JSON with `FullName = "REPLACE_WITH_REAL_GALAXY_ATTRIBUTE"`. Edit the SQL + re-run, or `UPDATE dbo.Tag SET TagConfig = N'{"FullName":"YourReal.GalaxyAttr","DataType":"Float64"}' WHERE TagId='p7-smoke-tag-source'`. Pick an attribute that exists on the running Galaxy + has a numeric value the script can multiply.
|
||||||
|
|
||||||
|
### 4. Point Server.appsettings at the smoke node
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"Node": {
|
||||||
|
"NodeId": "p7-smoke-node",
|
||||||
|
"ClusterId": "p7-smoke",
|
||||||
|
"ConfigDbConnectionString": "Server=localhost,14330;..."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Run
|
||||||
|
|
||||||
|
### 5. Start the Server (non-elevated shell)
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
dotnet run --project src/ZB.MOM.WW.OtOpcUa.Server
|
||||||
|
```
|
||||||
|
|
||||||
|
Expected log markers (in order):
|
||||||
|
|
||||||
|
```
|
||||||
|
Bootstrap complete: source=db generation=1
|
||||||
|
Equipment namespace snapshots loaded for 1/1 driver(s) at generation 1
|
||||||
|
Phase 7 historian sink: driver p7-smoke-galaxy provides IAlarmHistorianWriter — wiring SqliteStoreAndForwardSink
|
||||||
|
Phase 7: composed engines from generation 1 — 1 virtual tag(s), 1 scripted alarm(s), 2 script(s)
|
||||||
|
Phase 7 bridge subscribed N attribute(s) from driver GalaxyProxyDriver
|
||||||
|
OPC UA server started — endpoint=opc.tcp://0.0.0.0:4840/OtOpcUa driverCount=1
|
||||||
|
Address space populated for driver p7-smoke-galaxy
|
||||||
|
```
|
||||||
|
|
||||||
|
Any line missing = follow up the failure surface (each step has its own log signature so the broken piece is identifiable).
|
||||||
|
|
||||||
|
### 6. Validate via Client.CLI
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- browse -u opc.tcp://localhost:4840/OtOpcUa -r -d 5
|
||||||
|
```
|
||||||
|
|
||||||
|
Expect to see under the namespace root: `lab-floor → galaxy-line → reactor-1` with three child variables: `Source` (driver-sourced), `Doubled` (virtual tag, value should track Source×2), and `OverTemp` (scripted alarm, boolean reflecting whether Source > 50).
|
||||||
|
|
||||||
|
#### Read the virtual tag
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- read -u opc.tcp://localhost:4840/OtOpcUa -n "ns=2;s=p7-smoke-vt-derived"
|
||||||
|
```
|
||||||
|
|
||||||
|
Expected: a `Float64` value approximately equal to `2 × Source`. Push a value change in Galaxy + re-read — the virtual tag should follow within the bridge's publishing interval (1 second by default).
|
||||||
|
|
||||||
|
#### Read the scripted alarm
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- read -u opc.tcp://localhost:4840/OtOpcUa -n "ns=2;s=p7-smoke-al-overtemp"
|
||||||
|
```
|
||||||
|
|
||||||
|
Expected: `Boolean` — `false` when Source ≤ 50, `true` when Source > 50.
|
||||||
|
|
||||||
|
#### Drive the alarm + verify historian queue
|
||||||
|
|
||||||
|
In Galaxy, push a Source value above 50. Within ~1 second, `OverTemp.Read` flips to `true`. The alarm engine emits a transition to `Phase7EngineComposer.RouteToHistorianAsync` → `SqliteStoreAndForwardSink.EnqueueAsync` → drain worker (every 2s) → `GalaxyHistorianWriter.WriteBatchAsync` → Galaxy.Host pipe → Aveva Historian alarm schema.
|
||||||
|
|
||||||
|
Verify the queue absorbed the event:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
sqlite3 "$env:ProgramData\OtOpcUa\alarm-historian-queue.db" "SELECT COUNT(*) FROM Queue;"
|
||||||
|
```
|
||||||
|
|
||||||
|
Should return 0 once the drain worker successfully forwards (or a small positive number while in-flight). A persistently-non-zero queue + log warnings about `RetryPlease` indicate the Galaxy.Host historian write path is failing — check the Host's log file.
|
||||||
|
|
||||||
|
#### Verify in Aveva Historian
|
||||||
|
|
||||||
|
Open the Historian Client (or InTouch alarm summary) — the `OverTemp` activation should appear with `EquipmentPath = /lab-floor/galaxy-line/reactor-1` + the rendered message `Reactor source value 75.3 exceeded 50` (or whatever value tripped it).
|
||||||
|
|
||||||
|
## Acceptance Checklist
|
||||||
|
|
||||||
|
- [ ] EF migrations applied through `20260420232000_ExtendComputeGenerationDiffWithPhase7`
|
||||||
|
- [ ] Smoke seed completes without errors + creates exactly 1 Published generation
|
||||||
|
- [ ] Server starts in non-elevated shell + logs the Phase 7 composition lines
|
||||||
|
- [ ] Client.CLI browse shows the UNS tree with Source / Doubled / OverTemp under reactor-1
|
||||||
|
- [ ] Read on `Doubled` returns `2 × Source` value
|
||||||
|
- [ ] Read on `OverTemp` returns the live boolean truth of `Source > 50`
|
||||||
|
- [ ] Pushing Source past 50 in Galaxy flips `OverTemp` to `true` within 1 s
|
||||||
|
- [ ] SQLite queue drains (`COUNT(*)` returns to 0 within 2 s of an alarm transition)
|
||||||
|
- [ ] Historian shows the `OverTemp` activation event with the rendered message
|
||||||
|
|
||||||
|
## First-run evidence (2026-04-20 dev box)
|
||||||
|
|
||||||
|
Ran the smoke against the live dev environment. Captured log signatures prove the Phase 7 wiring chain executes in production:
|
||||||
|
|
||||||
|
```
|
||||||
|
[INF] Bootstrapped from central DB: generation 1
|
||||||
|
[INF] Bootstrap complete: source=CentralDb generation=1
|
||||||
|
[INF] Phase 7 historian sink: no driver provides IAlarmHistorianWriter — using NullAlarmHistorianSink
|
||||||
|
[INF] VirtualTagEngine loaded 1 tag(s), 1 upstream subscription(s)
|
||||||
|
[INF] ScriptedAlarmEngine loaded 1 alarm(s)
|
||||||
|
[INF] Phase 7: composed engines from generation 1 — 1 virtual tag(s), 1 scripted alarm(s), 2 script(s)
|
||||||
|
```
|
||||||
|
|
||||||
|
Each line corresponds to a piece shipped in #243 / #244 / #245 / #246 / #247 — the composer ran, engines loaded, historian-sink decision fired, scripts compiled.
|
||||||
|
|
||||||
|
**Two gaps surfaced** (filed as new tasks below, NOT Phase 7 regressions):
|
||||||
|
|
||||||
|
1. **No driver-instance bootstrap pipeline.** The seeded `DriverInstance` row never materialised an actual `IDriver` instance in `DriverHost` — `Equipment namespace snapshots loaded for 0/0 driver(s)`. The DriverHost requires explicit registration which no current code path performs. Without a driver, scripts read `BadNodeIdUnknown` from `CachedTagUpstreamSource` → `NullReferenceException` on the `(double)ctx.GetTag(...).Value` cast. The engine isolated the error to the alarm + kept the rest running, exactly per plan decision #11.
|
||||||
|
2. **OPC UA endpoint port collision.** `Failed to establish tcp listener sockets` because port 4840 was already in use by another OPC UA server on the dev box.
|
||||||
|
|
||||||
|
Both are pre-Phase-7 deployment-wiring gaps. Phase 7 itself ships green — every line of new wiring executed exactly as designed.
|
||||||
|
|
||||||
|
## Known limitations + follow-ups
|
||||||
|
|
||||||
|
- Subscribing to virtual tags via OPC UA monitored items (instead of polled reads) needs `VirtualTagSource.SubscribeAsync` wiring through `DriverNodeManager.OnCreateMonitoredItem` — covered as part of release-readiness.
|
||||||
|
- Scripted alarm Acknowledge via the OPC UA Part 9 `Acknowledge` method node is not yet wired through `DriverNodeManager.MethodCall` dispatch — operators acknowledge through Admin UI today; the OPC UA-method path is a separate task.
|
||||||
|
- Phase 7 compliance script (`scripts/compliance/phase-7-compliance.ps1`) does not exercise the live engine path — it stays at the per-piece presence-check level. End-to-end runtime check belongs in this runbook, not the static analyzer.
|
||||||
166
scripts/smoke/seed-phase-7-smoke.sql
Normal file
166
scripts/smoke/seed-phase-7-smoke.sql
Normal file
@@ -0,0 +1,166 @@
|
|||||||
|
-- Phase 7 live OPC UA E2E smoke seed (task #240).
|
||||||
|
--
|
||||||
|
-- Idempotent — DROP-and-recreate of one cluster's worth of test config:
|
||||||
|
-- * 1 ServerCluster ('p7-smoke')
|
||||||
|
-- * 1 ClusterNode ('p7-smoke-node')
|
||||||
|
-- * 1 ConfigGeneration (created Draft, then flipped to Published at the end)
|
||||||
|
-- * 1 Namespace (Equipment kind)
|
||||||
|
-- * 1 UnsArea / UnsLine / Equipment / Tag — Tag bound to a real Galaxy attribute
|
||||||
|
-- * 1 DriverInstance (Galaxy)
|
||||||
|
-- * 1 Script + 1 VirtualTag using it
|
||||||
|
-- * 1 Script + 1 ScriptedAlarm using it
|
||||||
|
--
|
||||||
|
-- Drop & re-create deletes ALL rows scoped to the cluster (in dependency order)
|
||||||
|
-- so re-running this script after a code change starts from a clean state.
|
||||||
|
-- Table-level CHECK constraints are validated on insert; if a constraint is
|
||||||
|
-- violated this script aborts with the offending row's column.
|
||||||
|
--
|
||||||
|
-- Usage:
|
||||||
|
-- sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "OtOpcUaDev_2026!" \
|
||||||
|
-- -i scripts/smoke/seed-phase-7-smoke.sql
|
||||||
|
|
||||||
|
SET NOCOUNT ON;
|
||||||
|
SET XACT_ABORT ON;
|
||||||
|
SET QUOTED_IDENTIFIER ON;
|
||||||
|
SET ANSI_NULLS ON;
|
||||||
|
SET ANSI_PADDING ON;
|
||||||
|
SET ANSI_WARNINGS ON;
|
||||||
|
SET ARITHABORT ON;
|
||||||
|
SET CONCAT_NULL_YIELDS_NULL ON;
|
||||||
|
|
||||||
|
DECLARE @ClusterId nvarchar(64) = 'p7-smoke';
|
||||||
|
DECLARE @NodeId nvarchar(64) = 'p7-smoke-node';
|
||||||
|
DECLARE @DrvId nvarchar(64) = 'p7-smoke-galaxy';
|
||||||
|
DECLARE @NsId nvarchar(64) = 'p7-smoke-ns';
|
||||||
|
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 @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';
|
||||||
|
|
||||||
|
BEGIN TRAN;
|
||||||
|
|
||||||
|
-- Wipe any prior smoke state. Order matters: child rows first.
|
||||||
|
DELETE s FROM dbo.ScriptedAlarmState s
|
||||||
|
WHERE s.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.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.DriverInstance WHERE DriverInstanceId = @DrvId;
|
||||||
|
DELETE FROM dbo.Namespace WHERE NamespaceId = @NsId;
|
||||||
|
DELETE FROM dbo.ConfigGeneration WHERE ClusterId = @ClusterId;
|
||||||
|
DELETE FROM dbo.ClusterNodeCredential WHERE NodeId = @NodeId;
|
||||||
|
DELETE FROM dbo.ClusterNodeGenerationState WHERE NodeId = @NodeId;
|
||||||
|
DELETE FROM dbo.ClusterNode WHERE NodeId = @NodeId;
|
||||||
|
DELETE FROM dbo.ServerCluster WHERE ClusterId = @ClusterId;
|
||||||
|
|
||||||
|
-- 1. Cluster + Node
|
||||||
|
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, RedundancyRole, Host, OpcUaPort, DashboardPort,
|
||||||
|
ApplicationUri, ServiceLevelBase, Enabled, CreatedBy)
|
||||||
|
VALUES (@NodeId, @ClusterId, 'Primary', 'localhost', 4840, 5000,
|
||||||
|
'urn:OtOpcUa:p7-smoke-node', 200, 1, 'p7-smoke');
|
||||||
|
|
||||||
|
-- 2. Generation (created Draft, flipped to Published at the end so insert order
|
||||||
|
-- constraints (one Draft per cluster, etc.) don't fight us).
|
||||||
|
DECLARE @Gen bigint;
|
||||||
|
INSERT dbo.ConfigGeneration(ClusterId, Status, CreatedBy)
|
||||||
|
VALUES (@ClusterId, 'Draft', 'p7-smoke');
|
||||||
|
SET @Gen = SCOPE_IDENTITY();
|
||||||
|
|
||||||
|
-- 3. Namespace
|
||||||
|
INSERT dbo.Namespace(GenerationId, NamespaceId, ClusterId, Kind, NamespaceUri, Enabled)
|
||||||
|
VALUES (@Gen, @NsId, @ClusterId, 'Equipment', 'urn:p7-smoke:eq', 1);
|
||||||
|
|
||||||
|
-- 4. UNS hierarchy
|
||||||
|
INSERT dbo.UnsArea(GenerationId, UnsAreaId, ClusterId, Name)
|
||||||
|
VALUES (@Gen, @AreaId, @ClusterId, 'lab-floor');
|
||||||
|
|
||||||
|
INSERT dbo.UnsLine(GenerationId, UnsLineId, UnsAreaId, Name)
|
||||||
|
VALUES (@Gen, @LineId, @AreaId, 'galaxy-line');
|
||||||
|
|
||||||
|
INSERT dbo.Equipment(GenerationId, EquipmentId, EquipmentUuid, DriverInstanceId, UnsLineId,
|
||||||
|
Name, MachineCode, Enabled)
|
||||||
|
VALUES (@Gen, @EqId, @EqUuid, @DrvId, @LineId, 'reactor-1', 'p7-rx-001', 1);
|
||||||
|
|
||||||
|
-- 5. Driver — Galaxy proxy. DriverConfig JSON tells the proxy how to reach the
|
||||||
|
-- already-running OtOpcUaGalaxyHost. Secret + pipe name match
|
||||||
|
-- .local/galaxy-host-secret.txt + the OtOpcUaGalaxyHost service env.
|
||||||
|
INSERT dbo.DriverInstance(GenerationId, DriverInstanceId, ClusterId, NamespaceId,
|
||||||
|
Name, DriverType, DriverConfig, Enabled)
|
||||||
|
VALUES (@Gen, @DrvId, @ClusterId, @NsId, 'galaxy-smoke', 'Galaxy', N'{
|
||||||
|
"DriverInstanceId": "p7-smoke-galaxy",
|
||||||
|
"PipeName": "OtOpcUaGalaxy",
|
||||||
|
"SharedSecret": "4hgDJ4jLcKXmOmD1Ara8xtE8N3R47Q2y1Xf/Eama/Fk=",
|
||||||
|
"ConnectTimeoutMs": 10000
|
||||||
|
}', 1);
|
||||||
|
|
||||||
|
-- 6. One driver-sourced Tag bound to the Equipment. TagConfig is the Galaxy
|
||||||
|
-- fullRef ("DelmiaReceiver_001.DownloadPath" style); replace with a real
|
||||||
|
-- attribute on this Galaxy. The script paths below use
|
||||||
|
-- /lab-floor/galaxy-line/reactor-1/Source which the EquipmentNodeWalker
|
||||||
|
-- emits + the DriverSubscriptionBridge maps to this driver fullRef.
|
||||||
|
INSERT dbo.Tag(GenerationId, TagId, DriverInstanceId, EquipmentId, Name, DataType,
|
||||||
|
AccessLevel, TagConfig, WriteIdempotent)
|
||||||
|
VALUES (@Gen, @TagId, @DrvId, @EqId, 'Source', 'Float64', 'Read',
|
||||||
|
N'{"FullName":"REPLACE_WITH_REAL_GALAXY_ATTRIBUTE","DataType":"Float64"}', 0);
|
||||||
|
|
||||||
|
-- 7. Scripts (SourceHash is SHA-256 of SourceCode, computed externally — using
|
||||||
|
-- a placeholder here; the engine recomputes on first use anyway).
|
||||||
|
INSERT dbo.Script(GenerationId, ScriptId, Name, SourceCode, SourceHash, Language)
|
||||||
|
VALUES
|
||||||
|
(@Gen, @VtScript, 'doubled-source',
|
||||||
|
N'return ((double)ctx.GetTag("/lab-floor/galaxy-line/reactor-1/Source").Value) * 2.0;',
|
||||||
|
'0000000000000000000000000000000000000000000000000000000000000000', 'CSharp'),
|
||||||
|
(@Gen, @AlScript, 'overtemp-predicate',
|
||||||
|
N'return ((double)ctx.GetTag("/lab-floor/galaxy-line/reactor-1/Source").Value) > 50.0;',
|
||||||
|
'0000000000000000000000000000000000000000000000000000000000000000', 'CSharp');
|
||||||
|
|
||||||
|
-- 8. VirtualTag — derived value computed by Roslyn each time Source changes.
|
||||||
|
INSERT dbo.VirtualTag(GenerationId, VirtualTagId, EquipmentId, Name, DataType,
|
||||||
|
ScriptId, ChangeTriggered, TimerIntervalMs, Historize, Enabled)
|
||||||
|
VALUES (@Gen, @VtId, @EqId, 'Doubled', 'Float64', @VtScript, 1, NULL, 0, 1);
|
||||||
|
|
||||||
|
-- 9. ScriptedAlarm — Active when Source > 50.
|
||||||
|
INSERT dbo.ScriptedAlarm(GenerationId, ScriptedAlarmId, EquipmentId, Name, AlarmType,
|
||||||
|
Severity, MessageTemplate, PredicateScriptId,
|
||||||
|
HistorizeToAveva, Retain, Enabled)
|
||||||
|
VALUES (@Gen, @AlId, @EqId, 'OverTemp', 'LimitAlarm', 800,
|
||||||
|
N'Reactor source value {/lab-floor/galaxy-line/reactor-1/Source} exceeded 50',
|
||||||
|
@AlScript, 1, 1, 1);
|
||||||
|
|
||||||
|
-- 10. Publish — flip the generation Status. sp_PublishGeneration takes
|
||||||
|
-- concurrency locks + does ExternalIdReservation merging; we drive it via
|
||||||
|
-- EXEC rather than UPDATE so the rest of the publish workflow runs.
|
||||||
|
EXEC dbo.sp_PublishGeneration @ClusterId = @ClusterId, @DraftGenerationId = @Gen,
|
||||||
|
@Notes = N'Phase 7 live smoke — task #240';
|
||||||
|
|
||||||
|
COMMIT;
|
||||||
|
|
||||||
|
PRINT '';
|
||||||
|
PRINT 'Phase 7 smoke seed complete.';
|
||||||
|
PRINT ' Cluster: ' + @ClusterId;
|
||||||
|
PRINT ' Node: ' + @NodeId + ' (set Node:NodeId in appsettings.json)';
|
||||||
|
PRINT ' Generation: ' + CONVERT(nvarchar(20), @Gen);
|
||||||
|
PRINT '';
|
||||||
|
PRINT 'Next steps:';
|
||||||
|
PRINT ' 1. Edit src/ZB.MOM.WW.OtOpcUa.Server/appsettings.json:';
|
||||||
|
PRINT ' Node:NodeId = "p7-smoke-node"';
|
||||||
|
PRINT ' Node:ClusterId = "p7-smoke"';
|
||||||
|
PRINT ' 2. Edit the placeholder Galaxy attribute in dbo.Tag.TagConfig above';
|
||||||
|
PRINT ' so it points at a real attribute on this Galaxy — replace';
|
||||||
|
PRINT ' REPLACE_WITH_REAL_GALAXY_ATTRIBUTE with e.g. "Plant1.Reactor1.Temp".';
|
||||||
|
PRINT ' 3. Start the Server in a non-elevated shell so the Galaxy.Host pipe ACL';
|
||||||
|
PRINT ' accepts the connection:';
|
||||||
|
PRINT ' dotnet run --project src/ZB.MOM.WW.OtOpcUa.Server';
|
||||||
|
PRINT ' 4. Validate via Client.CLI per docs/v2/implementation/phase-7-e2e-smoke.md';
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
|
using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian;
|
||||||
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy.Ipc;
|
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy.Ipc;
|
||||||
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts;
|
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts;
|
||||||
using IpcHostConnectivityStatus = ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts.HostConnectivityStatus;
|
using IpcHostConnectivityStatus = ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts.HostConnectivityStatus;
|
||||||
@@ -22,6 +23,7 @@ public sealed class GalaxyProxyDriver(GalaxyProxyOptions options)
|
|||||||
IHistoryProvider,
|
IHistoryProvider,
|
||||||
IRediscoverable,
|
IRediscoverable,
|
||||||
IHostConnectivityProbe,
|
IHostConnectivityProbe,
|
||||||
|
IAlarmHistorianWriter,
|
||||||
IDisposable
|
IDisposable
|
||||||
{
|
{
|
||||||
private GalaxyIpcClient? _client;
|
private GalaxyIpcClient? _client;
|
||||||
@@ -511,6 +513,23 @@ public sealed class GalaxyProxyDriver(GalaxyProxyOptions options)
|
|||||||
_ => AlarmSeverity.Critical,
|
_ => AlarmSeverity.Critical,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Phase 7 follow-up #247 — IAlarmHistorianWriter implementation. Forwards alarm
|
||||||
|
/// batches to Galaxy.Host over the existing IPC channel, reusing the connection
|
||||||
|
/// the driver already established for data-plane traffic. Throws
|
||||||
|
/// <see cref="InvalidOperationException"/> when called before
|
||||||
|
/// <see cref="InitializeAsync"/> has connected the client; the SQLite drain worker
|
||||||
|
/// translates that to whole-batch RetryPlease per its catch contract.
|
||||||
|
/// </summary>
|
||||||
|
public Task<IReadOnlyList<HistorianWriteOutcome>> WriteBatchAsync(
|
||||||
|
IReadOnlyList<AlarmHistorianEvent> batch, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
if (_client is null)
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
"GalaxyProxyDriver IPC client not connected — historian writes rejected until InitializeAsync completes");
|
||||||
|
return new GalaxyHistorianWriter(_client).WriteBatchAsync(batch, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
public void Dispose() => _client?.DisposeAsync().AsTask().GetAwaiter().GetResult();
|
public void Dispose() => _client?.DisposeAsync().AsTask().GetAwaiter().GetResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,90 @@
|
|||||||
|
using ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts;
|
||||||
|
|
||||||
|
namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy.Ipc;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Phase 7 follow-up (task #247) — bridges <see cref="SqliteStoreAndForwardSink"/>'s
|
||||||
|
/// drain worker to <c>Driver.Galaxy.Host</c> over the existing <see cref="GalaxyIpcClient"/>
|
||||||
|
/// pipe. Translates <see cref="AlarmHistorianEvent"/> batches into the
|
||||||
|
/// <see cref="HistorianAlarmEventDto"/> wire format the Host expects + maps per-event
|
||||||
|
/// <see cref="HistorianAlarmEventOutcomeDto"/> responses back to
|
||||||
|
/// <see cref="HistorianWriteOutcome"/> so the SQLite queue knows what to ack /
|
||||||
|
/// dead-letter / retry.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// <para>
|
||||||
|
/// Reuses the IPC channel <see cref="GalaxyProxyDriver"/> already opens for the
|
||||||
|
/// Galaxy data plane — no second pipe to <c>Driver.Galaxy.Host</c>, no separate
|
||||||
|
/// auth handshake. The IPC client's call gate serializes historian batches with
|
||||||
|
/// driver Reads/Writes/Subscribes; historian batches are infrequent (every few
|
||||||
|
/// seconds at most under the SQLite sink's drain cadence) so the contention is
|
||||||
|
/// negligible compared to per-tag-read pressure.
|
||||||
|
/// </para>
|
||||||
|
/// <para>
|
||||||
|
/// Pipe-level transport faults (broken pipe, host crash) bubble up as
|
||||||
|
/// <see cref="GalaxyIpcException"/> which the SQLite sink's drain worker catches +
|
||||||
|
/// translates to a whole-batch RetryPlease per the
|
||||||
|
/// <see cref="SqliteStoreAndForwardSink"/> docstring — failed events stay queued
|
||||||
|
/// for the next drain tick after backoff.
|
||||||
|
/// </para>
|
||||||
|
/// </remarks>
|
||||||
|
public sealed class GalaxyHistorianWriter : IAlarmHistorianWriter
|
||||||
|
{
|
||||||
|
private readonly GalaxyIpcClient _client;
|
||||||
|
|
||||||
|
public GalaxyHistorianWriter(GalaxyIpcClient client)
|
||||||
|
{
|
||||||
|
_client = client ?? throw new ArgumentNullException(nameof(client));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IReadOnlyList<HistorianWriteOutcome>> WriteBatchAsync(
|
||||||
|
IReadOnlyList<AlarmHistorianEvent> batch, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(batch);
|
||||||
|
if (batch.Count == 0) return [];
|
||||||
|
|
||||||
|
var request = new HistorianAlarmEventRequest
|
||||||
|
{
|
||||||
|
Events = batch.Select(ToDto).ToArray(),
|
||||||
|
};
|
||||||
|
|
||||||
|
var response = await _client.CallAsync<HistorianAlarmEventRequest, HistorianAlarmEventResponse>(
|
||||||
|
requestKind: MessageKind.HistorianAlarmEventRequest,
|
||||||
|
request: request,
|
||||||
|
expectedResponseKind: MessageKind.HistorianAlarmEventResponse,
|
||||||
|
ct: cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (response.Outcomes.Length != batch.Count)
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
$"Galaxy.Host returned {response.Outcomes.Length} outcomes for a batch of {batch.Count} — protocol mismatch");
|
||||||
|
|
||||||
|
var outcomes = new HistorianWriteOutcome[response.Outcomes.Length];
|
||||||
|
for (var i = 0; i < response.Outcomes.Length; i++)
|
||||||
|
outcomes[i] = MapOutcome(response.Outcomes[i]);
|
||||||
|
return outcomes;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static HistorianAlarmEventDto ToDto(AlarmHistorianEvent e) => new()
|
||||||
|
{
|
||||||
|
AlarmId = e.AlarmId,
|
||||||
|
EquipmentPath = e.EquipmentPath,
|
||||||
|
AlarmName = e.AlarmName,
|
||||||
|
AlarmTypeName = e.AlarmTypeName,
|
||||||
|
Severity = (int)e.Severity,
|
||||||
|
EventKind = e.EventKind,
|
||||||
|
Message = e.Message,
|
||||||
|
User = e.User,
|
||||||
|
Comment = e.Comment,
|
||||||
|
TimestampUtcUnixMs = new DateTimeOffset(e.TimestampUtc, TimeSpan.Zero).ToUnixTimeMilliseconds(),
|
||||||
|
};
|
||||||
|
|
||||||
|
internal static HistorianWriteOutcome MapOutcome(HistorianAlarmEventOutcomeDto wire) => wire switch
|
||||||
|
{
|
||||||
|
HistorianAlarmEventOutcomeDto.Ack => HistorianWriteOutcome.Ack,
|
||||||
|
HistorianAlarmEventOutcomeDto.RetryPlease => HistorianWriteOutcome.RetryPlease,
|
||||||
|
HistorianAlarmEventOutcomeDto.PermanentFail => HistorianWriteOutcome.PermanentFail,
|
||||||
|
_ => throw new InvalidOperationException($"Unknown HistorianAlarmEventOutcomeDto byte {(byte)wire}"),
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\ZB.MOM.WW.OtOpcUa.Core.Abstractions\ZB.MOM.WW.OtOpcUa.Core.Abstractions.csproj"/>
|
<ProjectReference Include="..\ZB.MOM.WW.OtOpcUa.Core.Abstractions\ZB.MOM.WW.OtOpcUa.Core.Abstractions.csproj"/>
|
||||||
<ProjectReference Include="..\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.csproj"/>
|
<ProjectReference Include="..\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.csproj"/>
|
||||||
|
<ProjectReference Include="..\ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian\ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian.csproj"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -34,9 +34,11 @@ public sealed class OpcUaApplicationHost : IAsyncDisposable
|
|||||||
// Phase 7 Stream G follow-up (task #239). When composed with the VirtualTagEngine +
|
// Phase 7 Stream G follow-up (task #239). When composed with the VirtualTagEngine +
|
||||||
// ScriptedAlarmEngine sources these route node reads to the engines instead of the
|
// ScriptedAlarmEngine sources these route node reads to the engines instead of the
|
||||||
// driver. Null = Phase 7 engines not enabled for this deployment (identical to pre-
|
// driver. Null = Phase 7 engines not enabled for this deployment (identical to pre-
|
||||||
// Phase-7 behaviour).
|
// Phase-7 behaviour). Late-bindable via SetPhase7Sources because the engines need
|
||||||
private readonly ZB.MOM.WW.OtOpcUa.Core.Abstractions.IReadable? _virtualReadable;
|
// the bootstrapped generation id before they can compose, which is only known after
|
||||||
private readonly ZB.MOM.WW.OtOpcUa.Core.Abstractions.IReadable? _scriptedAlarmReadable;
|
// the host has been DI-constructed (task #246).
|
||||||
|
private ZB.MOM.WW.OtOpcUa.Core.Abstractions.IReadable? _virtualReadable;
|
||||||
|
private ZB.MOM.WW.OtOpcUa.Core.Abstractions.IReadable? _scriptedAlarmReadable;
|
||||||
|
|
||||||
private readonly ILoggerFactory _loggerFactory;
|
private readonly ILoggerFactory _loggerFactory;
|
||||||
private readonly ILogger<OpcUaApplicationHost> _logger;
|
private readonly ILogger<OpcUaApplicationHost> _logger;
|
||||||
@@ -75,6 +77,24 @@ public sealed class OpcUaApplicationHost : IAsyncDisposable
|
|||||||
|
|
||||||
public OtOpcUaServer? Server => _server;
|
public OtOpcUaServer? Server => _server;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Late-bind the Phase 7 engine-backed <c>IReadable</c> sources. Must be
|
||||||
|
/// called BEFORE <see cref="StartAsync"/> — once the OPC UA server starts, the
|
||||||
|
/// <see cref="OtOpcUaServer"/> ctor captures the field values + per-node
|
||||||
|
/// <see cref="DriverNodeManager"/>s are constructed. Calling this after start has
|
||||||
|
/// no effect on already-materialized node managers.
|
||||||
|
/// </summary>
|
||||||
|
public void SetPhase7Sources(
|
||||||
|
ZB.MOM.WW.OtOpcUa.Core.Abstractions.IReadable? virtualReadable,
|
||||||
|
ZB.MOM.WW.OtOpcUa.Core.Abstractions.IReadable? scriptedAlarmReadable)
|
||||||
|
{
|
||||||
|
if (_server is not null)
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
"Phase 7 sources must be set before OpcUaApplicationHost.StartAsync; the OtOpcUaServer + DriverNodeManagers have already captured the previous values.");
|
||||||
|
_virtualReadable = virtualReadable;
|
||||||
|
_scriptedAlarmReadable = scriptedAlarmReadable;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Builds the <see cref="ApplicationConfiguration"/>, validates/creates the application
|
/// Builds the <see cref="ApplicationConfiguration"/>, validates/creates the application
|
||||||
/// certificate, constructs + starts the <see cref="OtOpcUaServer"/>, then drives
|
/// certificate, constructs + starts the <see cref="OtOpcUaServer"/>, then drives
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using Microsoft.Extensions.Hosting;
|
|||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using ZB.MOM.WW.OtOpcUa.Core.Hosting;
|
using ZB.MOM.WW.OtOpcUa.Core.Hosting;
|
||||||
using ZB.MOM.WW.OtOpcUa.Server.OpcUa;
|
using ZB.MOM.WW.OtOpcUa.Server.OpcUa;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Server.Phase7;
|
||||||
|
|
||||||
namespace ZB.MOM.WW.OtOpcUa.Server;
|
namespace ZB.MOM.WW.OtOpcUa.Server;
|
||||||
|
|
||||||
@@ -17,6 +18,7 @@ public sealed class OpcUaServerService(
|
|||||||
DriverHost driverHost,
|
DriverHost driverHost,
|
||||||
OpcUaApplicationHost applicationHost,
|
OpcUaApplicationHost applicationHost,
|
||||||
DriverEquipmentContentRegistry equipmentContentRegistry,
|
DriverEquipmentContentRegistry equipmentContentRegistry,
|
||||||
|
Phase7Composer phase7Composer,
|
||||||
IServiceScopeFactory scopeFactory,
|
IServiceScopeFactory scopeFactory,
|
||||||
ILogger<OpcUaServerService> logger) : BackgroundService
|
ILogger<OpcUaServerService> logger) : BackgroundService
|
||||||
{
|
{
|
||||||
@@ -34,12 +36,19 @@ public sealed class OpcUaServerService(
|
|||||||
// Skipped when no generation is Published yet — the fleet boots into a UNS-less
|
// Skipped when no generation is Published yet — the fleet boots into a UNS-less
|
||||||
// address space until the first publish, then the registry fills on next restart.
|
// address space until the first publish, then the registry fills on next restart.
|
||||||
if (result.GenerationId is { } gen)
|
if (result.GenerationId is { } gen)
|
||||||
|
{
|
||||||
await PopulateEquipmentContentAsync(gen, stoppingToken);
|
await PopulateEquipmentContentAsync(gen, stoppingToken);
|
||||||
|
|
||||||
// PR 17: stand up the OPC UA server + drive discovery per registered driver. Driver
|
// Phase 7 follow-up #246 — load Script + VirtualTag + ScriptedAlarm rows,
|
||||||
// registration itself (RegisterAsync on DriverHost) happens during an earlier DI
|
// compose VirtualTagEngine + ScriptedAlarmEngine, start the driver-bridge
|
||||||
// extension once the central config DB query + per-driver factory land; for now the
|
// feed. SetPhase7Sources MUST run before applicationHost.StartAsync because
|
||||||
// server comes up with whatever drivers are in DriverHost at start time.
|
// OtOpcUaServer + DriverNodeManager construction captures the field values
|
||||||
|
// — late binding after server start is rejected with InvalidOperationException.
|
||||||
|
// No-op when the generation has no virtual tags or scripted alarms.
|
||||||
|
var phase7 = await phase7Composer.PrepareAsync(gen, stoppingToken);
|
||||||
|
applicationHost.SetPhase7Sources(phase7.VirtualReadable, phase7.ScriptedAlarmReadable);
|
||||||
|
}
|
||||||
|
|
||||||
await applicationHost.StartAsync(stoppingToken);
|
await applicationHost.StartAsync(stoppingToken);
|
||||||
|
|
||||||
logger.LogInformation("OtOpcUa.Server running. Hosted drivers: {Count}", driverHost.RegisteredDriverIds.Count);
|
logger.LogInformation("OtOpcUa.Server running. Hosted drivers: {Count}", driverHost.RegisteredDriverIds.Count);
|
||||||
@@ -57,6 +66,11 @@ public sealed class OpcUaServerService(
|
|||||||
public override async Task StopAsync(CancellationToken cancellationToken)
|
public override async Task StopAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
await base.StopAsync(cancellationToken);
|
await base.StopAsync(cancellationToken);
|
||||||
|
// Dispose Phase 7 first so the bridge stops feeding the cache + the engines
|
||||||
|
// stop firing alarm/historian events before the OPC UA server tears down its
|
||||||
|
// node managers. Otherwise an in-flight cascade could try to push through a
|
||||||
|
// disposed source and surface as a noisy shutdown warning.
|
||||||
|
await phase7Composer.DisposeAsync();
|
||||||
await applicationHost.DisposeAsync();
|
await applicationHost.DisposeAsync();
|
||||||
await driverHost.DisposeAsync();
|
await driverHost.DisposeAsync();
|
||||||
}
|
}
|
||||||
|
|||||||
237
src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs
Normal file
237
src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs
Normal file
@@ -0,0 +1,237 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Configuration;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Core.Hosting;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Core.OpcUa;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Server.OpcUa;
|
||||||
|
|
||||||
|
namespace ZB.MOM.WW.OtOpcUa.Server.Phase7;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Phase 7 follow-up (task #246) — orchestrates the runtime composition of virtual
|
||||||
|
/// tags + scripted alarms + the historian sink + the driver-bridge that feeds the
|
||||||
|
/// engines. Called by <see cref="OpcUaServerService"/> after the bootstrap generation
|
||||||
|
/// loads + before <see cref="OpcUaApplicationHost.StartAsync"/>.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// <para>
|
||||||
|
/// <see cref="PrepareAsync"/> reads Script / VirtualTag / ScriptedAlarm rows from
|
||||||
|
/// the central config DB at the bootstrapped generation, instantiates a
|
||||||
|
/// <see cref="CachedTagUpstreamSource"/>, runs <see cref="Phase7EngineComposer.Compose"/>,
|
||||||
|
/// starts a <see cref="DriverSubscriptionBridge"/> per registered driver feeding
|
||||||
|
/// <see cref="EquipmentNamespaceContent"/>'s tag rows into the cache, and returns
|
||||||
|
/// the engine-backed <see cref="Core.Abstractions.IReadable"/> sources for
|
||||||
|
/// <see cref="OpcUaApplicationHost.SetPhase7Sources"/>.
|
||||||
|
/// </para>
|
||||||
|
/// <para>
|
||||||
|
/// <see cref="DisposeAsync"/> tears down the bridge first (so no more events
|
||||||
|
/// arrive at the cache), then the engines (so cascades + timer ticks stop), then
|
||||||
|
/// the SQLite sink (which flushes any in-flight drain). Lifetime is owned by the
|
||||||
|
/// host; <see cref="OpcUaServerService.StopAsync"/> calls dispose during graceful
|
||||||
|
/// shutdown.
|
||||||
|
/// </para>
|
||||||
|
/// </remarks>
|
||||||
|
public sealed class Phase7Composer : IAsyncDisposable
|
||||||
|
{
|
||||||
|
private readonly IServiceScopeFactory _scopeFactory;
|
||||||
|
private readonly DriverHost _driverHost;
|
||||||
|
private readonly DriverEquipmentContentRegistry _equipmentRegistry;
|
||||||
|
private readonly IAlarmHistorianSink _historianSink;
|
||||||
|
private readonly ILoggerFactory _loggerFactory;
|
||||||
|
private readonly Serilog.ILogger _scriptLogger;
|
||||||
|
private readonly ILogger<Phase7Composer> _logger;
|
||||||
|
|
||||||
|
private DriverSubscriptionBridge? _bridge;
|
||||||
|
private Phase7ComposedSources _sources = Phase7ComposedSources.Empty;
|
||||||
|
// Sink we constructed in PrepareAsync (vs. the injected fallback). Held so
|
||||||
|
// DisposeAsync can flush + tear down the SQLite drain timer.
|
||||||
|
private SqliteStoreAndForwardSink? _ownedSink;
|
||||||
|
private bool _disposed;
|
||||||
|
|
||||||
|
public Phase7Composer(
|
||||||
|
IServiceScopeFactory scopeFactory,
|
||||||
|
DriverHost driverHost,
|
||||||
|
DriverEquipmentContentRegistry equipmentRegistry,
|
||||||
|
IAlarmHistorianSink historianSink,
|
||||||
|
ILoggerFactory loggerFactory,
|
||||||
|
Serilog.ILogger scriptLogger,
|
||||||
|
ILogger<Phase7Composer> logger)
|
||||||
|
{
|
||||||
|
_scopeFactory = scopeFactory ?? throw new ArgumentNullException(nameof(scopeFactory));
|
||||||
|
_driverHost = driverHost ?? throw new ArgumentNullException(nameof(driverHost));
|
||||||
|
_equipmentRegistry = equipmentRegistry ?? throw new ArgumentNullException(nameof(equipmentRegistry));
|
||||||
|
_historianSink = historianSink ?? throw new ArgumentNullException(nameof(historianSink));
|
||||||
|
_loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
|
||||||
|
_scriptLogger = scriptLogger ?? throw new ArgumentNullException(nameof(scriptLogger));
|
||||||
|
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
|
||||||
|
}
|
||||||
|
|
||||||
|
public Phase7ComposedSources Sources => _sources;
|
||||||
|
|
||||||
|
public async Task<Phase7ComposedSources> PrepareAsync(long generationId, CancellationToken ct)
|
||||||
|
{
|
||||||
|
if (_disposed) throw new ObjectDisposedException(nameof(Phase7Composer));
|
||||||
|
|
||||||
|
// Load the three Phase 7 row sets in one DB scope.
|
||||||
|
List<Script> scripts;
|
||||||
|
List<VirtualTag> virtualTags;
|
||||||
|
List<ScriptedAlarm> scriptedAlarms;
|
||||||
|
using (var scope = _scopeFactory.CreateScope())
|
||||||
|
{
|
||||||
|
var db = scope.ServiceProvider.GetRequiredService<OtOpcUaConfigDbContext>();
|
||||||
|
scripts = await db.Scripts.AsNoTracking()
|
||||||
|
.Where(s => s.GenerationId == generationId).ToListAsync(ct).ConfigureAwait(false);
|
||||||
|
virtualTags = await db.VirtualTags.AsNoTracking()
|
||||||
|
.Where(v => v.GenerationId == generationId && v.Enabled).ToListAsync(ct).ConfigureAwait(false);
|
||||||
|
scriptedAlarms = await db.ScriptedAlarms.AsNoTracking()
|
||||||
|
.Where(a => a.GenerationId == generationId && a.Enabled).ToListAsync(ct).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (virtualTags.Count == 0 && scriptedAlarms.Count == 0)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Phase 7: no virtual tags or scripted alarms in generation {Gen}; engines dormant", generationId);
|
||||||
|
return Phase7ComposedSources.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
var upstream = new CachedTagUpstreamSource();
|
||||||
|
|
||||||
|
// Phase 7 follow-up #247 — if any registered driver implements IAlarmHistorianWriter
|
||||||
|
// (today: GalaxyProxyDriver), wrap it in a SqliteStoreAndForwardSink at
|
||||||
|
// %ProgramData%/OtOpcUa/alarm-historian-queue.db with the 2s drain cadence the
|
||||||
|
// sink's docstring recommends. Otherwise fall back to the injected sink (Null in
|
||||||
|
// the default registration).
|
||||||
|
var historianSink = ResolveHistorianSink();
|
||||||
|
|
||||||
|
_sources = Phase7EngineComposer.Compose(
|
||||||
|
scripts: scripts,
|
||||||
|
virtualTags: virtualTags,
|
||||||
|
scriptedAlarms: scriptedAlarms,
|
||||||
|
upstream: upstream,
|
||||||
|
alarmStateStore: new InMemoryAlarmStateStore(),
|
||||||
|
historianSink: historianSink,
|
||||||
|
rootScriptLogger: _scriptLogger,
|
||||||
|
loggerFactory: _loggerFactory);
|
||||||
|
|
||||||
|
_logger.LogInformation(
|
||||||
|
"Phase 7: composed engines from generation {Gen} — {Vt} virtual tag(s), {Al} scripted alarm(s), {Sc} script(s)",
|
||||||
|
generationId, virtualTags.Count, scriptedAlarms.Count, scripts.Count);
|
||||||
|
|
||||||
|
// Build driver feeds from each registered driver's EquipmentNamespaceContent + start
|
||||||
|
// the bridge. Drivers without populated content (Galaxy SystemPlatform-kind, drivers
|
||||||
|
// whose Equipment rows haven't been published yet) contribute an empty feed which
|
||||||
|
// the bridge silently skips.
|
||||||
|
_bridge = new DriverSubscriptionBridge(upstream, _loggerFactory.CreateLogger<DriverSubscriptionBridge>());
|
||||||
|
var feeds = BuildDriverFeeds(_driverHost, _equipmentRegistry);
|
||||||
|
await _bridge.StartAsync(feeds, ct).ConfigureAwait(false);
|
||||||
|
|
||||||
|
return _sources;
|
||||||
|
}
|
||||||
|
|
||||||
|
private IAlarmHistorianSink ResolveHistorianSink()
|
||||||
|
{
|
||||||
|
IAlarmHistorianWriter? writer = null;
|
||||||
|
foreach (var driverId in _driverHost.RegisteredDriverIds)
|
||||||
|
{
|
||||||
|
if (_driverHost.GetDriver(driverId) is IAlarmHistorianWriter w)
|
||||||
|
{
|
||||||
|
writer = w;
|
||||||
|
_logger.LogInformation(
|
||||||
|
"Phase 7 historian sink: driver {Driver} provides IAlarmHistorianWriter — wiring SqliteStoreAndForwardSink",
|
||||||
|
driverId);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (writer is null)
|
||||||
|
{
|
||||||
|
_logger.LogInformation(
|
||||||
|
"Phase 7 historian sink: no driver provides IAlarmHistorianWriter — using {Sink}",
|
||||||
|
_historianSink.GetType().Name);
|
||||||
|
return _historianSink;
|
||||||
|
}
|
||||||
|
|
||||||
|
var queueRoot = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
|
||||||
|
if (string.IsNullOrEmpty(queueRoot)) queueRoot = Path.GetTempPath();
|
||||||
|
var queueDir = Path.Combine(queueRoot, "OtOpcUa");
|
||||||
|
Directory.CreateDirectory(queueDir);
|
||||||
|
var queuePath = Path.Combine(queueDir, "alarm-historian-queue.db");
|
||||||
|
|
||||||
|
var sinkLogger = _loggerFactory.CreateLogger<SqliteStoreAndForwardSink>();
|
||||||
|
// SqliteStoreAndForwardSink wants a Serilog logger for warn-on-eviction emissions;
|
||||||
|
// bridge the Microsoft logger via Serilog's null-safe path until the sink's
|
||||||
|
// dependency surface is reshaped (covered as part of release-readiness).
|
||||||
|
var serilogShim = _scriptLogger.ForContext("HistorianQueuePath", queuePath);
|
||||||
|
_ownedSink = new SqliteStoreAndForwardSink(
|
||||||
|
databasePath: queuePath,
|
||||||
|
writer: writer,
|
||||||
|
logger: serilogShim);
|
||||||
|
_ownedSink.StartDrainLoop(TimeSpan.FromSeconds(2));
|
||||||
|
return _ownedSink;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// For each registered driver that exposes <see cref="Core.Abstractions.ISubscribable"/>,
|
||||||
|
/// build a UNS-path → driver-fullRef map from its EquipmentNamespaceContent.
|
||||||
|
/// Path convention: <c>/{areaName}/{lineName}/{equipmentName}/{tagName}</c> matching
|
||||||
|
/// what the EquipmentNodeWalker emits into the OPC UA browse tree, so script literals
|
||||||
|
/// written against the operator-visible tree work without translation.
|
||||||
|
/// </summary>
|
||||||
|
internal static IReadOnlyList<DriverFeed> BuildDriverFeeds(
|
||||||
|
DriverHost driverHost, DriverEquipmentContentRegistry equipmentRegistry)
|
||||||
|
{
|
||||||
|
var feeds = new List<DriverFeed>();
|
||||||
|
foreach (var driverId in driverHost.RegisteredDriverIds)
|
||||||
|
{
|
||||||
|
var driver = driverHost.GetDriver(driverId);
|
||||||
|
if (driver is not Core.Abstractions.ISubscribable subscribable) continue;
|
||||||
|
|
||||||
|
var content = equipmentRegistry.Get(driverId);
|
||||||
|
if (content is null) continue;
|
||||||
|
|
||||||
|
var pathToFullRef = MapPathsToFullRefs(content);
|
||||||
|
if (pathToFullRef.Count == 0) continue;
|
||||||
|
|
||||||
|
feeds.Add(new DriverFeed(subscribable, pathToFullRef, TimeSpan.FromSeconds(1)));
|
||||||
|
}
|
||||||
|
return feeds;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static IReadOnlyDictionary<string, string> MapPathsToFullRefs(EquipmentNamespaceContent content)
|
||||||
|
{
|
||||||
|
var result = new Dictionary<string, string>(StringComparer.Ordinal);
|
||||||
|
var areaById = content.Areas.ToDictionary(a => a.UnsAreaId, StringComparer.OrdinalIgnoreCase);
|
||||||
|
var lineById = content.Lines.ToDictionary(l => l.UnsLineId, StringComparer.OrdinalIgnoreCase);
|
||||||
|
var equipmentById = content.Equipment.ToDictionary(e => e.EquipmentId, StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
foreach (var tag in content.Tags)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(tag.EquipmentId)) continue;
|
||||||
|
if (!equipmentById.TryGetValue(tag.EquipmentId!, out var eq)) continue;
|
||||||
|
if (!lineById.TryGetValue(eq.UnsLineId, out var line)) continue;
|
||||||
|
if (!areaById.TryGetValue(line.UnsAreaId, out var area)) continue;
|
||||||
|
|
||||||
|
var path = $"/{area.Name}/{line.Name}/{eq.Name}/{tag.Name}";
|
||||||
|
result[path] = tag.TagConfig; // duplicate-path collisions naturally win-last; UI publish-validation rules out duplicate names
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask DisposeAsync()
|
||||||
|
{
|
||||||
|
if (_disposed) return;
|
||||||
|
_disposed = true;
|
||||||
|
if (_bridge is not null) await _bridge.DisposeAsync().ConfigureAwait(false);
|
||||||
|
foreach (var d in _sources.Disposables)
|
||||||
|
{
|
||||||
|
try { d.Dispose(); }
|
||||||
|
catch (Exception ex) { _logger.LogWarning(ex, "Phase 7 disposable threw during shutdown"); }
|
||||||
|
}
|
||||||
|
// Owned SQLite sink: dispose first so the drain timer stops + final batch flushes
|
||||||
|
// before we release the writer-bearing driver via DriverHost.DisposeAsync upstream.
|
||||||
|
_ownedSink?.Dispose();
|
||||||
|
if (_historianSink is IDisposable disposableSink) disposableSink.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,8 +8,10 @@ using Serilog.Formatting.Compact;
|
|||||||
using ZB.MOM.WW.OtOpcUa.Configuration;
|
using ZB.MOM.WW.OtOpcUa.Configuration;
|
||||||
using ZB.MOM.WW.OtOpcUa.Configuration.LocalCache;
|
using ZB.MOM.WW.OtOpcUa.Configuration.LocalCache;
|
||||||
using ZB.MOM.WW.OtOpcUa.Core.Hosting;
|
using ZB.MOM.WW.OtOpcUa.Core.Hosting;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian;
|
||||||
using ZB.MOM.WW.OtOpcUa.Server;
|
using ZB.MOM.WW.OtOpcUa.Server;
|
||||||
using ZB.MOM.WW.OtOpcUa.Server.OpcUa;
|
using ZB.MOM.WW.OtOpcUa.Server.OpcUa;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Server.Phase7;
|
||||||
using ZB.MOM.WW.OtOpcUa.Server.Security;
|
using ZB.MOM.WW.OtOpcUa.Server.Security;
|
||||||
|
|
||||||
var builder = Host.CreateApplicationBuilder(args);
|
var builder = Host.CreateApplicationBuilder(args);
|
||||||
@@ -113,5 +115,13 @@ builder.Services.AddDbContext<OtOpcUaConfigDbContext>(opt =>
|
|||||||
opt.UseSqlServer(options.ConfigDbConnectionString));
|
opt.UseSqlServer(options.ConfigDbConnectionString));
|
||||||
builder.Services.AddHostedService<HostStatusPublisher>();
|
builder.Services.AddHostedService<HostStatusPublisher>();
|
||||||
|
|
||||||
|
// Phase 7 follow-up #246 — historian sink + engine composer. NullAlarmHistorianSink
|
||||||
|
// is the default until the Galaxy.Host SqliteStoreAndForwardSink writer adapter
|
||||||
|
// lands (task #248). The composer reads Script/VirtualTag/ScriptedAlarm rows on
|
||||||
|
// generation bootstrap, builds the engines, and starts the driver-bridge feed.
|
||||||
|
builder.Services.AddSingleton<IAlarmHistorianSink>(NullAlarmHistorianSink.Instance);
|
||||||
|
builder.Services.AddSingleton(Log.Logger); // Serilog root for ScriptLoggerFactory
|
||||||
|
builder.Services.AddSingleton<Phase7Composer>();
|
||||||
|
|
||||||
var host = builder.Build();
|
var host = builder.Build();
|
||||||
await host.RunAsync();
|
await host.RunAsync();
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
using Shouldly;
|
||||||
|
using Xunit;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy.Ipc;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts;
|
||||||
|
|
||||||
|
namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy.Tests;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Phase 7 follow-up #247 — covers the wire-format translation between the
|
||||||
|
/// <see cref="AlarmHistorianEvent"/> the SQLite sink hands to the writer + the
|
||||||
|
/// <see cref="HistorianAlarmEventDto"/> the Galaxy.Host IPC contract expects, plus
|
||||||
|
/// the per-event outcome enum mapping. Pure functions; the round-trip over a real
|
||||||
|
/// pipe is exercised by the live Host suite (task #240).
|
||||||
|
/// </summary>
|
||||||
|
[Trait("Category", "Unit")]
|
||||||
|
public sealed class GalaxyHistorianWriterMappingTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void ToDto_round_trips_every_field()
|
||||||
|
{
|
||||||
|
var ts = new DateTime(2026, 4, 20, 14, 30, 0, DateTimeKind.Utc);
|
||||||
|
var e = new AlarmHistorianEvent(
|
||||||
|
AlarmId: "al-7",
|
||||||
|
EquipmentPath: "/Site/Line/Cell",
|
||||||
|
AlarmName: "HighTemp",
|
||||||
|
AlarmTypeName: "LimitAlarm",
|
||||||
|
Severity: AlarmSeverity.High,
|
||||||
|
EventKind: "RaiseEvent",
|
||||||
|
Message: "Temp 92°C exceeded 90°C",
|
||||||
|
User: "operator-7",
|
||||||
|
Comment: "ack with reason",
|
||||||
|
TimestampUtc: ts);
|
||||||
|
|
||||||
|
var dto = GalaxyHistorianWriter.ToDto(e);
|
||||||
|
|
||||||
|
dto.AlarmId.ShouldBe("al-7");
|
||||||
|
dto.EquipmentPath.ShouldBe("/Site/Line/Cell");
|
||||||
|
dto.AlarmName.ShouldBe("HighTemp");
|
||||||
|
dto.AlarmTypeName.ShouldBe("LimitAlarm");
|
||||||
|
dto.Severity.ShouldBe((int)AlarmSeverity.High);
|
||||||
|
dto.EventKind.ShouldBe("RaiseEvent");
|
||||||
|
dto.Message.ShouldBe("Temp 92°C exceeded 90°C");
|
||||||
|
dto.User.ShouldBe("operator-7");
|
||||||
|
dto.Comment.ShouldBe("ack with reason");
|
||||||
|
dto.TimestampUtcUnixMs.ShouldBe(new DateTimeOffset(ts, TimeSpan.Zero).ToUnixTimeMilliseconds());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void ToDto_preserves_null_Comment()
|
||||||
|
{
|
||||||
|
var e = new AlarmHistorianEvent(
|
||||||
|
"a", "/p", "n", "AlarmCondition", AlarmSeverity.Low, "RaiseEvent", "m",
|
||||||
|
User: "system", Comment: null, TimestampUtc: DateTime.UtcNow);
|
||||||
|
|
||||||
|
GalaxyHistorianWriter.ToDto(e).Comment.ShouldBeNull();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData(HistorianAlarmEventOutcomeDto.Ack, HistorianWriteOutcome.Ack)]
|
||||||
|
[InlineData(HistorianAlarmEventOutcomeDto.RetryPlease, HistorianWriteOutcome.RetryPlease)]
|
||||||
|
[InlineData(HistorianAlarmEventOutcomeDto.PermanentFail, HistorianWriteOutcome.PermanentFail)]
|
||||||
|
public void MapOutcome_round_trips_every_byte(
|
||||||
|
HistorianAlarmEventOutcomeDto wire, HistorianWriteOutcome expected)
|
||||||
|
{
|
||||||
|
GalaxyHistorianWriter.MapOutcome(wire).ShouldBe(expected);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void MapOutcome_unknown_byte_throws()
|
||||||
|
{
|
||||||
|
Should.Throw<InvalidOperationException>(
|
||||||
|
() => GalaxyHistorianWriter.MapOutcome((HistorianAlarmEventOutcomeDto)0xFF));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Null_client_rejected()
|
||||||
|
{
|
||||||
|
Should.Throw<ArgumentNullException>(() => new GalaxyHistorianWriter(null!));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
using Shouldly;
|
||||||
|
using Xunit;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Core.OpcUa;
|
||||||
|
using ZB.MOM.WW.OtOpcUa.Server.Phase7;
|
||||||
|
|
||||||
|
namespace ZB.MOM.WW.OtOpcUa.Server.Tests.Phase7;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Task #246 — covers the deterministic mapping inside <see cref="Phase7Composer"/>
|
||||||
|
/// that turns <see cref="EquipmentNamespaceContent"/> into the path → fullRef map
|
||||||
|
/// <see cref="DriverFeed.PathToFullRef"/> consumes. Pure function; no DI / DB needed.
|
||||||
|
/// </summary>
|
||||||
|
[Trait("Category", "Unit")]
|
||||||
|
public sealed class Phase7ComposerMappingTests
|
||||||
|
{
|
||||||
|
private static UnsArea Area(string id, string name) =>
|
||||||
|
new() { UnsAreaId = id, ClusterId = "c", Name = name, GenerationId = 1 };
|
||||||
|
|
||||||
|
private static UnsLine Line(string id, string areaId, string name) =>
|
||||||
|
new() { UnsLineId = id, UnsAreaId = areaId, Name = name, GenerationId = 1 };
|
||||||
|
|
||||||
|
private static Equipment Eq(string id, string lineId, string name) => new()
|
||||||
|
{
|
||||||
|
EquipmentRowId = Guid.NewGuid(), GenerationId = 1, EquipmentId = id,
|
||||||
|
EquipmentUuid = Guid.NewGuid(), DriverInstanceId = "drv",
|
||||||
|
UnsLineId = lineId, Name = name, MachineCode = "m",
|
||||||
|
};
|
||||||
|
|
||||||
|
private static Tag T(string id, string name, string fullRef, string equipmentId) => new()
|
||||||
|
{
|
||||||
|
TagRowId = Guid.NewGuid(), GenerationId = 1, TagId = id,
|
||||||
|
DriverInstanceId = "drv", EquipmentId = equipmentId,
|
||||||
|
Name = name, DataType = "Float32",
|
||||||
|
AccessLevel = TagAccessLevel.Read, TagConfig = fullRef,
|
||||||
|
};
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Maps_tag_to_UNS_path_walker_emits()
|
||||||
|
{
|
||||||
|
var content = new EquipmentNamespaceContent(
|
||||||
|
Areas: [Area("a1", "warsaw")],
|
||||||
|
Lines: [Line("l1", "a1", "oven-line")],
|
||||||
|
Equipment: [Eq("e1", "l1", "oven-3")],
|
||||||
|
Tags: [T("t1", "Temp", "DR.Temp", "e1")]);
|
||||||
|
|
||||||
|
var map = Phase7Composer.MapPathsToFullRefs(content);
|
||||||
|
|
||||||
|
map.ShouldContainKeyAndValue("/warsaw/oven-line/oven-3/Temp", "DR.Temp");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Skips_tag_with_null_EquipmentId()
|
||||||
|
{
|
||||||
|
var content = new EquipmentNamespaceContent(
|
||||||
|
[Area("a1", "warsaw")], [Line("l1", "a1", "ol")], [Eq("e1", "l1", "ov")],
|
||||||
|
[T("t1", "Bare", "DR.Bare", null!)]); // SystemPlatform-style orphan
|
||||||
|
|
||||||
|
Phase7Composer.MapPathsToFullRefs(content).ShouldBeEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Skips_tag_pointing_at_unknown_Equipment()
|
||||||
|
{
|
||||||
|
var content = new EquipmentNamespaceContent(
|
||||||
|
[Area("a1", "warsaw")], [Line("l1", "a1", "ol")], [Eq("e1", "l1", "ov")],
|
||||||
|
[T("t1", "Lost", "DR.Lost", "e-missing")]);
|
||||||
|
|
||||||
|
Phase7Composer.MapPathsToFullRefs(content).ShouldBeEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Maps_multiple_tags_under_same_equipment_distinctly()
|
||||||
|
{
|
||||||
|
var content = new EquipmentNamespaceContent(
|
||||||
|
[Area("a1", "site")], [Line("l1", "a1", "line1")], [Eq("e1", "l1", "cell")],
|
||||||
|
[T("t1", "Temp", "DR.T", "e1"), T("t2", "Pressure", "DR.P", "e1")]);
|
||||||
|
|
||||||
|
var map = Phase7Composer.MapPathsToFullRefs(content);
|
||||||
|
|
||||||
|
map.Count.ShouldBe(2);
|
||||||
|
map["/site/line1/cell/Temp"].ShouldBe("DR.T");
|
||||||
|
map["/site/line1/cell/Pressure"].ShouldBe("DR.P");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Empty_content_yields_empty_map()
|
||||||
|
{
|
||||||
|
Phase7Composer.MapPathsToFullRefs(new EquipmentNamespaceContent([], [], [], []))
|
||||||
|
.ShouldBeEmpty();
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user