Fixes #2126 - Adds configuration of upstream protocol in cloud based mode

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/BasicsStation/DownstreamMessageSender.cs

@@ -11,6 +11,7 @@ namespace LoRaWan.NetworkServer.BasicsStation
     using System.Threading;
     using System.Threading.Tasks;
     using LoRaTools.LoRaPhysical;
+    using LoRaWan.NetworkServer.Extensions;
     using Microsoft.Extensions.Logging;
 
     internal class DownstreamMessageSender : IDownstreamMessageSender

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/DefaultLoRaDataRequestHandler.cs

@@ -15,6 +15,7 @@ namespace LoRaWan.NetworkServer
     using LoRaTools.Mac;
     using LoRaTools.Regions;
     using LoRaWan.NetworkServer.ADR;
+    using LoRaWan.NetworkServer.Extensions;
     using Microsoft.Extensions.Logging;
     using Newtonsoft.Json;
 

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/DownlinkMessageBuilder.cs

@@ -14,6 +14,7 @@ namespace LoRaWan.NetworkServer
     using LoRaTools.Mac;
     using LoRaTools.Regions;
     using LoRaTools.Utils;
+    using LoRaWan.NetworkServer.Extensions;
     using Microsoft.Extensions.Logging;
     using Newtonsoft.Json;
     using static ReceiveWindowNumber;

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/HexadecimalExtensions.cs → LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/Extensions/HexadecimalExtensions.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace LoRaWan.NetworkServer
+namespace LoRaWan.NetworkServer.Extensions
 {
     using System;
 

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/LoRaDeviceClientExtensions.cs → LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/Extensions/LoRaDeviceClientExtensions.cs

@@ -3,8 +3,9 @@
 
 #nullable enable
 
-namespace LoRaWan.NetworkServer
+namespace LoRaWan.NetworkServer.Extensions
 {
+    using LoRaWan;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
@@ -53,8 +54,8 @@ private async Task<TResult> InvokeAsync<T1, T2, TResult>(T1 arg1, T2 arg2, Func<
                     }
                     catch (Exception ex)
                         when ((ex is ObjectDisposedException
-                                  || (ex is InvalidOperationException ioe
-                                      && ioe.Message.StartsWith("This operation is only allowed using a successfully authenticated context.", StringComparison.OrdinalIgnoreCase)))
+                                  || ex is InvalidOperationException ioe
+                                      && ioe.Message.StartsWith("This operation is only allowed using a successfully authenticated context.", StringComparison.OrdinalIgnoreCase))
                               && ExceptionFilterUtility.True(() =>
                                      this.logger?.LogDebug(ex, @"Device client operation ""{Operation}"" (attempt {Attempt}/"
                                                                + MaxAttempts.ToString(CultureInfo.InvariantCulture)

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/TaskExtensions.cs → LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/Extensions/TaskExtensions.cs

@@ -3,7 +3,7 @@
 
 #nullable enable
 
-namespace LoRaWan.NetworkServer
+namespace LoRaWan.NetworkServer.Extensions
 {
     using System;
     using System.Collections.Generic;

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/Extensions/UpstreamProtocolExtensions.cs

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace LoRaWan.NetworkServer.Extensions;
+
+using System;
+using Microsoft.Azure.Devices.Client;
+
+public static class UpstreamProtocolExtensions
+{
+    public static UpstreamProtocol ToUpstreamProtocol(this string value)
+    {
+        return Enum.TryParse(value, true, out UpstreamProtocol upstreamProtocol)
+            ? throw new ArgumentOutOfRangeException(nameof(value), value,
+                $"Invalid value '{value}' for UpstreamProtocol")
+            : upstreamProtocol;
+    }
+
+    public static TransportType ToTransportType(this UpstreamProtocol value)
+    {
+        return value switch
+        {
+            UpstreamProtocol.Amqp => TransportType.Amqp_Tcp_Only,
+            UpstreamProtocol.AmqpWs => TransportType.Amqp_WebSocket_Only,
+            _ => throw new ArgumentOutOfRangeException(nameof(value), value,
+                "Value '{value}' cannot be associated to a TransportType")
+        };
+    }
+}

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/LoRaDeviceCache.cs

@@ -6,6 +6,7 @@
 namespace LoRaWan.NetworkServer
 {
     using LoRaTools.LoRaMessage;
+    using LoRaWan.NetworkServer.Extensions;
     using Microsoft.Extensions.Logging;
     using System;
     using System.Collections.Concurrent;

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/LoRaDeviceClientConnectionManager.cs

@@ -17,6 +17,7 @@ namespace LoRaWan.NetworkServer
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Logging;
     using LoRaTools;
+    using LoRaWan.NetworkServer.Extensions;
 
     /// <summary>
     /// Manages <see cref="ILoRaDeviceClient"/> connections for <see cref="LoRaDevice"/>.

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/LoRaDeviceFactory.cs

@@ -9,6 +9,7 @@ namespace LoRaWan.NetworkServer
     using System.Diagnostics.Metrics;
     using Microsoft.Azure.Devices.Client;
     using Microsoft.Extensions.Logging;
+    using LoRaWan.NetworkServer.Extensions;
 
     public class LoRaDeviceFactory : ILoRaDeviceFactory
     {
@@ -152,7 +153,7 @@ public virtual ILoRaDeviceClient CreateDeviceClient(string deviceId, string prim
                 // Enabling AMQP multiplexing
                 var transportSettings = new ITransportSettings[]
                 {
-                    new AmqpTransportSettings(TransportType.Amqp_Tcp_Only)
+                    new AmqpTransportSettings(this.configuration.UpstreamProtocol)
                     {
                         AmqpConnectionPoolSettings = new AmqpConnectionPoolSettings()
                         {

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/LoRaPayloadDecoder.cs

@@ -11,6 +11,7 @@ namespace LoRaWan.NetworkServer
     using System.Text;
     using System.Threading.Tasks;
     using System.Web;
+    using LoRaWan.NetworkServer.Extensions;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Logging;
     using Newtonsoft.Json;

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/NetworkServerConfiguration.cs

@@ -6,6 +6,7 @@ namespace LoRaWan.NetworkServer
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Extensions;
     using Microsoft.AspNetCore.Server.Kestrel.Https;
     using Microsoft.Azure.Devices.Client;
 
@@ -146,12 +147,16 @@ public class NetworkServerConfiguration
         /// </summary>
         public bool IsLocalDevelopment { get; set; }
 
-
         /// <summary>
         /// Specifies the Processing Delay in Milliseconds
         /// </summary>
         public int ProcessingDelayInMilliseconds { get; set; } = Constants.DefaultProcessingDelayInMilliseconds;
 
+        /// <summary>
+        /// Specifies the protocol to use for communication from the Azure IoT Device to Azure
+        /// </summary>
+        public TransportType UpstreamProtocol { get; set; }
+
         // Creates a new instance of NetworkServerConfiguration by reading values from environment variables
         public static NetworkServerConfiguration CreateFromEnvironmentVariables()
         {
@@ -210,6 +215,10 @@ public static NetworkServerConfiguration CreateFromEnvironmentVariables()
                                               ? size
                                               : throw new NotSupportedException($"'IOTHUB_CONNECTION_POOL_SIZE' needs to be between 1 and {AmqpConnectionPoolSettings.AbsoluteMaxPoolSize}.");
 
+            config.UpstreamProtocol = envVars.GetEnvVar("UPSTREAM_PROTOCOL", "Amqp")
+                .ToUpstreamProtocol()
+                .ToTransportType();
+
             config.RedisConnectionString = envVars.GetEnvVar("REDIS_CONNECTION_STRING", string.Empty);
             if (!config.RunningAsIoTEdgeModule && !config.IsLocalDevelopment && string.IsNullOrEmpty(config.RedisConnectionString))
                 throw new InvalidOperationException("'REDIS_CONNECTION_STRING' can't be empty if running network server as part of a cloud only deployment.");

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/UpstreamProtocol.cs

@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace LoRaWan.NetworkServer;
+
+public enum UpstreamProtocol
+{
+    Amqp,
+    AmqpWs,
+}

LoRaEngine/modules/LoRaWanNetworkSrvModule/LoRaWan.NetworkServer/WebSocketTextChannel.cs

@@ -11,6 +11,7 @@ namespace LoRaWan.NetworkServer
     using System.Threading;
     using System.Threading.Channels;
     using System.Threading.Tasks;
+    using LoRaWan.NetworkServer.Extensions;
 
     /// <summary>
     /// A <see cref="IWebSocketWriter{T}"/> implementation for text messages that uses a queue to

Tests/Common/SimulatedBasicsStation.cs

@@ -16,6 +16,7 @@ namespace LoRaWan.Tests.Common
     using LoRaTools.LoRaMessage;
     using System.Text.Json.Serialization;
     using LoRaTools;
+    using LoRaWan.NetworkServer.Extensions;
 
     public sealed class SimulatedBasicsStation : IDisposable
     {

Tests/Unit/NetworkServer/CancellationTokenExtensionsTest.cs

@@ -5,7 +5,7 @@ namespace LoRaWan.Tests.Unit.NetworkServer
 {
     using System;
     using System.Threading;
-    using LoRaWan.NetworkServer;
+    using LoRaWan.NetworkServer.Extensions;
     using Xunit;
 
     public class CancellationTokenExtensionsTest

Tests/Unit/NetworkServer/DisposableExtensionsTests.cs

@@ -10,7 +10,7 @@ namespace LoRaWan.Tests.Unit.NetworkServer
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
-    using LoRaWan.NetworkServer;
+    using LoRaWan.NetworkServer.Extensions;
     using Moq;
     using Xunit;
 

Tests/Unit/NetworkServer/HexadecimalExtensionsTests.cs

@@ -5,7 +5,7 @@ namespace LoRaWan.Tests.Unit.NetworkServer
 {
     using System;
     using Common;
-    using LoRaWan.NetworkServer;
+    using LoRaWan.NetworkServer.Extensions;
     using Xunit;
 
     public class HexadecimalExtensionsTests

Tests/Unit/NetworkServer/LoRaDeviceClientResiliencyTests.cs

@@ -13,6 +13,7 @@ namespace LoRaWan.Tests.Unit.NetworkServer
     using System.Threading.Tasks;
     using Common;
     using LoRaWan.NetworkServer;
+    using LoRaWan.NetworkServer.Extensions;
     using Microsoft.Azure.Devices.Client;
     using Microsoft.Azure.Devices.Shared;
     using Microsoft.Extensions.Logging;

Tests/Unit/NetworkServer/TaskExtensionTests.cs

@@ -8,7 +8,7 @@ namespace LoRaWan.Tests.Unit.NetworkServer
     using System;
     using System.Linq;
     using System.Threading.Tasks;
-    using LoRaWan.NetworkServer;
+    using LoRaWan.NetworkServer.Extensions;
     using LoRaWan.Tests.Common;
     using Xunit;