diff --git a/cmake_targets/tools/perf_oai.bash b/cmake_targets/tools/perf_oai.bash index 17c04c4ea6..71519534e3 100755 --- a/cmake_targets/tools/perf_oai.bash +++ b/cmake_targets/tools/perf_oai.bash @@ -289,7 +289,7 @@ oaisim_otg_stats(){ # install the required packages - $SUDO apt-get install -y test_install_package octave >> results/perf_log.txt 2>&1 + $SUDO apt-get install -y octave >> results/perf_log.txt 2>&1 $SUDO pkill oaisim $SUDO pkill oaisim_nos1 @@ -323,16 +323,17 @@ oaisim_otg_stats(){ AGGR_RESULT=1 STATUS="PASSED" EXTRA_STATS=0 - declare NUM_UES=7 - + declare NUM_UES=1 + declare TRAFFIC_DIRECTIONS=2 # DL and UL + if [ $TEST_MODE = 0 ]; then - declare -a TEMPLATES=(120 121 122 123 124 125 126 127 128 129 130) - declare -a FRAME_TYPE=(0 3) + declare -a TEMPLATES=(120 121 122 123 124 125 126 127 128 129) + declare -a FRAME_TYPE=(0) # (0 3) declare -a METRICS=(latency jitter goodput) declare -a RB=(25 50 100) else - declare -a TEMPLATES=(125) - declare -a FRAME_TYPE=(3) + declare -a TEMPLATES=(120 122 125 128) + declare -a FRAME_TYPE=(0) declare -a METRICS=(latency) declare -a RB=(25) fi @@ -346,7 +347,7 @@ oaisim_otg_stats(){ fi declare num_cols=0 - let num_cols=NUM_UES+1 + let num_cols=(TRAFFIC_DIRECTIONS*NUM_UES)+1 if [ $AGGR_RESULT = 1 ]; then COLUMN="[$num_cols:$num_cols]" else @@ -368,9 +369,9 @@ oaisim_otg_stats(){ let k=0; if [ $frame = 0 ]; then - OPT="$OPT -F " + OPT_FT="-F " else - OPT="$OPT -C $frame " + OPT_FT="-C $frame " fi for rb in ${RB[@]}; do @@ -378,10 +379,10 @@ oaisim_otg_stats(){ start=$(date +%s) LOG_FILE="oaisim_log_template${template}_frame${frame}_rb${rb}.txt" touch results/${LOG_FILE} - echo_info "[$start] Start test_$i.$j.$k:: $OAISIM_EXEC $OPT -R $RB -c $template" - echo "Start test_$i.$j.$k:: $OAISIM_EXEC $OPT -R $RB -c $template" >> results/${oai_exp_date} + echo_info "[$start] Start test_$i.$j.$k:: $OAISIM_EXEC $OPT_FT $OPT -R $RB -c $template" + echo "Start test_$i.$j.$k:: $OAISIM_EXEC $OPT_FT $OPT -R $RB -c $template" >> results/${oai_exp_date} #sleep 1 - $OAISIM_EXEC $OPT -R $RB -c $template 1>&2 >> ./results/$LOG_FILE + $OAISIM_EXEC $OPT_FT $OPT -R $RB -c $template 1>&2 >> ./results/$LOG_FILE # store exit status oai_status=$? end=$(date +%s) @@ -394,7 +395,7 @@ oaisim_otg_stats(){ STATUS="PASSED" else let e++; - echo_error "[$end] test_$i.$j.$k failed :: OAISIM return exit code $oai_status (remove bin/oaisim)" + echo_error "[$end] test_$i.$j.$k failed :: OAISIM return exit code $oai_status" echo "[$end]test_$i.$j.$k failed :: OAISIM return exit code $oai_status" >> ./results/$LOG_FILE STATUS="FAILED" fi @@ -457,6 +458,7 @@ PS2PDF="ps2pdf" STATUS="PASSED" EXTRA_STATS=0 declare NUM_UES=7 +declare TRAFFIC_DIRECTIONS=1 # DL and UL if [ $TEST_MODE = 0 ]; then declare -a TEMPLATES=(120 121 122 123 124 125 126 127 128 129 130) @@ -489,7 +491,7 @@ if [ $FRAME_TYPE = 0 ]; then fi declare num_cols=0 -let num_cols=NUM_UES+1 +let num_cols=(TRAFFIC_DIRECTIONS*NUM_UES)+1 if [ $AGGR_RESULT = 1 ]; then COLUMN="[$num_cols:$num_cols]" else diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_120.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_120.xml index 8949160a4d..6b84283808 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_120.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_120.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,15 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0 diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_121.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_121.xml index 6f554aa2e6..93e9575137 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_121.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_121.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,15 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0 diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_122.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_122.xml index 19a10891df..8ee129e560 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_122.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_122.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,14 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0 diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_123.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_123.xml index 00dc2a2c41..614908e1f0 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_123.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_123.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,14 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0 diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_124.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_124.xml index b6b208eb15..855d93aafe 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_124.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_124.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,14 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0 diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_125.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_125.xml index a19af48d88..93378a8856 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_125.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_125.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,15 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0 diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_126.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_126.xml index e66a5a6211..01f16cdae9 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_126.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_126.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,15 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0 diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_127.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_127.xml index 86ac3c275b..8e3b0ee4f2 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_127.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_127.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,15 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0 diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_128.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_128.xml index dd9dc1a453..1e015ac23e 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_128.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_128.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,15 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0 diff --git a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_129.xml b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_129.xml index 309ebe5fed..004ad957fe 100644 --- a/targets/SIMU/EXAMPLES/OSD/WEBXML/template_129.xml +++ b/targets/SIMU/EXAMPLES/OSD/WEBXML/template_129.xml @@ -35,7 +35,7 @@ - 7 + 1 STATIC @@ -50,14 +50,15 @@ - + - 1:7 + 1 udp - 0 + 100 55000 ipv4 0