gh-8 Update integration test

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

src/InformaticsGateway/Logging/Log.800.Hl7Service.cs

@@ -25,5 +25,11 @@ public static partial class Log
 
         [LoggerMessage(EventId = 805, Level = LogLevel.Information, Message = "Maximum number {maximumAllowedConcurrentConnections} of clients reached.")]
         public static partial void MaxedOutHl7Connections(this ILogger logger, int maximumAllowedConcurrentConnections);
+
+        [LoggerMessage(EventId = 806, Level = LogLevel.Information, Message = "HL7 listening on port: {port}.")]
+        public static partial void Hl7ListeningOnPort(this ILogger logger, int port);
+
+        [LoggerMessage(EventId = 807, Level = LogLevel.Critical, Message = "Socket error: {error}")]
+        public static partial void Hl7SocketException(this ILogger logger, string error);
     }
 }

src/InformaticsGateway/Program.cs

@@ -33,6 +33,7 @@
 using Monai.Deploy.InformaticsGateway.Services.Common;
 using Monai.Deploy.InformaticsGateway.Services.Connectors;
 using Monai.Deploy.InformaticsGateway.Services.DicomWeb;
+using Monai.Deploy.InformaticsGateway.Services.Export;
 using Monai.Deploy.InformaticsGateway.Services.HealthLevel7;
 using Monai.Deploy.InformaticsGateway.Services.Http;
 using Monai.Deploy.InformaticsGateway.Services.Scp;
@@ -126,8 +127,8 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddSingleton<IApplicationEntityManager, ApplicationEntityManager>();
                     services.AddSingleton<SpaceReclaimerService>();
                     services.AddSingleton<ScpService>();
-                    //services.AddSingleton<ScuExportService>();
-                    //services.AddSingleton<DicomWebExportService>();
+                    services.AddSingleton<ScuExportService>();
+                    services.AddSingleton<DicomWebExportService>();
                     services.AddSingleton<DataRetrievalService>();
                     services.AddSingleton<PayloadNotificationService>();
                     services.AddSingleton<MllpService>();
@@ -150,8 +151,8 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddHostedService<SpaceReclaimerService>(p => p.GetService<SpaceReclaimerService>());
                     services.AddHostedService<DataRetrievalService>(p => p.GetService<DataRetrievalService>());
                     services.AddHostedService<ScpService>(p => p.GetService<ScpService>());
-                    //services.AddHostedService<ScuExportService>(p => p.GetService<ScuExportService>());
-                    //services.AddHostedService<DicomWebExportService>(p => p.GetService<DicomWebExportService>());
+                    services.AddHostedService<ScuExportService>(p => p.GetService<ScuExportService>());
+                    services.AddHostedService<DicomWebExportService>(p => p.GetService<DicomWebExportService>());
                     services.AddHostedService<PayloadNotificationService>(p => p.GetService<PayloadNotificationService>());
                     services.AddHostedService<MllpService>(p => p.GetService<MllpService>());
                 })

src/InformaticsGateway/Services/HealthLevel7/MllpService.cs

@@ -20,6 +20,7 @@ namespace Monai.Deploy.InformaticsGateway.Services.HealthLevel7
 {
     internal sealed class MllpService : IHostedService, IDisposable, IMonaiService
     {
+        private const int SOCKET_OPERATION_CANCELLED = 125;
         private bool _disposedValue;
         private readonly ITcpListener _tcpListener;
         private readonly IMllpClientFactory _mllpClientFactory;
@@ -70,6 +71,7 @@ public Task StartAsync(CancellationToken cancellationToken)
 
             Status = ServiceStatus.Running;
             _logger.ServiceRunning(ServiceName);
+            _logger.Hl7ListeningOnPort(_configuration.Value.Hl7.Port);
 
             if (task.IsCompleted)
                 return task;
@@ -98,6 +100,14 @@ private async Task BackgroundProcessing(CancellationToken cancellationToken)
                     _ = mllpClient.Start(OnDisconnect, cancellationToken);
                     _activeTasks.TryAdd(mllpClient.ClientId, mllpClient);
                 }
+                catch (System.Net.Sockets.SocketException ex)
+                {
+                    _logger.Hl7SocketException(ex.Message);
+                    if (ex.ErrorCode == SOCKET_OPERATION_CANCELLED)
+                    {
+                        break;
+                    }
+                }
                 catch (Exception ex)
                 {
                     _logger.ServiceInvalidOrCancelled(ServiceName, ex);

tests/Integration.Test/.env.dev

@@ -1 +1 @@
-TAG=0.2.0
+TAG=0.3.0

tests/Integration.Test/run.sh

@@ -110,15 +110,16 @@ function start_services() {
 
     set +e
     COUNTER=0
+    EXPECTEDSERVICE=7
     while true; do
         info "Waiting for Informatics Gateway ($COUNTER)..."
         count=$(curl -s http://$HOST_IP:5000/health/status | jq | grep "running" | wc -l)
         info "$count services running..."
-        if [ $count -eq 6 ]; then
+        if [ $count -eq $EXPECTEDSERVICE ]; then
             break
         fi
         if [ $COUNTER -gt 100 ]; then
-            fatal "Timeout waiting for Informatics Gateway ($COUNTER)."
+            fatal "Timeout waiting for Informatics Gateway services to be ready ($COUNTER/$EXPECTEDSERVICE)."
         fi
         let COUNTER=COUNTER+1
         sleep 1s