Merge pull request #390 from ndokos/bengland2-pbench-uperf-more-ports

Bengland2 pbench uperf more ports

Author: ndokos

agent/bench-scripts/gold/pbench-uperf/test-00.txt

@@ -22,9 +22,9 @@ Iteration 2-tcp_stream-64B-1i complete (2 of 2), with 1 pass and 0 failures
 /var/tmp/pbench-test-bench/pbench/tools-default/sar
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i
-/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:21000--client_start.sh
-/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
-/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:21000--test_config.xml
+/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:20010--client_start.sh
+/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
+/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:20010--test_config.xml
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/process-iteration-samples.cmd
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/sample1
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/sample1/uperf-average.txt
@@ -33,9 +33,9 @@ Iteration 2-tcp_stream-64B-1i complete (2 of 2), with 1 pass and 0 failures
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/sample2/uperf-average.txt
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/sample2/uperf-postprocess.cmd
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i
-/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:21000--client_start.sh
-/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
-/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:21000--test_config.xml
+/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:20010--client_start.sh
+/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
+/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:20010--test_config.xml
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/process-iteration-samples.cmd
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/sample1
 /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/sample1/uperf-average.txt
@@ -53,18 +53,18 @@ Iteration 2-tcp_stream-64B-1i complete (2 of 2), with 1 pass and 0 failures
 /var/tmp/pbench-test-bench/pbench/pbench.log:[info][1900-01-01T00:00:00.000000] Starting iteration  (1 of 2)
 /var/tmp/pbench-test-bench/pbench/pbench.log:[info][1900-01-01T00:00:00.000000] test sample 1 of 2 
 /var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] client[127.0.0.1]protocol[tcp]test[rr]instances[1]size[64] <-> server[127.0.0.1]
-/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:21000--client_start.sh
+/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh
 /var/tmp/pbench-test-bench/pbench/pbench.log:[info][1900-01-01T00:00:00.000000] test sample 2 of 2 
 /var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] client[127.0.0.1]protocol[tcp]test[rr]instances[1]size[64] <-> server[127.0.0.1]
-/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:21000--client_start.sh
+/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh
 /var/tmp/pbench-test-bench/pbench/pbench.log:[info][1900-01-01T00:00:00.000000] Iteration 1-tcp_rr-64B-1i complete (1 of 2), with 1 pass and 0 failures
 /var/tmp/pbench-test-bench/pbench/pbench.log:[info][1900-01-01T00:00:00.000000] Starting iteration 1-tcp_rr-64B-1i (2 of 2)
 /var/tmp/pbench-test-bench/pbench/pbench.log:[info][1900-01-01T00:00:00.000000] test sample 1 of 2 
 /var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] client[127.0.0.1]protocol[tcp]test[stream]instances[1]size[64] <-> server[127.0.0.1]
-/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:21000--client_start.sh
+/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh
 /var/tmp/pbench-test-bench/pbench/pbench.log:[info][1900-01-01T00:00:00.000000] test sample 2 of 2 
 /var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] client[127.0.0.1]protocol[tcp]test[stream]instances[1]size[64] <-> server[127.0.0.1]
-/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:21000--client_start.sh
+/var/tmp/pbench-test-bench/pbench/pbench.log:[debug][1900-01-01T00:00:00.000000] screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh
 /var/tmp/pbench-test-bench/pbench/pbench.log:[info][1900-01-01T00:00:00.000000] Iteration 2-tcp_stream-64B-1i complete (2 of 2), with 1 pass and 0 failures
 --- pbench.log file contents
 +++ test-execution.log file contents
@@ -89,14 +89,14 @@ Iteration 2-tcp_stream-64B-1i complete (2 of 2), with 1 pass and 0 failures
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --iteration=1-tcp_rr-64B-1i --dir=/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/sample2
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --iteration=2-tcp_stream-64B-1i --dir=/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/sample1
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --iteration=2-tcp_stream-64B-1i --dir=/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/sample2
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/scp -o StrictHostKeyChecking=no /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:21000--server_start.sh 127.0.0.1:/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/scp -o StrictHostKeyChecking=no /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:21000--server_start.sh 127.0.0.1:/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/scp -o StrictHostKeyChecking=no /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:21000--server_start.sh 127.0.0.1:/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/scp -o StrictHostKeyChecking=no /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:21000--server_start.sh 127.0.0.1:/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:21000--client_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:21000--client_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:21000--client_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:21000--client_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/scp -o StrictHostKeyChecking=no /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:20010--server_start.sh 127.0.0.1:/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/scp -o StrictHostKeyChecking=no /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:20010--server_start.sh 127.0.0.1:/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/scp -o StrictHostKeyChecking=no /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:20010--server_start.sh 127.0.0.1:/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/scp -o StrictHostKeyChecking=no /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:20010--server_start.sh 127.0.0.1:/var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/screen -dmS uperf-client /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::127.0.0.1-server::127.0.0.1:20010--client_start.sh
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/sleep 26
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/sleep 26
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/sleep 26
@@ -114,10 +114,10 @@ Iteration 2-tcp_stream-64B-1i complete (2 of 2), with 1 pass and 0 failures
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 netstat -tlnp
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 netstat -tlnp
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 pbench-uperf --install
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 screen -dmS uperf-server /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 screen -dmS uperf-server /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 screen -dmS uperf-server /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
-/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 screen -dmS uperf-server /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:21000--server_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 screen -dmS uperf-server /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 screen -dmS uperf-server /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/1-tcp_rr-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 screen -dmS uperf-server /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
+/var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 screen -dmS uperf-server /var/tmp/pbench-test-bench/pbench/uperf_test-00_1900-01-01_00:00:00/2-tcp_stream-64B-1i/client::-server::127.0.0.1:20010--server_start.sh
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 systemctl stop firewalld
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 systemctl stop firewalld
 /var/tmp/pbench-test-bench/test-execution.log:/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 127.0.0.1 systemctl stop firewalld