Add CDD/EClass identifiers as DictionaryReferences, fix some AAS parsing, improve mapping to the DPP metamodel and also save all node values to file.

Author: barnstee

I4AASNodeManager.cs

@@ -2,6 +2,7 @@
 namespace AdminShell
 {
     using AAS2Nodeset;
+    using Newtonsoft.Json;
     using Opc.Ua;
     using Opc.Ua.Export;
     using Opc.Ua.Server;
@@ -98,6 +99,39 @@ public void SaveNodestateCollectionAsNodeSet2(string filePath, NodeStateCollecti
                     nodeSet.Write(stream.BaseStream);
                 }
             }
+        }
+
+        private void SaveValues(string filePath, NodeStateCollection nodesToExport)
+        {
+            if (nodesToExport.Count > 0)
+            {
+                // first remove duplicates
+                List<NodeState> nodes = nodesToExport.ToList();
+                for (int i = 0; i < nodes.Count; i++)
+                {
+                    // remove all duplicate nodes from the List, based on node ID
+                    for (int j = i + 1; j < nodes.Count; j++)
+                    {
+                        if (nodes[i].NodeId == nodes[j].NodeId)
+                        {
+                            nodes.RemoveAt(j);
+                            j--;
+                        }
+                    }
+                }
+
+                // capture name-value pairs of all variables in the NodeSet
+                Dictionary<string, string> values = new();
+                foreach (NodeState node in nodes)
+                {
+                    if (node is BaseDataVariableState variable)
+                    {
+                        values.Add(variable.NodeId.ToString().Replace("ns=2", "ns=1"), variable.Value?.ToString() ?? string.Empty);
+                    }
+                }
+
+                System.IO.File.WriteAllText(filePath.Replace(".NodeSet2.xml", ".values.json"), JsonConvert.SerializeObject(values, Formatting.Indented));
+            }
         }
 
         public override void CreateAddressSpace(IDictionary<NodeId, IList<IReference>> externalReferences)
@@ -147,6 +181,7 @@ public override void CreateAddressSpace(IDictionary<NodeId, IList<IReference>> e
                             // export nodeset XML
                             Console.WriteLine($"Writing {nodesToExport.Count} nodes to file {c_exportFilename}!");
                             SaveNodestateCollectionAsNodeSet2(c_exportFilename, nodesToExport);
+                            SaveValues(c_exportFilename, nodesToExport);
 
                             Console.WriteLine();
                         }
@@ -160,8 +195,8 @@ public override void CreateAddressSpace(IDictionary<NodeId, IList<IReference>> e
                 AddReverseReferences(externalReferences);
                 base.CreateAddressSpace(externalReferences);
             }
-        }
-
+        }
+
         public void CreateObjects(AssetAdministrationShellEnvironment env)
         {
             // create DPP variables and data element array
@@ -221,12 +256,39 @@ private void CreateDataElement(NodeState parent, SubmodelElement sme)
 
                     FolderState collectionFolder = CreateFolder(parent, sme.IdShort);
 
+                    if ((sme.SemanticId.Keys != null) && (sme.SemanticId.Keys.Count > 0))
+                    {
+                        CreateStringVariable(collectionFolder, "DictionaryReference", sme.SemanticId.Keys[0].Value);
+                    }
+
                     foreach (SubmodelElement smeChild in collection.Value)
                     {
                         CreateDataElement(collectionFolder, smeChild);
                     }
                 }
             }
+            else if (sme is SubmodelElementList list)
+            {
+                if (list.Value != null)
+                {
+                    if (string.IsNullOrEmpty(sme.IdShort) && (sme.SemanticId.Keys != null) && (sme.SemanticId.Keys.Count > 0))
+                    {
+                        sme.IdShort = sme.SemanticId.Keys[0].Value;
+                    }
+
+                    FolderState listFolder = CreateFolder(parent, sme.IdShort);
+
+                    if ((sme.SemanticId.Keys != null) && (sme.SemanticId.Keys.Count > 0))
+                    {
+                        CreateStringVariable(listFolder, "DictionaryReference", sme.SemanticId.Keys[0].Value);
+                    }
+
+                    foreach (SubmodelElement smeChild in list.Value)
+                    {
+                        CreateDataElement(listFolder, smeChild);
+                    }
+                }
+            }
             else
             {
                 // fall back to SemanticID if no IDShort is provided
@@ -235,45 +297,47 @@ private void CreateDataElement(NodeState parent, SubmodelElement sme)
                     sme.IdShort = sme.SemanticId.Keys[0].Value;
                 }
 
