Skip to content

Commit

Permalink
Update models to harmonize with current UA-ModelCompiler release #655
Browse files Browse the repository at this point in the history 
Updated SemanticData/UAModelDesignExport.UnitTest/Models/ using UA-Compiler Version 2.1.1.0
  • Loading branch information
@mpostol
mpostol committed Apr 1, 2022
1 parent ec1279c commit 27ac6bd
Show file tree
Hide file tree
Showing 26 changed files with 931 additions and 431 deletions.
4 changes: 4 additions & 0 deletions SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
cas_BinarySchema_Deprecated,1,Variable
cas_XmlSchema,2,Variable
cas_XmlSchema_DataTypeVersion,3,Variable
cas_XmlSchema_NamespaceUri,4,Variable
cas_BinarySchema,5,Variable
cas_BinarySchema_DataTypeVersion,6,Variable
cas_BinarySchema_NamespaceUri,7,Variable
cas_XmlSchema_Deprecated,8,Variable
AbstractEnumerationDataType,9,DataType
AbstractEnumerationDataType_EnumStrings,10,Variable
EnumerationDataType,11,DataType
Expand All @@ -26,3 +28,5 @@ DerivedStructure_Encoding_DefaultBinary,27,Object
cas_BinarySchema_DerivedStructure,28,Variable
cas_BinarySchema_DerivedStructure_DataTypeVersion,29,Variable
cas_BinarySchema_DerivedStructure_DictionaryFragment,30,Variable
AbstractStructure_Encoding_DefaultJson,31,Object
DerivedStructure_Encoding_DefaultJson,32,Object
146 changes: 88 additions & 58 deletions SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.Classes.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Copyright (c) 2005-2016 The OPC Foundation, Inc. All rights reserved.
* Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
*
* OPC Foundation MIT License 1.00
*
Expand Down Expand Up @@ -74,6 +74,16 @@ public static partial class DataTypes
[System.CodeDom.Compiler.GeneratedCodeAttribute("Opc.Ua.ModelCompiler", "1.0.0.0")]
public static partial class Objects
{
/// <summary>
/// The identifier for the AbstractStructure_Encoding_DefaultBinary Object.
/// </summary>
public const uint AbstractStructure_Encoding_DefaultBinary = 18;

/// <summary>
/// The identifier for the DerivedStructure_Encoding_DefaultBinary Object.
/// </summary>
public const uint DerivedStructure_Encoding_DefaultBinary = 27;

/// <summary>
/// The identifier for the AbstractStructure_Encoding_DefaultXml Object.
/// </summary>
Expand All @@ -85,14 +95,14 @@ public static partial class Objects
public const uint DerivedStructure_Encoding_DefaultXml = 23;

/// <summary>
/// The identifier for the AbstractStructure_Encoding_DefaultBinary Object.
/// The identifier for the AbstractStructure_Encoding_DefaultJson Object.
/// </summary>
public const uint AbstractStructure_Encoding_DefaultBinary = 18;
public const uint AbstractStructure_Encoding_DefaultJson = 31;

/// <summary>
/// The identifier for the DerivedStructure_Encoding_DefaultBinary Object.
/// The identifier for the DerivedStructure_Encoding_DefaultJson Object.
/// </summary>
public const uint DerivedStructure_Encoding_DefaultBinary = 27;
public const uint DerivedStructure_Encoding_DefaultJson = 32;
}
#endregion

Expand All @@ -115,44 +125,54 @@ public static partial class Variables
public const uint EnumerationDataType_EnumValues = 12;

/// <summary>
/// The identifier for the cas_XmlSchema Variable.
/// The identifier for the cas_BinarySchema Variable.
/// </summary>
public const uint cas_XmlSchema = 2;
public const uint cas_BinarySchema = 5;

/// <summary>
/// The identifier for the cas_XmlSchema_NamespaceUri Variable.
/// The identifier for the cas_BinarySchema_NamespaceUri Variable.
/// </summary>
public const uint cas_XmlSchema_NamespaceUri = 4;
public const uint cas_BinarySchema_NamespaceUri = 7;

/// <summary>
/// The identifier for the cas_XmlSchema_AbstractStructure Variable.
/// The identifier for the cas_BinarySchema_Deprecated Variable.
/// </summary>
public const uint cas_XmlSchema_AbstractStructure = 15;
public const uint cas_BinarySchema_Deprecated = 1;

/// <summary>
/// The identifier for the cas_XmlSchema_DerivedStructure Variable.
/// The identifier for the cas_BinarySchema_AbstractStructure Variable.
/// </summary>
public const uint cas_XmlSchema_DerivedStructure = 24;
public const uint cas_BinarySchema_AbstractStructure = 19;

/// <summary>
/// The identifier for the cas_BinarySchema Variable.
/// The identifier for the cas_BinarySchema_DerivedStructure Variable.
/// </summary>
public const uint cas_BinarySchema = 5;
public const uint cas_BinarySchema_DerivedStructure = 28;

