Adding layout reference

Author: DEVAID-MSFT

src/VirtualClient/VirtualClient.Actions/Network/NetworkingWorkload/NTttcp/NTttcpClientExecutor.cs

@@ -5,6 +5,7 @@ namespace VirtualClient.Actions.NetworkPerformance
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using Microsoft.Extensions.DependencyInjection;
     using VirtualClient.Contracts;
 

src/VirtualClient/VirtualClient.Actions/Network/NetworkingWorkload/NetworkingWorkloadExecutor.cs

@@ -9,8 +9,11 @@ namespace VirtualClient.Actions.NetworkPerformance
     using System.Linq;
     using System.Net;
     using System.Net.Http;
+    using System.Text.RegularExpressions;
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Hosting.Server;
+    using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.Extensions.DependencyInjection;
     using Newtonsoft.Json.Linq;
     using Polly;
@@ -30,6 +33,8 @@ public class NetworkingWorkloadExecutor : VirtualClientComponent
     {
         private static readonly object LockObject = new object();
         private static Task heartbeatTask;
+        private static Regex layoutServerIPRegex = new Regex(@"\$\.\s*layout\.serverip\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static Regex layoutClientIPRegex = new Regex(@"\$\.\s*layout\.clientip\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         // Contains the background running process for the server-side
         // networking workload tool.
@@ -599,6 +604,8 @@ protected override async Task InitializeAsync(EventContext telemetryContext, Can
             EventContext.PersistentProperties["role"] = this.Role;
 
             this.InitializeApiClients();
+
+            this.InlineLayoutReferences();
         }
 
         /// <summary>
@@ -1137,6 +1144,23 @@ private void StopServerTool(EventContext telemetryContext)
             }
         }
 
+        private void InlineLayoutReferences()
+        {
+            string serverIPAddress = this.GetLayoutClientInstances(ClientRole.Server).First().IPAddress;
+            string clientIPAddress = this.GetLayoutClientInstances(ClientRole.Client).First().IPAddress;
+
+            foreach (var key in this.Parameters.Keys.ToList())
+            {
+                var original = this.Parameters[key]?.ToString();
+
+                var updated = layoutServerIPRegex.Replace(original, serverIPAddress);
+                updated = layoutClientIPRegex.Replace(updated, clientIPAddress);
+
+                this.Parameters[key] = updated;
+                
+            }
+        }
+
         /// <summary>
         /// Used to track and managed the execution of the background server-side workload
         /// process over a long running period of time.

src/VirtualClient/VirtualClient.Core/ProfileExpressionEvaluator.cs

@@ -1000,7 +1000,7 @@ private static bool EvaluateParameterSpecificExpressions(IServiceCollection depe
                                 if (!cancellationToken.IsCancellationRequested)
                                 {
                                     // Groups[0] = the full matched text (e.g. {Port})
-                                    // Groups]1] = the capture group (e.g. 1234).
+                                    // Groups[1] = the capture group (e.g. 1234).
                                     if (parameters.TryGetValue(match.Groups[1].Value, out IConvertible value))
                                     {
                                         matchesFound = true;