update to latest schema versions

tools/schema/Opc.Ua.Types.bsd

@@ -6,12 +6,9 @@
   DefaultByteOrder="LittleEndian"
   TargetNamespace="http://opcfoundation.org/UA/"
 >
-  <!-- This File was generated on 2013-03-06 and supports the specifications supported by version 1.1.334.4 of the OPC UA deliverables. -->
+  <!-- This File was generated on 2015-08-18 and supports the specifications supported by version 1.1.335.1 of the OPC UA deliverables. -->
 
   <opc:Import Namespace="http://opcfoundation.org/BinarySchema/" />
- 
- 
- 
 
   <opc:StructuredType Name="XmlElement">
     <opc:Documentation>An XML element encoded as a UTF-8 string.</opc:Documentation>
@@ -93,14 +90,15 @@
     <opc:Documentation>A recursive structure containing diagnostic information associated with a status code.</opc:Documentation>
     <opc:Field Name="SymbolicIdSpecified" TypeName="opc:Bit" />
     <opc:Field Name="NamespaceURISpecified" TypeName="opc:Bit" />
-    <opc:Field Name="LocalizedTextSpecified" TypeName="opc:Bit" />
     <opc:Field Name="LocaleSpecified" TypeName="opc:Bit" />
+    <opc:Field Name="LocalizedTextSpecified" TypeName="opc:Bit" />
     <opc:Field Name="AdditionalInfoSpecified" TypeName="opc:Bit" />
     <opc:Field Name="InnerStatusCodeSpecified" TypeName="opc:Bit" />
     <opc:Field Name="InnerDiagnosticInfoSpecified" TypeName="opc:Bit" />
-    <opc:Field Name="Reserved1" TypeName="opc:Bit" Length="1" />
+    <opc:Field Name="Reserved1" TypeName="opc:Bit" Length="2" />
     <opc:Field Name="SymbolicId" TypeName="opc:Int32" SwitchField="SymbolicIdSpecified" />
     <opc:Field Name="NamespaceURI" TypeName="opc:Int32" SwitchField="NamespaceURISpecified" />
+    <opc:Field Name="Locale" TypeName="opc:Int32" SwitchField="LocaleSpecified" />
     <opc:Field Name="LocalizedText" TypeName="opc:Int32" SwitchField="LocalizedTextSpecified" />
     <opc:Field Name="AdditionalInfo" TypeName="opc:CharArray" SwitchField="AdditionalInfoSpecified" />
     <opc:Field Name="InnerStatusCode" TypeName="ua:StatusCode" SwitchField="InnerStatusCodeSpecified" />
@@ -152,7 +150,8 @@
 
   <opc:StructuredType Name="Variant">
     <opc:Documentation>A union of several types.</opc:Documentation>
-    <opc:Field Name="VariantType" TypeName="opc:Bit" Length="7" />
+    <opc:Field Name="VariantType" TypeName="opc:Bit" Length="6" />
+    <opc:Field Name="ArrayDimensionsSpecified" TypeName="opc:Bit" Length="1"/>
     <opc:Field Name="ArrayLengthSpecified" TypeName="opc:Bit" Length="1"/>
     <opc:Field Name="ArrayLength" TypeName="opc:Int32" SwitchField="ArrayLengthSpecified" />
     <opc:Field Name="Boolean" TypeName="opc:Boolean" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="1" />
@@ -166,7 +165,7 @@
     <opc:Field Name="UInt64" TypeName="opc:UInt64" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="9" />
     <opc:Field Name="Float" TypeName="opc:Float" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="10" />
     <opc:Field Name="Double" TypeName="opc:Double" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="11" />
-    <opc:Field Name="String" TypeName="opc:String" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="12" />
+    <opc:Field Name="String" TypeName="opc:CharArray" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="12" />
     <opc:Field Name="DateTime" TypeName="opc:DateTime" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="13" />
     <opc:Field Name="Guid" TypeName="opc:Guid" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="14" />
     <opc:Field Name="ByteString" TypeName="opc:ByteString" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="15" />
