Skip to content

Abstract Arrays and Enumeration Values addressed #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Archie-Miller merged 13 commits into from
Jun 3, 2025
Merged

Abstract Arrays and Enumeration Values addressed #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9df4911
Potential Solution for Issue 112
Archie-Miller May 1, 2025
5c811d1
Save Work in Progress
Archie-Miller May 22, 2025
256a942
Save work in progress
Archie-Miller May 22, 2025
593e712
Clean up, ready for testing feature
Archie-Miller May 22, 2025
6e92bfb
Potential Complete. Ready for Testing
Archie-Miller May 23, 2025
e783b90
Add Structure Testing
Archie-Miller May 23, 2025
7415085
Add another use case Extra variable to defined object type
Archie-Miller May 23, 2025
893f5cb
Testing Complete
Archie-Miller May 23, 2025
db9920f
Add Typeonly to Enumerations in AttributeTypeLibrary
Archie-Miller Jun 2, 2025
f514214
Testing for Enumerations
Archie-Miller Jun 2, 2025
4b38844
Merge branch '112_Derived_Array_Variable_Types' into Enum_And_Abstrac…
Archie-Miller Jun 2, 2025
fe20138
Save Work in Progress.
Archie-Miller Jun 2, 2025
1ae57e4
Testing complete for Enumerations
Archie-Miller Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
478 changes: 393 additions & 85 deletions NodeSetToAML.cs
View file
Open in desktop

Large diffs are not rendered by default.

7,527 changes: 4,270 additions & 3,257 deletions SystemTest/NodeSetFiles/InstanceLevel.xml
View file
Open in desktop

Large diffs are not rendered by default.

164 changes: 159 additions & 5 deletions SystemTest/NodeSetFiles/LevelOne.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,70 @@
<Alias Alias="LocalizedText">i=21</Alias>
<Alias Alias="DataValue">i=23</Alias>
<Alias Alias="DiagnosticInfo">i=25</Alias>
<Alias Alias="HasEncoding">i=38</Alias>
<Alias Alias="HasModellingRule">i=37</Alias>
<Alias Alias="HasEncoding">i=38</Alias>
<Alias Alias="HasTypeDefinition">i=40</Alias>
<Alias Alias="HasSubtype">i=45</Alias>
<Alias Alias="HasProperty">i=46</Alias>
<Alias Alias="HasComponent">i=47</Alias>
<Alias Alias="IdType">i=256</Alias>
<Alias Alias="NumericRange">i=291</Alias>
<Alias Alias="NodeClass">i=257</Alias>
<Alias Alias="NumericRange">i=291</Alias>
<Alias Alias="PublishedVariableDataType">i=14273</Alias>
<Alias Alias="DataSetMetaDataType">i=14523</Alias>
</Aliases>
<Alias Alias="NegotiationStatus">i=24216</Alias>
<Alias Alias="AbstractionOne">ns=1;i=3007</Alias>
<Alias Alias="AbstractionTwo">ns=1;i=3010</Alias>
</Aliases>
<Extensions>
<Extension>
<ua:ModelInfo Tool="UaModeler" Hash="DuPGKAwEHXQ1SZQJiUlj2g==" Version="1.6.8"/>
</Extension>
</Extensions>
<UADataType NodeId="ns=1;i=3003" BrowseName="1:ComprehensiveScalarType">
<UADataType IsAbstract="true" NodeId="ns=1;i=3007" BrowseName="1:AbstractionOne">
<DisplayName>AbstractionOne</DisplayName>
<References>
<Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
</References>
<Definition Name="1:AbstractionOne">
<Field DataType="Double" Name="ParentOne"/>
</Definition>
</UADataType>
<UADataType NodeId="ns=1;i=3014" BrowseName="1:AbstractionStructureOne">
<DisplayName>AbstractionStructureOne</DisplayName>
<References>
<Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
<Reference ReferenceType="HasEncoding">ns=1;i=5008</Reference>
<Reference ReferenceType="HasEncoding">ns=1;i=5010</Reference>
<Reference ReferenceType="HasEncoding">ns=1;i=5009</Reference>
</References>
<Definition Name="1:AbstractionStructureOne">
<Field AllowSubTypes="true" DataType="AbstractionOne" Name="AbstractionOne"/>
<Field AllowSubTypes="true" DataType="AbstractionTwo" Name="AbstractionTwo"/>
</Definition>
</UADataType>
<UADataType NodeId="ns=1;i=3008" BrowseName="1:AbstractionSub">
<DisplayName>AbstractionSub</DisplayName>
<References>
<Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
<Reference ReferenceType="HasEncoding">ns=1;i=5011</Reference>
<Reference ReferenceType="HasEncoding">ns=1;i=5013</Reference>
<Reference ReferenceType="HasEncoding">ns=1;i=5012</Reference>
</References>
<Definition Name="1:AbstractionSub">
<Field AllowSubTypes="true" DataType="AbstractionOne" Name="AbstractionOne"/>
</Definition>
</UADataType>
<UADataType IsAbstract="true" NodeId="ns=1;i=3010" BrowseName="1:AbstractionTwo">
<DisplayName>AbstractionTwo</DisplayName>
<References>
<Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
</References>
<Definition Name="1:AbstractionTwo">
<Field DataType="Int32" Name="ParentTwo"/>
</Definition>
</UADataType>
<UADataType NodeId="ns=1;i=3003" BrowseName="1:ComprehensiveScalarType">
<DisplayName>ComprehensiveScalarType</DisplayName>
<References>
<Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
Expand Down Expand Up @@ -81,7 +129,50 @@
<Field DataType="DiagnosticInfo" Name="DiagnosticInfo"/>
</Definition>
</UADataType>
<UAObject SymbolicName="http___opcfoundation_org_UA_FX_AML_TESTING_LevelOne_" NodeId="ns=1;i=5004" BrowseName="1:http://opcfoundation.org/UA/FX/AML/TESTING/LevelOne/">

