merge from feature-34-test_framework

.gitlab-ci.yml

@@ -33,7 +33,7 @@ job1:
    - sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no "  --rsync-path="mkdir -p $EXTERNAL_SHARE_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$EXTERNAL_SHARE_DIR
    - cat $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml
    - exce_log=`egrep -i 'warning|error|critical|exception' $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log  |cat `
-   - if [ -n "$exce_log" ]; then  echo -e "\e[31mThere are errors in $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log. Please check the logs\e[0m" ; fi
+   - if [ -n "$exce_log" ]; then  echo -e "\e[31mThere are errors in $NFS_TEST_RESULTS_DIR/log/python_autotest.log. Please check the logs\e[0m" ; fi
    - exce_log=`egrep -i 'warning|error|critical|exception' $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log |cat `
-   - if [ -n "$exce_log" ]; then echo -e "\e[31mThere are errors in $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log. Please check the logs\e[0m" ; fi
+   - if [ -n "$exce_log" ]; then echo -e "\e[31mThere are errors in $NFS_TEST_RESULTS_DIR/log/python_autotest_cleanup.log. Please check the logs\e[0m" ; fi
    

cmake_targets/autotests/README.txt

@@ -100,18 +100,24 @@ Obj.#   Case#   Test#	Description
 
 
 01      55              lte-softmodem tests with USRP B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX, 2TX/2RX
-01      55      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
-01      55      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
-01      55      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
-01      55      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
-01      55      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
-01      55      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
-01      55      06      Band 7 FDD 5MHz UL Throughput for 300 sec for 2TX/2RX
-01      55      07      Band 7 FDD 10MHz UL Throughput for 300 sec for 2TX/2RX
-01      55      08      Band 7 FDD 20MHz UL Throughput for 300 sec for 2TX/2RX
-01      55      09      Band 7 FDD 5MHz DL Throughput for 300 sec for 2TX/2RX
-01      55      10      Band 7 FDD 10MHz DL Throughput for 300 sec for 2TX/2RX
-01      55      11      Band 7 FDD 20MHz DL Throughput for 300 sec for 2TX/2RX
+01      55      00      Band 7 FDD 5MHz UL Throughput (UDP) for 300 sec for 1TX/1RX 
+01      55      01      Band 7 FDD 10MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
+01      55      02      Band 7 FDD 20MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
+01      55      03      Band 7 FDD 5MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+01      55      04      Band 7 FDD 10MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+01      55      05      Band 7 FDD 20MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+01      55      06      Band 7 FDD 5MHz UL Throughput (UDP) for 300 sec for 2TX/2RX
+01      55      07      Band 7 FDD 10MHz UL Throughput (UDP) for 300 sec for 2TX/2RX
+01      55      08      Band 7 FDD 20MHz UL Throughput (UDP) for 300 sec for 2TX/2RX
+01      55      09      Band 7 FDD 5MHz DL Throughput (UDP) for 300 sec for 2TX/2RX
+01      55      10      Band 7 FDD 10MHz DL Throughput (UDP) for 300 sec for 2TX/2RX
+01      55      11      Band 7 FDD 20MHz DL Throughput (UDP) for 300 sec for 2TX/2RX
+01      55      12      Band 7 FDD 5MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+01      55      13      Band 7 FDD 10MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+01      55      14      Band 7 FDD 20MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+01      55      15      Band 7 FDD 5MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+01      55      16      Band 7 FDD 10MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+01      55      17      Band 7 FDD 20MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
 
 01      56              lte-softmodem tests with USRP B210  RF as eNB and  OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
 01      56      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
@@ -130,12 +136,19 @@ Obj.#   Case#   Test#	Description
 01      57      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 01      58               lte-softmodem tests with USRP X310 RF as eNB and ALU EPC w/ Bandrich COTS UE for `TX/1RX, 2TX/2RX
-01      58      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
-01      58      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
-01      58      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
-01      58      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
-01      58      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
-01      58      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+01      58      00      Band 7 FDD 5MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
+01      58      01      Band 7 FDD 10MHz UL Throughput (UDP)  for 300 sec for 1TX/1RX
+01      58      02      Band 7 FDD 20MHz UL Throughput (UDP)  for 300 sec for 1TX/1RX
+01      58      03      Band 7 FDD 5MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+01      58      04      Band 7 FDD 10MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+01      58      05      Band 7 FDD 20MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+01      58      06      Band 7 FDD 5MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+01      58      07      Band 7 FDD 10MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+01      58      08      Band 7 FDD 20MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+01      58      09      Band 7 FDD 5MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+01      58      10      Band 7 FDD 10MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+01      58      11      Band 7 FDD 20MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+
 
 01      59              lte-softmodem tests with USRP X310  RF as eNB and  OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
 
@@ -208,12 +221,18 @@ Obj.#   Case#   Test#	Description
 01      85      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 02      55              lte-softmodem tests with USRP B210 RF as eNB and ALU EPC w/ Sony Experia M4 COTS UE for TX/1RX
-02      55      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
-02      55      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
-02      55      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
-02      55      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
-02      55      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
-02      55      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+02      55      00      Band 7 FDD 5MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
+02      55      01      Band 7 FDD 10MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
+02      55      02      Band 7 FDD 20MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
+02      55      03      Band 7 FDD 5MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+02      55      04      Band 7 FDD 10MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+02      55      05      Band 7 FDD 20MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+02      55      06      Band 7 FDD 5MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+02      55      07      Band 7 FDD 10MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+02      55      08      Band 7 FDD 20MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+02      55      09      Band 7 FDD 5MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+02      55      10      Band 7 FDD 10MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+02      55      11      Band 7 FDD 20MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
   
 
 01      64              lte-softmodem-noS1 tests

cmake_targets/autotests/tools/iperf_script

@@ -39,7 +39,7 @@ timeout=${args[0]}
 iface=${args[1]}
 iperf_args=(${args[@]:2})
 
-ip_client=echo "$iperf_args" | sed -ne 's/.*\-c[ ]*\([0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\).*/\1/p'
+ip_client=`echo "$iperf_args" | sed -ne 's/.*\-c[ ]*\([0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\).*/\1/p'`
 
 #array=${1:-1}
 echo "args =  ${args[@]}"