@@ -174,13 +173,22 @@
     <opc:Field Name="NodeId" TypeName="ua:NodeId" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="17" />
     <opc:Field Name="ExpandedNodeId" TypeName="ua:ExpandedNodeId" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="18" />
     <opc:Field Name="StatusCode" TypeName="ua:StatusCode" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="19" />
-    <opc:Field Name="DiagnosticInfo" TypeName="ua:DiagnosticInfo" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="20" />
-    <opc:Field Name="QualifiedName" TypeName="ua:QualifiedName" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="21" />
-    <opc:Field Name="LocalizedText" TypeName="ua:LocalizedText" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="22" />
-    <opc:Field Name="ExtensionObject" TypeName="ua:ExtensionObject" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="23" />
-    <opc:Field Name="DataValue" TypeName="ua:DataValue" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="24" />
-    <opc:Field Name="Variant" TypeName="ua:Variant" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="25" />
-  </opc:StructuredType>
+    <opc:Field Name="QualifiedName" TypeName="ua:QualifiedName" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="20" />
+    <opc:Field Name="LocalizedText" TypeName="ua:LocalizedText" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="21" />
+    <opc:Field Name="ExtensionObject" TypeName="ua:ExtensionObject" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="22" />
+    <opc:Field Name="DataValue" TypeName="ua:DataValue" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="23" />
+    <opc:Field Name="Variant" TypeName="ua:Variant" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="24" />
+    <opc:Field Name="DiagnosticInfo" TypeName="ua:DiagnosticInfo" LengthField="ArrayLength" SwitchField="VariantType" SwitchValue="25" />
+    <opc:Field Name="NoOfArrayDimensions" TypeName="opc:Int32" SwitchField="ArrayDimensionsSpecified" />
+    <opc:Field Name="ArrayDimensions" TypeName="opc:Int32" LengthField="NoOfArrayDimensions" SwitchField="ArrayDimensionsSpecified" />
+  </opc:StructuredType>
+
+  <opc:EnumeratedType Name="NamingRuleType" LengthInBits="32">
+    <opc:EnumeratedValue Name="Mandatory" Value="1" />
+    <opc:EnumeratedValue Name="Optional" Value="2" />
+    <opc:EnumeratedValue Name="Constraint" Value="3" />
+  </opc:EnumeratedType>
+    
 
   <opc:OpaqueType Name="ImageBMP">
     <opc:Documentation>An image encoded in BMP format.</opc:Documentation>
@@ -205,10 +213,31 @@
   <opc:EnumeratedType Name="OpenFileMode" LengthInBits="32">
     <opc:EnumeratedValue Name="Read" Value="1" />
     <opc:EnumeratedValue Name="Write" Value="2" />
-    <opc:EnumeratedValue Name="EraseExisiting" Value="4" />
+    <opc:EnumeratedValue Name="EraseExisting" Value="4" />
     <opc:EnumeratedValue Name="Append" Value="8" />
   </opc:EnumeratedType>
 
+  <opc:EnumeratedType Name="TrustListMasks" LengthInBits="32">
+    <opc:EnumeratedValue Name="None" Value="0" />
+    <opc:EnumeratedValue Name="TrustedCertificates" Value="1" />
+    <opc:EnumeratedValue Name="TrustedCrls" Value="2" />
+    <opc:EnumeratedValue Name="IssuerCertificates" Value="4" />
+    <opc:EnumeratedValue Name="IssuerCrls" Value="8" />
+    <opc:EnumeratedValue Name="All" Value="15" />
+  </opc:EnumeratedType>
+
+  <opc:StructuredType Name="TrustListDataType" BaseType="ua:ExtensionObject">
+    <opc:Field Name="SpecifiedLists" TypeName="opc:UInt32" />
+    <opc:Field Name="NoOfTrustedCertificates" TypeName="opc:Int32" />
+    <opc:Field Name="TrustedCertificates" TypeName="opc:ByteString" LengthField="NoOfTrustedCertificates" />
+    <opc:Field Name="NoOfTrustedCrls" TypeName="opc:Int32" />
+    <opc:Field Name="TrustedCrls" TypeName="opc:ByteString" LengthField="NoOfTrustedCrls" />
+    <opc:Field Name="NoOfIssuerCertificates" TypeName="opc:Int32" />
+    <opc:Field Name="IssuerCertificates" TypeName="opc:ByteString" LengthField="NoOfIssuerCertificates" />
+    <opc:Field Name="NoOfIssuerCrls" TypeName="opc:Int32" />
+    <opc:Field Name="IssuerCrls" TypeName="opc:ByteString" LengthField="NoOfIssuerCrls" />
+  </opc:StructuredType>
+
   <opc:EnumeratedType Name="IdType" LengthInBits="32">
     <opc:Documentation>The type of identifier used in a node id.</opc:Documentation>
     <opc:EnumeratedValue Name="Numeric" Value="0" />
