Merge branch 'main' of https://github.com/Azure/Industrial-IoT into r…

…elease/2.9.5_preview

src/Azure.IIoT.OpcUa.Publisher.Models/src/ConnectionModel.cs

@@ -42,11 +42,11 @@ public sealed record class ConnectionModel
         public string? Group { get; set; }
 
         /// <summary>
-        /// Connection should be established in reverse to
-        /// transition through proxies.
+        /// Connection options to apply to the created
+        /// connection.
         /// </summary>
-        [DataMember(Name = "isReverse", Order = 4,
+        [DataMember(Name = "options", Order = 5,
              EmitDefaultValue = false)]
-        public bool? IsReverse { get; set; }
+        public ConnectionOptions Options { get; set; }
     }
 }

src/Azure.IIoT.OpcUa.Publisher.Models/src/ConnectionOptions.cs

@@ -0,0 +1,36 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Licensed under the MIT License (MIT). See License.txt in the repo root for license information.
+// ------------------------------------------------------------
+
+namespace Azure.IIoT.OpcUa.Publisher.Models
+{
+    using System;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Options that can be applied to a connection
+    /// </summary>
+    [Flags]
+    [DataContract]
+    public enum ConnectionOptions
+    {
+        /// <summary>
+        /// No options
+        /// </summary>
+        [EnumMember(Value = "None")]
+        None = 0x0,
+
+        /// <summary>
+        /// Create a reverse connection
+        /// </summary>
+        [EnumMember(Value = "UseReverseConnect")]
+        UseReverseConnect = 0x1,
+
+        /// <summary>
+        /// Do not load complex types
+        /// </summary>
+        [EnumMember(Value = "NoComplexTypeSystem")]
+        NoComplexTypeSystem = 0x10
+    }
+}

src/Azure.IIoT.OpcUa.Publisher.Models/src/DataSetFieldContentMask.cs

@@ -51,6 +51,12 @@ public enum DataSetFieldContentMask
         [EnumMember(Value = "RawData")]
         RawData = 0x20,
 
+        /// <summary>
+        /// Write data set with one entry as value
+        /// </summary>
+        [EnumMember(Value = "SingleFieldDegradeToValue")]
+        SingleFieldDegradeToValue = 0x1000,
+
         /// <summary>
         /// Node id included
         /// </summary>

src/Azure.IIoT.OpcUa.Publisher.Models/src/PublishedNodesEntryModel.cs

@@ -326,6 +326,14 @@ public sealed record class PublishedNodesEntryModel
             EmitDefaultValue = false)]
         public QoS? QualityOfService { get; set; }
 
+        /// <summary>
+        /// Number of partitions to split the writer group into
+        /// when publishing to target topics.
+        /// </summary>
+        [DataMember(Name = "WriterGroupPartitions", Order = 39,
+            EmitDefaultValue = false)]
+        public int? WriterGroupPartitions { get; set; }
+
         /// <summary>
         /// The node to monitor in "ns=" syntax.
         /// </summary>

src/Azure.IIoT.OpcUa.Publisher.Models/src/WriterGroupDiagnosticModel.cs

@@ -371,5 +371,26 @@ public record class WriterGroupDiagnosticModel
         [DataMember(Name = "IngressSampledValuesInLastMinute", Order = 49,
             EmitDefaultValue = true)]
         public long IngressSampledValuesInLastMinute { get; set; }
+
+        /// <summary>
+        /// Notifications dropped before pushing to publish queue
+        /// </summary>
+        [DataMember(Name = "IngressNotificationsDropped", Order = 50,
+            EmitDefaultValue = true)]
+        public long IngressNotificationsDropped { get; set; }
+
+        /// <summary>
+        /// Total partitions
+        /// </summary>
+        [DataMember(Name = "TotalPublishQueuePartitions", Order = 51,
+            EmitDefaultValue = true)]
+        public int TotalPublishQueuePartitions { get; set; }
+
+        /// <summary>
+        /// Active partitions
+        /// </summary>
+        [DataMember(Name = "ActivePublishQueuePartitions", Order = 52,
+            EmitDefaultValue = true)]
+        public int ActivePublishQueuePartitions { get; set; }
     }
 }

src/Azure.IIoT.OpcUa.Publisher.Models/src/WriterGroupModel.cs

@@ -121,26 +121,25 @@ public sealed record class WriterGroupModel
         public TimeSpan? KeepAliveTime { get; set; }
 
         /// <summary>
-        /// Number of notifications to queue before
-        /// sending a batch (Publisher extension).
-        /// The default is set to the value of the
-        /// BatchSize option.
+        /// Number of notifications to queue before sending a batch
+        /// (Publisher extension).
+        /// The default is set to the value of the BatchSize option.
         /// </summary>
         [DataMember(Name = "notificationPublishThreshold", Order = 14,
             EmitDefaultValue = false)]
         public uint? NotificationPublishThreshold { get; set; }
 
         /// <summary>
-        /// Max publish queue size
+        /// Max publish queue size.
         /// </summary>
         [DataMember(Name = "publishQueueSize", Order = 15,
             EmitDefaultValue = false)]
         public uint? PublishQueueSize { get; set; }
 
         /// <summary>
-        /// Desired Transport to use. If transport is
-        /// not registered the default (first) registered
-        /// transport is used (Publisher extension).
+        /// Desired Transport to use. If transport is not registered
+        /// the default (first) registered transport is used.
+        /// (Publisher extension)
         /// </summary>
         [DataMember(Name = "transport", Order = 16,
             EmitDefaultValue = false)]
@@ -153,5 +152,13 @@ public sealed record class WriterGroupModel
         [DataMember(Name = "publishing", Order = 17,
             EmitDefaultValue = false)]
         public PublishingQueueSettingsModel? Publishing { get; set; }
+
+        /// <summary>
+        /// Number of partitions to create of the publish queue.
+        /// (Publisher extension)
+        /// </summary>
+        [DataMember(Name = "publishQueuePartitions", Order = 18,
+            EmitDefaultValue = false)]
+        public int? PublishQueuePartitions { get; set; }
     }
 }