mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 14:43:08 +08:00
e8bec27d5d
# Description
Complete WoT Binding preservation and the two-pump aggregation workflow
without implicit overlays or multi-source action fan-out.
- Add verified linked-document export and bounded partition merging.
Preserve complete source facts, reject contradictory archival content,
and retain usable readable content when a future native grammar is
unsupported.
- Wire local Methods and Condition events through the existing
injectable binding/runtime infrastructure. Keep local and upstream
identities distinct, translate namespace-bearing values, and bound
occurrence routes by source and generation.
- Wait for asynchronous event-producer readiness before completing
subscription creation, so the first alarm is not lost. Preserve
cancellation, teardown, and startup-failure reporting.
- Import runtime types in inheritance order and attach typed Method
argument Properties. Keep generated Double spelling deterministic across
supported frameworks and remove an AOT-unsafe registry validation
conversion.
- Generate both pumps and their asset/group projections. Expose fifteen
typed readings per pump, separate source-owned controls, and
acknowledge/confirm/reset workflows. Extend the demo script for managed
and NativeAOT execution, bounded failures, and exact-process cleanup.
- Synchronize current-state documentation and specification fixtures.
Compose fixture paths from platform-independent components and emit/pin
LF pump XML so byte-exact regeneration holds on Windows, Linux, and
macOS.
- Keep sample JSON readable with sorted members, two-space indentation,
and LF line endings. Normalize generated filenames to single hyphens
without changing registry resource IDs, document values, logical links,
or dependency ordering; the manifest maps resource IDs to their physical
filenames.
Most changed files are deterministic regenerations of checked-in sample
documents. The demo manifest contains 533 linked resources; the
aggregation server remains generic and has no Pump-specific compiled
model dependency.
No new alarm vocabulary, shelving/suppression/dialog/ConditionRefresh
transport mapping, Azure SDK changes, or complete Pump/OpenUSD parity is
introduced.
## Related Issues
Fixes #4430, which records the approved implementation scope, design
decisions, and acceptance criteria.
Follow-up to #4411. Specification fixtures are pinned to
[OPCF-Members/spec-drafts commit
82620d9](https://github.com/OPCF-Members/spec-drafts/commit/82620d9e313f35386dfc7477f7875cd47d2fd268),
associated with OPCF-Members/spec-drafts#35.
## Validation
- .NET 10 and .NET 8: complete affected converter/schema, WoT
Connectivity, and binding suites passed.
- .NET Framework 4.8: affected libraries, converter/generator, projected
runtime, readiness, and NodeSet-import compatibility runs passed. The
existing filesystem test exceeding the host's legacy path limit passed
through a temporary short-path alias, without changing its assertions.
- All 29 aggregation sample tests passed, including the independent
companion-model oracle.
- Managed/default-port and NativeAOT/alternate-port demo runs completed
with 533 documents, two pumps, thirty Good readings, and all four
pump/source control and alarm workflows.
- Timeout and duplicate-port failure paths were exercised; owned
processes and ports were released.
- Specification artifact/rule checks, byte-identical example mirroring,
statement-digest verification, and changed-file whitespace checks
passed.
- The [Build and Test .NET 10.0 workflow for
278b092](https://github.com/OPCFoundation/UA-.NETStandard/actions/runs/34095520510)
passed, including the previously failing Linux/macOS Types and WoT
Connectivity jobs. Portability fixes preserve the existing assertions
and add an explicit LF-output regression.
- After the readability changes in `dc61d032`, all 131 targeted
sample/projected-runtime cases passed on both .NET 10 and .NET Framework
4.8, and all 29 aggregation sample tests passed after rebuilding. All
539 JSON assets meet the formatting and filename rules; the 538 document
JSON values are unchanged, with only physical paths changing in the
manifest. Byte-exact regeneration assertions remain in place.
Local validation was scoped to affected projects rather than the entire
UA.slnx solution. Numeric coverage percentages and remaining CI gates
remain for CI; coverage thresholds were not changed. Existing unrelated
analyzer warnings were left unchanged.
## 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.
- [ ] 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.
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed.
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [x] I have addressed **all** PR feedback received.
Regression and integration tests are included and passed as described
above; the combined tests/coverage checkbox remains open because numeric
coverage was not measured locally.
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 6a9f41b1-72f0-4c74-bd7f-26fa531e5738
323 lines
9.1 KiB
JSON
323 lines
9.1 KiB
JSON
{
|
|
"@context": [
|
|
"https://www.w3.org/2022/wot/td/v1.1",
|
|
{
|
|
"ns1": "urn:opcfoundation.org:UA:WotAggregation:PumpInstance",
|
|
"ns2": "http://opcfoundation.org/UA/Pumps/",
|
|
"ns3": "http://opcfoundation.org/UA/Machinery/",
|
|
"ns4": "http://opcfoundation.org/UA/DI/",
|
|
"ua": "http://opcfoundation.org/UA/",
|
|
"uav": "http://opcfoundation.org/UA/WoT-Binding/"
|
|
},
|
|
"http://opcfoundation.org/UA/WoT-Binding/v1.1/opc-ua-wot-binding.context.jsonld"
|
|
],
|
|
"@type": "uav:object",
|
|
"links": [
|
|
{
|
|
"href": "nsu=http://opcfoundation.org/UA/Pumps/;i=1005",
|
|
"rel": "ua:HasTypeDefinition"
|
|
},
|
|
{
|
|
"href": "sample-pump",
|
|
"rel": "uav:componentOf",
|
|
"type": "application/td+json"
|
|
}
|
|
],
|
|
"properties": {
|
|
"Manufacturer": {
|
|
"@type": "uav:variable",
|
|
"forms": [
|
|
{
|
|
"href": "${SOURCE_A_ENDPOINT}",
|
|
"op": [
|
|
"readproperty"
|
|
],
|
|
"uav:id": "nsu=urn:opcfoundation.org:UA:WotAggregation:SourceA;s=Pump1.Identification.Manufacturer"
|
|
}
|
|
],
|
|
"links": [
|
|
{
|
|
"href": "i=68",
|
|
"rel": "ua:HasTypeDefinition"
|
|
}
|
|
],
|
|
"observable": true,
|
|
"readOnly": true,
|
|
"title": "Manufacturer",
|
|
"uav:browseName": "ns4:Manufacturer",
|
|
"uav:id": "nsu=urn:opcfoundation.org:UA:WotAggregation:PumpInstance;s=Pump1.Identification.Manufacturer",
|
|
"uav:mapToNodeId": "nsu=urn:opcfoundation.org:UA:WotAggregation:PumpInstance;s=Pump1.Identification.Manufacturer",
|
|
"uav:mapToType": "i=21"
|
|
},
|
|
"ProductInstanceUri": {
|
|
"@type": "uav:variable",
|
|
"const": "urn:simdevice:SimPump:PumpX-2000:SN-001",
|
|
"forms": [
|
|
{
|
|
"href": "${SOURCE_A_ENDPOINT}",
|
|
"op": [
|
|
"readproperty"
|
|
],
|
|
"uav:id": "nsu=urn:opcfoundation.org:UA:WotAggregation:SourceA;s=Pump1.Identification.ProductInstanceUri"
|
|
}
|
|
],
|
|
"links": [
|
|
{
|
|
"href": "i=68",
|
|
"rel": "ua:HasTypeDefinition"
|
|
}
|
|
],
|
|
"observable": true,
|
|
"readOnly": true,
|
|
"title": "ProductInstanceUri",
|
|
"type": "string",
|
|
"uav:browseName": "ns4:ProductInstanceUri",
|
|
"uav:id": "nsu=urn:opcfoundation.org:UA:WotAggregation:PumpInstance;s=Pump1.Identification.ProductInstanceUri",
|
|
"uav:mapToNodeId": "nsu=urn:opcfoundation.org:UA:WotAggregation:PumpInstance;s=Pump1.Identification.ProductInstanceUri",
|
|
"uav:mapToType": "i=12"
|
|
},
|
|
"SerialNumber": {
|
|
"@type": "uav:variable",
|
|
"const": "SN-001",
|
|
"forms": [
|
|
{
|
|
"href": "${SOURCE_A_ENDPOINT}",
|
|
"op": [
|
|
"readproperty"
|
|
],
|
|
"uav:id": "nsu=urn:opcfoundation.org:UA:WotAggregation:SourceA;s=Pump1.Identification.SerialNumber"
|
|
}
|
|
],
|
|
"links": [
|
|
{
|
|
"href": "i=68",
|
|
"rel": "ua:HasTypeDefinition"
|
|
}
|
|
],
|
|
"observable": true,
|
|
"readOnly": true,
|
|
"title": "SerialNumber",
|
|
"type": "string",
|
|
"uav:browseName": "ns4:SerialNumber",
|
|
"uav:id": "nsu=urn:opcfoundation.org:UA:WotAggregation:PumpInstance;s=Pump1.Identification.SerialNumber",
|
|
"uav:mapToNodeId": "nsu=urn:opcfoundation.org:UA:WotAggregation:PumpInstance;s=Pump1.Identification.SerialNumber",
|
|
"uav:mapToType": "i=12"
|
|
}
|
|
},
|
|
"security": "nosec_sc",
|
|
"securityDefinitions": {
|
|
"nosec_sc": {
|
|
"scheme": "nosec"
|
|
}
|
|
},
|
|
"title": "Identification",
|
|
"uav:bindingVersion": "1.1",
|
|
"uav:browseName": "ns4:Identification",
|
|
"uav:id": "nsu=urn:opcfoundation.org:UA:WotAggregation:PumpInstance;s=Pump1.Identification",
|
|
"uav:nodes": {
|
|
"@type": "uav:NodeModel",
|
|
"aliases": [
|
|
{
|
|
"alias": "Boolean",
|
|
"value": "i=1"
|
|
},
|
|
{
|
|
"alias": "UInt32",
|
|
"value": "i=7"
|
|
},
|
|
{
|
|
"alias": "Double",
|
|
"value": "i=11"
|
|
},
|
|
{
|
|
"alias": "String",
|
|
"value": "i=12"
|
|
},
|
|
{
|
|
"alias": "LocalizedText",
|
|
"value": "i=21"
|
|
},
|
|
{
|
|
"alias": "HasTypeDefinition",
|
|
"value": "i=40"
|
|
},
|
|
{
|
|
"alias": "HasProperty",
|
|
"value": "i=46"
|
|
},
|
|
{
|
|
"alias": "HasComponent",
|
|
"value": "i=47"
|
|
},
|
|
{
|
|
"alias": "Range",
|
|
"value": "i=884"
|
|
},
|
|
{
|
|
"alias": "EUInformation",
|
|
"value": "i=887"
|
|
},
|
|
{
|
|
"alias": "HasSubtype",
|
|
"value": "i=45"
|
|
},
|
|
{
|
|
"alias": "GeneratesEvent",
|
|
"value": "i=41"
|
|
},
|
|
{
|
|
"alias": "Argument",
|
|
"value": "i=296"
|
|
}
|
|
],
|
|
"models": [
|
|
{
|
|
"modelUri": "urn:opcfoundation.org:UA:WotAggregation:PumpInstance",
|
|
"publicationDate": "2026-07-24T00:00:00Z",
|
|
"requiredModels": [
|
|
{
|
|
"modelUri": "http://opcfoundation.org/UA/",
|
|
"publicationDate": "2022-02-24T00:00:00Z",
|
|
"version": "1.05.01"
|
|
},
|
|
{
|
|
"modelUri": "http://opcfoundation.org/UA/DI/",
|
|
"publicationDate": "2022-11-03T00:00:00Z",
|
|
"version": "1.04.0"
|
|
},
|
|
{
|
|
"modelUri": "http://opcfoundation.org/UA/Machinery/",
|
|
"publicationDate": "2021-02-25T00:00:00Z",
|
|
"version": "1.01.0"
|
|
},
|
|
{
|
|
"modelUri": "http://opcfoundation.org/UA/Pumps/",
|
|
"publicationDate": "2021-04-19T00:00:00Z",
|
|
"version": "1.0.0"
|
|
}
|
|
],
|
|
"version": "1.0.0"
|
|
}
|
|
],
|
|
"namespaceUris": [
|
|
"urn:opcfoundation.org:UA:WotAggregation:PumpInstance",
|
|
"http://opcfoundation.org/UA/Pumps/",
|
|
"http://opcfoundation.org/UA/Machinery/",
|
|
"http://opcfoundation.org/UA/DI/"
|
|
],
|
|
"nodes": [
|
|
{
|
|
"browseName": "4:Identification",
|
|
"displayName": [
|
|
{
|
|
"value": "Identification"
|
|
}
|
|
],
|
|
"nodeClass": "Object",
|
|
"nodeId": "ns=1;s=Pump1.Identification",
|
|
"parentNodeId": "ns=1;s=Pump1",
|
|
"references": [
|
|
{
|
|
"isForward": false,
|
|
"referenceType": "HasComponent",
|
|
"target": "ns=1;s=Pump1"
|
|
},
|
|
{
|
|
"referenceType": "HasProperty",
|
|
"target": "ns=1;s=Pump1.Identification.Manufacturer"
|
|
},
|
|
{
|
|
"referenceType": "HasProperty",
|
|
"target": "ns=1;s=Pump1.Identification.SerialNumber"
|
|
},
|
|
{
|
|
"referenceType": "HasProperty",
|
|
"target": "ns=1;s=Pump1.Identification.ProductInstanceUri"
|
|
},
|
|
{
|
|
"referenceType": "HasTypeDefinition",
|
|
"target": "ns=2;i=1005"
|
|
}
|
|
],
|
|
"typeDefinition": "ns=2;i=1005"
|
|
},
|
|
{
|
|
"browseName": "4:Manufacturer",
|
|
"dataType": "LocalizedText",
|
|
"displayName": [
|
|
{
|
|
"value": "Manufacturer"
|
|
}
|
|
],
|
|
"nodeClass": "Variable",
|
|
"nodeId": "ns=1;s=Pump1.Identification.Manufacturer",
|
|
"parentNodeId": "ns=1;s=Pump1.Identification",
|
|
"references": [
|
|
{
|
|
"isForward": false,
|
|
"referenceType": "HasProperty",
|
|
"target": "ns=1;s=Pump1.Identification"
|
|
},
|
|
{
|
|
"referenceType": "HasTypeDefinition",
|
|
"target": "i=68"
|
|
}
|
|
],
|
|
"typeDefinition": "i=68",
|
|
"valueXml": "<uax:LocalizedText xmlns:uax=\"http://opcfoundation.org/UA/2008/02/Types.xsd\">\n <uax:Text>SimPump Corp</uax:Text>\n </uax:LocalizedText>"
|
|
},
|
|
{
|
|
"browseName": "4:SerialNumber",
|
|
"dataType": "String",
|
|
"displayName": [
|
|
{
|
|
"value": "SerialNumber"
|
|
}
|
|
],
|
|
"nodeClass": "Variable",
|
|
"nodeId": "ns=1;s=Pump1.Identification.SerialNumber",
|
|
"parentNodeId": "ns=1;s=Pump1.Identification",
|
|
"references": [
|
|
{
|
|
"isForward": false,
|
|
"referenceType": "HasProperty",
|
|
"target": "ns=1;s=Pump1.Identification"
|
|
},
|
|
{
|
|
"referenceType": "HasTypeDefinition",
|
|
"target": "i=68"
|
|
}
|
|
],
|
|
"typeDefinition": "i=68",
|
|
"valueXml": "<uax:String xmlns:uax=\"http://opcfoundation.org/UA/2008/02/Types.xsd\">SN-001</uax:String>"
|
|
},
|
|
{
|
|
"browseName": "4:ProductInstanceUri",
|
|
"dataType": "String",
|
|
"displayName": [
|
|
{
|
|
"value": "ProductInstanceUri"
|
|
}
|
|
],
|
|
"nodeClass": "Variable",
|
|
"nodeId": "ns=1;s=Pump1.Identification.ProductInstanceUri",
|
|
"parentNodeId": "ns=1;s=Pump1.Identification",
|
|
"references": [
|
|
{
|
|
"isForward": false,
|
|
"referenceType": "HasProperty",
|
|
"target": "ns=1;s=Pump1.Identification"
|
|
},
|
|
{
|
|
"referenceType": "HasTypeDefinition",
|
|
"target": "i=68"
|
|
}
|
|
],
|
|
"typeDefinition": "i=68",
|
|
"valueXml": "<uax:String xmlns:uax=\"http://opcfoundation.org/UA/2008/02/Types.xsd\">urn:simdevice:SimPump:PumpX-2000:SN-001</uax:String>"
|
|
}
|
|
],
|
|
"profileVersion": "1.0"
|
|
}
|
|
}
|