@@ -418,8 +447,38 @@
     <opc:Field Name="Description" TypeName="ua:LocalizedText" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="OptionSet" BaseType="ua:ExtensionObject">
+    <opc:Documentation>This abstract Structured DataType is the base DataType for all DataTypes representing a bit mask.</opc:Documentation>
+    <opc:Field Name="Value" TypeName="opc:ByteString" />
+    <opc:Field Name="ValidBits" TypeName="opc:ByteString" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="Union" BaseType="ua:ExtensionObject">
+    <opc:Documentation>This abstract DataType is the base DataType for all union DataTypes.</opc:Documentation>
+  </opc:StructuredType>
+
+  <opc:OpaqueType Name="NormalizedString">
+    <opc:Documentation>A string normalized based on the rules in the unicode specification.</opc:Documentation>
+  </opc:OpaqueType>
+
+  <opc:OpaqueType Name="DecimalString">
+    <opc:Documentation>An arbitraty numeric value.</opc:Documentation>
+  </opc:OpaqueType>
+
+  <opc:OpaqueType Name="DurationString">
+    <opc:Documentation>A period of time formatted as defined in ISO 8601-2000.</opc:Documentation>
+  </opc:OpaqueType>
+
+  <opc:OpaqueType Name="TimeString">
+    <opc:Documentation>A time formatted as defined in ISO 8601-2000.</opc:Documentation>
+  </opc:OpaqueType>
+
+  <opc:OpaqueType Name="DateString">
+    <opc:Documentation>A date formatted as defined in ISO 8601-2000.</opc:Documentation>
+  </opc:OpaqueType>
+
   <opc:OpaqueType Name="Duration">
-    <opc:Documentation>A period of time measured in seconds.</opc:Documentation>
+    <opc:Documentation>A period of time measured in milliseconds.</opc:Documentation>
   </opc:OpaqueType>
 
   <opc:OpaqueType Name="UtcTime">
@@ -503,6 +562,29 @@
     <opc:Field Name="Servers" TypeName="tns:ApplicationDescription" LengthField="NoOfServers" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="ServerOnNetwork" BaseType="ua:ExtensionObject">
+    <opc:Field Name="RecordId" TypeName="opc:UInt32" />
+    <opc:Field Name="ServerName" TypeName="opc:String" />
+    <opc:Field Name="DiscoveryUrl" TypeName="opc:String" />
+    <opc:Field Name="NoOfServerCapabilities" TypeName="opc:Int32" />
+    <opc:Field Name="ServerCapabilities" TypeName="opc:String" LengthField="NoOfServerCapabilities" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="FindServersOnNetworkRequest" BaseType="ua:ExtensionObject">
+    <opc:Field Name="RequestHeader" TypeName="tns:RequestHeader" />
+    <opc:Field Name="StartingRecordId" TypeName="opc:UInt32" />
+    <opc:Field Name="MaxRecordsToReturn" TypeName="opc:UInt32" />
+    <opc:Field Name="NoOfServerCapabilityFilter" TypeName="opc:Int32" />
+    <opc:Field Name="ServerCapabilityFilter" TypeName="opc:String" LengthField="NoOfServerCapabilityFilter" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="FindServersOnNetworkResponse" BaseType="ua:ExtensionObject">
+    <opc:Field Name="ResponseHeader" TypeName="tns:ResponseHeader" />
+    <opc:Field Name="LastCounterResetTime" TypeName="opc:DateTime" />
+    <opc:Field Name="NoOfServers" TypeName="opc:Int32" />
+    <opc:Field Name="Servers" TypeName="tns:ServerOnNetwork" LengthField="NoOfServers" />
+  </opc:StructuredType>
+
   <opc:OpaqueType Name="ApplicationInstanceCertificate">
     <opc:Documentation>A certificate for an instance of an application.</opc:Documentation>
   </opc:OpaqueType>
