mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 09:06:37 +08:00
da7412c429
## Summary - support the xRegistry 0.6.0 distinct Resource/Version hierarchy: `Registry -> Group -> Resource -> Versions -> Version` - instantiate stable logical Resource nodes separately from exact Version nodes while preserving existing Version NodeIds - delegate logical Resource FileType operations and Version-view metadata to the selected default Version with handle pinning and shared writer reservations - make Resource and Version delete behavior role-stable and use `MetaEpoch` / `Epoch` respectively - use stable Resource SourceNodes, exact Version SourceNodes and the `Server -> Registry -> Group -> Resource -> Version` notifier chain - keep a model-metadata-gated client fallback for 0.5 flat Servers; 0.6 Servers expose no legacy aliases - target `HasWoTProjection` at the real stable logical Resource node - use `AsyncCustomNodeManager` for the registration, fast-path, and federation managers, with awaited lifecycle, node mutations, event delivery, and cleanup - handle startup rollback, reentrant deletion callbacks, undisclosed file handles, and retryable cleanup without blocking unrelated file operations ## Authoritative dependencies - companion specification: OPCF-Members/spec-drafts#32 at `d3399fca025025a73e5a6b599f850a81d985c060` - OPC UA binding: xregistry/spec#568 - xRegistry event semantics: xregistry/spec#563, merged as `66ee31e47fbadff6ab982ae1516f7d9065e46b64` - companion NodeSet SHA-256: `369f5f3f1814b333e4eeb52bfb4b6a730cdff372505a5f91a54c94f0016ac4cf` ## Review feedback - keep the WoT Connectivity information-model designation at `1.1`; draft revisions update the publication date without changing the model version - eliminate all 198 unique CA1861 diagnostics across 54 files and remove seven obsolete project suppressions - fix the analyzer-clean touched-path CA1307 and the hierarchy follow-up CA1846/CA1851 diagnostics without dropping legacy-TFM compatibility - recover the reconcile queue after callback faults/cancellation and continue accepted pending changes - remove migration guidance for the xRegistry managers, which are new in 2.0 ## Compatibility - public WoT Connectivity model designation remains `1.1` - generated event-record ABI, constructors, options, NodeIds, and stored documents remain compatible - the generic xRegistry managers are new in 2.0 and implement `IAsyncNodeManager`; use `IAsyncNodeManagerFactory` and the async lifecycle hooks (see `docs\XRegistry.md`) - persistence schema and document blobs remain compatible unless noted below ## Validation - merge validation at `980422f76` with upstream `e8bec27d5`: 454 targeted WoT/materialization/model/registry cases and all 327 XRegistry cases passed on both net10.0 and net48; all 29 net10 aggregation sample cases passed - feedback regressions at `308e8ba74`: 55 targeted queue and live registry event/projection/lifecycle cases passed on each of net10.0 and net48 - prior CI: all 266 checks passed at `6489a0908`; the unchanged Ubuntu Core certificate-counter test and dependent jobs passed on the one-time retry ([run 34117304035, attempt 2](https://github.com/OPCFoundation/UA-.NETStandard/actions/runs/34117304035/attempts/2)) - `Opc.Ua.XRegistry.Tests` — 327 passed on net10.0 and net48 for migration commit `32c914aaf` - `Opc.Ua.WotCon.Tests` net10.0 — 1348 passed - `Opc.Ua.WotCon.Bindings.Tests` net10.0 — 683 passed - `Opc.Ua.SourceGeneration.Core.Tests` net10.0 — 3807 passed, 8 skipped - `Opc.Ua.SourceGeneration.Tests` net10.0 — 145 passed - `Opc.Ua.SourceGeneration.Stack.Tests` net10.0 — 94 passed - affected XRegistry and WoT client/server projects build successfully - xRegistry NodeSet is byte-identical to the companion artifact - repository-wide CA1861 inventory — 198 unique diagnostics across 54 files reduced to zero - targeted changed-fixture validation — 1,098 passed, 3 skipped, 0 failed - constrained full `UA.slnx` net10.0 Release build — CA1861 = 0 - `Opc.Ua.XRegistry.Client` net472 and netstandard2.1 builds — 0 warnings, 0 errors - independent shared-array safety review — no significant issues - `git diff --check` The final review regressions cover concurrent reconcile/open, synthetic logical handle collisions across default switches, cross-session Close isolation, shared writer reservations, logical FileType property/change propagation, logical Labels delegation, role-fixed deletion, event sources, model-version gating, and stable `HasWoTProjection` targets. The companion specification and protocol binding are reviewed in the linked PRs above. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 5c79a1ed-6dab-4522-a9fc-6548caa78ad5 Copilot-Session: b605797f-a97a-4cd0-8f12-016d33c2fd88 Copilot-Session: 7ef369a5-2307-4f71-8a11-15af0e72f240 Copilot-Session: e716d455-8397-4d22-9c5a-398847ab7317
362 lines
14 KiB
C#
362 lines
14 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Di.Server.SoftwareUpdate;
|
|
using Opc.Ua.Server.FileSystem;
|
|
|
|
namespace Opc.Ua.Di.Tests
|
|
{
|
|
/// <summary>
|
|
/// Unit tests for the software-package storage layer
|
|
/// (<see cref="MemoryPackageStore"/>,
|
|
/// <see cref="FileSystemPackageStore"/>).
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("DI")]
|
|
[Category("SoftwareUpdate")]
|
|
public sealed class PackageStoreTests
|
|
{
|
|
[Test]
|
|
public async Task MemoryStoreAddAndGetRoundTrip()
|
|
{
|
|
var store = new MemoryPackageStore();
|
|
byte[] payload = [1, 2, 3, 4, 5];
|
|
SoftwarePackage stored = await store.AddAsync(
|
|
NewMetadata("fw-1"),
|
|
new MemoryStream(payload)).ConfigureAwait(false);
|
|
|
|
Assert.That(stored.SizeBytes, Is.EqualTo(payload.LongLength));
|
|
Assert.That(stored.Id, Is.EqualTo("fw-1"));
|
|
|
|
SoftwarePackage? roundTrip = await store.GetAsync("fw-1").ConfigureAwait(false);
|
|
Assert.That(roundTrip, Is.Not.Null);
|
|
Assert.That(roundTrip!.Vendor, Is.EqualTo("Acme"));
|
|
|
|
using Stream stream = await store.OpenReadAsync("fw-1").ConfigureAwait(false);
|
|
using MemoryStream copy = new();
|
|
await stream.CopyToAsync(copy).ConfigureAwait(false);
|
|
Assert.That(copy.ToArray(), Is.EqualTo(payload));
|
|
}
|
|
|
|
[Test]
|
|
public async Task MemoryStoreListEnumeratesAllPackages()
|
|
{
|
|
var store = new MemoryPackageStore();
|
|
await store.AddAsync(NewMetadata("fw-1"), new MemoryStream([1])).ConfigureAwait(false);
|
|
await store.AddAsync(NewMetadata("fw-2"), new MemoryStream([2, 3])).ConfigureAwait(false);
|
|
await store.AddAsync(NewMetadata("fw-3"), new MemoryStream([4, 5, 6])).ConfigureAwait(false);
|
|
|
|
var seen = new HashSet<string>();
|
|
await foreach (SoftwarePackage p in store.ListAsync())
|
|
{
|
|
seen.Add(p.Id);
|
|
}
|
|
|
|
Assert.That(seen, Is.EquivalentTo(["fw-1", "fw-2", "fw-3"]));
|
|
}
|
|
|
|
[Test]
|
|
public async Task MemoryStoreExistsAndDelete()
|
|
{
|
|
var store = new MemoryPackageStore();
|
|
await store.AddAsync(NewMetadata("fw-1"), new MemoryStream([1])).ConfigureAwait(false);
|
|
|
|
Assert.That(await store.ExistsAsync("fw-1").ConfigureAwait(false), Is.True);
|
|
Assert.That(await store.ExistsAsync("fw-missing").ConfigureAwait(false), Is.False);
|
|
|
|
Assert.That(await store.DeleteAsync("fw-1").ConfigureAwait(false), Is.True);
|
|
Assert.That(await store.DeleteAsync("fw-1").ConfigureAwait(false), Is.False,
|
|
"Second delete must return false.");
|
|
Assert.That(await store.ExistsAsync("fw-1").ConfigureAwait(false), Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void MemoryStoreOpenReadThrowsForMissingPackage()
|
|
{
|
|
var store = new MemoryPackageStore();
|
|
Assert.ThrowsAsync<FileNotFoundException>(
|
|
async () => await store.OpenReadAsync("nope").ConfigureAwait(false));
|
|
}
|
|
|
|
[Test]
|
|
public void MemoryStoreRejectsEmptyId()
|
|
{
|
|
var store = new MemoryPackageStore();
|
|
Assert.ThrowsAsync<ArgumentException>(
|
|
async () => await store.GetAsync(string.Empty).ConfigureAwait(false));
|
|
Assert.ThrowsAsync<ArgumentException>(
|
|
async () => await store.ExistsAsync(" ").ConfigureAwait(false));
|
|
}
|
|
|
|
[Test]
|
|
public async Task FileSystemStoreAddAndGetRoundTripViaPhysicalProvider()
|
|
{
|
|
string tempRoot = Path.Combine(
|
|
Path.GetTempPath(),
|
|
"di-pkg-tests-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(tempRoot);
|
|
try
|
|
{
|
|
var provider = new PhysicalFileSystemProvider(
|
|
rootDirectory: tempRoot,
|
|
mountName: "Packages",
|
|
isWritable: true);
|
|
var store = new FileSystemPackageStore(provider, rootPath: "/SoftwarePackages");
|
|
|
|
byte[] payload = [10, 20, 30, 40, 50];
|
|
SoftwarePackage stored = await store.AddAsync(
|
|
NewMetadata("fw-x"),
|
|
new MemoryStream(payload)).ConfigureAwait(false);
|
|
|
|
Assert.That(stored.SizeBytes, Is.EqualTo(payload.LongLength));
|
|
|
|
SoftwarePackage? roundTrip = await store.GetAsync("fw-x").ConfigureAwait(false);
|
|
Assert.That(roundTrip, Is.Not.Null);
|
|
Assert.That(roundTrip!.Id, Is.EqualTo("fw-x"));
|
|
Assert.That(roundTrip.Vendor, Is.EqualTo("Acme"));
|
|
Assert.That(roundTrip.SizeBytes, Is.EqualTo(payload.LongLength));
|
|
|
|
using Stream stream = await store.OpenReadAsync("fw-x").ConfigureAwait(false);
|
|
using MemoryStream copy = new();
|
|
await stream.CopyToAsync(copy).ConfigureAwait(false);
|
|
Assert.That(copy.ToArray(), Is.EqualTo(payload));
|
|
}
|
|
finally
|
|
{
|
|
if (Directory.Exists(tempRoot))
|
|
{
|
|
Directory.Delete(tempRoot, recursive: true);
|
|
}
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task FileSystemStoreListReturnsKnownPackages()
|
|
{
|
|
string tempRoot = Path.Combine(
|
|
Path.GetTempPath(),
|
|
"di-pkg-tests-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(tempRoot);
|
|
try
|
|
{
|
|
var provider = new PhysicalFileSystemProvider(
|
|
rootDirectory: tempRoot,
|
|
mountName: "Packages",
|
|
isWritable: true);
|
|
var store = new FileSystemPackageStore(provider, rootPath: "/Pkgs");
|
|
|
|
await store.AddAsync(NewMetadata("a"), new MemoryStream([1])).ConfigureAwait(false);
|
|
await store.AddAsync(NewMetadata("b"), new MemoryStream([2, 3])).ConfigureAwait(false);
|
|
|
|
var seen = new HashSet<string>();
|
|
await foreach (SoftwarePackage p in store.ListAsync())
|
|
{
|
|
seen.Add(p.Id);
|
|
}
|
|
|
|
Assert.That(seen, Is.EquivalentTo(["a", "b"]));
|
|
}
|
|
finally
|
|
{
|
|
if (Directory.Exists(tempRoot))
|
|
{
|
|
Directory.Delete(tempRoot, recursive: true);
|
|
}
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task FileSystemStoreDeleteRemovesPackage()
|
|
{
|
|
string tempRoot = Path.Combine(
|
|
Path.GetTempPath(),
|
|
"di-pkg-tests-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(tempRoot);
|
|
try
|
|
{
|
|
var provider = new PhysicalFileSystemProvider(
|
|
rootDirectory: tempRoot,
|
|
mountName: "Packages",
|
|
isWritable: true);
|
|
var store = new FileSystemPackageStore(provider, rootPath: "/Pkgs");
|
|
await store.AddAsync(NewMetadata("doomed"), new MemoryStream([0])).ConfigureAwait(false);
|
|
|
|
Assert.That(await store.DeleteAsync("doomed").ConfigureAwait(false), Is.True);
|
|
Assert.That(await store.ExistsAsync("doomed").ConfigureAwait(false), Is.False);
|
|
Assert.That(await store.DeleteAsync("doomed").ConfigureAwait(false), Is.False);
|
|
}
|
|
finally
|
|
{
|
|
if (Directory.Exists(tempRoot))
|
|
{
|
|
Directory.Delete(tempRoot, recursive: true);
|
|
}
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public void FileSystemStoreRejectsIdWithPathSeparator()
|
|
{
|
|
string tempRoot = Path.Combine(
|
|
Path.GetTempPath(),
|
|
"di-pkg-tests-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(tempRoot);
|
|
try
|
|
{
|
|
var provider = new PhysicalFileSystemProvider(
|
|
rootDirectory: tempRoot,
|
|
mountName: "Packages",
|
|
isWritable: true);
|
|
var store = new FileSystemPackageStore(provider, rootPath: "/Pkgs");
|
|
Assert.ThrowsAsync<ArgumentException>(
|
|
async () => await store.GetAsync("bad/id").ConfigureAwait(false));
|
|
Assert.ThrowsAsync<ArgumentException>(
|
|
async () => await store.GetAsync("bad\\id").ConfigureAwait(false));
|
|
}
|
|
finally
|
|
{
|
|
if (Directory.Exists(tempRoot))
|
|
{
|
|
Directory.Delete(tempRoot, recursive: true);
|
|
}
|
|
}
|
|
}
|
|
|
|
[TestCase(".")]
|
|
[TestCase("..")]
|
|
public void FileSystemStoreRejectsDotSegmentId(string packageId)
|
|
{
|
|
string tempRoot = Path.Combine(
|
|
Path.GetTempPath(),
|
|
"di-pkg-tests-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(tempRoot);
|
|
try
|
|
{
|
|
var provider = new PhysicalFileSystemProvider(
|
|
rootDirectory: tempRoot,
|
|
mountName: "Packages",
|
|
isWritable: true);
|
|
var store = new FileSystemPackageStore(provider, rootPath: "/Pkgs");
|
|
|
|
Assert.ThrowsAsync<ArgumentException>(
|
|
async () => await store.GetAsync(packageId).ConfigureAwait(false));
|
|
}
|
|
finally
|
|
{
|
|
if (Directory.Exists(tempRoot))
|
|
{
|
|
Directory.Delete(tempRoot, recursive: true);
|
|
}
|
|
}
|
|
}
|
|
|
|
[TestCase("/Pkgs/./Nested")]
|
|
[TestCase("/Pkgs/../Outside")]
|
|
[TestCase("\\Pkgs\\..\\Outside")]
|
|
public void FileSystemStoreRejectsRootWithDotSegment(string rootPath)
|
|
{
|
|
string tempRoot = Path.Combine(
|
|
Path.GetTempPath(),
|
|
"di-pkg-tests-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(tempRoot);
|
|
try
|
|
{
|
|
var provider = new PhysicalFileSystemProvider(
|
|
rootDirectory: tempRoot,
|
|
mountName: "Packages",
|
|
isWritable: true);
|
|
|
|
Assert.That(
|
|
() => new FileSystemPackageStore(provider, rootPath),
|
|
Throws.TypeOf<ArgumentException>());
|
|
}
|
|
finally
|
|
{
|
|
if (Directory.Exists(tempRoot))
|
|
{
|
|
Directory.Delete(tempRoot, recursive: true);
|
|
}
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task FileSystemStoreCanonicalizesProviderRelativeRootAsync()
|
|
{
|
|
string tempRoot = Path.Combine(
|
|
Path.GetTempPath(),
|
|
"di-pkg-tests-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(tempRoot);
|
|
try
|
|
{
|
|
var provider = new PhysicalFileSystemProvider(
|
|
rootDirectory: tempRoot,
|
|
mountName: "Packages",
|
|
isWritable: true);
|
|
var store = new FileSystemPackageStore(
|
|
provider,
|
|
rootPath: "\\Pkgs\\\\Nested\\");
|
|
using var payload = new MemoryStream([1, 2, 3]);
|
|
|
|
await store.AddAsync(
|
|
NewMetadata("firmware"),
|
|
payload).ConfigureAwait(false);
|
|
|
|
string packageRoot = Path.Combine(tempRoot, "Pkgs", "Nested", "firmware");
|
|
Assert.That(File.Exists(Path.Combine(packageRoot, "payload.bin")), Is.True);
|
|
Assert.That(File.Exists(Path.Combine(packageRoot, "metadata.json")), Is.True);
|
|
Assert.That(File.Exists(Path.Combine(tempRoot, "payload.bin")), Is.False);
|
|
}
|
|
finally
|
|
{
|
|
if (Directory.Exists(tempRoot))
|
|
{
|
|
Directory.Delete(tempRoot, recursive: true);
|
|
}
|
|
}
|
|
}
|
|
|
|
private static SoftwarePackage NewMetadata(string id)
|
|
{
|
|
return new(
|
|
Id: id,
|
|
Version: "1.0.0",
|
|
Vendor: "Acme",
|
|
Description: "Test package",
|
|
SizeBytes: 0,
|
|
CreatedAt: default,
|
|
Hash: string.Empty);
|
|
}
|
|
}
|
|
}
|