From e3eea26562958c99ec17cb5aa89efee51c44182f Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Mon, 4 Nov 2024 14:28:35 -0700
Subject: [PATCH 01/11] Potential Solution - requires feedback

---
 NodeSetToAML.cs | 276 +++++++++++++++++++++++++++++++++++++++++++++---
 Program.cs      |   1 -
 UANodeSet.cs    | 146 ++++++++++++++++++-------
 UANodeSet.xsd   |  42 ++++----
 generate.bat    |   1 +
 5 files changed, 386 insertions(+), 80 deletions(-)
 create mode 100644 generate.bat

diff --git a/NodeSetToAML.cs b/NodeSetToAML.cs
index fb3fd2b..fe5cdb1 100644
--- a/NodeSetToAML.cs
+++ b/NodeSetToAML.cs
@@ -35,10 +35,12 @@
 using Aml.Engine.AmlObjects;
 using Aml.Engine.CAEX;
 using Aml.Engine.CAEX.Extensions;
+using UADataType = MarkdownProcessor.NodeSet.UADataType;
+using UAInstance = MarkdownProcessor.NodeSet.UAInstance;
 using UANode = MarkdownProcessor.NodeSet.UANode;
+using UAObject = MarkdownProcessor.NodeSet.UAObject;
 using UAType = MarkdownProcessor.NodeSet.UAType;
 using UAVariable = MarkdownProcessor.NodeSet.UAVariable;
-using UAInstance = MarkdownProcessor.NodeSet.UAInstance;
 using DataTypeField = MarkdownProcessor.NodeSet.DataTypeField;
 using Aml.Engine.Adapter;
 using System.Xml.Linq;
@@ -48,9 +50,7 @@
 using NodeSetToAmlUtils;
 using System.Collections;
 using System.Reflection;
-using MarkdownProcessor.NodeSet;
 using System.Xml;
-using Microsoft.AspNetCore.Identity;
 
 namespace MarkdownProcessor
 {
@@ -221,20 +221,29 @@ public void CreateAML(string modelPath, string modelName = null)
                 AddLibraryHeaderInfo(scl_temp as CAEXBasicObject, modelInfo);
 
                 SortedDictionary<string, AttributeFamilyType> SortedDataTypes = new SortedDictionary<string, AttributeFamilyType>();
+
                 SortedDictionary<string, NodeId> SortedReferenceTypes = new SortedDictionary<string, NodeId>();
                 SortedDictionary<string, NodeId> SortedObjectTypes = new SortedDictionary<string, NodeId>();  // also contains VariableTypes
 
-
-                foreach (var node in modelInfo.Types)
+                Dictionary<string, UANode> fieldDefinitions = new Dictionary<string, UANode>();
+                foreach (KeyValuePair<string, UANode> node in modelInfo.Types)
                 {
                     switch (node.Value.NodeClass)
                     {
                         case NodeClass.DataType:
-                            var toAdd = ProcessDataType(node.Value);
-                            if (toAdd != null)
+                            if( node.Key.Equals( "RedundantServerDataType", StringComparison.OrdinalIgnoreCase ) )
+                            {
+                                bool interesting = true;
+                            }
+
+                            AttributeFamilyType toAdd = ProcessDataType( node.Value );
+                            if( toAdd != null )
                             {
-                                if (!SortedDataTypes.ContainsKey(node.Value.DecodedBrowseName.Name))
-                                    SortedDataTypes.Add(node.Value.DecodedBrowseName.Name, toAdd);
+                                if( !SortedDataTypes.ContainsKey( node.Value.DecodedBrowseName.Name ) )
+                                {
+                                    SortedDataTypes.Add( node.Value.DecodedBrowseName.Name, toAdd );
+                                    fieldDefinitions.Add( node.Value.DecodedBrowseName.Name, node.Value );
+                                }
                             }
                             break;
                         case NodeClass.ReferenceType:
@@ -248,14 +257,15 @@ public void CreateAML(string modelPath, string modelName = null)
                     }
                 }
 
-                foreach( var dicEntry in SortedDataTypes)
+                foreach( KeyValuePair<string, AttributeFamilyType> dicEntry in SortedDataTypes)
                 {
                     if (atl == null)
                     {
                         atl = m_cAEXDocument.CAEXFile.AttributeTypeLib.Append(ATLPrefix + modelInfo.NamespaceUri);
                         AddLibraryHeaderInfo(atl as CAEXBasicObject, modelInfo);
                     }
-                    atl.AttributeType.Insert(dicEntry.Value, false);  // insert into the AML document in alpha order
+
+                    atl.AttributeType.Insert( dicEntry.Value, false);  // insert into the AML document in alpha order
                 }
 
                 foreach( var dicEntry in SortedDataTypes)  // cteate the ListOf versions
@@ -263,6 +273,25 @@ public void CreateAML(string modelPath, string modelName = null)
                     atl.AttributeType.Insert(CreateListOf(dicEntry.Value), false);  // insert into the AML document in alpha order
                 }
 