@@ -521,6 +603,7 @@
     <opc:EnumeratedValue Name="UserName" Value="1" />
     <opc:EnumeratedValue Name="Certificate" Value="2" />
     <opc:EnumeratedValue Name="IssuedToken" Value="3" />
+    <opc:EnumeratedValue Name="Kerberos" Value="4" />
   </opc:EnumeratedType>
 
   <opc:StructuredType Name="UserTokenPolicy" BaseType="ua:ExtensionObject">
@@ -587,6 +670,32 @@
     <opc:Field Name="ResponseHeader" TypeName="tns:ResponseHeader" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="DiscoveryConfiguration" BaseType="ua:ExtensionObject">
+    <opc:Documentation>A base type for discovery configuration information.</opc:Documentation>
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="MdnsDiscoveryConfiguration" BaseType="tns:DiscoveryConfiguration">
+    <opc:Documentation>The discovery information needed for mDNS registration.</opc:Documentation>
+    <opc:Field Name="MdnsServerName" TypeName="opc:String" />
+    <opc:Field Name="NoOfServerCapabilities" TypeName="opc:Int32" />
+    <opc:Field Name="ServerCapabilities" TypeName="opc:String" LengthField="NoOfServerCapabilities" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="RegisterServer2Request" BaseType="ua:ExtensionObject">
+    <opc:Field Name="RequestHeader" TypeName="tns:RequestHeader" />
+    <opc:Field Name="Server" TypeName="tns:RegisteredServer" />
+    <opc:Field Name="NoOfDiscoveryConfiguration" TypeName="opc:Int32" />
+    <opc:Field Name="DiscoveryConfiguration" TypeName="ua:ExtensionObject" LengthField="NoOfDiscoveryConfiguration" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="RegisterServer2Response" BaseType="ua:ExtensionObject">
+    <opc:Field Name="ResponseHeader" TypeName="tns:ResponseHeader" />
+    <opc:Field Name="NoOfConfigurationResults" TypeName="opc:Int32" />
+    <opc:Field Name="ConfigurationResults" TypeName="ua:StatusCode" LengthField="NoOfConfigurationResults" />
+    <opc:Field Name="NoOfDiagnosticInfos" TypeName="opc:Int32" />
+    <opc:Field Name="DiagnosticInfos" TypeName="ua:DiagnosticInfo" LengthField="NoOfDiagnosticInfos" />
+  </opc:StructuredType>
+
   <opc:EnumeratedType Name="SecurityTokenRequestType" LengthInBits="32">
     <opc:Documentation>Indicates whether a token if being created or renewed.</opc:Documentation>
     <opc:EnumeratedValue Name="Issue" Value="0" />
@@ -698,6 +807,11 @@
     <opc:Field Name="CertificateData" TypeName="opc:ByteString" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="KerberosIdentityToken" BaseType="tns:UserIdentityToken">
+    <opc:Field Name="PolicyId" TypeName="opc:String" SourceType="tns:UserIdentityToken" />
+    <opc:Field Name="TicketData" TypeName="opc:ByteString" />
+  </opc:StructuredType>
+
   <opc:StructuredType Name="IssuedIdentityToken" BaseType="tns:UserIdentityToken">
     <opc:Documentation>A token representing a user identified by a WS-Security XML token.</opc:Documentation>
     <opc:Field Name="PolicyId" TypeName="opc:String" SourceType="tns:UserIdentityToken" />
