configuring postgres serverIp for client/server connections (#319)

* configuring serverIp for client/server connections

* tests

* bumping version

---------

Co-authored-by: Erica Vellanoweth <[email protected]>

Author: ericavella

.pipelines/azure-pipelines-linux.yml

@@ -16,7 +16,7 @@ resources:
     options: --entrypoint=""
 
 variables:
-  VcVersion : 1.14.28
+  VcVersion : 1.14.29
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

.pipelines/azure-pipelines.yml

@@ -18,7 +18,7 @@ pool:
   vmImage: windows-latest
 
 variables:
-  VcVersion : 1.14.28
+  VcVersion : 1.14.29
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

src/VirtualClient/VirtualClient.Actions.FunctionalTests/HammerDBProfileTests.cs

@@ -234,7 +234,7 @@ private IEnumerable<string> GetUnixProfileExpectedCommands(bool singleVM)
                     "sudo apt list python3",
 
                     $"python3 {this.postgreSQLPackagePath}/install-server.py",
-                    $"python3 {this.postgreSQLPackagePath}/configure-server.py --dbName hammerdbtest --password [A-Za-z0-9+/=]+ --port 5432 --sharedMemoryBuffer [0-9]+",
+                    $"python3 {this.postgreSQLPackagePath}/configure-server.py --dbName hammerdbtest --password [A-Za-z0-9+/=]+ --port 5432 --sharedMemoryBuffer [0-9]+ --serverIp 1.2.3.5",
 
                     $"python3 {this.hammerdbPackagePath}/configure-workload-generator.py --workload tpcc --sqlServer postgresql --port 5432 --virtualUsers [0-9]+ --warehouseCount [0-9]+ --password [A-Za-z0-9+/=]+ --dbName hammerdbtest --hostIPAddress",
                     $"python3 {this.hammerdbPackagePath}/populate-database.py --createDBTCLPath createDB.tcl",
@@ -271,7 +271,7 @@ private IEnumerable<string> GetWindowsProfileExpectedCommands(bool singleVM)
                 return new List<string>()
                 {
                     $"python3 {this.postgreSQLPackagePath}/install-server.py",
-                    $"python3 {tempPostgreSqlPackagePath}/configure-server.py --dbName hammerdbtest --password [A-Za-z0-9+/=]+ --port 5432 --sharedMemoryBuffer [0-9]+",
+                    $"python3 {tempPostgreSqlPackagePath}/configure-server.py --dbName hammerdbtest --password [A-Za-z0-9+/=]+ --port 5432 --sharedMemoryBuffer [0-9]+ --serverIp 1.2.3.5",
 
                     $"python3 {temphammerdbPackagePath}/configure-workload-generator.py --workload tpcc --sqlServer postgresql --port 5432 --virtualUsers [0-9]+ --warehouseCount [0-9]+ --password [A-Za-z0-9+/=]+ --dbName hammerdbtest --hostIPAddress",
                     $"python3 {this.hammerdbPackagePath}/populate-database.py --createDBTCLPath createDB.tcl",

src/VirtualClient/VirtualClient.Dependencies.UnitTests/PostgreSQLServer/PostgreSQLServerConfigurationTests.cs

@@ -54,7 +54,7 @@ public async Task PostgreSQLServerConfigurationExecutesTheExpectedProcessForConf
 
             string[] expectedCommands =
             {
-                $"python3 {tempPackagePath}/configure-server.py --dbName hammerdbtest --password [A-Za-z0-9+/=]+ --port 5432 --sharedMemoryBuffer [0-9]+",
+                $"python3 {tempPackagePath}/configure-server.py --dbName hammerdbtest --password [A-Za-z0-9+/=]+ --port 5432 --sharedMemoryBuffer [0-9]+ --serverIp 1.2.3.5",
             };
 
             int commandNumber = 0;

src/VirtualClient/VirtualClient.Dependencies/PostgreSQLServer/PostgreSQLServerConfiguration.cs

@@ -6,6 +6,7 @@ namespace VirtualClient.Dependencies
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Net;
     using System.Security.Cryptography;
     using System.Text;
     using System.Threading;
@@ -178,7 +179,9 @@ await this.DistributePostgreSQLDatabaseAsync(telemetryContext, cancellationToken
 
         private async Task ConfigurePostgreSQLServerAsync(EventContext telemetryContext, CancellationToken cancellationToken)
         {
-            string arguments = $"{this.packageDirectory}/configure-server.py --dbName {this.DatabaseName} --password {this.SuperUserPassword} --port {this.Port} --sharedMemoryBuffer {this.SharedMemoryBuffer}";
+            string serverIp = this.GetServerIpAddress();
+
+            string arguments = $"{this.packageDirectory}/configure-server.py --dbName {this.DatabaseName} --password {this.SuperUserPassword} --port {this.Port} --sharedMemoryBuffer {this.SharedMemoryBuffer} --serverIp {serverIp}";
 
             using (IProcessProxy process = await this.ExecuteCommandAsync(
                "python3",
@@ -255,6 +258,20 @@ private async Task<string> GetPostgreSQLInnodbDirectoriesAsync(CancellationToken
             return diskPaths;
         }
 
+        private string GetServerIpAddress()
+        {
+            string serverIPAddress = IPAddress.Loopback.ToString();
+
+            if (this.IsMultiRoleLayout())
+            {
+                ClientInstance serverInstance = this.GetLayoutClientInstances(ClientRole.Server).First();
+                IPAddress.TryParse(serverInstance.IPAddress, out IPAddress serverIP);
+                serverIPAddress = serverIP.ToString();
+            }
+
+            return serverIPAddress;
+        }
+
         /// <summary>
         /// Supported PostgreSQL Server configuration actions.
         /// </summary>