<UADataType NodeId="ns=1;i=3009" BrowseName="1:EnumerationStructure">
<DisplayName>EnumerationStructure</DisplayName>
<References>
<Reference ReferenceType="HasEncoding">ns=1;i=5014</Reference>
<Reference ReferenceType="HasEncoding">ns=1;i=5016</Reference>
<Reference ReferenceType="HasEncoding">ns=1;i=5015</Reference>
<Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
</References>
<Definition Name="1:EnumerationStructure">
<Field DataType="NodeClass" Name="One"/>
<Field DataType="NegotiationStatus" ValueRank="1" ArrayDimensions="0" Name="Two"/>
</Definition>
</UADataType>

<UAObjectType NodeId="ns=1;i=1003" BrowseName="1:AbstractLevelOne">
<DisplayName>AbstractLevelOne</DisplayName>
<References>
<Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=6008</Reference>
<Reference ReferenceType="HasComponent">ns=1;i=6009</Reference>
</References>
</UAObjectType>
<UAVariable DataType="AbstractionOne" ParentNodeId="ns=1;i=1003" NodeId="ns=1;i=6008" BrowseName="1:One" AccessLevel="3">
<DisplayName>One</DisplayName>
<References>
<Reference ReferenceType="HasModellingRule">i=78</Reference>
<Reference ReferenceType="HasTypeDefinition">i=63</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1003</Reference>
</References>
</UAVariable>
<UAVariable DataType="AbstractionTwo" ParentNodeId="ns=1;i=1003" NodeId="ns=1;i=6009" BrowseName="1:Two" AccessLevel="3">
<DisplayName>Two</DisplayName>
<References>
<Reference ReferenceType="HasModellingRule">i=78</Reference>
<Reference ReferenceType="HasTypeDefinition">i=63</Reference>
<Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1003</Reference>
</References>
</UAVariable>




<UAObject SymbolicName="http___opcfoundation_org_UA_FX_AML_TESTING_LevelOne_" NodeId="ns=1;i=5004" BrowseName="1:http://opcfoundation.org/UA/FX/AML/TESTING/LevelOne/">
<DisplayName>http://opcfoundation.org/UA/FX/AML/TESTING/LevelOne/</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=11616</Reference>
Expand Down Expand Up @@ -177,4 +268,67 @@
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3003</Reference>
</References>
</UAObject>
<UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=5008" BrowseName="Default Binary">
<DisplayName>Default Binary</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=76</Reference>
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3014</Reference>
</References>
</UAObject>
<UAObject SymbolicName="DefaultXml" NodeId="ns=1;i=5009" BrowseName="Default XML">
<DisplayName>Default XML</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=76</Reference>
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3014</Reference>
</References>
</UAObject>
<UAObject SymbolicName="DefaultJson" NodeId="ns=1;i=5010" BrowseName="Default JSON">
<DisplayName>Default JSON</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=76</Reference>
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3014</Reference>
</References>
</UAObject>
<UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=5011" BrowseName="Default Binary">
<DisplayName>Default Binary</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=76</Reference>
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3008</Reference>
</References>
</UAObject>
<UAObject SymbolicName="DefaultXml" NodeId="ns=1;i=5012" BrowseName="Default XML">
<DisplayName>Default XML</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=76</Reference>
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3008</Reference>
</References>
</UAObject>
<UAObject SymbolicName="DefaultJson" NodeId="ns=1;i=5013" BrowseName="Default JSON">
<DisplayName>Default JSON</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=76</Reference>
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3008</Reference>
</References>
</UAObject>
<UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=5014" BrowseName="Default Binary">
<DisplayName>Default Binary</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=76</Reference>
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3009</Reference>
</References>
</UAObject>
<UAObject SymbolicName="DefaultXml" NodeId="ns=1;i=5015" BrowseName="Default XML">
<DisplayName>Default XML</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=76</Reference>
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3009</Reference>
</References>
</UAObject>
<UAObject SymbolicName="DefaultJson" NodeId="ns=1;i=5016" BrowseName="Default JSON">
<DisplayName>Default JSON</DisplayName>
<References>
<Reference ReferenceType="HasTypeDefinition">i=76</Reference>
<Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3009</Reference>
</References>
</UAObject>
</UANodeSet>
Loading