@@ -999,7 +1113,7 @@
   </opc:StructuredType>
 
   <opc:EnumeratedType Name="AttributeWriteMask" LengthInBits="32">
-    <opc:Documentation>Define bits used to indicate which attributes are writeable.</opc:Documentation>
+    <opc:Documentation>Define bits used to indicate which attributes are writable.</opc:Documentation>
     <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="AccessLevel" Value="1" />
     <opc:EnumeratedValue Name="ArrayDimensions" Value="2" />
@@ -1604,11 +1718,6 @@
     <opc:Field Name="DiagnosticInfos" TypeName="ua:DiagnosticInfo" LengthField="NoOfDiagnosticInfos" />
   </opc:StructuredType>
 
-  <opc:StructuredType Name="HistoryUpdateEventResult" BaseType="ua:ExtensionObject">
-    <opc:Field Name="StatusCode" TypeName="ua:StatusCode" />
-    <opc:Field Name="EventFilterResult" TypeName="tns:EventFilterResult" />
-  </opc:StructuredType>
-
   <opc:StructuredType Name="HistoryUpdateRequest" BaseType="ua:ExtensionObject">
     <opc:Field Name="RequestHeader" TypeName="tns:RequestHeader" />
     <opc:Field Name="NoOfHistoryUpdateDetails" TypeName="opc:Int32" />
@@ -2008,118 +2117,6 @@
     <opc:EnumeratedValue Name="Green" Value="5" />
   </opc:EnumeratedType>
 
