Updated NTTTCP test.

Azure_ICA_all.xml

@@ -7105,7 +7105,7 @@
 			<SubtestValues>SOME,TEXTS,NEEDS,TO,BE,PRESENT,HERE,FOR,PRINTING,TEST,SUMMARY</SubtestValues>
 			<files>.\remote-scripts\azuremodules.sh</files>
 			<TestParameters>
-				<param>testDuration=300</param>
+				<param>testDuration=60</param>
 			</TestParameters>
 			<Priority>P0</Priority>
 		</test>

remote-scripts/ICA-PERF-NTTTCP-TEST.ps1

@@ -40,7 +40,16 @@ if ($isDeployed)
 		LogMsg "  RoleName : $($serverVMData.RoleName)"
 		LogMsg "  Public IP : $($serverVMData.PublicIP)"
 		LogMsg "  SSH Port : $($serverVMData.SSHPort)"
-
+		if($EnableAcceleratedNetworking)
+		{
+			$DataPath = "SRIOV"
+			$nicName = "bond0"
+		}
+		else
+		{
+			$DataPath = "Synthetic"
+			$nicName = "eth0"    
+		}
 		#
 		# PROVISION VMS FOR LISA WILL ENABLE ROOT USER AND WILL MAKE ENABLE PASSWORDLESS AUTHENTICATION ACROSS ALL VMS IN SAME HOSTED SERVICE.	
 		#
@@ -53,6 +62,7 @@ if ($isDeployed)
 		Set-Content -Value "#Generated by Azure Automation." -Path $constantsFile
 		Add-Content -Value "server=$($serverVMData.InternalIP)" -Path $constantsFile	
 		Add-Content -Value "client=$($clientVMData.InternalIP)" -Path $constantsFile
+		Add-Content -Value "nicName=$nicName" -Path $constantsFile
 		foreach ( $param in $currentTestData.TestParameters.param)
 		{
 			Add-Content -Value "$param" -Path $constantsFile
@@ -87,7 +97,10 @@ collect_VM_properties
 		$finalStatus = RunLinuxCmd -ip $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -command "cat /root/state.txt"
 		RemoteCopy -downloadFrom $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -download -downloadTo $LogDir -files "/root/ntttcpConsoleLogs.txt"
 		RemoteCopy -downloadFrom $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -download -downloadTo $LogDir -files "lagscope-ntttcp-*"
-		RemoteCopy -downloadFrom $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -download -downloadTo $LogDir -files "ntttcp-p*"
+		RemoteCopy -downloadFrom $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -download -downloadTo $LogDir -files "ntttcp-sender-p*"
+		RemoteCopy -downloadFrom $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -download -downloadTo $LogDir -files "mpstat-sender-p*"
+		RemoteCopy -downloadFrom $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -download -downloadTo $LogDir -files "dstat-sender-p*"
+		RemoteCopy -downloadFrom $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -download -downloadTo $LogDir -files "sar-sender-p*"
 		RemoteCopy -downloadFrom $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -download -downloadTo $LogDir -files "report.log"
 		RemoteCopy -downloadFrom $clientVMData.PublicIP -port $clientVMData.SSHPort -username "root" -password $password -download -downloadTo $LogDir -files "VM_properties.csv"
 		
@@ -168,14 +181,6 @@ collect_VM_properties
 			$KernelVersion	= cat "$LogDir\VM_properties.csv" | Select-String "Kernel version"| %{$_ -replace ",Kernel version,",""}
 			$IPVersion = "IPv4"
 			$ProtocolType = "TCP"
-			if($EnableAcceleratedNetworking)
-			{
-				$DataPath = "SRIOV"
-			}
-			else
-			{
-				$DataPath = "Synthetic"    
-			}
 			$connectionString = "Server=$dataSource;uid=$user; pwd=$password;Database=$database;Encrypt=yes;TrustServerCertificate=no;Connection Timeout=30;"
 			$LogContents = Get-Content -Path "$LogDir\report.log"
 			$SQLQuery = "INSERT INTO $dataTableName (TestCaseName,TestDate,HostType,HostBy,HostOS,GuestOSType,GuestDistro,GuestSize,KernelVersion,IPVersion,ProtocolType,DataPath,NumberOfConnections,Throughput_Gbps,Latency_ms) VALUES "

remote-scripts/perf_ntttcp.sh

@@ -181,6 +181,13 @@ if [ ! ${testDuration} ]; then
 	exit 1
 fi
 
+if [ ! ${nicName} ]; then
+	errMsg="Please add/provide value for nicName in constants.sh. nicName=eth0/bond0"
+	LogMsg "${errMsg}"
+	echo "${errMsg}" >> ./summary.log
+	UpdateTestState $ICA_TESTABORTED
+	exit 1
+fi
 #Make & build ntttcp on client and server Machine
 
 LogMsg "Configuring client ${client}..."
@@ -196,7 +203,7 @@ ssh root@${client} "wget https://raw.githubusercontent.com/iamshital/linux_perfo
 ssh root@${client} "chmod +x run-ntttcp-and-tcping.sh && chmod +x report-ntttcp-and-tcping.sh"
 LogMsg "Now running NTTTCP test"
 ssh root@${client} "rm -rf ntttcp-test-logs"
-ssh root@${client} "./run-ntttcp-and-tcping.sh ntttcp-test-logs ${server} root ${testDuration}"
+ssh root@${client} "./run-ntttcp-and-tcping.sh ntttcp-test-logs ${server} root ${testDuration} ${nicName}"
 ssh root@${client} "./report-ntttcp-and-tcping.sh ntttcp-test-logs"
 ssh root@${client} "cp ntttcp-test-logs/* ."