/// <summary>
/// The identifier for the cas_BinarySchema_NamespaceUri Variable.
/// The identifier for the cas_XmlSchema Variable.
/// </summary>
public const uint cas_BinarySchema_NamespaceUri = 7;
public const uint cas_XmlSchema = 2;

/// <summary>
/// The identifier for the cas_BinarySchema_AbstractStructure Variable.
/// The identifier for the cas_XmlSchema_NamespaceUri Variable.
/// </summary>
public const uint cas_BinarySchema_AbstractStructure = 19;
public const uint cas_XmlSchema_NamespaceUri = 4;

/// <summary>
/// The identifier for the cas_BinarySchema_DerivedStructure Variable.
/// The identifier for the cas_XmlSchema_Deprecated Variable.
/// </summary>
public const uint cas_BinarySchema_DerivedStructure = 28;
public const uint cas_XmlSchema_Deprecated = 8;

/// <summary>
/// The identifier for the cas_XmlSchema_AbstractStructure Variable.
/// </summary>
public const uint cas_XmlSchema_AbstractStructure = 15;

/// <summary>
/// The identifier for the cas_XmlSchema_DerivedStructure Variable.
/// </summary>
public const uint cas_XmlSchema_DerivedStructure = 24;
}
#endregion

Expand Down Expand Up @@ -194,6 +214,16 @@ public static partial class DataTypeIds
[System.CodeDom.Compiler.GeneratedCodeAttribute("Opc.Ua.ModelCompiler", "1.0.0.0")]
public static partial class ObjectIds
{
/// <summary>
/// The identifier for the AbstractStructure_Encoding_DefaultBinary Object.
/// </summary>
public static readonly ExpandedNodeId AbstractStructure_Encoding_DefaultBinary = new ExpandedNodeId(DataTypeTest.Objects.AbstractStructure_Encoding_DefaultBinary, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the DerivedStructure_Encoding_DefaultBinary Object.
/// </summary>
public static readonly ExpandedNodeId DerivedStructure_Encoding_DefaultBinary = new ExpandedNodeId(DataTypeTest.Objects.DerivedStructure_Encoding_DefaultBinary, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the AbstractStructure_Encoding_DefaultXml Object.
/// </summary>
Expand All @@ -205,14 +235,14 @@ public static partial class ObjectIds
public static readonly ExpandedNodeId DerivedStructure_Encoding_DefaultXml = new ExpandedNodeId(DataTypeTest.Objects.DerivedStructure_Encoding_DefaultXml, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the AbstractStructure_Encoding_DefaultBinary Object.
/// The identifier for the AbstractStructure_Encoding_DefaultJson Object.
/// </summary>
public static readonly ExpandedNodeId AbstractStructure_Encoding_DefaultBinary = new ExpandedNodeId(DataTypeTest.Objects.AbstractStructure_Encoding_DefaultBinary, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId AbstractStructure_Encoding_DefaultJson = new ExpandedNodeId(DataTypeTest.Objects.AbstractStructure_Encoding_DefaultJson, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the DerivedStructure_Encoding_DefaultBinary Object.
/// The identifier for the DerivedStructure_Encoding_DefaultJson Object.
/// </summary>
public static readonly ExpandedNodeId DerivedStructure_Encoding_DefaultBinary = new ExpandedNodeId(DataTypeTest.Objects.DerivedStructure_Encoding_DefaultBinary, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId DerivedStructure_Encoding_DefaultJson = new ExpandedNodeId(DataTypeTest.Objects.DerivedStructure_Encoding_DefaultJson, DataTypeTest.Namespaces.cas);
}
#endregion

Expand All @@ -235,44 +265,54 @@ public static partial class VariableIds
public static readonly ExpandedNodeId EnumerationDataType_EnumValues = new ExpandedNodeId(DataTypeTest.Variables.EnumerationDataType_EnumValues, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_XmlSchema Variable.
/// The identifier for the cas_BinarySchema Variable.
/// </summary>
public static readonly ExpandedNodeId cas_XmlSchema = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId cas_BinarySchema = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_XmlSchema_NamespaceUri Variable.
/// The identifier for the cas_BinarySchema_NamespaceUri Variable.
/// </summary>
public static readonly ExpandedNodeId cas_XmlSchema_NamespaceUri = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_NamespaceUri, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId cas_BinarySchema_NamespaceUri = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_NamespaceUri, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_XmlSchema_AbstractStructure Variable.
/// The identifier for the cas_BinarySchema_Deprecated Variable.
/// </summary>
public static readonly ExpandedNodeId cas_XmlSchema_AbstractStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_AbstractStructure, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId cas_BinarySchema_Deprecated = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_Deprecated, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_XmlSchema_DerivedStructure Variable.
/// The identifier for the cas_BinarySchema_AbstractStructure Variable.
/// </summary>
public static readonly ExpandedNodeId cas_XmlSchema_DerivedStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_DerivedStructure, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId cas_BinarySchema_AbstractStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_AbstractStructure, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_BinarySchema Variable.
/// The identifier for the cas_BinarySchema_DerivedStructure Variable.
/// </summary>
public static readonly ExpandedNodeId cas_BinarySchema = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId cas_BinarySchema_DerivedStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_DerivedStructure, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_BinarySchema_NamespaceUri Variable.
/// The identifier for the cas_XmlSchema Variable.
/// </summary>
public static readonly ExpandedNodeId cas_BinarySchema_NamespaceUri = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_NamespaceUri, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId cas_XmlSchema = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_BinarySchema_AbstractStructure Variable.
/// The identifier for the cas_XmlSchema_NamespaceUri Variable.
/// </summary>
public static readonly ExpandedNodeId cas_BinarySchema_AbstractStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_AbstractStructure, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId cas_XmlSchema_NamespaceUri = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_NamespaceUri, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_BinarySchema_DerivedStructure Variable.
/// The identifier for the cas_XmlSchema_Deprecated Variable.
/// </summary>
public static readonly ExpandedNodeId cas_BinarySchema_DerivedStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_BinarySchema_DerivedStructure, DataTypeTest.Namespaces.cas);
public static readonly ExpandedNodeId cas_XmlSchema_Deprecated = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_Deprecated, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_XmlSchema_AbstractStructure Variable.
/// </summary>
public static readonly ExpandedNodeId cas_XmlSchema_AbstractStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_AbstractStructure, DataTypeTest.Namespaces.cas);

/// <summary>
/// The identifier for the cas_XmlSchema_DerivedStructure Variable.
/// </summary>
public static readonly ExpandedNodeId cas_XmlSchema_DerivedStructure = new ExpandedNodeId(DataTypeTest.Variables.cas_XmlSchema_DerivedStructure, DataTypeTest.Namespaces.cas);
}
#endregion

Expand Down Expand Up @@ -335,22 +375,18 @@ public static partial class Namespaces
#region AbstractEnumerationDataType Enumeration
#if (!OPCUA_EXCLUDE_AbstractEnumerationDataType)
/// <summary>
/// A description for the AbstractEnumerationDataType DataType.
///
/// </summary>
/// <exclude />
[System.CodeDom.Compiler.GeneratedCodeAttribute("Opc.Ua.ModelCompiler", "1.0.0.0")]
[DataContract(Namespace = DataTypeTest.Namespaces.cas)]
public enum AbstractEnumerationDataType
{
/// <summary>
/// A description for the Field1 field.
/// </summary>
/// <remarks />
[EnumMember(Value = "Field1_0")]
Field1 = 0,

/// <summary>
/// A description for the Field2 field.
/// </summary>
/// <remarks />
[EnumMember(Value = "Field2_1")]
Field2 = 1,
}
Expand Down Expand Up @@ -452,9 +488,7 @@ public object Clone()
[DataContract(Namespace = DataTypeTest.Namespaces.cas)]
public enum EnumerationDataType
{
/// <summary>
/// A description for the Field3 field.
/// </summary>
/// <remarks />
[EnumMember(Value = "Field3_1")]
Field3 = 1,
}
Expand Down Expand Up @@ -584,9 +618,7 @@ private void Initialize()
#endregion

#region Public Properties
/// <summary>
/// A description for the Number field.
/// </summary>
/// <remarks />
[DataMember(Name = "Number", IsRequired = false, Order = 1)]
public Variant Number
{
Expand Down Expand Up @@ -768,7 +800,7 @@ public object Clone()
#region DerivedStructure Class
#if (!OPCUA_EXCLUDE_DerivedStructure)
/// <summary>
/// A description for the DerivedStructure DataType.
///
/// </summary>
/// <exclude />
[System.CodeDom.Compiler.GeneratedCodeAttribute("Opc.Ua.ModelCompiler", "1.0.0.0")]
Expand Down Expand Up @@ -803,9 +835,7 @@ private void Initialize()
#endregion

#region Public Properties
/// <summary>
/// Derived from Number
/// </summary>
/// <remarks />
[DataMember(Name = "Number", IsRequired = false, Order = 1)]
public int Number
{
Expand Down
12 changes: 12 additions & 0 deletions SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest/DataTypeTest.NodeIds.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
AbstractEnumerationDataType,9,DataType
AbstractStructure,13,DataType
AbstractStructure_Encoding_DefaultBinary,18,Object
AbstractStructure_Encoding_DefaultJson,31,Object
AbstractStructure_Encoding_DefaultXml,14,Object
cas_BinarySchema,5,Variable
cas_XmlSchema,2,Variable
DerivedStructure,22,DataType
DerivedStructure_Encoding_DefaultBinary,27,Object
DerivedStructure_Encoding_DefaultJson,32,Object
DerivedStructure_Encoding_DefaultXml,23,Object
EnumerationDataType,11,DataType
Loading

0 comments on commit 27ac6bd

Please sign in to comment.