-                if (sme is Property)
-                {
-                    CreateStringVariable(parent, sme.IdShort, ((Property)sme).Value);
-                }
-                else if (sme is Blob)
-                {
-                    CreateStringVariable(parent, sme.IdShort, ((Blob)sme).Value);
-                }
-                else if (sme is File)
+                FolderState smeFolder = CreateFolder(parent, sme.IdShort);
+
+                if (sme is Property property)
                 {
-                    CreateStringVariable(parent, sme.IdShort, ((File)sme).Value);
+                    CreateStringVariable(smeFolder, "Value", property.Value);
                 }
-                else if (sme is ReferenceElement)
+                else if (sme is MultiLanguageProperty multiLanguageProperty)
                 {
-                    if (string.IsNullOrEmpty(sme.IdShort) && (((ReferenceElement)sme).Value != null) && (((ReferenceElement)sme).Value.Keys.Count > 0) && (((ReferenceElement)sme).Value.Keys[0].Value != null))
+                    foreach (var entry in multiLanguageProperty.Value)
                     {
-                        sme.IdShort = ((ReferenceElement)sme).Value.Keys[0].Value;
-                        CreateStringVariable(parent, sme.IdShort, string.Empty);
+                        FolderState mlDataElement = CreateFolder(smeFolder, "MultiLanguageValue");
+
+                        CreateStringVariable(mlDataElement, "Language", entry.Language);
+                        CreateStringVariable(mlDataElement, "Value", entry.Text);
                     }
                 }
+                else if (sme is File file)
+                {
+                    FolderState relatedResource = CreateFolder(smeFolder, "RelatedResource");
+
+                    CreateStringVariable(relatedResource, "contentType", file.MimeType);
+                    CreateStringVariable(relatedResource, "url", file.Value);
+                }
                 else
                 {
-                    // use the SemanticID as the value of the variable
-                    string value = string.Empty;
-                    if ((sme.SemanticId.Keys != null) && (sme.SemanticId.Keys.Count > 0))
-                    {
-                        value = sme.SemanticId.Keys[0].Value;
-                    }
+                    // for other types of SubmodelElements, there is no mapping to the DPP
+                    Console.WriteLine($"Warning: SubmodelElement of type {sme.GetType().Name} with idShort '{sme.IdShort}' has no mapping to the DPP and will be created as an empty folder in the OPC UA address space.");
+                }
 
-                    CreateStringVariable(parent, sme.IdShort, value);
-                }
+                if ((sme.SemanticId.Keys != null) && (sme.SemanticId.Keys.Count > 0))
+                {
+                    CreateStringVariable(smeFolder, "DictionaryReference", sme.SemanticId.Keys[0].Value);
+                }
             }
         }
 
         public FolderState CreateFolder(NodeState? parent, string browseDisplayName)
         {
             if (string.IsNullOrEmpty(browseDisplayName))
             {
-                throw new ArgumentNullException("Cannot create UA folder with empty browsename!");
+                browseDisplayName = "Folder";
             }
 
             FolderState folder = new(parent)

Models/Key.cs

@@ -13,13 +13,13 @@ public class Key
     {
         [Required]
         [DataMember(Name="type")]
-        [XmlAttribute(AttributeName="type")]
+        [XmlElement(ElementName = "type")]
         [MetaModelName("Key.Type")]
         public KeyElements Type { get; set; }
 
         [Required]
-        [XmlText]
         [DataMember(Name="value")]
+        [XmlElement(ElementName = "value")]
         [MetaModelName("Key.Value")]
         public string Value { get; set; }