Files
Copilot d525bc3f28 Bound reconnect cleanup and organize samples by domain (#4276)
# Description

This PR fixes bounded ManagedSession reconnect cleanup and reorganizes
the sample applications into domain-focused folders.

## Reconnect cleanup

- Bounds reconnect integration cleanup with independent 30-second close
and dispose limits.
- Sends `CloseSession` through the awaited transport request path during
`Session.DisposeAsync`.
- Preserves explicit `Session.CloseAsync` behavior that waits for or
cancels outstanding publish requests.
- Covers the disposal request path with a regression test.

## Sample organization

- `samples/OpenUsd`: `GeneratorServer`, `SiteCompositionServer`
- `samples/Redundancy`: `RedundantClient`, `RedundantServer`,
`RedundantPubSub`
- `samples/Isa95`: `MinimalIsa95Server`
- `samples/MinimalApi`: `MinimalBoilerServer`, `MinimalCalcServer`,
`MinimalClient`
- `samples/DI`: `PumpDeviceIntegrationServer`
- `samples/Lds`: `ConsoleLdsServer`
- `samples/Reference`: `ConsoleReferenceClient`,
`ConsoleReferenceServer`
- `samples/PubSub`: `ConsoleReferencePubSubClient`

`UA.slnx` now exposes the same requested domain groups. Project
references, tests, runtime sample probes, CI workflows, Dockerfiles,
Compose files, helper scripts, and documentation were updated to the new
paths. `samples/Robotics/MinimalRobotServer` remains under `Robotics`.

## Validation

- `dotnet build UA.slnx`
- 3 Redundancy short-haul sample tests
- 70 DI sample tests
- 914 OpenUSD tests
- 1 WotCon model-materialization test
- 137 AOT tests
- `docker compose config` for all 6 moved Redundancy Compose files

## Related Issues

- Fixes #4273

## Checklist

- [ ] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf)
and read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage.
- [x] I have added all necessary documentation.
- [x] I have verified that my changes do not introduce new build or
analyzer warnings.
- [x] I built the complete `UA.slnx` solution locally.
- [ ] I ran all tests locally against at least .NET Framework and .NET
10.
- [ ] I fixed all failing and flaky tests in the CI pipelines and all
CodeQL warnings.
- [x] I have addressed all PR feedback received.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: marcschier <11168470+marcschier@users.noreply.github.com>
Co-authored-by: Marc Schier <mschier@microsoft.com>
Co-authored-by: Marc Schier <marcschier@users.noreply.github.com>
Copilot-Session: a2c2838f-74ae-4997-a1d4-50574d9e0636
2026-08-21 04:35:47 +00:00

135 lines
5.4 KiB
C#

/* ========================================================================
* Copyright (c) 2005-2026 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 Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using MinimalIsa95Server;
using Opc.Ua;
using Opc.Ua.ISA95;
using Opc.Ua.ISA95.Server.Builders;
using Opc.Ua.ISA95.Server.Providers;
HostApplicationBuilder builder = Host.CreateApplicationBuilder(args);
builder.Logging.ClearProviders();
builder.Logging.AddConsole();
int port = int.TryParse(builder.Configuration["port"], out int configuredPort)
? configuredPort
: 62545;
Isa95GeoSpatialLocationBinding? locationBinding = null;
const string PlantSourceId = "plant";
using var locationProvider = new InMemoryGeoLocationProvider();
locationProvider.Update(
PlantSourceId,
new GeoPosition(47.3769, 8.5417, EpsgCode: 4326));
builder.Services
.AddOpcUa()
.AddServer(options =>
{
options.ApplicationName = "MinimalIsa95Server";
options.ApplicationUri = "urn:localhost:OPCFoundation:MinimalIsa95Server";
options.ProductUri = "uri:opcfoundation.org:MinimalIsa95Server";
options.AutoAcceptUntrustedCertificates = true;
options.EndpointUrls.Add(
$"opc.tcp://localhost:{port}/MinimalIsa95Server");
})
.AddIsa95Server()
.ConfigureModel(async (model, ct) =>
{
PersonnelClassState operators =
await model.CreatePersonnelClassAsync(model.Root, "Operators", ct)
.ConfigureAwait(false);
PersonState operatorOne =
await model.CreatePersonAsync(model.Root, "Operator-1", ct)
.ConfigureAwait(false);
model.DefinedByPersonnelClass(operatorOne, operators);
EquipmentClassState reactorClass =
await model.CreateEquipmentClassAsync(model.Root, "ReactorClass", ct)
.ConfigureAwait(false);
EquipmentState reactor =
await model.CreateEquipmentAsync(model.Root, "Reactor-1", ct)
.ConfigureAwait(false);
model.DefinedByEquipmentClass(reactor, reactorClass);
PhysicalAssetClassState vesselClass =
await model.CreatePhysicalAssetClassAsync(model.Root, "VesselClass", ct)
.ConfigureAwait(false);
PhysicalAssetState vessel =
await model.CreatePhysicalAssetAsync(model.Root, "Vessel-1", ct)
.ConfigureAwait(false);
model.DefinedByPhysicalAssetClass(vessel, vesselClass);
MaterialClassState materialClass =
await model.CreateMaterialClassAsync(model.Root, "Feedstock", ct)
.ConfigureAwait(false);
MaterialDefinitionState materialDefinition =
await model.CreateMaterialDefinitionAsync(
model.Root,
"Feedstock-Grade-A",
ct).ConfigureAwait(false);
model.DefinedByMaterialClass(materialDefinition, materialClass);
MaterialLotState lot =
await model.CreateMaterialLotAsync(model.Root, "Lot-1001", ct)
.ConfigureAwait(false);
model.DefinedByMaterialDefinition(lot, materialDefinition);
MaterialSublotState sublot =
await model.CreateMaterialSublotAsync(lot, "Sublot-A", ct)
.ConfigureAwait(false);
model.MadeUpOfMaterialSublot(lot, sublot);
Isa95GeoSpatialLocationBinding location =
await model.CreateGeoSpatialLocationAsync(
model.Root,
"PlantLocation",
locationProvider,
PlantSourceId,
cancellationToken: ct).ConfigureAwait(false);
PhysicalAssetPropertyState locationProperty = await model.AddPropertyAsync(
vessel,
"LocationReference",
cancellationToken: ct).ConfigureAwait(false);
model.LocatedIn(locationProperty, location.State);
locationBinding = location;
});
builder.Services.AddHostedService<DemoJobSeeder>();
using IHost host = builder.Build();
try
{
await host.RunAsync().ConfigureAwait(false);
}
finally
{
locationBinding?.Dispose();
}