+                if( atl != null )
+                {
+                    foreach( AttributeFamilyType attribute in atl.AttributeType )
+                    {
+                        if( fieldDefinitions.ContainsKey( attribute.Name ) )
+                        {
+                            AddStructureFieldDefinition( attribute, fieldDefinitions[ attribute.Name ] );
+                        }
+                        else
+                        {
+                            if( !attribute.Name.StartsWith( "ListOf" ) )
+                            {
+                                bool unexpected = true;
+                            }
+                        }
+                    }
+                }
+
+
                 foreach( var refType in SortedReferenceTypes)
                 {
                     ProcessReferenceType(ref icl_temp, refType.Value);
@@ -332,6 +361,10 @@ public void CreateAML(string modelPath, string modelName = null)
 
             Utils.LogInfo( "Creating Instances Complete" );
 
+            RemoveTypeOnly();
+
+            Utils.LogInfo( "Remove Type Only information Complete" );
+
             // write out the AML file
             // var OutFilename = modelName + ".aml";
             // m_cAEXDocument.SaveToFile(OutFilename, true);
@@ -505,7 +538,58 @@ private void AddMetaModelLibraries(CAEXDocument doc)
 
             atl_meta.AttributeType.Insert(AliasAttr, false);
 
-            
+            //Add StructureFieldDefinition
+            AttributeFamilyType structureFieldDefinition = new AttributeFamilyType(
+                new System.Xml.Linq.XElement( defaultNS + "AttributeType" ) );
+            structureFieldDefinition.Name = "StructureFieldDefinition";
+
+            AttributeType nameAttribute = new AttributeType(
+                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
+            nameAttribute.Name = "Name";
+            nameAttribute.AttributeDataType = "xs:string";
+            structureFieldDefinition.Insert( nameAttribute, false );
+
+            //AttributeType descriptionAttribute = new AttributeType(
+            //    new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
+            //descriptionAttribute.Name = "Description";
+            //descriptionAttribute.AttributeDataType = "xs:string";
+            //structureFieldDefinition.Insert( descriptionAttribute, false );
+
+            AttributeType valueRankAttribute = new AttributeType(
+                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
+            valueRankAttribute.Name = "ValueRank";
+            valueRankAttribute.AttributeDataType = "xs:int";
+            valueRankAttribute.RefAttributeType = "[ATL_http://opcfoundation.org/UA/]/[Int32]";
+            structureFieldDefinition.Insert( valueRankAttribute, false );
+
+            AttributeType isOptionalAttribute = new AttributeType(
+                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
+            isOptionalAttribute.Name = "IsOptional";
+            isOptionalAttribute.AttributeDataType = "xs:boolean";
+            structureFieldDefinition.Insert( isOptionalAttribute, false );
+
+            AttributeType arrayDimensionsAttribute = new AttributeType(
+                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
+            arrayDimensionsAttribute.Name = "ArrayDimensions";
+            arrayDimensionsAttribute.AttributeDataType = "xs:int";
+            arrayDimensionsAttribute.RefAttributeType = "[ATL_http://opcfoundation.org/UA/]/[ListOfInt32]";
+            structureFieldDefinition.Insert( arrayDimensionsAttribute, false );
+
+            AttributeType allowSubtypesAttribute = new AttributeType(
+                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
+            allowSubtypesAttribute.Name = "AllowSubtypes";
+            allowSubtypesAttribute.AttributeDataType = "xs:boolean";
+            structureFieldDefinition.Insert( allowSubtypesAttribute, false );
+
+            AttributeType maxStringLengthAttribute = new AttributeType(
+                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
+            maxStringLengthAttribute.Name = "MaxStringLength";
+            maxStringLengthAttribute.AttributeDataType = "xs:int";
+            maxStringLengthAttribute.RefAttributeType = "[ATL_http://opcfoundation.org/UA/]/[UInt32]";
+            structureFieldDefinition.Insert( maxStringLengthAttribute, false );
+
+            atl_meta.AttributeType.Insert( structureFieldDefinition, false );
+
 
             // add UABaseRole to the RCL
             var rcl_meta = m_cAEXDocument.CAEXFile.RoleClassLib.Append(RCLPrefix + MetaModelName);
@@ -1030,7 +1114,7 @@ private Dictionary<string, DataTypeField> CreateFieldReferenceTypes( AttributeTy
 
                 if( typeUaNode != null )
                 {
-                    UADataType typeDataType = typeUaNode as UADataType;
+                    NodeSet.UADataType typeDataType = typeUaNode as NodeSet.UADataType;
                     if( typeDataType != null && typeDataType.Definition != null && typeDataType.Definition.Field != null )
                     {
                         Dictionary<string, DataTypeField> fields = new Dictionary<string, DataTypeField>();
@@ -2389,21 +2473,26 @@ SystemUnitFamilyType FindOrAddSUC(ref SystemUnitClassLibType scl, ref RoleClassL
         }
 
         private void SetArrayDimensions( SystemUnitClassType element, string arrayDimensions )
+        {
+            SetArrayDimensions( element.Attribute, arrayDimensions );
+        }
+
+        private void SetArrayDimensions( AttributeSequence attributes, string arrayDimensions )
         {
             string[] parts = arrayDimensions.Split( ',' );
             List<uint> arrayValues = new List<uint>();
             foreach( string part in parts )
             {
                 UInt32 value;
-                if ( UInt32.TryParse( part, out value ) )
+                if( UInt32.TryParse( part, out value ) )
                 {
                     arrayValues.Add( value );
                 }
             }
 
-            AddModifyAttribute( element.Attribute, 
-                "ArrayDimensions", 
-                Opc.Ua.DataTypeIds.UInt32, 
+            AddModifyAttribute( attributes,
+                "ArrayDimensions",
+                Opc.Ua.DataTypeIds.UInt32,
                 new Variant( arrayValues.ToArray() ),
                 bListOf: true );
         }
@@ -2713,6 +2802,7 @@ private void RecurseStructures(ref AttributeTypeType att, NodeId nodeId)
             }
             if (m_modelManager.IsTypeOf(nodeId, structureNode.DecodedNodeId))
             {
+                bool debugMessage = false;
                 att.AttributeDataType = "";
                 var MyNode = FindNode<UANode>(nodeId) as NodeSet.UADataType;
                 if (MyNode.Definition != null && MyNode.Definition.Field != null)
@@ -2781,6 +2871,67 @@ private void RecurseStructures(ref AttributeTypeType att, NodeId nodeId)
             }
         }
 
+        private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode uaNode)
+        {
+            if( m_modelManager.IsTypeOf( uaNode.DecodedNodeId, structureNode.DecodedNodeId ) )
+            {
+                attribute.AttributeDataType = "";
+                NodeSet.UADataType uaDataType = uaNode as NodeSet.UADataType;
+
+                if( uaDataType != null && 
+                    uaDataType.Definition != null && 
+                    uaDataType.Definition.Field != null )
+                {
+                    if( !uaDataType.Definition.IsOptionSet || 
+                        !m_modelManager.IsTypeOf( uaNode.DecodedNodeId, OptionSetStructureNodeId ) )
+                    {
+                        string path = BuildLibraryReference( ATLPrefix, MetaModelName, "StructureFieldDefinition" );
+
+                        for( int index = 0; index < uaDataType.Definition.Field.Length; index++ )
+                        {
+                            DataTypeField field = uaDataType.Definition.Field[ index ];
+                            AttributeTypeType fieldDefinitionAttribute = attribute.Attribute[ field.Name ] ;
+                            if( fieldDefinitionAttribute != null )
+                            {
+                                AttributeType structureFieldAttribute =
+                                    fieldDefinitionAttribute.Attribute[ "StructureFieldDefinition" ];
+
+                                if( structureFieldAttribute == null )
+                                {
+                                    AttributeFamilyType structureFieldDefinition = m_cAEXDocument.FindByPath( path ) as AttributeFamilyType;
+
+                                    structureFieldAttribute = new AttributeType(
+                                        new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
+
+                                    structureFieldAttribute.RecreateAttributeInstance( structureFieldDefinition as AttributeFamilyType );
+                                    structureFieldAttribute.Name = "StructureFieldDefinition";
+                                    structureFieldAttribute.AdditionalInformation.Append( "OpcUa:TypeOnly" );
+
+
+                                    // NowFill the data
+                                    AddModifyAttribute( structureFieldAttribute.Attribute, 
+                                        "Name", "String", new Variant( field.Name ) );
+                                    AddModifyAttribute( structureFieldAttribute.Attribute,
+                                        "ValueRank", "Int32", new Variant( field.ValueRank ) );
+                                    AddModifyAttribute( structureFieldAttribute.Attribute,
+                                        "IsOptional", "Boolean", new Variant( field.IsOptional) );
+                                    
+                                    SetArrayDimensions( structureFieldAttribute.Attribute, field.ArrayDimensions );
+
+                                    AddModifyAttribute( structureFieldAttribute.Attribute,
+                                        "AllowSubtypes", "Boolean", new Variant( field.AllowSubTypes ) );
+                                    AddModifyAttribute( structureFieldAttribute.Attribute,
+                                        "MaxStringLength", "UInt32", new Variant( field.MaxStringLength ) );
+
+                                    fieldDefinitionAttribute.Attribute.Insert( structureFieldAttribute );
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         private AttributeFamilyType ProcessDataType(NodeSet.UANode node)
         {
             var typeNode = node as MarkdownProcessor.NodeSet.UADataType;
@@ -3295,6 +3446,97 @@ public NodeId ComplexGetBuiltInTypeEx( NodeId sourceId )
             return null;
         }
 
+        #endregion
+
+        #region Type Only
+
+        private void RemoveTypeOnly()
+        {
+            RemoveTypeOnlySystemUnitClasses();
+            RemoveTypeOnlyInstances();
+        }
+
+        private void RemoveTypeOnlyInstances( )
+        {
+            Utils.LogInfo("Remove TypeOnly Attributes - Instances" );
+
+            foreach( InstanceHierarchyType instanceHierarchy in m_cAEXDocument.CAEXFile.InstanceHierarchy )
+            {
+                Console.WriteLine( "InstanceHierarchy " + instanceHierarchy.Name );
+
+                foreach( InternalElementType internalElement in instanceHierarchy.InternalElement )
+                {
+                    RemoveTypeOnlySystemUnitClassTypes( internalElement );
+                }
+            }
+        }
+
+        private void RemoveTypeOnlySystemUnitClasses( )
+        {
+            Utils.LogInfo( "Remove TypeOnly Attributes - SystemUnitClasses" );
+
+            foreach( SystemUnitClassLibType libType in m_cAEXDocument.CAEXFile.SystemUnitClassLib )
+            {
+                Console.WriteLine( "SystemUnitClass LibType " + libType.Name );
+
+                foreach( SystemUnitFamilyType familyType in libType.SystemUnitClass )
+                {
+                    RemoveTypeOnlySystemUnitClassTypes( familyType );
+                }
+            }
+        }
+
+        private void RemoveTypeOnlySystemUnitClassTypes( SystemUnitClassType entity )
+        {
+            Console.WriteLine( "\tSystemUnitClassType " + entity.Name );
+
+            foreach( InternalElementType internalElement in entity.InternalElement )
+            {
+                RemoveTypeOnlySystemUnitClassTypes( internalElement );
+            }
+
+            RemoveTypeOnlyAttributes(entity.Attribute, entity.Name );
+        }
+
+        private void RemoveTypeOnlyAttributes( AttributeSequence attributes, string path )
+        {
+            List<AttributeType> attributesToRemove = new List<AttributeType>();
+
+            foreach( AttributeType attribute in attributes )
+            {
+                if ( attribute.AdditionalInformation != null && 
+                    attribute.AdditionalInformation.Count > 0 )
+                {
+                    foreach( object additionalInformation in attribute.AdditionalInformation )
+                    {
+                        if ( additionalInformation.GetType().Name == "String" )
+                        {
+                            string isTypeOnly = additionalInformation as string;
+                            if ( !string.IsNullOrEmpty( isTypeOnly ) && 
+                                isTypeOnly == "OpcUa:TypeOnly" )
+                            {
+                                attributesToRemove.Add( attribute );
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            foreach( AttributeType attribute in attributesToRemove )
+            {
+                Utils.LogInfo( "{0} Removing TypeOnly Attribute {1}", path, attribute.Name ); 
+                attributes.RemoveElement( attribute );
+            }
+
+            foreach( AttributeType attribute in attributes )
+            {
+                string subPath = path + " " + attribute.Name;
+                RemoveTypeOnlyAttributes( attribute.Attribute, subPath );
+            }   
+        }
+
+
         #endregion
     }
 }
\ No newline at end of file
diff --git a/Program.cs b/Program.cs
index d02987b..8c0d206 100644
--- a/Program.cs
+++ b/Program.cs
@@ -36,7 +36,6 @@
 using System.IO;
 using System.Collections.Generic;
 using MarkdownProcessor;
-using Microsoft.Extensions.Configuration;
 using Opc.Ua;
 
 namespace Opc2Aml
diff --git a/UANodeSet.cs b/UANodeSet.cs
index 1e75551..065c96d 100644
--- a/UANodeSet.cs
+++ b/UANodeSet.cs
@@ -1,4 +1,3 @@
-#pragma warning disable 1591 
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -10,14 +9,14 @@
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by xsd, Version=4.6.1055.0.
+// This source code was auto-generated by xsd, Version=4.8.3928.0.
 // 
 namespace MarkdownProcessor.NodeSet {
     using System.Xml.Serialization;
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -138,7 +137,7 @@ public bool LastModifiedSpecified {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -151,16 +150,20 @@ public partial class ModelTableEntry {
         
         private string modelUriField;
         
+        private string xmlSchemaUriField;
+        
         private string versionField;
         
         private System.DateTime publicationDateField;
         
         private bool publicationDateFieldSpecified;
         
-        private byte accessRestrictionsField;
+        private string modelVersionField;
+        
+        private ushort accessRestrictionsField;
         
         public ModelTableEntry() {
-            this.accessRestrictionsField = ((byte)(0));
+            this.accessRestrictionsField = ((ushort)(0));
         }
         
         /// <remarks/>
@@ -196,6 +199,17 @@ public string ModelUri {
             }
         }
         
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string XmlSchemaUri {
+            get {
+                return this.xmlSchemaUriField;
+            }
+            set {
+                this.xmlSchemaUriField = value;
+            }
+        }
+        
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string Version {
@@ -231,8 +245,19 @@ public bool PublicationDateSpecified {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        [System.ComponentModel.DefaultValueAttribute(typeof(byte), "0")]
-        public byte AccessRestrictions {
+        public string ModelVersion {
+            get {
+                return this.modelVersionField;
+            }
+            set {
+                this.modelVersionField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.ComponentModel.DefaultValueAttribute(typeof(ushort), "0")]
+        public ushort AccessRestrictions {
             get {
                 return this.accessRestrictionsField;
             }
@@ -243,7 +268,7 @@ public byte AccessRestrictions {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -283,7 +308,7 @@ public string Value {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -323,7 +348,7 @@ public string Value {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -363,7 +388,7 @@ public string Value {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -429,7 +454,7 @@ public string Value {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -456,6 +481,8 @@ public partial class DataTypeField {
         
         private bool isOptionalField;
         
+        private bool allowSubTypesField;
+        
         public DataTypeField() {
             this.dataTypeField = "i=24";
             this.valueRankField = -1;
@@ -463,6 +490,7 @@ public DataTypeField() {
             this.maxStringLengthField = ((uint)(0));
             this.valueField = -1;
             this.isOptionalField = false;
+            this.allowSubTypesField = false;
         }
         
         /// <remarks/>
@@ -580,10 +608,22 @@ public bool IsOptional {
                 this.isOptionalField = value;
             }
         }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.ComponentModel.DefaultValueAttribute(false)]
+        public bool AllowSubTypes {
+            get {
+                return this.allowSubTypesField;
+            }
+            set {
+                this.allowSubTypesField = value;
+            }
+        }
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -623,7 +663,7 @@ public string Value {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -643,7 +683,6 @@ public partial class DataTypeDefinition {
         private string baseTypeField;
         
         public DataTypeDefinition() {
-            this.symbolicNameField = "";
             this.isUnionField = false;
             this.isOptionSetField = false;
             this.baseTypeField = "";
@@ -673,7 +712,6 @@ public string Name {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        [System.ComponentModel.DefaultValueAttribute("")]
         public string SymbolicName {
             get {
                 return this.symbolicNameField;
@@ -721,7 +759,7 @@ public string BaseType {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -755,7 +793,7 @@ public LocalizedText[] Description {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -790,7 +828,7 @@ public string Name {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -813,7 +851,7 @@ public object[] Items {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -876,7 +914,7 @@ public string Value {
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UAMethod))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UAVariable))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UAObject))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -905,7 +943,11 @@ public partial class UANode {
         
         private uint userWriteMaskField;
         
-        private byte accessRestrictionsField;
+        private ushort accessRestrictionsField;
+        
+        private bool accessRestrictionsFieldSpecified;
+        
+        private bool hasNoPermissionsField;
         
         private string symbolicNameField;
         
@@ -914,7 +956,7 @@ public partial class UANode {
         public UANode() {
             this.writeMaskField = ((uint)(0));
             this.userWriteMaskField = ((uint)(0));
-            this.accessRestrictionsField = ((byte)(0));
+            this.hasNoPermissionsField = false;
             this.releaseStatusField = ReleaseStatus.Released;
         }
         
@@ -1042,8 +1084,7 @@ public uint UserWriteMask {
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        [System.ComponentModel.DefaultValueAttribute(typeof(byte), "0")]
-        public byte AccessRestrictions {
+        public ushort AccessRestrictions {
             get {
                 return this.accessRestrictionsField;
             }
@@ -1052,6 +1093,29 @@ public byte AccessRestrictions {
             }
         }
         
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool AccessRestrictionsSpecified {
+            get {
+                return this.accessRestrictionsFieldSpecified;
+            }
+            set {
+                this.accessRestrictionsFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.ComponentModel.DefaultValueAttribute(false)]
+        public bool HasNoPermissions {
+            get {
+                return this.hasNoPermissionsField;
+            }
+            set {
+                this.hasNoPermissionsField = value;
+            }
+        }
+        
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string SymbolicName {
@@ -1077,7 +1141,7 @@ public ReleaseStatus ReleaseStatus {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd")]
     public enum ReleaseStatus {
@@ -1097,7 +1161,7 @@ public enum ReleaseStatus {
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UADataType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UAVariableType))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UAObjectType))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1124,7 +1188,7 @@ public bool IsAbstract {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1164,7 +1228,7 @@ public bool Symmetric {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1203,7 +1267,7 @@ public DataTypePurpose Purpose {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd")]
     public enum DataTypePurpose {
@@ -1219,7 +1283,7 @@ public enum DataTypePurpose {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1288,7 +1352,7 @@ public string ArrayDimensions {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1301,7 +1365,7 @@ public partial class UAObjectType : UAType {
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UAMethod))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UAVariable))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(UAObject))]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1323,7 +1387,7 @@ public string ParentNodeId {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1365,7 +1429,7 @@ public byte EventNotifier {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1433,7 +1497,7 @@ public string MethodDeclarationId {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1575,7 +1639,7 @@ public bool Historizing {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1602,7 +1666,7 @@ public byte EventNotifier {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1637,7 +1701,7 @@ public string Value {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -1815,7 +1879,7 @@ public bool AcceptAllOrNothing {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.3928.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
diff --git a/UANodeSet.xsd b/UANodeSet.xsd
index fc9e924..209bfa5 100644
--- a/UANodeSet.xsd
+++ b/UANodeSet.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
- * Copyright (c) 2005-2019 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -34,6 +34,12 @@
     xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
 >
+  <xs:annotation>
+    <xs:appinfo>
+      <Model ModelUri="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd" Version="1.05.02" PublicationDate="2022-10-01T00:00:00Z" />
+    </xs:appinfo>
+  </xs:annotation>
+
   <xs:element name="UANodeSet">
     <xs:complexType>
       <xs:sequence>
@@ -157,8 +163,10 @@
       <xs:element name="RequiredModel" type="ModelTableEntry" minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
     <xs:attribute name="ModelUri" type="xs:string" use="required" />
+    <xs:attribute name="XmlSchemaUri" type="xs:string" use="optional" />
     <xs:attribute name="Version" type="xs:string" />
     <xs:attribute name="PublicationDate" type="xs:dateTime" />
+    <xs:attribute name="ModelVersion" type="ModelVersion" use="optional" />
     <xs:attribute name="AccessRestrictions" type="AccessRestriction" default="0" />
   </xs:complexType>
 
@@ -167,6 +175,10 @@
       <xs:element name="Model" type="ModelTableEntry" minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
   </xs:complexType>
+  
+  <xs:simpleType name="ModelVersion">
+    <xs:restriction base="xs:string" />
+  </xs:simpleType>
 
   <xs:simpleType name="NodeId">
     <xs:restriction base="xs:string" />
@@ -215,7 +227,7 @@
   </xs:simpleType>
 
   <xs:simpleType name="AccessRestriction">
-    <xs:restriction base="xs:unsignedByte" />
+    <xs:restriction base="xs:unsignedShort" />
   </xs:simpleType>
 
   <xs:simpleType name="ArrayDimensions">
@@ -225,23 +237,9 @@
   </xs:simpleType>
 
   <xs:simpleType name="SymbolicName">
-    <xs:list>
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:pattern value="[A-Za-z][A-Za-z0-9_]*" />
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:list>
-  </xs:simpleType>
-
-  <xs:simpleType name="CardinalityType">
-    <xs:list>
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:pattern value="(\p{N})*|unbounded" />
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:list>
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[A-Za-z][A-Za-z0-9_]*" />
+    </xs:restriction>
   </xs:simpleType>
 
   <xs:simpleType name="Duration">
@@ -315,7 +313,8 @@
     <xs:attribute name="BrowseName" type="QualifiedName" use="required" />
     <xs:attribute name="WriteMask" type="WriteMask" default="0" />
     <xs:attribute name="UserWriteMask" type="WriteMask" default="0" />
-    <xs:attribute name="AccessRestrictions" type="AccessRestriction" default="0" />
+    <xs:attribute name="AccessRestrictions" type="AccessRestriction" use="optional" />
+    <xs:attribute name="HasNoPermissions" type="xs:boolean" default="false" />
     <xs:attribute name="SymbolicName" type="SymbolicName" />
     <xs:attribute name="ReleaseStatus" type="ReleaseStatus" default="Released" />
   </xs:complexType>
@@ -460,7 +459,7 @@
       <xs:element name="Field" type="DataTypeField" minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
     <xs:attribute name="Name" type="QualifiedName" use="required" />
-    <xs:attribute name="SymbolicName" type="SymbolicName" default="" />
+    <xs:attribute name="SymbolicName" type="SymbolicName" use="optional" />
     <xs:attribute name="IsUnion" type="xs:boolean" default="false" />
     <xs:attribute name="IsOptionSet" type="xs:boolean" default="false" />
     
@@ -481,6 +480,7 @@
     <xs:attribute name="MaxStringLength" type="xs:unsignedInt" default="0" />
     <xs:attribute name="Value" type="xs:int" default="-1" />
     <xs:attribute name="IsOptional" type="xs:boolean" default="false" />
+    <xs:attribute name="AllowSubTypes" type="xs:boolean" default="false" />
   </xs:complexType>
 
   <xs:complexType name="UAReferenceType">
diff --git a/generate.bat b/generate.bat
new file mode 100644
index 0000000..d9630b9
--- /dev/null
+++ b/generate.bat
@@ -0,0 +1 @@
+"C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\xsd.exe" UANodeSet.xsd /classes /n:MarkdownProcessor.NodeSet
\ No newline at end of file

From 64b8c071ed7210607d6b0e2750f1b2a6977ff05e Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:41:25 -0700
Subject: [PATCH 02/11] Prototype Complete

---
 NodeSetToAML.cs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/NodeSetToAML.cs b/NodeSetToAML.cs
index fe5cdb1..09f5221 100644
--- a/NodeSetToAML.cs
+++ b/NodeSetToAML.cs
@@ -2886,6 +2886,7 @@ private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode
                         !m_modelManager.IsTypeOf( uaNode.DecodedNodeId, OptionSetStructureNodeId ) )
                     {
                         string path = BuildLibraryReference( ATLPrefix, MetaModelName, "StructureFieldDefinition" );
+                        string alternatePath = BuildLibraryReference( ATLPrefix, Opc.Ua.Namespaces.OpcUa, "StructureField" );
 
                         for( int index = 0; index < uaDataType.Definition.Field.Length; index++ )
                         {
@@ -2899,6 +2900,8 @@ private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode
                                 if( structureFieldAttribute == null )
                                 {
                                     AttributeFamilyType structureFieldDefinition = m_cAEXDocument.FindByPath( path ) as AttributeFamilyType;
+                                    structureFieldDefinition = 
+                                        m_atl_temp.CAEXDocument.FindByPath( alternatePath ) as AttributeFamilyType;
 
                                     structureFieldAttribute = new AttributeType(
                                         new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
@@ -2923,6 +2926,18 @@ private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode
                                     AddModifyAttribute( structureFieldAttribute.Attribute,
                                         "MaxStringLength", "UInt32", new Variant( field.MaxStringLength ) );
 
+                                    List<NodeSet.LocalizedText> description = new List<NodeSet.LocalizedText> ( );
+                                    
+                                    if ( field.Description != null )
+                                    {
+                                        description = new List<NodeSet.LocalizedText>(field.Description);
+                                    }
+                                    AddModifyAttribute( structureFieldAttribute.Attribute,
+                                        "Description", "String", new Variant( field.Description ), true );
+
+                                    AddModifyAttribute( structureFieldAttribute.Attribute,
+                                        "DataType", "NodeId", new Variant( field.DecodedDataType ) );
+
                                     fieldDefinitionAttribute.Attribute.Insert( structureFieldAttribute );
                                 }
                             }
@@ -3462,8 +3477,6 @@ private void RemoveTypeOnlyInstances( )
 
             foreach( InstanceHierarchyType instanceHierarchy in m_cAEXDocument.CAEXFile.InstanceHierarchy )
             {
-                Console.WriteLine( "InstanceHierarchy " + instanceHierarchy.Name );
-
                 foreach( InternalElementType internalElement in instanceHierarchy.InternalElement )
                 {
                     RemoveTypeOnlySystemUnitClassTypes( internalElement );
@@ -3477,8 +3490,6 @@ private void RemoveTypeOnlySystemUnitClasses( )
 
             foreach( SystemUnitClassLibType libType in m_cAEXDocument.CAEXFile.SystemUnitClassLib )
             {
-                Console.WriteLine( "SystemUnitClass LibType " + libType.Name );
-
                 foreach( SystemUnitFamilyType familyType in libType.SystemUnitClass )
                 {
                     RemoveTypeOnlySystemUnitClassTypes( familyType );
@@ -3488,8 +3499,6 @@ private void RemoveTypeOnlySystemUnitClasses( )
 
         private void RemoveTypeOnlySystemUnitClassTypes( SystemUnitClassType entity )
         {
-            Console.WriteLine( "\tSystemUnitClassType " + entity.Name );
-
             foreach( InternalElementType internalElement in entity.InternalElement )
             {
                 RemoveTypeOnlySystemUnitClassTypes( internalElement );

From bbfdd85db4fd23a8acf72e303f4eb45cd04851ba Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:53:53 -0700
Subject: [PATCH 03/11] Revert use of StructureField to use MetaModel

---
 NodeSetToAML.cs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/NodeSetToAML.cs b/NodeSetToAML.cs
index 09f5221..2f201bb 100644
--- a/NodeSetToAML.cs
+++ b/NodeSetToAML.cs
@@ -2886,7 +2886,6 @@ private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode
                         !m_modelManager.IsTypeOf( uaNode.DecodedNodeId, OptionSetStructureNodeId ) )
                     {
                         string path = BuildLibraryReference( ATLPrefix, MetaModelName, "StructureFieldDefinition" );
-                        string alternatePath = BuildLibraryReference( ATLPrefix, Opc.Ua.Namespaces.OpcUa, "StructureField" );
 
                         for( int index = 0; index < uaDataType.Definition.Field.Length; index++ )
                         {
@@ -2900,8 +2899,6 @@ private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode
                                 if( structureFieldAttribute == null )
                                 {
                                     AttributeFamilyType structureFieldDefinition = m_cAEXDocument.FindByPath( path ) as AttributeFamilyType;
-                                    structureFieldDefinition = 
-                                        m_atl_temp.CAEXDocument.FindByPath( alternatePath ) as AttributeFamilyType;
 
                                     structureFieldAttribute = new AttributeType(
                                         new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
@@ -2926,18 +2923,6 @@ private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode
                                     AddModifyAttribute( structureFieldAttribute.Attribute,
                                         "MaxStringLength", "UInt32", new Variant( field.MaxStringLength ) );
 
-                                    List<NodeSet.LocalizedText> description = new List<NodeSet.LocalizedText> ( );
-                                    
-                                    if ( field.Description != null )
-                                    {
-                                        description = new List<NodeSet.LocalizedText>(field.Description);
-                                    }
-                                    AddModifyAttribute( structureFieldAttribute.Attribute,
-                                        "Description", "String", new Variant( field.Description ), true );
-
-                                    AddModifyAttribute( structureFieldAttribute.Attribute,
-                                        "DataType", "NodeId", new Variant( field.DecodedDataType ) );
-
                                     fieldDefinitionAttribute.Attribute.Insert( structureFieldAttribute );
                                 }
                             }

From d3f53fd8b5f35835f6ff96616456c63a05dd4ebc Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:51:02 -0700
Subject: [PATCH 04/11] Add Node Id to Attributes

---
 NodeSetToAML.cs | 57 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/NodeSetToAML.cs b/NodeSetToAML.cs
index 2f201bb..400cc44 100644
--- a/NodeSetToAML.cs
+++ b/NodeSetToAML.cs
@@ -279,14 +279,7 @@ public void CreateAML(string modelPath, string modelName = null)
                     {
                         if( fieldDefinitions.ContainsKey( attribute.Name ) )
                         {
-                            AddStructureFieldDefinition( attribute, fieldDefinitions[ attribute.Name ] );
-                        }
-                        else
-                        {
-                            if( !attribute.Name.StartsWith( "ListOf" ) )
-                            {
-                                bool unexpected = true;
-                            }
+                            AddAttributeData( attribute, fieldDefinitions[ attribute.Name ] );
                         }
                     }
                 }
@@ -1055,6 +1048,25 @@ private AttributeType AddModifyAttribute(AttributeSequence seq, string name, str
             return a;
         }
 
+        private bool MinimizeNodeId( AttributeType nodeIdAttribute )
+        {
+            bool minimized = false;
+
+            AttributeType rootNodeId = nodeIdAttribute.Attribute[ "RootNodeId" ];
+
+            if ( rootNodeId != null )
+            {
+                if ( MinimizeExplicitNodeId( rootNodeId ) )
+                {
+                    nodeIdAttribute.Attribute.Remove();
+                    nodeIdAttribute.Attribute.Insert( rootNodeId );
+                    minimized = true;
+                }
+            }
+
+            return minimized;
+        }
+
         private bool MinimizeExplicitNodeId( AttributeType explicitNodeIdAttribute )
         {
             bool minimized = false;
@@ -2871,7 +2883,20 @@ private void RecurseStructures(ref AttributeTypeType att, NodeId nodeId)
             }
         }
 
-        private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode uaNode)
+        private void AddAttributeData( AttributeFamilyType attribute, UANode uaNode )
+        {
+            AddStructureFieldDefinition( attribute, uaNode );
+
+            AttributeType nodeIdAttribute = AddModifyAttribute( attribute.Attribute,"NodeId", "NodeId", 
+                new Variant( uaNode.DecodedNodeId ) );
+
+            MinimizeNodeId( nodeIdAttribute );
+
+            nodeIdAttribute.AdditionalInformation.Append( "OpcUa:TypeOnly" );
+        }
+
+
+        private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode uaNode )
         {
             if( m_modelManager.IsTypeOf( uaNode.DecodedNodeId, structureNode.DecodedNodeId ) )
             {
@@ -3487,11 +3512,25 @@ private void RemoveTypeOnlySystemUnitClassTypes( SystemUnitClassType entity )
             foreach( InternalElementType internalElement in entity.InternalElement )
             {
                 RemoveTypeOnlySystemUnitClassTypes( internalElement );
+                RemoveTypeOnlyExternalInterfaces( internalElement.ExternalInterface, internalElement.Name );
             }
 
             RemoveTypeOnlyAttributes(entity.Attribute, entity.Name );
         }
 
+        private void RemoveTypeOnlyExternalInterfaces( ExternalInterfaceSequence externalInterfaces, string path )
+        {
+            foreach( ExternalInterfaceType externalInterface in externalInterfaces )
+            {
+                RemoveTypeOnlyAttributes( externalInterface.Attribute, path + " " + externalInterface.Name );
+            }
+
+            foreach( ExternalInterfaceType externalInterface in externalInterfaces )
+            {
+                RemoveTypeOnlyExternalInterfaces( externalInterface.ExternalInterface, path + " " + externalInterface.Name );
+            }
+
+        }
         private void RemoveTypeOnlyAttributes( AttributeSequence attributes, string path )
         {
             List<AttributeType> attributesToRemove = new List<AttributeType>();

From 9d6c4c938e767b3b03a3376b29d94172d9b3a360 Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Wed, 6 Nov 2024 14:41:27 -0700
Subject: [PATCH 05/11] Add NodeIds to Interface Libraries

---
 NodeSetToAML.cs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/NodeSetToAML.cs b/NodeSetToAML.cs
index 400cc44..03926fa 100644
--- a/NodeSetToAML.cs
+++ b/NodeSetToAML.cs
@@ -2532,7 +2532,6 @@ private void OverrideAttribute(IClassWithBaseClassReference owner, string Name,
             a.Name = Name;
             a.AttributeDataType = AttType;
             a.AttributeValue = val;
-
         }
 
         private void ProcessReferenceType(ref InterfaceClassLibType icl, NodeId nodeId)
@@ -2578,7 +2577,7 @@ private void ProcessReferenceType(ref InterfaceClassLibType icl, NodeId nodeId)
             // it would take more time to look it up each time
             OverrideBooleanAttribute( added.Attribute, "IsAbstract", refnode.IsAbstract );
 
-            // ovveride any attribute values
+            // override any attribute values
             if (BaseNodeId != null)
             {
                 var basenode = FindNode<NodeSet.UAReferenceType>(BaseNodeId);
@@ -2594,12 +2593,8 @@ private void ProcessReferenceType(ref InterfaceClassLibType icl, NodeId nodeId)
                 OverrideAttribute(added, IsSource, "xs:boolean", true);
                 OverrideAttribute(added, RefClassConnectsToPath, "xs:string", (inverseAdded != null ? inverseAdded.CAEXPath() : added.CAEXPath()));
 
-
-
-
                 if (inverseAdded != null)
                 {
-
                     if (basenode.IsAbstract != refnode.IsAbstract)
                         OverrideBooleanAttribute(inverseAdded.Attribute, "IsAbstract", refnode.IsAbstract);
                     if (basenode.Symmetric != refnode.Symmetric)
@@ -2608,11 +2603,12 @@ private void ProcessReferenceType(ref InterfaceClassLibType icl, NodeId nodeId)
 
                     OverrideAttribute(inverseAdded, IsSource, "xs:boolean", false);
                     OverrideAttribute(inverseAdded, RefClassConnectsToPath, "xs:string", added.CAEXPath());
-
                 }
-
-
             }
+
+            AttributeType nodeIdAttribute = AddModifyAttribute(added.Attribute, "NodeId", "NodeId", new Variant( nodeId ) );
+            nodeIdAttribute.AdditionalInformation.Append( "OpcUa:TypeOnly" );
+            MinimizeNodeId( nodeIdAttribute );
         }
 
         #endregion
@@ -3512,10 +3508,10 @@ private void RemoveTypeOnlySystemUnitClassTypes( SystemUnitClassType entity )
             foreach( InternalElementType internalElement in entity.InternalElement )
             {
                 RemoveTypeOnlySystemUnitClassTypes( internalElement );
-                RemoveTypeOnlyExternalInterfaces( internalElement.ExternalInterface, internalElement.Name );
             }
 
             RemoveTypeOnlyAttributes(entity.Attribute, entity.Name );
+            RemoveTypeOnlyExternalInterfaces( entity.ExternalInterface, entity.Name );
         }
 
         private void RemoveTypeOnlyExternalInterfaces( ExternalInterfaceSequence externalInterfaces, string path )

From 99ca7aa19e9c23da547632d6b0aee5950b585a0d Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Wed, 6 Nov 2024 15:24:49 -0700
Subject: [PATCH 06/11] Add Node Ids to Interfaces.

Optimized existing NodeIds
---
 NodeSetToAML.cs                        | 2 +-
 SystemTest/TestHelper.cs               | 6 +++---
 SystemTest/TestOptionSetEmptyValues.cs | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/NodeSetToAML.cs b/NodeSetToAML.cs
index 03926fa..cba8b68 100644
--- a/NodeSetToAML.cs
+++ b/NodeSetToAML.cs
@@ -911,7 +911,7 @@ private AttributeType AddModifyAttribute(AttributeSequence seq, string name, str
                                     a.DefaultValue = null;
                                     a.Value = null;
 
-                                    MinimizeExplicitNodeId( rootNodeId );
+                                    MinimizeNodeId( a );
                                 }
 
                                 if ( expandedNodeId != null )
diff --git a/SystemTest/TestHelper.cs b/SystemTest/TestHelper.cs
index 4880b93..f39a7d6 100644
--- a/SystemTest/TestHelper.cs
+++ b/SystemTest/TestHelper.cs
@@ -26,7 +26,7 @@ public static List<FileInfo> RetrieveFiles()
         {
             if (!Executed)
             {
-                const bool EXECUTE_CONVERSION = false;
+                const bool EXECUTE_CONVERSION = true;
 
                 List<string> testFiles = GetTestFileNames();
                 if (EXECUTE_CONVERSION)
@@ -34,9 +34,9 @@ public static List<FileInfo> RetrieveFiles()
                     PrepareUnconvertedXml(testFiles);
                     System.Threading.Thread.Sleep(1000);
                     Execute();
-                    List<FileInfo> amlFiles = ExtractAmlxFiles(testFiles);
-                    Assert.AreNotEqual(0, amlFiles.Count, "Unable to get Converted Aml files");
                 }
+                List<FileInfo> amlFiles = ExtractAmlxFiles( testFiles );
+                Assert.AreNotEqual(0, amlFiles.Count, "Unable to get Converted Aml files");
                 Executed = true;
             }
             List<FileInfo> amlxFiles = GetAmlxFiles();
diff --git a/SystemTest/TestOptionSetEmptyValues.cs b/SystemTest/TestOptionSetEmptyValues.cs
index d851923..4e1f249 100644
--- a/SystemTest/TestOptionSetEmptyValues.cs
+++ b/SystemTest/TestOptionSetEmptyValues.cs
@@ -104,14 +104,13 @@ private CAEXDocument GetDocument()
         public void TestOptionSet( AttributeTypeType attributeFamilyType )
         {
             Assert.IsNotNull( attributeFamilyType );
-            Assert.AreEqual( 4, attributeFamilyType.Attribute.Count );
+            Assert.IsTrue( attributeFamilyType.Attribute.Count >= 4 );
             ValidateOptionSetNames( attributeFamilyType );
         }
 
         public void ValidateOptionSetNames( AttributeTypeType attributeFamilyType )
         {
             HashSet<string> names = GetOptionSetNames( attributeFamilyType );
-            Assert.AreEqual( 4, names.Count );
             Assert.AreEqual( true, names.Contains( "OperationalWarning" ) );
             Assert.AreEqual( true, names.Contains( "OperationalError" ) );
             Assert.AreEqual( true, names.Contains( "SubOperationalWarning" ) );

From 8baba60c1d99d2ab9900f809ddd6f26ee4ec55ed Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:27:47 -0700
Subject: [PATCH 07/11] Replace MetaData StructureField with Root
 StructureField attribute definition

---
 NodeSetToAML.cs | 76 +++++++++++--------------------------------------
 1 file changed, 17 insertions(+), 59 deletions(-)

diff --git a/NodeSetToAML.cs b/NodeSetToAML.cs
index cba8b68..de519e3 100644
--- a/NodeSetToAML.cs
+++ b/NodeSetToAML.cs
@@ -231,10 +231,6 @@ public void CreateAML(string modelPath, string modelName = null)
                     switch (node.Value.NodeClass)
                     {
                         case NodeClass.DataType:
-                            if( node.Key.Equals( "RedundantServerDataType", StringComparison.OrdinalIgnoreCase ) )
-                            {
-                                bool interesting = true;
-                            }
 
                             AttributeFamilyType toAdd = ProcessDataType( node.Value );
                             if( toAdd != null )
@@ -531,59 +527,6 @@ private void AddMetaModelLibraries(CAEXDocument doc)
 
             atl_meta.AttributeType.Insert(AliasAttr, false);
 
-            //Add StructureFieldDefinition
-            AttributeFamilyType structureFieldDefinition = new AttributeFamilyType(
-                new System.Xml.Linq.XElement( defaultNS + "AttributeType" ) );
-            structureFieldDefinition.Name = "StructureFieldDefinition";
-
-            AttributeType nameAttribute = new AttributeType(
-                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
-            nameAttribute.Name = "Name";
-            nameAttribute.AttributeDataType = "xs:string";
-            structureFieldDefinition.Insert( nameAttribute, false );
-
-            //AttributeType descriptionAttribute = new AttributeType(
-            //    new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
-            //descriptionAttribute.Name = "Description";
-            //descriptionAttribute.AttributeDataType = "xs:string";
-            //structureFieldDefinition.Insert( descriptionAttribute, false );
-
-            AttributeType valueRankAttribute = new AttributeType(
-                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
-            valueRankAttribute.Name = "ValueRank";
-            valueRankAttribute.AttributeDataType = "xs:int";
-            valueRankAttribute.RefAttributeType = "[ATL_http://opcfoundation.org/UA/]/[Int32]";
-            structureFieldDefinition.Insert( valueRankAttribute, false );
-
-            AttributeType isOptionalAttribute = new AttributeType(
-                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
-            isOptionalAttribute.Name = "IsOptional";
-            isOptionalAttribute.AttributeDataType = "xs:boolean";
-            structureFieldDefinition.Insert( isOptionalAttribute, false );
-
-            AttributeType arrayDimensionsAttribute = new AttributeType(
-                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
-            arrayDimensionsAttribute.Name = "ArrayDimensions";
-            arrayDimensionsAttribute.AttributeDataType = "xs:int";
-            arrayDimensionsAttribute.RefAttributeType = "[ATL_http://opcfoundation.org/UA/]/[ListOfInt32]";
-            structureFieldDefinition.Insert( arrayDimensionsAttribute, false );
-
-            AttributeType allowSubtypesAttribute = new AttributeType(
-                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
-            allowSubtypesAttribute.Name = "AllowSubtypes";
-            allowSubtypesAttribute.AttributeDataType = "xs:boolean";
-            structureFieldDefinition.Insert( allowSubtypesAttribute, false );
-
-            AttributeType maxStringLengthAttribute = new AttributeType(
-                new System.Xml.Linq.XElement( defaultNS + "Attribute" ) );
-            maxStringLengthAttribute.Name = "MaxStringLength";
-            maxStringLengthAttribute.AttributeDataType = "xs:int";
-            maxStringLengthAttribute.RefAttributeType = "[ATL_http://opcfoundation.org/UA/]/[UInt32]";
-            structureFieldDefinition.Insert( maxStringLengthAttribute, false );
-
-            atl_meta.AttributeType.Insert( structureFieldDefinition, false );
-
-
             // add UABaseRole to the RCL
             var rcl_meta = m_cAEXDocument.CAEXFile.RoleClassLib.Append(RCLPrefix + MetaModelName);
             var br = rcl_meta.New_RoleClass(UaBaseRole);
@@ -2906,7 +2849,7 @@ private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode
                     if( !uaDataType.Definition.IsOptionSet || 
                         !m_modelManager.IsTypeOf( uaNode.DecodedNodeId, OptionSetStructureNodeId ) )
                     {
-                        string path = BuildLibraryReference( ATLPrefix, MetaModelName, "StructureFieldDefinition" );
+                        string path = BuildLibraryReference( ATLPrefix, Opc.Ua.Namespaces.OpcUa, "StructureField" );
 
                         for( int index = 0; index < uaDataType.Definition.Field.Length; index++ )
                         {
@@ -2929,7 +2872,7 @@ private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode
                                     structureFieldAttribute.AdditionalInformation.Append( "OpcUa:TypeOnly" );
 
 
-                                    // NowFill the data
+                                    // Now fill the data
                                     AddModifyAttribute( structureFieldAttribute.Attribute, 
                                         "Name", "String", new Variant( field.Name ) );
                                     AddModifyAttribute( structureFieldAttribute.Attribute,
@@ -2944,6 +2887,21 @@ private void AddStructureFieldDefinition( AttributeFamilyType attribute, UANode
                                     AddModifyAttribute( structureFieldAttribute.Attribute,
                                         "MaxStringLength", "UInt32", new Variant( field.MaxStringLength ) );
 
+                                    if( field.Description != null  && field.Description.Length > 0 )
+                                    {
+                                        LocalizedText localizedText = new LocalizedText(
+                                            field.Description[0].Locale, field.Description[ 0 ].Value );
+                                        AddModifyAttribute( structureFieldAttribute.Attribute,
+                                            "Description", "LocalizedText", new Variant( localizedText ) );
+                                    }
+
+                                    // Remove the NodeId from the structure Field
+                                    AttributeType nodeIdAttribute = structureFieldAttribute.Attribute[ "DataType" ];
+                                    if( nodeIdAttribute != null )
+                                    {
+                                        structureFieldAttribute.Attribute.RemoveElement( nodeIdAttribute );
+                                    }
+
                                     fieldDefinitionAttribute.Attribute.Insert( structureFieldAttribute );
                                 }
                             }

From 320df0cc3e5340f1326f1b06910f4f97f848ab4a Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:18:57 -0700
Subject: [PATCH 08/11] Add Descriptions to a few fields

---
 .../NodeSetFiles/Modified.Opc.Ua.NodeSet2.xml       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/SystemTest/NodeSetFiles/Modified.Opc.Ua.NodeSet2.xml b/SystemTest/NodeSetFiles/Modified.Opc.Ua.NodeSet2.xml
index 556d40e..1cf436a 100644
--- a/SystemTest/NodeSetFiles/Modified.Opc.Ua.NodeSet2.xml
+++ b/SystemTest/NodeSetFiles/Modified.Opc.Ua.NodeSet2.xml
@@ -9730,9 +9730,16 @@
       <Reference ReferenceType="HasSubtype" IsForward="false">i=18809</Reference>
     </References>
     <Definition Name="3DCartesianCoordinates" SymbolicName="ThreeDCartesianCoordinates">
-      <Field Name="X" DataType="i=11" />
-      <Field Name="Y" DataType="i=11" />
-      <Field Name="Z" DataType="i=11" />
+      <Field Name="X" DataType="i=11" >
+        <Description>No Locale</Description>
+      </Field>
+      <Field Name="Y" DataType="i=11" >
+        <Description Locale="en">With Locale</Description>
+      </Field>
+      <Field Name="Z" DataType="i=11" >
+        <Description>Multiple Descriptions</Description>
+        <Description Locale="en">Multiple Descriptions with Locale</Description>
+      </Field>
     </Definition>
   </UADataType>
   <UADataType NodeId="i=18811" BrowseName="Orientation" IsAbstract="true">

From 689133a356a3930b6a40bee3edc2e2ab8b05444d Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Fri, 15 Nov 2024 13:57:36 -0700
Subject: [PATCH 09/11] Remove Models and Namespaces

Assures testing of Issue 73 Exception thrown during conversion
---
 SystemTest/NodeSetFiles/AmlFxTest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/SystemTest/NodeSetFiles/AmlFxTest.xml b/SystemTest/NodeSetFiles/AmlFxTest.xml
index be16b47..4b10783 100644
--- a/SystemTest/NodeSetFiles/AmlFxTest.xml
+++ b/SystemTest/NodeSetFiles/AmlFxTest.xml
@@ -4,13 +4,9 @@
         <Uri>http://opcfoundation.org/UA/FX/AML/TESTING/AmlFxTest/</Uri>
         <Uri>http://opcfoundation.org/UA/FX/AC/</Uri>
         <Uri>http://opcfoundation.org/UA/FX/Data/</Uri>
-        <Uri>http://opcfoundation.org/UA/DI/</Uri>
     </NamespaceUris>
     <Models>
         <Model ModelUri="http://opcfoundation.org/UA/FX/AML/TESTING/AmlFxTest/">
-            <RequiredModel ModelUri="http://opcfoundation.org/UA/"/>
-            <RequiredModel ModelUri="http://opcfoundation.org/UA/DI/" />
-            <RequiredModel ModelUri="http://opcfoundation.org/UA/FX/Data/" />
             <RequiredModel ModelUri="http://opcfoundation.org/UA/FX/AC/" />
         </Model>
     </Models>
@@ -24,11 +20,6 @@
         <Alias Alias="DeviceHealthOptionSet">ns=2;i=3005</Alias>
         <Alias Alias="OperationalHealthOptionSet">ns=2;i=3010</Alias>
     </Aliases>
-    <Extensions>
-        <Extension>
-            <ua:ModelInfo Tool="UaModeler" Hash="WltXoHM4YlagD+N7UzeKkw==" Version="1.6.8"/>
-        </Extension>
-    </Extensions>
     <UAObject NodeId="ns=1;i=5003" BrowseName="1:AutomationComponentInstance">
         <DisplayName>AutomationComponentInstance</DisplayName>
         <References>

From ca22306e928bbf26f0179de3526673604961945c Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Mon, 18 Nov 2024 11:46:22 -0700
Subject: [PATCH 10/11] Add Unit Testing

---
 SystemTest/TestHelper.cs   |   2 +
 SystemTest/TestTypeOnly.cs | 329 +++++++++++++++++++++++++++++++++++++
 2 files changed, 331 insertions(+)
 create mode 100644 SystemTest/TestTypeOnly.cs

diff --git a/SystemTest/TestHelper.cs b/SystemTest/TestHelper.cs
index ce44965..4d1a67b 100644
--- a/SystemTest/TestHelper.cs
+++ b/SystemTest/TestHelper.cs
@@ -18,6 +18,8 @@ internal class TestHelper
 
         public const string TestAmlUri = "http://opcfoundation.org/UA/FX/AML/TESTING";
 
+        public const int UnitTestTimeout = 480000;
+
         static bool Executed = false;
 
         static Dictionary<string, CAEXDocument> ReadOnlyDocuments = new Dictionary<string, CAEXDocument>();
diff --git a/SystemTest/TestTypeOnly.cs b/SystemTest/TestTypeOnly.cs
new file mode 100644
index 0000000..f80bea2
--- /dev/null
+++ b/SystemTest/TestTypeOnly.cs
@@ -0,0 +1,329 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.IO;
+using Aml.Engine.AmlObjects;
+using Aml.Engine.CAEX;
+using Aml.Engine.CAEX.Extensions;
+using Opc.Ua;
+using System.Diagnostics;
+using Org.BouncyCastle.Utilities.IO;
+using System.Net.NetworkInformation;
+
+
+namespace SystemTest
+{
+    [TestClass, Timeout(TestHelper.UnitTestTimeout )]
+    public class TestTypeOnly
+    {
+        CAEXDocument m_document = null;
+        private const string TypeOnly = "OpcUa:TypeOnly";
+
+        #region Tests
+
+        [TestMethod]
+        public void TestLibraryAttributes()
+        {
+            CAEXDocument document = GetDocument();
+
+            int attributesTested = 0;
+            foreach( AttributeTypeLibType libType in document.CAEXFile.AttributeTypeLib )
+            {
+                if( libType.Name.StartsWith( "ATL_http", StringComparison.OrdinalIgnoreCase ) )
+                {
+                    foreach( AttributeFamilyType attribute in libType )
+                    {
+                        if( attribute.Name.StartsWith( "ListOf" ) )
+                        {
+                            TestForNonExistingNodeId( attribute.Attribute );
+                        }
+                        else
+                        {
+                            TestForExistingNodeId( attribute.Attribute, hasAdditionalInformation: true );
+                        }
+                        attributesTested++;
+                    }
+                }
+            }
+
+            int interfacesTested = 0;
+            foreach( InterfaceClassLibType libType in document.CAEXFile.InterfaceClassLib )
+            {
+                if( libType.Name.StartsWith( "ICL_http", StringComparison.OrdinalIgnoreCase ) )
+                {
+                    foreach( InterfaceFamilyType interfaceFamilyType in libType )
+                    {
+                        TestForExistingNodeId( interfaceFamilyType.Attribute, hasAdditionalInformation: true );
+                        interfacesTested++;
+                    }
+                }
+            }
+
+            int roleClassesTested = 0;
+            foreach( RoleClassLibType libType in document.CAEXFile.RoleClassLib )
+            {
+                if( libType.Name.StartsWith( "RCL_http", StringComparison.OrdinalIgnoreCase ) )
+                {
+                    foreach( RoleFamilyType role in libType )
+                    {
+                        TestForNonExistingNodeId( role.Attribute );
+                        roleClassesTested++;
+                    }
+                }
+            }
+
+            Debug.WriteLine( $"Attributes tested: {attributesTested} Interfaces {interfacesTested} RoleClasses {roleClassesTested}" );
+        }
+
+        private int count = 0;
+
+        [TestMethod]
+        public void TestForNodeId()
+        {
+            CAEXDocument document = GetDocument();
+            count = 0;
+
+            foreach( SystemUnitClassLibType libType in document.CAEXFile.SystemUnitClassLib )
+            {
+                if( libType.Name.StartsWith( "SUC_http", StringComparison.OrdinalIgnoreCase ) )
+                {
+                    foreach( SystemUnitClassType systemUnitClass in libType )
+                    {
+                        TestSystemUnitClassType( systemUnitClass );
+                    }
+                }
+            }
+            Debug.WriteLine( $"Types: {count}" );
+            count = 0;
+
+            foreach( InstanceHierarchyType libType in document.CAEXFile.InstanceHierarchy )
+            {
+                foreach( SystemUnitClassType systemUnitClass in libType )
+                {
+                    TestSystemUnitClassType( systemUnitClass );
+                }
+            }
+            Debug.WriteLine( $"Instances: {count}" );
+
+        }
+
+        private void TestSystemUnitClassType( SystemUnitClassType entity )
+        {
+            foreach( InternalElementType internalElement in entity.InternalElement )
+            {
+                TestSystemUnitClassType( internalElement );
+            }
+
+            TestForExistingNodeId( entity.Attribute, hasAdditionalInformation: false );
+            TypeOnlyTest( entity.Attribute );
+
+            foreach( AttributeType attributes in entity.Attribute )
+            {
+                // Expect a nodeId on the initial level.
+                TestAttributesNodeId( attributes.Attribute );
+            }
+
+            TestExternalInterfaces( entity.ExternalInterface );
+            count++;
+        }
+
+        private void TestExternalInterfaces( ExternalInterfaceSequence externalInterfaces )
+        {
+            foreach( ExternalInterfaceType externalInterface in externalInterfaces )
+            {
+                TestAttributesNodeId( externalInterface.Attribute );
+                TypeOnlyTest( externalInterface.Attribute );
+            }
+        }
+
+        private void TestAttributesNodeId( AttributeSequence attributes )
+        {
+            foreach( AttributeType attribute in attributes )
+            {
+                TestForNonExistingNodeId( attribute.Attribute );
+            }
+        }
+
+
+        [TestMethod]
+        public void TestForStructureField()
+        {
+            CAEXDocument document = GetDocument();
+            count = 0;
+
+            foreach( SystemUnitClassLibType libType in document.CAEXFile.SystemUnitClassLib )
+            {
+                if( libType.Name.StartsWith( "SUC_http", StringComparison.OrdinalIgnoreCase ) )
+                {
+                    foreach( SystemUnitClassType systemUnitClass in libType )
+                    {
+                        TestSystemUnitClassStructureField( systemUnitClass );
+                    }
+                }
+            }
+            Debug.WriteLine( $"Types: {count}" );
+            count = 0;
+
+            foreach( InstanceHierarchyType libType in document.CAEXFile.InstanceHierarchy )
+            {
+                foreach( SystemUnitClassType systemUnitClass in libType )
+                {
+                    TestSystemUnitClassStructureField( systemUnitClass );
+                }
+            }
+            Debug.WriteLine( $"Instances: {count}" );
+
+        }
+
+        private void TestSystemUnitClassStructureField( SystemUnitClassType entity )
+        {
+            foreach( InternalElementType internalElement in entity.InternalElement )
+            {
+                TestSystemUnitClassStructureField( internalElement );
+            }
+
+            TypeOnlyTest( entity.Attribute );
+            TestAttributesStructureFields( entity.Attribute );
+
+            TestExternalInterfacesStructureField( entity.ExternalInterface );
+            count++;
+        }
+
+        private void TestExternalInterfacesStructureField( ExternalInterfaceSequence externalInterfaces )
+        {
+            foreach( ExternalInterfaceType externalInterface in externalInterfaces )
+            {
+                TestAttributesStructureField( externalInterface.Attribute );
+                TypeOnlyTest( externalInterface.Attribute );
+            }
+        }
+
+
+        private void TestAttributesStructureField( AttributeSequence attributes)
+        {
+            foreach( AttributeType attribute in attributes )
+            {
+                TestForNonExistingNodeId( attribute.Attribute );
+            }
+        }
+
+        private void TestAttributesStructureFields( AttributeSequence attributes )
+        {
+            foreach( AttributeType attribute in attributes )
+            {
+                Assert.IsNull( attribute.Attribute[ "StructureFieldDefinition" ] );
+
+                TestAttributesStructureFields( attribute.Attribute );
+            }
+        }
+
+        private void TypeOnlyTest( AttributeSequence attributes )
+        {
+            foreach( AttributeType attribute in attributes )
+            {
+                if ( attribute.AdditionalInformation != null )
+                {
+                    foreach( object info in attribute.AdditionalInformation )
+                    {
+                        if( info.GetType().Name == "String" )
+                        {
+                            string value = (string)info;
+                            Assert.AreNotEqual( value, TypeOnly );
+                        }
+                    }
+                }
+
+                TypeOnlyTest( attribute.Attribute );
+
+            }
+        }
+
+        #endregion
+
+        #region Helpers
+
+        private CAEXDocument GetDocument()
+        {
+            if( m_document == null )
+            {
+                m_document = TestHelper.GetReadOnlyDocument( "AmlFxTest.xml.amlx" );
+            }
+            Assert.IsNotNull( m_document, "Unable to retrieve Document" );
+            return m_document;
+        }
+
+        public SystemUnitClassType GetTestObject( string nodeId, bool foundationRoot = false )
+        {
+            CAEXDocument document = GetDocument();
+            string rootName = TestHelper.GetRootName();
+            if( foundationRoot )
+            {
+                rootName = TestHelper.GetOpcRootName();
+            }
+            CAEXObject initialObject = document.FindByID( rootName + nodeId );
+            Assert.IsNotNull( initialObject, "Unable to find Initial Object" );
+            SystemUnitClassType theObject = initialObject as SystemUnitClassType;
+            Assert.IsNotNull( theObject, "Unable to Cast Initial Object" );
+            return theObject;
+        }
+
+        private void TestForExistingNodeId( AttributeSequence attributes, bool hasAdditionalInformation )
+        {
+            AttributeType nodeId = attributes[ "NodeId" ];
+            Assert.IsNotNull( nodeId );
+            if( hasAdditionalInformation )
+            {
+                Assert.IsNotNull( nodeId.AdditionalInformation );
+                bool found = false;
+                foreach( object info in nodeId.AdditionalInformation )
+                {
+                    if( info.GetType().Name == "String" )
+                    {
+                        string value = (string)info;
+                        if( value == TypeOnly )
+                        {
+                            found = true;
+                            break;
+                        }
+                    }
+                }
+                Assert.IsTrue( found );
+            }
+            else
+            {
+                if( nodeId.AdditionalInformation != null )
+                {
+                    foreach( object info in nodeId.AdditionalInformation )
+                    {
+                        if( info.GetType().Name == "String" )
+                        {
+                            string value = (string)info;
+                            Assert.AreNotEqual( value, TypeOnly );
+                        }
+                    }
+                }
+            }
+
+            Assert.IsNull( nodeId.Attribute[ "ServerInstanceUri" ] );
+            Assert.IsNull( nodeId.Attribute[ "Alias" ] );
+            Assert.IsNull( nodeId.Attribute[ "BrowsePath" ] );
+
+            AttributeType rootNodeId = nodeId.Attribute[ "RootNodeId" ];
+            Assert.IsNotNull( rootNodeId );
+
+            Assert.AreEqual( 2, rootNodeId.Attribute.Count );
+            Assert.IsNotNull( rootNodeId.Attribute[ "NamespaceUri" ] );
+        }
+
+        private void TestForNonExistingNodeId( AttributeSequence attributes )
+        {
+            if( attributes != null )
+            {
+                Assert.IsNull( attributes[ "NodeId" ] );
+            }
+        }
+
+
+
+        #endregion
+    }
+}

From fc9f1545fb0ff08c9f36cef5d562eeaea2096ffa Mon Sep 17 00:00:00 2001
From: Archie Miller <62433534+Archie-Miller@users.noreply.github.com>
Date: Mon, 18 Nov 2024 13:30:29 -0700
Subject: [PATCH 11/11] Change timeouts for better running time.

---
 SystemTest/ExternalInterfaces.cs           |  2 +-
 SystemTest/Ids.cs                          |  2 +-
 SystemTest/InternalElements.cs             | 10 ++++-----
 SystemTest/IsAbstract.cs                   |  2 +-
 SystemTest/TestAttributes.cs               |  4 ++--
 SystemTest/TestCommandLine.cs              | 26 +++++++++++-----------
 SystemTest/TestComplexNonRootNamespace.cs  | 10 ++++-----
 SystemTest/TestComplexRootNamespace.cs     |  6 ++---
 SystemTest/TestDataTypes.cs                |  2 +-
 SystemTest/TestEnums.cs                    | 14 ++++++------
 SystemTest/TestHelper.cs                   | 12 +++++-----
 SystemTest/TestInstanceNodeIdAttributes.cs |  2 +-
 SystemTest/TestMultiDimensionalArray.cs    |  8 +++----
 SystemTest/TestNodeIds.cs                  |  2 +-
 SystemTest/TestOptionSetEmptyValues.cs     |  6 ++---
 SystemTest/TestServerDiagnostics.cs        |  4 ++--
 SystemTest/TestTypeOnly.cs                 |  8 +++----
 SystemTest/XmlDocTests.cs                  |  2 +-
 18 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/SystemTest/ExternalInterfaces.cs b/SystemTest/ExternalInterfaces.cs
index 4885e18..da7ed9f 100644
--- a/SystemTest/ExternalInterfaces.cs
+++ b/SystemTest/ExternalInterfaces.cs
@@ -19,7 +19,7 @@ public class ExternalInterfaces
 
         // This test is more about studying the file output, but has validity as a real test        
         private int LinkInternalElementDifferentCount;
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void DifferencesBetweenLinksAndInternalElements()
         {
             GetDocument();
diff --git a/SystemTest/Ids.cs b/SystemTest/Ids.cs
index be0a6f1..0c59549 100644
--- a/SystemTest/Ids.cs
+++ b/SystemTest/Ids.cs
@@ -21,7 +21,7 @@ public class Ids
         CAEXDocument m_document = null;
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestForGuids()
         {
             GetDocument();
diff --git a/SystemTest/InternalElements.cs b/SystemTest/InternalElements.cs
index 0b14516..556e494 100644
--- a/SystemTest/InternalElements.cs
+++ b/SystemTest/InternalElements.cs
@@ -23,7 +23,7 @@ public class InternalElements
 
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void Validation()
         {
             var lookupService = LookupService.Register();
@@ -67,7 +67,7 @@ public void Validation()
 
         // Test is done on AcknowledgeableConditionType/AckedState and AlarmConditionType/SuppressedState
         // As both use TwoStateConditionType, and StateVariableType
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow(
             Opc.Ua.Variables.AcknowledgeableConditionType_AckedState,
             Opc.Ua.Variables.AcknowledgeableConditionType_AckedState_Id,
@@ -112,7 +112,7 @@ public void TestDerivedTwoState(uint objectType, uint id, uint transitionTime, u
             }
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow(
             Opc.Ua.Variables.StateMachineType_CurrentState,
             Opc.Ua.Variables.StateVariableType_Name,
@@ -202,7 +202,7 @@ public void TestDerivedCurrentState(uint objectType,
 
         // Objects/Server/PublishSubscribe/SecurityGroups is an instance that has been improved to have nodeIds as IDs.
         // This is an object picked semi-randomly as an Id test for InternalElements
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestSecurityGroupInstance()
         {
             string root = TestHelper.GetOpcRootName();
@@ -224,7 +224,7 @@ public void TestSecurityGroupInstance()
         }
 
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow(new string[]
         {
             "DescriptionMethod",
diff --git a/SystemTest/IsAbstract.cs b/SystemTest/IsAbstract.cs
index 213f411..be2e99a 100644
--- a/SystemTest/IsAbstract.cs
+++ b/SystemTest/IsAbstract.cs
@@ -35,7 +35,7 @@ enum CheckType
             ExternalInterfaceType
         };
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestAllIsAbstract()
         {
             DirectoryInfo outputDirectoryInfo = TestHelper.GetOpc2AmlDirectory();
diff --git a/SystemTest/TestAttributes.cs b/SystemTest/TestAttributes.cs
index 9f5fe92..dd72cba 100644
--- a/SystemTest/TestAttributes.cs
+++ b/SystemTest/TestAttributes.cs
@@ -15,7 +15,7 @@ public class TestAttributes
 
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow("Description", "5001",
             "A Folder to store instances specifically for testing purposes",
             true, DisplayName = "Instance Expected Description")]
@@ -59,7 +59,7 @@ public void TestAttribute(string attribute, string nodeId,
             }
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestMethodClassAttributes()
         {
             CAEXDocument document = GetDocument();
diff --git a/SystemTest/TestCommandLine.cs b/SystemTest/TestCommandLine.cs
index fda02ea..fa0c7a5 100644
--- a/SystemTest/TestCommandLine.cs
+++ b/SystemTest/TestCommandLine.cs
@@ -42,7 +42,7 @@ public static void ClassInitialize(TestContext context)
 
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void OutputSpecific()
         {
             DirectoryInfo outputDirectoryInfo = TestHelper.GetOpc2AmlDirectory();
@@ -71,7 +71,7 @@ public void OutputSpecific()
             Assert.IsFalse( dontBuildfileInfo.Exists );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void OutputNonExistent()
         {
             string commandLine = "--Nodeset NonExistent.xml";
@@ -80,7 +80,7 @@ public void OutputNonExistent()
         }
 
         // Test 6:  Output specific output overwrite
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void OutputSpecificOverwrite()
         {
             string commandLine = DirectoryParameter( ) + 
@@ -95,7 +95,7 @@ public void OutputSpecificOverwrite()
             Assert.IsTrue( before < fileInfo.LastWriteTimeUtc );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void SpecificNoDirectory()
         {
             string commandLine = NodesetParameter( WorkingDirectoryString() + "LevelOne.xml" ) + 
@@ -107,7 +107,7 @@ public void SpecificNoDirectory()
             Assert.IsTrue( fileInfo.Exists );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void NoDirectoryOutputSubdirectory()
         {
             string commandLine = NodesetParameter( WorkingDirectoryString() + "LevelOne.xml" ) +
@@ -119,7 +119,7 @@ public void NoDirectoryOutputSubdirectory()
             Assert.IsTrue( fileInfo.Exists );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void RelativeDirectory()
         {
             string commandLine = DirectoryParameter() + 
@@ -132,7 +132,7 @@ public void RelativeDirectory()
             Assert.IsTrue( fileInfo.Exists );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void AbsoluteDirectory()
         {
             DirectoryInfo directoryInfo = new DirectoryInfo( WorkingDirectory().FullName );
@@ -146,7 +146,7 @@ public void AbsoluteDirectory()
             Assert.IsTrue( fileInfo.Exists );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void BadDirectory()
         {
             string commandLine = DirectoryParameter() + "BadDirectory" +
@@ -156,7 +156,7 @@ public void BadDirectory()
             TestHelper.Execute( commandLine, expectedResult: 1 );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void OutputAllDirectory()
         {
             DirectoryInfo directoryInfo = new DirectoryInfo( WorkingDirectory().FullName );
@@ -176,7 +176,7 @@ public void OutputAllDirectory()
                 directoryInfo.GetFiles( "*.xml" ).Length );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void OutputOneDirectory()
         {
             string commandLine = DirectoryParameter() +
@@ -185,7 +185,7 @@ public void OutputOneDirectory()
             TestHelper.Execute( commandLine, expectedResult: 1 );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void RelativeConfig()
         {
             DirectoryInfo directoryInfo = new DirectoryInfo( ConfigDirectory().FullName );
@@ -207,7 +207,7 @@ public void RelativeConfig()
             Assert.IsTrue( expectedLog.Exists );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void AbsoluteConfig()
         {
             DirectoryInfo directoryInfo = new DirectoryInfo( ConfigDirectory().FullName );
@@ -228,7 +228,7 @@ public void AbsoluteConfig()
             Assert.IsTrue( expectedLog.Exists );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void BadConfig()
         {
             DateTime start = DateTime.UtcNow;
diff --git a/SystemTest/TestComplexNonRootNamespace.cs b/SystemTest/TestComplexNonRootNamespace.cs
index 59d15ad..1ed10ae 100644
--- a/SystemTest/TestComplexNonRootNamespace.cs
+++ b/SystemTest/TestComplexNonRootNamespace.cs
@@ -26,7 +26,7 @@ public class TestComplexNonRootNamespace
         private const string LevelTwo = "http://opcfoundation.org/UA/FX/AML/TESTING/LevelTwo/";
         private const string RootLevel = "http://opcfoundation.org/UA/";
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestLevelOne()
         {
             AttributeType value = InitialGetValueAttribute( "LevelOne" );
@@ -216,7 +216,7 @@ public void TestLevelOne()
             #endregion
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestLevelTwo()
         {
             AttributeType value = InitialGetValueAttribute( "LevelTwo" );
@@ -226,7 +226,7 @@ public void TestLevelTwo()
             return;
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestTopLevel()
         {
             AttributeType topLevel = InitialGetValueAttribute( "TopLevel" );
@@ -399,7 +399,7 @@ public void TestValue( AttributeType source, string target, string value, string
             Assert.AreEqual( type, attribute.AttributeDataType );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestFieldTargetData()
         {
             SystemUnitClassType objectToTest = GetObjectFolder();
@@ -442,7 +442,7 @@ public void TestFieldTargetData()
             //Assert.AreEqual( "", overrideValue.AttributeDataType );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestPublishedVariableData()
         {
             SystemUnitClassType objectToTest = GetObjectFolder();
diff --git a/SystemTest/TestComplexRootNamespace.cs b/SystemTest/TestComplexRootNamespace.cs
index 9c91b3b..c7714d0 100644
--- a/SystemTest/TestComplexRootNamespace.cs
+++ b/SystemTest/TestComplexRootNamespace.cs
@@ -23,7 +23,7 @@ public class TestComplexRootNamespace
         private const string LevelTwo = "http://opcfoundation.org/UA/FX/AML/TESTING/LevelTwo/";
         private const string RootLevel = "http://opcfoundation.org/UA/";
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestDataSetMetaData()
         {
             SystemUnitClassType objectToTest = GetObjectFolder();
@@ -110,7 +110,7 @@ public void TestDataSetMetaData()
         }
 
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestFieldTargetData()
         {
             SystemUnitClassType objectToTest = GetObjectFolder();
@@ -153,7 +153,7 @@ public void TestFieldTargetData()
             //Assert.AreEqual( "", overrideValue.AttributeDataType );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestPublishedVariableData()
         {
             SystemUnitClassType objectToTest = GetObjectFolder();
diff --git a/SystemTest/TestDataTypes.cs b/SystemTest/TestDataTypes.cs
index 4bca572..df2b42e 100644
--- a/SystemTest/TestDataTypes.cs
+++ b/SystemTest/TestDataTypes.cs
@@ -21,7 +21,7 @@ public class TestDataTypes
 
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow( "6192", "12345", "xs:int", "Value", DisplayName = "DataValue Value" )]
         [DataRow( "6192", "2165637120", "xs:unsignedInt", "StatusCode", DisplayName = "StatusCode" )]
         [DataRow( "6192", "2023-09-13T14:39:08-06:00", "xs:dateTime", "SourceTimestamp", DisplayName = "SourceTimestamp" )]
diff --git a/SystemTest/TestEnums.cs b/SystemTest/TestEnums.cs
index af8f547..78e4e62 100644
--- a/SystemTest/TestEnums.cs
+++ b/SystemTest/TestEnums.cs
@@ -25,7 +25,7 @@ public class TestDisplay
 
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow("5015", "TrueState", "FalseState", true, DisplayName = "Default Parameters")]
         [DataRow("5016", "OverrideTrueState", "OverrideFalseState", true, DisplayName = "Override Default Parameters")]
         [DataRow("5017", "InstanceTrueState", "InstanceFalseState", false, DisplayName = "Override Parameters")]
@@ -56,7 +56,7 @@ public void TwoStateInstances(string nodeId, string expectedTrue, string expecte
 
 
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow("6012", "", "", false, DisplayName = "Has No Values")]
         [DataRow("6013", "TrueState", "FalseState", true, DisplayName = "Has Values")]
         public void TwoStateClasses(string nodeId, string expectedTrue, string expectedFalse, bool hasValues)
@@ -93,7 +93,7 @@ public void TwoStateClasses(string nodeId, string expectedTrue, string expectedF
             Assert.IsNotNull(valueAsText, "Unable to Find ValueAsText Property");
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow("5005", new string[] {"ZeroValue","OneValue"}, 1, DisplayName = "Default Parameters")]
         [DataRow("5007", new string[] { "OverrideZero", "OverrideOne" }, 1, DisplayName = "Override Default Parameters")]
         [DataRow("5006", new string[] { "InstanceZero", "InstanceOne" }, 0, DisplayName = "Override Parameters")]
@@ -104,7 +104,7 @@ public void MultiStateVariableInstances(string nodeId, string[] values, int expe
 
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow("6009", new string[] { }, false, DisplayName = "Has No Values")]
         [DataRow("6008", new string[] { "ZeroValue", "OneValue" }, true, DisplayName = "Has Values")]
         public void MultiStateVariableClasses(string nodeId, string[] values, bool hasValues)
@@ -112,7 +112,7 @@ public void MultiStateVariableClasses(string nodeId, string[] values, bool hasVa
             EnumClassTest(nodeId, values, hasValues, "EnumValues", "ListOfEnumValueType");
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow("5008", new string[] { "ZeroState", "OneState" }, 1, DisplayName = "Default Parameters")]
         [DataRow("5009", new string[] { "OverrideZero", "OverrideOne" }, 1, DisplayName = "Override Default Parameters")]
         [DataRow("5010", new string[] { "InstanceZero", "InstanceOne" }, 0, DisplayName = "Override Parameters")]
@@ -122,7 +122,7 @@ public void MultiStateInstances(string nodeId, string[] values, int expectedInde
                 "Test_MultiState_", "EnumStrings", "ListOfLocalizedText");
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow("6010", new string[] { }, false, DisplayName = "Has No Values")]
         [DataRow("6011", new string[] { "ZeroState", "OneState" }, true, DisplayName = "Has Values")]
         public void MultiStateClasses(string nodeId, string[] values, bool hasValues)
@@ -130,7 +130,7 @@ public void MultiStateClasses(string nodeId, string[] values, bool hasValues)
             EnumClassTest(nodeId, values, hasValues, "EnumStrings", "ListOfLocalizedText");
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
 
         [DataRow( Opc.Ua.DataTypes.NodeClass, new NodeClass(), DisplayName = "EnumValue Constraints - NodeClass" )]
         [DataRow( Opc.Ua.DataTypes.MessageSecurityMode, new MessageSecurityMode(), DisplayName = "EnumString Constraints - MessageSecurityMode" )]
diff --git a/SystemTest/TestHelper.cs b/SystemTest/TestHelper.cs
index 4d1a67b..d10ac2d 100644
--- a/SystemTest/TestHelper.cs
+++ b/SystemTest/TestHelper.cs
@@ -2,6 +2,7 @@
 using Aml.Engine.CAEX;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -176,15 +177,16 @@ static public bool Execute( string arguments = "", int expectedResult = 0 )
                 processStartInfo.Arguments += arguments;
             }
 
+            DateTime startTime = DateTime.Now;
+            DateTime maxTime = startTime.AddMilliseconds(UnitTestTimeout);
+
             Process opc2amlProcess = Process.Start(processStartInfo);
+
             
-            int counter = 0;
-            int limit = 150;
-            while( !opc2amlProcess.HasExited && counter < limit )
+            while( !opc2amlProcess.HasExited )
             {
                 System.Threading.Thread.Sleep(1000);
-                counter++;
-                if ( counter >= limit )
+                if ( DateTime.Now > maxTime )
                 {
                     success = false;
                     opc2amlProcess.Kill();
diff --git a/SystemTest/TestInstanceNodeIdAttributes.cs b/SystemTest/TestInstanceNodeIdAttributes.cs
index 3349a9d..3bb6eba 100644
--- a/SystemTest/TestInstanceNodeIdAttributes.cs
+++ b/SystemTest/TestInstanceNodeIdAttributes.cs
@@ -16,7 +16,7 @@ public class TestInstanceNodeIdAttributes
 
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow( "6144", TestHelper.TestAmlUri, false, DisplayName = "EventId variable should have instance NodeId" )]
         [DataRow( "6130", TestHelper.TestAmlUri, false, DisplayName = "InputArguments should have instance NodeId" )]
         [DataRow( "2255", Opc.Ua.Namespaces.OpcUa, true, DisplayName = "Namespace variable should have instance NodeId" )]
diff --git a/SystemTest/TestMultiDimensionalArray.cs b/SystemTest/TestMultiDimensionalArray.cs
index ae6756e..e4fdbdb 100644
--- a/SystemTest/TestMultiDimensionalArray.cs
+++ b/SystemTest/TestMultiDimensionalArray.cs
@@ -15,7 +15,7 @@ public class TestMultiDimensionalArray
 
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow( "6134", "3", "3,3,3", false, DisplayName = "Three Dimensions, no Value" )]
         [DataRow( "6126", "1", "10", true, DisplayName = "One Dimension" )]
         [DataRow( "6127", "2", "2,5", true, DisplayName = "Two Dimensions" )]
@@ -77,7 +77,7 @@ public void TestArray( string nodeId, string valueRank, string arrayDimensions,
         }
 
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestMethodClassAttributes()
         {
             CAEXDocument document = GetDocument();
@@ -98,7 +98,7 @@ public void TestMethodClassAttributes()
             Assert.AreEqual( "xs:string", nameAttribute.AttributeDataType );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow( "2330", "", false, true, DisplayName = "SUC HistoryServerCapabilitiesType should not have ArrayDimensions" )]
         [DataRow( "24186", "", true, true, DisplayName = "SUC FailureCode should have empty ArrayDimensions" )]
         [DataRow( "24187", "0,8", true, true, DisplayName = "SUC FailureSystemIdentifier ArrayDimensions" )]
@@ -146,7 +146,7 @@ public void TestArrayDimensions( string nodeId, string expected,
             }
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow( "2330", "", false, true, DisplayName = "SUC HistoryServerCapabilitiesType should not have ValueRank" )]
         [DataRow( "24186", "-1", true, true, DisplayName = "SUC FailureCode should have Scalar ValueRank" )]
         [DataRow( "24187", "2", true, true, DisplayName = "SUC FailureSystemIdentifier" )]
diff --git a/SystemTest/TestNodeIds.cs b/SystemTest/TestNodeIds.cs
index 3202af0..e9af19f 100644
--- a/SystemTest/TestNodeIds.cs
+++ b/SystemTest/TestNodeIds.cs
@@ -21,7 +21,7 @@ public class TestNodeIds
 
 
         #region Tests
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         [DataRow( "GuidNodeIdWithActualGuidId", "0EB66E95-DCED-415F-B8EC-43ED3F0C759B", IdType.Guid )]
         [DataRow( "NumericNodeIdWithActualNumericId", "12345", IdType.Numeric )]
         [DataRow( "OpaqueNodeIdWithActualOpaqueId", "T3BhcXVlTm9kZUlk", IdType.Opaque )]
diff --git a/SystemTest/TestOptionSetEmptyValues.cs b/SystemTest/TestOptionSetEmptyValues.cs
index 4e1f249..50f65b3 100644
--- a/SystemTest/TestOptionSetEmptyValues.cs
+++ b/SystemTest/TestOptionSetEmptyValues.cs
@@ -55,7 +55,7 @@ public void Validation()
             }
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestOperationalHealthOptionSet()
         {
             AttributeTypeLibType attributeLibrary = GetFxAcAttributes();
@@ -63,7 +63,7 @@ public void TestOperationalHealthOptionSet()
             TestOptionSet( attributeFamilyType );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestAggregatedHealthOptionSet()
         {
             AttributeTypeLibType attributeLibrary = GetFxAcAttributes();
@@ -73,7 +73,7 @@ public void TestAggregatedHealthOptionSet()
             TestOptionSet( attributeType );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestInstance()
         {
             CAEXDocument document = GetDocument();
diff --git a/SystemTest/TestServerDiagnostics.cs b/SystemTest/TestServerDiagnostics.cs
index ad85079..dadb15d 100644
--- a/SystemTest/TestServerDiagnostics.cs
+++ b/SystemTest/TestServerDiagnostics.cs
@@ -22,7 +22,7 @@ public class TestServerDiagnostics
 
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestEnabledFlag()
         {
             SystemUnitClassType testObject = GetTestObject( "2294", true );
@@ -31,7 +31,7 @@ public void TestEnabledFlag()
             Assert.AreEqual("true", attributeType.Value, true );
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
 
         [DataRow( "6224", DisplayName = "SessionDiagnosticsDataType" )]
         [DataRow( "6225", DisplayName = "SessionSecurityDiagnosticsDataType" )]
diff --git a/SystemTest/TestTypeOnly.cs b/SystemTest/TestTypeOnly.cs
index f80bea2..a1c63a5 100644
--- a/SystemTest/TestTypeOnly.cs
+++ b/SystemTest/TestTypeOnly.cs
@@ -12,7 +12,7 @@
 
 namespace SystemTest
 {
-    [TestClass, Timeout(TestHelper.UnitTestTimeout )]
+    [TestClass]
     public class TestTypeOnly
     {
         CAEXDocument m_document = null;
@@ -20,7 +20,7 @@ public class TestTypeOnly
 
         #region Tests
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestLibraryAttributes()
         {
             CAEXDocument document = GetDocument();
@@ -76,7 +76,7 @@ public void TestLibraryAttributes()
 
         private int count = 0;
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestForNodeId()
         {
             CAEXDocument document = GetDocument();
@@ -144,7 +144,7 @@ private void TestAttributesNodeId( AttributeSequence attributes )
         }
 
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void TestForStructureField()
         {
             CAEXDocument document = GetDocument();
diff --git a/SystemTest/XmlDocTests.cs b/SystemTest/XmlDocTests.cs
index 051fda7..a86e88d 100644
--- a/SystemTest/XmlDocTests.cs
+++ b/SystemTest/XmlDocTests.cs
@@ -31,7 +31,7 @@ public void TestInitialize()
             }
         }
 
-        [TestMethod]
+        [TestMethod, Timeout( TestHelper.UnitTestTimeout )]
         public void InternalElementGuidCount()
         {
             foreach (XmlNode child in m_doc.ChildNodes)