-  <opc:StructuredType Name="ScalarTestType" BaseType="ua:ExtensionObject">
-    <opc:Documentation>A complex type containing all possible scalar types used for testing.</opc:Documentation>
-    <opc:Field Name="Boolean" TypeName="opc:Boolean" />
-    <opc:Field Name="SByte" TypeName="opc:SByte" />
-    <opc:Field Name="Byte" TypeName="opc:Byte" />
-    <opc:Field Name="Int16" TypeName="opc:Int16" />
-    <opc:Field Name="UInt16" TypeName="opc:UInt16" />
-    <opc:Field Name="Int32" TypeName="opc:Int32" />
-    <opc:Field Name="UInt32" TypeName="opc:UInt32" />
-    <opc:Field Name="Int64" TypeName="opc:Int64" />
-    <opc:Field Name="UInt64" TypeName="opc:UInt64" />
-    <opc:Field Name="Float" TypeName="opc:Float" />
-    <opc:Field Name="Double" TypeName="opc:Double" />
-    <opc:Field Name="String" TypeName="opc:String" />
-    <opc:Field Name="DateTime" TypeName="opc:DateTime" />
-    <opc:Field Name="Guid" TypeName="opc:Guid" />
-    <opc:Field Name="ByteString" TypeName="opc:ByteString" />
-    <opc:Field Name="XmlElement" TypeName="ua:XmlElement" />
-    <opc:Field Name="NodeId" TypeName="ua:NodeId" />
-    <opc:Field Name="ExpandedNodeId" TypeName="ua:ExpandedNodeId" />
-    <opc:Field Name="StatusCode" TypeName="ua:StatusCode" />
-    <opc:Field Name="DiagnosticInfo" TypeName="ua:DiagnosticInfo" />
-    <opc:Field Name="QualifiedName" TypeName="ua:QualifiedName" />
-    <opc:Field Name="LocalizedText" TypeName="ua:LocalizedText" />
-    <opc:Field Name="ExtensionObject" TypeName="ua:ExtensionObject" />
-    <opc:Field Name="DataValue" TypeName="ua:DataValue" />
-    <opc:Field Name="EnumeratedValue" TypeName="tns:EnumeratedTestType" />
-  </opc:StructuredType>
-
-  <opc:StructuredType Name="ArrayTestType" BaseType="ua:ExtensionObject">
-    <opc:Documentation>A complex type containing all possible array types used for testing.</opc:Documentation>
-    <opc:Field Name="NoOfBooleans" TypeName="opc:Int32" />
-    <opc:Field Name="Booleans" TypeName="opc:Boolean" LengthField="NoOfBooleans" />
-    <opc:Field Name="NoOfSBytes" TypeName="opc:Int32" />
-    <opc:Field Name="SBytes" TypeName="opc:SByte" LengthField="NoOfSBytes" />
-    <opc:Field Name="NoOfInt16s" TypeName="opc:Int32" />
-    <opc:Field Name="Int16s" TypeName="opc:Int16" LengthField="NoOfInt16s" />
-    <opc:Field Name="NoOfUInt16s" TypeName="opc:Int32" />
-    <opc:Field Name="UInt16s" TypeName="opc:UInt16" LengthField="NoOfUInt16s" />
-    <opc:Field Name="NoOfInt32s" TypeName="opc:Int32" />
-    <opc:Field Name="Int32s" TypeName="opc:Int32" LengthField="NoOfInt32s" />
-    <opc:Field Name="NoOfUInt32s" TypeName="opc:Int32" />
-    <opc:Field Name="UInt32s" TypeName="opc:UInt32" LengthField="NoOfUInt32s" />
-    <opc:Field Name="NoOfInt64s" TypeName="opc:Int32" />
-    <opc:Field Name="Int64s" TypeName="opc:Int64" LengthField="NoOfInt64s" />
-    <opc:Field Name="NoOfUInt64s" TypeName="opc:Int32" />
-    <opc:Field Name="UInt64s" TypeName="opc:UInt64" LengthField="NoOfUInt64s" />
-    <opc:Field Name="NoOfFloats" TypeName="opc:Int32" />
-    <opc:Field Name="Floats" TypeName="opc:Float" LengthField="NoOfFloats" />
-    <opc:Field Name="NoOfDoubles" TypeName="opc:Int32" />
-    <opc:Field Name="Doubles" TypeName="opc:Double" LengthField="NoOfDoubles" />
-    <opc:Field Name="NoOfStrings" TypeName="opc:Int32" />
-    <opc:Field Name="Strings" TypeName="opc:String" LengthField="NoOfStrings" />
-    <opc:Field Name="NoOfDateTimes" TypeName="opc:Int32" />
-    <opc:Field Name="DateTimes" TypeName="opc:DateTime" LengthField="NoOfDateTimes" />
-    <opc:Field Name="NoOfGuids" TypeName="opc:Int32" />
-    <opc:Field Name="Guids" TypeName="opc:Guid" LengthField="NoOfGuids" />
-    <opc:Field Name="NoOfByteStrings" TypeName="opc:Int32" />
-    <opc:Field Name="ByteStrings" TypeName="opc:ByteString" LengthField="NoOfByteStrings" />
-    <opc:Field Name="NoOfXmlElements" TypeName="opc:Int32" />
-    <opc:Field Name="XmlElements" TypeName="ua:XmlElement" LengthField="NoOfXmlElements" />
-    <opc:Field Name="NoOfNodeIds" TypeName="opc:Int32" />
-    <opc:Field Name="NodeIds" TypeName="ua:NodeId" LengthField="NoOfNodeIds" />
-    <opc:Field Name="NoOfExpandedNodeIds" TypeName="opc:Int32" />
-    <opc:Field Name="ExpandedNodeIds" TypeName="ua:ExpandedNodeId" LengthField="NoOfExpandedNodeIds" />
-    <opc:Field Name="NoOfStatusCodes" TypeName="opc:Int32" />
-    <opc:Field Name="StatusCodes" TypeName="ua:StatusCode" LengthField="NoOfStatusCodes" />
-    <opc:Field Name="NoOfDiagnosticInfos" TypeName="opc:Int32" />
-    <opc:Field Name="DiagnosticInfos" TypeName="ua:DiagnosticInfo" LengthField="NoOfDiagnosticInfos" />
-    <opc:Field Name="NoOfQualifiedNames" TypeName="opc:Int32" />
-    <opc:Field Name="QualifiedNames" TypeName="ua:QualifiedName" LengthField="NoOfQualifiedNames" />
-    <opc:Field Name="NoOfLocalizedTexts" TypeName="opc:Int32" />
-    <opc:Field Name="LocalizedTexts" TypeName="ua:LocalizedText" LengthField="NoOfLocalizedTexts" />
-    <opc:Field Name="NoOfExtensionObjects" TypeName="opc:Int32" />
-    <opc:Field Name="ExtensionObjects" TypeName="ua:ExtensionObject" LengthField="NoOfExtensionObjects" />
-    <opc:Field Name="NoOfDataValues" TypeName="opc:Int32" />
-    <opc:Field Name="DataValues" TypeName="ua:DataValue" LengthField="NoOfDataValues" />
-    <opc:Field Name="NoOfVariants" TypeName="opc:Int32" />
-    <opc:Field Name="Variants" TypeName="ua:Variant" LengthField="NoOfVariants" />
-    <opc:Field Name="NoOfEnumeratedValues" TypeName="opc:Int32" />
-    <opc:Field Name="EnumeratedValues" TypeName="tns:EnumeratedTestType" LengthField="NoOfEnumeratedValues" />
-  </opc:StructuredType>
-
-  <opc:StructuredType Name="CompositeTestType" BaseType="ua:ExtensionObject">
-    <opc:Field Name="Field1" TypeName="tns:ScalarTestType" />
-    <opc:Field Name="Field2" TypeName="tns:ArrayTestType" />
-  </opc:StructuredType>
-
-  <opc:StructuredType Name="TestStackRequest" BaseType="ua:ExtensionObject">
-    <opc:Field Name="RequestHeader" TypeName="tns:RequestHeader" />
-    <opc:Field Name="TestId" TypeName="opc:UInt32" />
-    <opc:Field Name="Iteration" TypeName="opc:Int32" />
-    <opc:Field Name="Input" TypeName="ua:Variant" />
-  </opc:StructuredType>
-
-  <opc:StructuredType Name="TestStackResponse" BaseType="ua:ExtensionObject">
-    <opc:Field Name="ResponseHeader" TypeName="tns:ResponseHeader" />
-    <opc:Field Name="Output" TypeName="ua:Variant" />
-  </opc:StructuredType>
-
-  <opc:StructuredType Name="TestStackExRequest" BaseType="ua:ExtensionObject">
-    <opc:Field Name="RequestHeader" TypeName="tns:RequestHeader" />
-    <opc:Field Name="TestId" TypeName="opc:UInt32" />
-    <opc:Field Name="Iteration" TypeName="opc:Int32" />
-    <opc:Field Name="Input" TypeName="tns:CompositeTestType" />
-  </opc:StructuredType>
-
-  <opc:StructuredType Name="TestStackExResponse" BaseType="ua:ExtensionObject">
-    <opc:Field Name="ResponseHeader" TypeName="tns:ResponseHeader" />
-    <opc:Field Name="Output" TypeName="tns:CompositeTestType" />
-  </opc:StructuredType>
-
   <opc:StructuredType Name="BuildInfo" BaseType="ua:ExtensionObject">
     <opc:Field Name="ProductUri" TypeName="opc:String" />
     <opc:Field Name="ManufacturerName" TypeName="opc:String" />
@@ -2385,10 +2382,10 @@
 
   <opc:EnumeratedType Name="ExceptionDeviationFormat" LengthInBits="32">
     <opc:EnumeratedValue Name="AbsoluteValue" Value="0" />
-    <opc:EnumeratedValue Name="PercentOfRange" Value="1" />
-    <opc:EnumeratedValue Name="PercentOfValue" Value="2" />
+    <opc:EnumeratedValue Name="PercentOfValue" Value="1" />
+    <opc:EnumeratedValue Name="PercentOfRange" Value="2" />
     <opc:EnumeratedValue Name="PercentOfEURange" Value="3" />
     <opc:EnumeratedValue Name="Unknown" Value="4" />
   </opc:EnumeratedType>
 
-</opc:TypeDictionary>
+</opc:TypeDictionary>