Merge branch 'feature-34-test_framework'

0c74ab15 · Rohit Gupta · 2be77066 · 7f4ec782 · 0c74ab15 · 0c74ab15
Commit 0c74ab15 authored Jun 18, 2016 by Rohit Gupta
15 changed files
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
 <testCaseList>
-<MachineList>mozart calisson stevens nano amerique</MachineList>
+<MachineList>mozart tique stevens nano amerique</MachineList>
 <NFSResultsShare>/mnt/sradio/TEST_RESULTS/</NFSResultsShare>
 <GitOAI5GRepo>https://gitlab.eurecom.fr/oai/openairinterface5g.git</GitOAI5GRepo>
 <GitOpenair-cnRepo>https://gitlab.eurecom.fr/oai/openair-cn.git</GitOpenair-cnRepo>
 <GitOAI5GRepoBranch>develop</GitOAI5GRepoBranch>
 <GitOpenair-cnRepoBranch>develop</GitOpenair-cnRepoBranch>
- <CleanUpOldProgs>oaisim oaisim_nos1 lte-softmodem lte-softmodem-nos1 mme_gw run_epc auth_request run_hss oai_hss mme spgw hss hss_sim configure_cots* wvdial  iperf iperf_script iperf_script_phone ping tshark rrh_gw iperf3 iperf3_script iperf3_script_phone</CleanUpOldProgs>	
+ <CleanUpOldProgs>oaisim oaisim_nos1 lte-softmodem lte-softmodem-nos1 mme_gw run_epc auth_request run_hss oai_hss mme spgw hss hss_sim configure_cots* wvdial  iperf iperf_script iperf_script_phone ping tshark rrh_gw iperf3 iperf3_script iperf3_script_phone pppd</CleanUpOldProgs>	
 <CleanUpAluLteBox>sudo -S -E /opt/ltebox/tools/stop_ltebox</CleanUpAluLteBox>
 <ExmimoRfStop>$OPENAIR_DIR/cmake_targets/build_oai -w EXMIMO -c; sudo -S -E $OPENAIR_DIR/cmake_targets/tools/stop_exmimo2; sudo -E $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --reset-ue; sudo -E $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_huaweiE398_ue.py --reset-ue;  sudo -E $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_sony_experia_m4_ue.py --stop-ue; uname -a; sudo -E dmesg</ExmimoRfStop>
 <Timeout_execution>36000</Timeout_execution>
 <TestCaseExclusionList>010141 0102+ 010304 010305 0104+ 015502 015505 015506 015507 015508 015509 015510 015511 015602 015605 015702 015705 015802 015805 016102 016105 016502 016505 017002 017005 017502 017505 018002 018005 018502 018505 025502 025505</TestCaseExclusionList>
 <nruns_lte-softmodem>3</nruns_lte-softmodem>
- <MachineListGeneric>mozart calisson stevens nano amerique</MachineListGeneric>
+ <MachineListGeneric>mozart tique stevens nano amerique </MachineListGeneric>
     <testCase id="010101" >
     <class>compilation</class>
     <desc>Build oaisim.Rel8</desc>
@@ -874,7 +874,7 @@
  <testCase id="015500" >
    <class>lte-softmodem</class>
    <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>tique</eNB>
    <UE>stevens</UE>
    <EPC>amerique</EPC>
    <TimeOut_cmd>390</TimeOut_cmd>
@@ -891,10 +891,10 @@
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  frame_type \"FDD\"
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  nb_antennas_rx  1
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth5\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.147/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth5\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.147/24\"
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
@@ -949,7 +949,7 @@
  <testCase id="015501" >
    <class>lte-softmodem</class>
    <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>tique</eNB>
    <UE>stevens</UE>
    <EPC>amerique</EPC>
    <TimeOut_cmd>390</TimeOut_cmd>
@@ -966,10 +966,10 @@
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  frame_type \"FDD\"
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  nb_antennas_rx  1
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth5\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.147/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth5\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.147/24\"
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
@@ -1097,7 +1097,7 @@
  <testCase id="015503" >
    <class>lte-softmodem</class>
    <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>tique</eNB>
    <UE>stevens</UE>
    <EPC>amerique</EPC>
    <TimeOut_cmd>390</TimeOut_cmd>
@@ -1114,10 +1114,10 @@
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  frame_type \"FDD\"
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  nb_antennas_rx  1
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth5\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.147/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth5\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.147/24\"
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
@@ -1139,7 +1139,7 @@
    <UE_pre_exec_args></UE_pre_exec_args>
    <UE_main_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --reset-ue; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --stop-ue ; sleep 10; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --start-ue </UE_main_exec>
    <UE_main_exec_args></UE_main_exec_args>
-    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf3_script 1 ppp0 -c 192.172.0.1 -i 1 -u -f m -B 192.172.0.2 -b 10M -R</UE_traffic_exec>
+    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf3_script 1 ppp0 -c 192.172.0.1 -i 1 -u -f m -B 192.172.0.2 -b 17M -R</UE_traffic_exec>
    <UE_traffic_exec_args></UE_traffic_exec_args>
    <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
    <UE_stop_script>sudo -S -E $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --stop-ue </UE_stop_script>
@@ -1170,7 +1170,7 @@
  <testCase id="015504" >
    <class>lte-softmodem</class>
    <desc></desc>
-    <eNB>calisson</eNB>
+    <eNB>tique</eNB>
    <UE>stevens</UE>
    <EPC>amerique</EPC>
    <TimeOut_cmd>390</TimeOut_cmd>
@@ -1187,10 +1187,10 @@
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  frame_type \"FDD\"
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  nb_antennas_rx  1
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  nb_antennas_tx 1
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth5\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1_MME       \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1_MME          \"192.168.12.147/24\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth5\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_INTERFACE_NAME_FOR_S1U          \"eth1\"
-                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.82/24\"
+                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_IPV4_ADDRESS_FOR_S1U           \"192.168.12.147/24\"
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
@@ -1211,7 +1211,7 @@
    <UE_pre_exec_args></UE_pre_exec_args>
    <UE_main_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --reset-ue; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --stop-ue ; sleep 10; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --start-ue </UE_main_exec>
    <UE_main_exec_args></UE_main_exec_args>
-    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf3_script 1 ppp0 -c 192.172.0.1 -i 1 -u -f m -B 192.172.0.2 -b 30M -R</UE_traffic_exec>
+    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf3_script 1 ppp0 -c 192.172.0.1 -i 1 -u -f m -B 192.172.0.2 -b 34M -R</UE_traffic_exec>
    <UE_traffic_exec_args></UE_traffic_exec_args>
    <UE_search_expr_true>throughput_test min=8.0Mbits/sec max=9.0Mbits/sec average=8.5Mbits/sec   </UE_search_expr_true>
    <UE_search_expr_false></UE_search_expr_false>
@@ -2854,7 +2854,7 @@ c
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
-    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
+    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_usrpb210.py --stop-usrpb210 ; $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
    <eNB_pre_exec_args></eNB_pre_exec_args>
    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
    <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  -W </eNB_main_exec_args>
@@ -2926,7 +2926,7 @@ c
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
-    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
+    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_usrpb210.py --stop-usrpb210 ; $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
    <eNB_pre_exec_args></eNB_pre_exec_args>
    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
    <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  -W </eNB_main_exec_args>
@@ -2997,7 +2997,7 @@ c
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
-    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
+    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_usrpb210.py --stop-usrpb210 ; $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
    <eNB_pre_exec_args></eNB_pre_exec_args>
    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
    <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  -W </eNB_main_exec_args>
@@ -3015,7 +3015,7 @@ c
    <UE_pre_exec_args></UE_pre_exec_args>
    <UE_main_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --reset-ue; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --stop-ue ; sleep 10; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --start-ue </UE_main_exec>
    <UE_main_exec_args></UE_main_exec_args>
-    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf_script 1 ppp0  -u -c  192.172.0.1 -b 10Mbits/s    -B 192.172.0.2</UE_traffic_exec>
+    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf_script 1 ppp0  -u -c  192.172.0.1 -b 17Mbits/s    -B 192.172.0.2</UE_traffic_exec>
    <UE_traffic_exec_args></UE_traffic_exec_args>
    <UE_search_expr_true></UE_search_expr_true>
    <UE_search_expr_false></UE_search_expr_false>
@@ -3069,7 +3069,7 @@ c
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
-    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
+    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_usrpb210.py --stop-usrpb210 ; $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
    <eNB_pre_exec_args></eNB_pre_exec_args>
    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
    <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  -W </eNB_main_exec_args>
@@ -3087,7 +3087,7 @@ c
    <UE_pre_exec_args></UE_pre_exec_args>
    <UE_main_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --reset-ue; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --stop-ue ; sleep 10; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --start-ue </UE_main_exec>
    <UE_main_exec_args></UE_main_exec_args>
-    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf3_script 1 ppp0 -c 192.172.0.1 -i 1 -u -f m -B 192.172.0.2 -b 10M -R</UE_traffic_exec>
+    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf3_script 1 ppp0 -c 192.172.0.1 -i 1 -u -f m -B 192.172.0.2 -b 17M -R</UE_traffic_exec>
    <UE_traffic_exec_args></UE_traffic_exec_args>
    <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
    <UE_stop_script>sudo -S -E $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --stop-ue </UE_stop_script>
@@ -3140,7 +3140,7 @@ c
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
-    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
+    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_usrpb210.py --stop-usrpb210 ; $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash  ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
    <eNB_pre_exec_args>sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec_args>
    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
    <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf -W </eNB_main_exec_args>
@@ -3158,7 +3158,7 @@ c
    <UE_pre_exec_args></UE_pre_exec_args>
    <UE_main_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --reset-ue; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --stop-ue ; sleep 10; $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --start-ue </UE_main_exec>
    <UE_main_exec_args></UE_main_exec_args>
-    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf3_script 1 ppp0 -c 192.172.0.1 -i 1 -u -f m -B 192.172.0.2 -b 20M -R</UE_traffic_exec>
+    <UE_traffic_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/iperf3_script 1 ppp0 -c 192.172.0.1 -i 1 -u -f m -B 192.172.0.2 -b 35M -R</UE_traffic_exec>
    <UE_traffic_exec_args></UE_traffic_exec_args>
    <UE_terminate_missing_procs>False</UE_terminate_missing_procs>
    <UE_stop_script>sudo -S -E $OPENAIR_DIR/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py --stop-ue </UE_stop_script>
@@ -3211,7 +3211,7 @@ c
                     targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  ENB_PORT_FOR_S1U                     2152</eNB_config_file>
    <eNB_compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</eNB_compile_prog>
    <eNB_compile_prog_args>--eNB -w USRP -x -c </eNB_compile_prog_args>
-    <eNB_pre_exec>sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
+    <eNB_pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/configure_usrpb210.py --stop-usrpb210 ; $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash ; sudo -E -S /usr/local/bin/niusrprio_pcie start ; dmesg|tail</eNB_pre_exec>
    <eNB_pre_exec_args></eNB_pre_exec_args>
    <eNB_main_exec>$OPENAIR_DIR/cmake_targets/lte_build_oai/build/lte-softmodem</eNB_main_exec>
    <eNB_main_exec_args> -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf  -W </eNB_main_exec_args>

--- a/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py
+++ b/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py
@@ -33,6 +33,7 @@
 import time
 import serial
 import os
+from socket import AF_INET
 from pyroute2 import IPRoute
 import sys
 import re
@@ -62,7 +63,7 @@ def find_open_port():
   while True:
     if os.path.exists(serial_port) == True:
       return serial_port
-     for port in range(2,100):
+     for port in range(0,100):
        serial_port_tmp = '/dev/ttyUSB'+str(port)
        if os.path.exists(serial_port_tmp) == True:
           print 'New Serial Port : ' + serial_port_tmp
@@ -97,11 +98,12 @@ signal.signal(signal.SIGINT, signal_handler)
 #ser.isOpen()
 class pppThread (threading.Thread):
-    def __init__(self, threadID, name, counter):
+    def __init__(self, threadID, name, counter,port):
        threading.Thread.__init__(self)
        self.threadID = threadID
        self.name = name
        self.counter = counter
+        self.port=port
    def run(self):
        print "Starting " + self.name
        #Here we keep running pppd thread in indefinite loop as this script terminates sometimes
@@ -111,6 +113,10 @@ class pppThread (threading.Thread):
           print "Starting wvdial now..."
           print 'exit_flag = ' + str(exit_flag)
           send_command('AT+CGATT=1','OK', 300)
+           #Now we do search and replace on wvdial config file
+           cmd="sed -i \"s%Modem = .*%Modem = " + self.port + "%g\" " +  bandrich_ppd_config
+           os.system(cmd)
           os.system('wvdial -C ' + bandrich_ppd_config + '' )
           if exit_flag == 1:
              print "Exit flag set to true. Exiting pppThread now"
@@ -146,6 +152,7 @@ def send_command (cmd, response, timeout):
 def start_ue () :
   #print 'Enter your commands below.\r\nInsert "exit" to leave the application.'
+   global serial_port
   timeout=60 #timeout in seconds
   send_command('AT', 'OK' , timeout)
   send_command('AT+CFUN=1' , 'OK' , timeout)
@@ -153,23 +160,33 @@ def start_ue () :
   send_command('AT+CGATT=1','OK', 300)
   #os.system('wvdial -C ' + bandrich_ppd_config + ' &' )
-   thread_ppp = pppThread(1, "ppp_thread", 1)
+   thread_ppp = pppThread(1, "ppp_thread", 1,port=serial_port)
   thread_ppp.start()
-   iface='ppp0'
+   #iface='ppp0'
   while 1:
     time.sleep ( 2)
+     iface=''
     #Now we check if ppp0 interface is up and running
     try:
        if exit_flag == 1:
          break
+        cmd="ifconfig -a | sed 's/[ \t].*//;/^$/d' | grep ppp"
+        status, out = commands.getstatusoutput(cmd)
+        iface=out
        ip = IPRoute()
        idx = ip.link_lookup(ifname=iface)[0]
-        os.system ('route add ' + gw + ' ppp0')
+        print "iface = " + iface
+        print " Setting route now..."
+        #os.system("status=1; while [ \"$status\" -ne \"0\" ]; do route add -host " + gw + ' ' + iface + " ; status=$? ;sleep 1; echo \"status = $status\"  ; sleep 2; done ")
+        os.system ('route add -host ' + gw + ' ' + iface + ' 2> /dev/null')
+        #ip.route('add', dst=gw, oif=iface)
        os.system('sleep 5')
-        os.system ('ping ' + gw)
+        #print "Starting ping now..."
-        break
+        os.system ('ping -c 1 ' + gw)
+        #break
     except Exception, e:
        error = ' Interface ' + iface + 'does not exist...'
        error = error + ' In function: ' + sys._getframe().f_code.co_name + ': *** Caught exception: '  + str(e.__class__) + " : " + str( e)
@@ -206,6 +223,7 @@ def reset_ue():
  os.system(cmd + " ; sleep 15" )
  cmd = "sudo sh -c \"echo 1 > " + usb_dir + "/authorized\""
  os.system(cmd + " ; sleep 30" )
+  find_open_port()
  stop_ue()
 i=1
@@ -213,14 +231,17 @@ gw='192.172.0.1'
 while i <  len(sys.argv):
    arg=sys.argv[i]
    if arg == '--start-ue' :
+        print "Turning on UE..."
        find_open_port()
        print 'Using Serial port : ' + serial_port  
        start_ue()
    elif arg == '--stop-ue' :
+        print "Turning off UE..."
        find_open_port()
        print 'Using Serial port : ' + serial_port  
        stop_ue()
    elif arg == '--reset-ue' :
+        print "Resetting UE..."
        find_open_port()
        reset_ue()
    elif arg == '-gw' :

--- a/cmake_targets/autotests/tools/configure_usrpb210.py
+++ b/cmake_targets/autotests/tools/configure_usrpb210.py
+#!/usr/bin/python 
+#******************************************************************************
+#    OpenAirInterface 
+#    Copyright(c) 1999 - 2014 Eurecom
+#    OpenAirInterface is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#    OpenAirInterface is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#   You should have received a copy of the GNU General Public License
+#   along with OpenAirInterface.The full GNU General Public License is 
+#   included in this distribution in the file called "COPYING". If not, 
+#   see <http://www.gnu.org/licenses/>.
+#  Contact Information
+#  OpenAirInterface Admin: openair_admin@eurecom.fr
+#  OpenAirInterface Tech : openair_tech@eurecom.fr
+#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
+#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
+# *******************************************************************************/
+# \author Navid Nikaein, Rohit Gupta
+import time
+import serial
+import os
+from pyroute2 import IPRoute
+import sys
+import re
+import threading
+import signal
+import traceback
+import os
+import commands
+# configure the serial connections (the parameters differs on the device you are connecting to)
+#First we find an open port to work with
+serial_port=''
+openair_dir = os.environ.get('OPENAIR_DIR')
+if openair_dir == None:
+  print "Error getting OPENAIR_DIR environment variable"
+  sys.exit(1)
+sys.path.append(os.path.expandvars('$OPENAIR_DIR/cmake_targets/autotests/tools/'))
+from lib_autotest import *
+#Stop the USB BUS of USRPB210
+def stop_usrpb210():
+  stringIdBandrich='National Instruments Corp.'
+  status, out = commands.getstatusoutput('lsusb | grep -i \'' + stringIdBandrich + '\'')
+  if (out == '') :
+     print "USRP B210 not found. Exiting now..."
+     sys.exit()
+  p=re.compile('Bus\s*(\w+)\s*Device\s*(\w+):\s*ID\s*(\w+):(\w+)')
+  res=p.findall(out)
+  BusId=res[0][0]
+  DeviceId=res[0][1]
+  VendorId=res[0][2]
+  ProductId=res[0][3]
+  usb_dir= find_usb_path(VendorId, ProductId)
+  print "USRP B210 found in..." + usb_dir
+  cmd = "sudo sh -c \"echo 0 > " + usb_dir + "/authorized\""
+  os.system(cmd)
+#Start the USB bus of USRP B210
+def start_usrpb210():
+  stringIdBandrich='National Instruments Corp.'  
+  status, out = commands.getstatusoutput('lsusb | grep -i \'' + stringIdBandrich + '\'')
+  if (out == '') :
+     print "USRP B210 not found. Exiting now..."
+     sys.exit()
+  p=re.compile('Bus\s*(\w+)\s*Device\s*(\w+):\s*ID\s*(\w+):(\w+)')
+  res=p.findall(out)
+  BusId=res[0][0]
+  DeviceId=res[0][1]
+  VendorId=res[0][2]
+  ProductId=res[0][3]
+  usb_dir= find_usb_path(VendorId, ProductId)
+  print "USRP B210 found in..." + usb_dir
+  cmd = "sudo sh -c \"echo 1 > " + usb_dir + "/authorized\""
+  os.system(cmd)
+i=1
+while i <  len(sys.argv):
+    arg=sys.argv[i]
+    if arg == '--start-usrpb210' :
+        start_usrpb210()
+    elif arg == '--stop-usrpb210' :
+        stop_usrpb210()
+    elif arg == '-h' :
+        print "--stop-usrpb210:  Stop the USRP B210. It cannot be found in uhd_find_devices" 
+        print "--start-usrpb210:  Start the USRP B210. It can now be found in uhd_find_devices"
+    else :
+        print " Script called with wrong arguments, arg = " + arg
+        sys.exit()
+    i = i +1
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -226,7 +226,25 @@ check_install_additional_tools (){
 	valgrind  \
 	vlan	  \
 	ctags \
-        ntpdate
+        ntpdate \
+        iperf3 \
+        android-tools-adb
+    $SUDO pip install paramiko
+    $SUDO pip install pyroute2
+    $SUDO rm -fr /opt/ssh
+    $SUDO git clone https://gist.github.com/2190472.git /opt/ssh
+    log_netiface=$OPENAIR_DIR/cmake_targets/log/netiface_install_log.txt
+    echo_info "Installing Netinterfaces package. The logfile for installation is in $log_netiface"
+    (
+    $SUDO rm -fr /tmp/netifaces-0.10.4.tar.gz /tmp/netifaces
+    wget -P /tmp  https://pypi.python.org/packages/18/fa/dd13d4910aea339c0bb87d2b3838d8fd923c11869b1f6e741dbd0ff3bc00/netifaces-0.10.4.tar.gz
+    tar -xzvf /tmp/netifaces-0.10.4.tar.gz -C /tmp
+    cd /tmp/netifaces-0.10.4
+    $SUDO python setup.py install
+    cd -
+    ) >& $log_netiface
 }
 check_install_oai_software() {
@@ -293,8 +311,7 @@ check_install_oai_software() {
        python-numpy \
        sshpass \
        libxslt1-dev \
-        android-tools-adb \
+        android-tools-adb
-        iperf3
    $SUDO update-alternatives --set liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
@@ -303,11 +320,7 @@ check_install_oai_software() {
    install_nettle_from_source
    install_gnutls_from_source
-    $SUDO pip install paramiko
-    $SUDO pip install pyroute2
    install_asn1c_from_source
-    $SUDO rm -fr /opt/ssh
-    $SUDO git clone https://gist.github.com/2190472.git /opt/ssh
 }
 install_asn1c_from_source(){
@@ -315,14 +328,12 @@ install_asn1c_from_source(){
    echo_info "\nInstalling ASN1. The log file for ASN1 installation is here: $asn1_install_log "
    (
    $SUDO rm -rf /tmp/asn1c-r1516
-    mkdir -p /tmp/asn1c-r1516
+    svn co https://github.com/vlm/asn1c/trunk  /tmp/asn1c-r1516 -r 1516
-    cd /tmp/asn1c-r1516
+    cd /tmp/asn1c-r1516 
-    rm -rf /tmp/asn1c-r1516/*
+    patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch.p0 
-    svn co https://github.com/vlm/asn1c/trunk  /tmp/asn1c-r1516 -r 1516 > /tmp/log_compile_asn1c
+    patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0 
-    patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch.p0 >> /tmp/log_compile_asn1c
+    patch -p0 < $OPENAIR_DIR/openair2/RRC/LITE/MESSAGES/asn1c/asn1cpatch.p0 
-    patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_2.p0 >> /tmp/log_compile_asn1c
+    patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_3.p0 
-    patch -p0 < $OPENAIR_DIR/openair2/RRC/LITE/MESSAGES/asn1c/asn1cpatch.p0 >> /tmp/log_compile_asn1c
-    patch -p0 < $OPENAIR_DIR/openair3/S1AP/MESSAGES/ASN1/asn1cpatch_3.p0 >> /tmp/log_compile_asn1c
    ./configure
    make -j`nproc`
    $SUDO make install

--- a/common/utils/T/T_defs.h
+++ b/common/utils/T/T_defs.h
@@ -29,10 +29,10 @@ typedef struct {
 #define T_SHM_FILENAME "/T_shm_segment"
 /* number of VCD functions (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_FUNCTIONS 139
+#define VCD_NUM_FUNCTIONS 146
 /* number of VCD variables (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_VARIABLES 45
+#define VCD_NUM_VARIABLES 99
 /* first VCD function (to be kept up to date! see in T_messages.txt) */
 #define VCD_FIRST_FUNCTION    ((uintptr_t)T_VCD_FUNCTION_RT_SLEEP)

--- a/common/utils/T/T_messages.txt
+++ b/common/utils/T/T_messages.txt
@@ -5,59 +5,59 @@ ID = ENB_MASTER_TICK
    FORMAT = int,eNB_ID : int,frame : int,subframe
 #PHY logs
-ID = ENB_UL_TICK
+ID = ENB_PHY_UL_TICK
    DESC = eNodeB uplink tick - one tick per ms at start of uplink processing
    GROUP = ALL:PHY:GRAPHIC:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe
-ID = ENB_DL_TICK
+ID = ENB_PHY_DL_TICK
    DESC = eNodeB downlink tick - one tick per ms at start of downlink processing
    GROUP = ALL:PHY:GRAPHIC:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe
-ID = ENB_DLSCH_UE_DCI
+ID = ENB_PHY_DLSCH_UE_DCI
    DESC = eNodeB downlink UE specific DCI as sent by the PHY layer
    GROUP = ALL:PHY:GRAPHIC:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid
-ID = ENB_DLSCH_UE_ACK
+ID = ENB_PHY_DLSCH_UE_ACK
    DESC = eNodeB downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
    GROUP = ALL:PHY:GRAPHIC:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = ENB_DLSCH_UE_NACK
+ID = ENB_PHY_DLSCH_UE_NACK
    DESC = eNodeB downlink UE NACK as seen by the PHY layer in process_HARQ_feedback
    GROUP = ALL:PHY:GRAPHIC:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = ENB_ULSCH_UE_DCI
+ID = ENB_PHY_ULSCH_UE_DCI
    DESC = eNodeB uplink UE specific DCI as sent by the PHY layer
    GROUP = ALL:PHY:GRAPHIC:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = ENB_ULSCH_UE_NO_DCI_RETRANSMISSION
+ID = ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION
    DESC = eNodeB uplink UE retransmission due to PHICH NACK (see generate_phich_top)
    GROUP = ALL:PHY:GRAPHIC:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = ENB_ULSCH_UE_ACK
+ID = ENB_PHY_ULSCH_UE_ACK
    DESC = eNodeB uplink UE ACK as seen by the PHY layer
    GROUP = ALL:PHY:GRAPHIC:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = ENB_ULSCH_UE_NACK
+ID = ENB_PHY_ULSCH_UE_NACK
    DESC = eNodeB uplink UE NACK as seen by the PHY layer
    GROUP = ALL:PHY:GRAPHIC:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = ENB_INPUT_SIGNAL
+ID = ENB_PHY_INPUT_SIGNAL
    DESC = eNodeB received signal in the time domain for a duration of 1ms
    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
    FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,rxdata
-ID = ENB_UL_CHANNEL_ESTIMATE
+ID = ENB_PHY_UL_CHANNEL_ESTIMATE
    DESC = eNodeB channel estimation in the time domain
    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
-ID = PUSCH_IQ
+ID = ENB_PHY_PUSCH_IQ
    DESC = eNodeB PUSCH received IQ data
    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,nb_rb : buffer,pusch_comp
-ID = PUCCH_1AB_IQ
+ID = ENB_PHY_PUCCH_1AB_IQ
    DESC = eNodeB PUCCH received IQ data
    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,I : int,Q
-ID = PUCCH_1_ENERGY
+ID = ENB_PHY_PUCCH_1_ENERGY
    DESC = eNodeB PUCCH 1 energy and threshold
    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,energy : int,threshold
@@ -233,464 +233,464 @@ ID = ENB_RRC_UNKNOW_MESSAGE
 #legacy logs
 ID = LEGACY_MAC_INFO
    DESC = MAC legacy logs - info level
-    GROUP = ALL:LEGACY_MAC:INFO:LEGACY
+    GROUP = ALL:LEGACY_MAC:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_MAC_ERROR
    DESC = MAC legacy logs - error level
-    GROUP = ALL:LEGACY_MAC:ERROR:LEGACY
+    GROUP = ALL:LEGACY_MAC:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_MAC_WARNING
    DESC = MAC legacy logs - warning level
-    GROUP = ALL:LEGACY_MAC:WARNING:LEGACY
+    GROUP = ALL:LEGACY_MAC:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_MAC_DEBUG
    DESC = MAC legacy logs - debug level
-    GROUP = ALL:LEGACY_MAC:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_MAC:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_MAC_TRACE
    DESC = MAC legacy logs - trace level
-    GROUP = ALL:LEGACY_MAC:TRACE:LEGACY
+    GROUP = ALL:LEGACY_MAC:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_PHY_INFO
    DESC = PHY legacy logs - info level
-    GROUP = ALL:LEGACY_PHY:INFO:LEGACY
+    GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_PHY_ERROR
    DESC = PHY legacy logs - error level
-    GROUP = ALL:LEGACY_PHY:ERROR:LEGACY
+    GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_PHY_WARNING
    DESC = PHY legacy logs - warning level
-    GROUP = ALL:LEGACY_PHY:WARNING:LEGACY
+    GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_PHY_DEBUG
    DESC = PHY legacy logs - debug level
-    GROUP = ALL:LEGACY_PHY:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_PHY_TRACE
    DESC = PHY legacy logs - trace level
-    GROUP = ALL:LEGACY_PHY:TRACE:LEGACY
+    GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_S1AP_INFO
    DESC = S1AP legacy logs - info level
-    GROUP = ALL:LEGACY_S1AP:INFO:LEGACY
+    GROUP = ALL:LEGACY_S1AP:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_S1AP_ERROR
    DESC = S1AP legacy logs - error level
-    GROUP = ALL:LEGACY_S1AP:ERROR:LEGACY
+    GROUP = ALL:LEGACY_S1AP:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_S1AP_WARNING
    DESC = S1AP legacy logs - warning level
-    GROUP = ALL:LEGACY_S1AP:WARNING:LEGACY
+    GROUP = ALL:LEGACY_S1AP:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_S1AP_DEBUG
    DESC = S1AP legacy logs - debug level
-    GROUP = ALL:LEGACY_S1AP:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_S1AP:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_S1AP_TRACE
    DESC = S1AP legacy logs - trace level
-    GROUP = ALL:LEGACY_S1AP:TRACE:LEGACY
+    GROUP = ALL:LEGACY_S1AP:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_X2AP_INFO
    DESC = X2AP legacy logs - info level
-    GROUP = ALL:LEGACY_X2AP:INFO:LEGACY
+    GROUP = ALL:LEGACY_X2AP:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_X2AP_ERROR
    DESC = X2AP legacy logs - error level
-    GROUP = ALL:LEGACY_X2AP:ERROR:LEGACY
+    GROUP = ALL:LEGACY_X2AP:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_X2AP_WARNING
    DESC = X2AP legacy logs - warning level
-    GROUP = ALL:LEGACY_X2AP:WARNING:LEGACY
+    GROUP = ALL:LEGACY_X2AP:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_X2AP_DEBUG
    DESC = X2AP legacy logs - debug level
-    GROUP = ALL:LEGACY_X2AP:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_X2AP:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_X2AP_TRACE
    DESC = X2AP legacy logs - trace level
-    GROUP = ALL:LEGACY_X2AP:TRACE:LEGACY
+    GROUP = ALL:LEGACY_X2AP:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_RRC_INFO
    DESC = RRC legacy logs - info level
-    GROUP = ALL:LEGACY_RRC:INFO:LEGACY
+    GROUP = ALL:LEGACY_RRC:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_RRC_ERROR
    DESC = RRC legacy logs - error level
-    GROUP = ALL:LEGACY_RRC:ERROR:LEGACY
+    GROUP = ALL:LEGACY_RRC:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_RRC_WARNING
    DESC = RRC legacy logs - warning level
-    GROUP = ALL:LEGACY_RRC:WARNING:LEGACY
+    GROUP = ALL:LEGACY_RRC:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_RRC_DEBUG
    DESC = RRC legacy logs - debug level
-    GROUP = ALL:LEGACY_RRC:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_RRC:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_RRC_TRACE
    DESC = RRC legacy logs - trace level
-    GROUP = ALL:LEGACY_RRC:TRACE:LEGACY
+    GROUP = ALL:LEGACY_RRC:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_RLC_INFO
    DESC = RLC legacy logs - info level
-    GROUP = ALL:LEGACY_RLC:INFO:LEGACY
+    GROUP = ALL:LEGACY_RLC:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_RLC_ERROR
    DESC = RLC legacy logs - error level
-    GROUP = ALL:LEGACY_RLC:ERROR:LEGACY
+    GROUP = ALL:LEGACY_RLC:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_RLC_WARNING
    DESC = RLC legacy logs - warning level
-    GROUP = ALL:LEGACY_RLC:WARNING:LEGACY
+    GROUP = ALL:LEGACY_RLC:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_RLC_DEBUG
    DESC = RLC legacy logs - debug level
-    GROUP = ALL:LEGACY_RLC:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_RLC:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_RLC_TRACE
    DESC = RLC legacy logs - trace level
-    GROUP = ALL:LEGACY_RLC:TRACE:LEGACY
+    GROUP = ALL:LEGACY_RLC:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_PDCP_INFO
    DESC = PDCP legacy logs - info level
-    GROUP = ALL:LEGACY_PDCP:INFO:LEGACY
+    GROUP = ALL:LEGACY_PDCP:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_PDCP_ERROR
    DESC = PDCP legacy logs - error level
-    GROUP = ALL:LEGACY_PDCP:ERROR:LEGACY
+    GROUP = ALL:LEGACY_PDCP:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_PDCP_WARNING
    DESC = PDCP legacy logs - warning level
-    GROUP = ALL:LEGACY_PDCP:WARNING:LEGACY
+    GROUP = ALL:LEGACY_PDCP:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_PDCP_DEBUG
    DESC = PDCP legacy logs - debug level
-    GROUP = ALL:LEGACY_PDCP:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_PDCP:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_PDCP_TRACE
    DESC = PDCP legacy logs - trace level
-    GROUP = ALL:LEGACY_PDCP:TRACE:LEGACY
+    GROUP = ALL:LEGACY_PDCP:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_ENB_APP_INFO
    DESC = ENB_APP legacy logs - info level
-    GROUP = ALL:LEGACY_ENB_APP:INFO:LEGACY
+    GROUP = ALL:LEGACY_ENB_APP:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_ENB_APP_ERROR
    DESC = ENB_APP legacy logs - error level
-    GROUP = ALL:LEGACY_ENB_APP:ERROR:LEGACY
+    GROUP = ALL:LEGACY_ENB_APP:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_ENB_APP_WARNING
    DESC = ENB_APP legacy logs - warning level
-    GROUP = ALL:LEGACY_ENB_APP:WARNING:LEGACY
+    GROUP = ALL:LEGACY_ENB_APP:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_ENB_APP_DEBUG
    DESC = ENB_APP legacy logs - debug level
-    GROUP = ALL:LEGACY_ENB_APP:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_ENB_APP:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_ENB_APP_TRACE
    DESC = ENB_APP legacy logs - trace level
-    GROUP = ALL:LEGACY_ENB_APP:TRACE:LEGACY
+    GROUP = ALL:LEGACY_ENB_APP:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_SCTP_INFO
    DESC = SCTP legacy logs - info level
-    GROUP = ALL:LEGACY_SCTP:INFO:LEGACY
+    GROUP = ALL:LEGACY_SCTP:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_SCTP_ERROR
    DESC = SCTP legacy logs - error level
-    GROUP = ALL:LEGACY_SCTP:ERROR:LEGACY
+    GROUP = ALL:LEGACY_SCTP:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_SCTP_WARNING
    DESC = SCTP legacy logs - warning level
-    GROUP = ALL:LEGACY_SCTP:WARNING:LEGACY
+    GROUP = ALL:LEGACY_SCTP:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_SCTP_DEBUG
    DESC = SCTP legacy logs - debug level
-    GROUP = ALL:LEGACY_SCTP:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_SCTP:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_SCTP_TRACE
    DESC = SCTP legacy logs - trace level
-    GROUP = ALL:LEGACY_SCTP:TRACE:LEGACY
+    GROUP = ALL:LEGACY_SCTP:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_UDP__INFO
    DESC = UDP_ legacy logs - info level
-    GROUP = ALL:LEGACY_UDP_:INFO:LEGACY
+    GROUP = ALL:LEGACY_UDP_:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_UDP__ERROR
    DESC = UDP_ legacy logs - error level
-    GROUP = ALL:LEGACY_UDP_:ERROR:LEGACY
+    GROUP = ALL:LEGACY_UDP_:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_UDP__WARNING
    DESC = UDP_ legacy logs - warning level
-    GROUP = ALL:LEGACY_UDP_:WARNING:LEGACY
+    GROUP = ALL:LEGACY_UDP_:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_UDP__DEBUG
    DESC = UDP_ legacy logs - debug level
-    GROUP = ALL:LEGACY_UDP_:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_UDP_:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_UDP__TRACE
    DESC = UDP_ legacy logs - trace level
-    GROUP = ALL:LEGACY_UDP_:TRACE:LEGACY
+    GROUP = ALL:LEGACY_UDP_:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_NAS_INFO
    DESC = NAS legacy logs - info level
-    GROUP = ALL:LEGACY_NAS:INFO:LEGACY
+    GROUP = ALL:LEGACY_NAS:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_NAS_ERROR
    DESC = NAS legacy logs - error level
-    GROUP = ALL:LEGACY_NAS:ERROR:LEGACY
+    GROUP = ALL:LEGACY_NAS:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_NAS_WARNING
    DESC = NAS legacy logs - warning level
-    GROUP = ALL:LEGACY_NAS:WARNING:LEGACY
+    GROUP = ALL:LEGACY_NAS:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_NAS_DEBUG
    DESC = NAS legacy logs - debug level
-    GROUP = ALL:LEGACY_NAS:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_NAS:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_NAS_TRACE
    DESC = NAS legacy logs - trace level
-    GROUP = ALL:LEGACY_NAS:TRACE:LEGACY
+    GROUP = ALL:LEGACY_NAS:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_HW_INFO
    DESC = HW legacy logs - info level
-    GROUP = ALL:LEGACY_HW:INFO:LEGACY
+    GROUP = ALL:LEGACY_HW:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_HW_ERROR
    DESC = HW legacy logs - error level
-    GROUP = ALL:LEGACY_HW:ERROR:LEGACY
+    GROUP = ALL:LEGACY_HW:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_HW_WARNING
    DESC = HW legacy logs - warning level
-    GROUP = ALL:LEGACY_HW:WARNING:LEGACY
+    GROUP = ALL:LEGACY_HW:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_HW_DEBUG
    DESC = HW legacy logs - debug level
-    GROUP = ALL:LEGACY_HW:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_HW:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_HW_TRACE
    DESC = HW legacy logs - trace level
-    GROUP = ALL:LEGACY_HW:TRACE:LEGACY
+    GROUP = ALL:LEGACY_HW:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_EMU_INFO
    DESC = EMU legacy logs - info level
-    GROUP = ALL:LEGACY_EMU:INFO:LEGACY
+    GROUP = ALL:LEGACY_EMU:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_EMU_ERROR
    DESC = EMU legacy logs - error level
-    GROUP = ALL:LEGACY_EMU:ERROR:LEGACY
+    GROUP = ALL:LEGACY_EMU:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_EMU_WARNING
    DESC = EMU legacy logs - warning level
-    GROUP = ALL:LEGACY_EMU:WARNING:LEGACY
+    GROUP = ALL:LEGACY_EMU:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_EMU_DEBUG
    DESC = EMU legacy logs - debug level
-    GROUP = ALL:LEGACY_EMU:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_EMU:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_EMU_TRACE
    DESC = EMU legacy logs - trace level
-    GROUP = ALL:LEGACY_EMU:TRACE:LEGACY
+    GROUP = ALL:LEGACY_EMU:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_OTG_INFO
    DESC = OTG legacy logs - info level
-    GROUP = ALL:LEGACY_OTG:INFO:LEGACY
+    GROUP = ALL:LEGACY_OTG:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_OTG_ERROR
    DESC = OTG legacy logs - error level
-    GROUP = ALL:LEGACY_OTG:ERROR:LEGACY
+    GROUP = ALL:LEGACY_OTG:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_OTG_WARNING
    DESC = OTG legacy logs - warning level
-    GROUP = ALL:LEGACY_OTG:WARNING:LEGACY
+    GROUP = ALL:LEGACY_OTG:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_OTG_DEBUG
    DESC = OTG legacy logs - debug level
-    GROUP = ALL:LEGACY_OTG:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_OTG:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_OTG_TRACE
    DESC = OTG legacy logs - trace level
-    GROUP = ALL:LEGACY_OTG:TRACE:LEGACY
+    GROUP = ALL:LEGACY_OTG:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCG_INFO
    DESC = OCG legacy logs - info level
-    GROUP = ALL:LEGACY_OCG:INFO:LEGACY
+    GROUP = ALL:LEGACY_OCG:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCG_ERROR
    DESC = OCG legacy logs - error level
-    GROUP = ALL:LEGACY_OCG:ERROR:LEGACY
+    GROUP = ALL:LEGACY_OCG:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCG_WARNING
    DESC = OCG legacy logs - warning level
-    GROUP = ALL:LEGACY_OCG:WARNING:LEGACY
+    GROUP = ALL:LEGACY_OCG:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCG_DEBUG
    DESC = OCG legacy logs - debug level
-    GROUP = ALL:LEGACY_OCG:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_OCG:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCG_TRACE
    DESC = OCG legacy logs - trace level
-    GROUP = ALL:LEGACY_OCG:TRACE:LEGACY
+    GROUP = ALL:LEGACY_OCG:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCM_INFO
    DESC = OCM legacy logs - info level
-    GROUP = ALL:LEGACY_OCM:INFO:LEGACY
+    GROUP = ALL:LEGACY_OCM:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCM_ERROR
    DESC = OCM legacy logs - error level
-    GROUP = ALL:LEGACY_OCM:ERROR:LEGACY
+    GROUP = ALL:LEGACY_OCM:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCM_WARNING
    DESC = OCM legacy logs - warning level
-    GROUP = ALL:LEGACY_OCM:WARNING:LEGACY
+    GROUP = ALL:LEGACY_OCM:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCM_DEBUG
    DESC = OCM legacy logs - debug level
-    GROUP = ALL:LEGACY_OCM:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_OCM:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_OCM_TRACE
    DESC = OCM legacy logs - trace level
-    GROUP = ALL:LEGACY_OCM:TRACE:LEGACY
+    GROUP = ALL:LEGACY_OCM:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_OIP_INFO
    DESC = OIP legacy logs - info level
-    GROUP = ALL:LEGACY_OIP:INFO:LEGACY
+    GROUP = ALL:LEGACY_OIP:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_OIP_ERROR
    DESC = OIP legacy logs - error level
-    GROUP = ALL:LEGACY_OIP:ERROR:LEGACY
+    GROUP = ALL:LEGACY_OIP:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_OIP_WARNING
    DESC = OIP legacy logs - warning level
-    GROUP = ALL:LEGACY_OIP:WARNING:LEGACY
+    GROUP = ALL:LEGACY_OIP:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_OIP_DEBUG
    DESC = OIP legacy logs - debug level
-    GROUP = ALL:LEGACY_OIP:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_OIP:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_OIP_TRACE
    DESC = OIP legacy logs - trace level
-    GROUP = ALL:LEGACY_OIP:TRACE:LEGACY
+    GROUP = ALL:LEGACY_OIP:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_OMG_INFO
    DESC = OMG legacy logs - info level
-    GROUP = ALL:LEGACY_OMG:INFO:LEGACY
+    GROUP = ALL:LEGACY_OMG:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_OMG_ERROR
    DESC = OMG legacy logs - error level
-    GROUP = ALL:LEGACY_OMG:ERROR:LEGACY
+    GROUP = ALL:LEGACY_OMG:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_OMG_WARNING
    DESC = OMG legacy logs - warning level
-    GROUP = ALL:LEGACY_OMG:WARNING:LEGACY
+    GROUP = ALL:LEGACY_OMG:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_OMG_DEBUG
    DESC = OMG legacy logs - debug level
-    GROUP = ALL:LEGACY_OMG:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_OMG:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_OMG_TRACE
    DESC = OMG legacy logs - trace level
-    GROUP = ALL:LEGACY_OMG:TRACE:LEGACY
+    GROUP = ALL:LEGACY_OMG:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_OPT_INFO
    DESC = OPT legacy logs - info level
-    GROUP = ALL:LEGACY_OPT:INFO:LEGACY
+    GROUP = ALL:LEGACY_OPT:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_OPT_ERROR
    DESC = OPT legacy logs - error level
-    GROUP = ALL:LEGACY_OPT:ERROR:LEGACY
+    GROUP = ALL:LEGACY_OPT:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_OPT_WARNING
    DESC = OPT legacy logs - warning level
-    GROUP = ALL:LEGACY_OPT:WARNING:LEGACY
+    GROUP = ALL:LEGACY_OPT:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_OPT_DEBUG
    DESC = OPT legacy logs - debug level
-    GROUP = ALL:LEGACY_OPT:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_OPT:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_OPT_TRACE
    DESC = OPT legacy logs - trace level
-    GROUP = ALL:LEGACY_OPT:TRACE:LEGACY
+    GROUP = ALL:LEGACY_OPT:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_GTPU_INFO
    DESC = GTPU legacy logs - info level
-    GROUP = ALL:LEGACY_GTPU:INFO:LEGACY
+    GROUP = ALL:LEGACY_GTPU:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_GTPU_ERROR
    DESC = GTPU legacy logs - error level
-    GROUP = ALL:LEGACY_GTPU:ERROR:LEGACY
+    GROUP = ALL:LEGACY_GTPU:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_GTPU_WARNING
    DESC = GTPU legacy logs - warning level
-    GROUP = ALL:LEGACY_GTPU:WARNING:LEGACY
+    GROUP = ALL:LEGACY_GTPU:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_GTPU_DEBUG
    DESC = GTPU legacy logs - debug level
-    GROUP = ALL:LEGACY_GTPU:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_GTPU:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_GTPU_TRACE
    DESC = GTPU legacy logs - trace level
-    GROUP = ALL:LEGACY_GTPU:TRACE:LEGACY
+    GROUP = ALL:LEGACY_GTPU:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_TMR_INFO
    DESC = TMR legacy logs - info level
-    GROUP = ALL:LEGACY_TMR:INFO:LEGACY
+    GROUP = ALL:LEGACY_TMR:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_TMR_ERROR
    DESC = TMR legacy logs - error level
-    GROUP = ALL:LEGACY_TMR:ERROR:LEGACY
+    GROUP = ALL:LEGACY_TMR:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_TMR_WARNING
    DESC = TMR legacy logs - warning level
-    GROUP = ALL:LEGACY_TMR:WARNING:LEGACY
+    GROUP = ALL:LEGACY_TMR:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_TMR_DEBUG
    DESC = TMR legacy logs - debug level
-    GROUP = ALL:LEGACY_TMR:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_TMR:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_TMR_TRACE
    DESC = TMR legacy logs - trace level
-    GROUP = ALL:LEGACY_TMR:TRACE:LEGACY
+    GROUP = ALL:LEGACY_TMR:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_OSA_INFO
    DESC = OSA legacy logs - info level
-    GROUP = ALL:LEGACY_OSA:INFO:LEGACY
+    GROUP = ALL:LEGACY_OSA:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_OSA_ERROR
    DESC = OSA legacy logs - error level
-    GROUP = ALL:LEGACY_OSA:ERROR:LEGACY
+    GROUP = ALL:LEGACY_OSA:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_OSA_WARNING
    DESC = OSA legacy logs - warning level
-    GROUP = ALL:LEGACY_OSA:WARNING:LEGACY
+    GROUP = ALL:LEGACY_OSA:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_OSA_DEBUG
    DESC = OSA legacy logs - debug level
-    GROUP = ALL:LEGACY_OSA:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_OSA:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_OSA_TRACE
    DESC = OSA legacy logs - trace level
-    GROUP = ALL:LEGACY_OSA:TRACE:LEGACY
+    GROUP = ALL:LEGACY_OSA:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 # this is a bad hack but I won't fix (function util_print_hex_octets
@@ -699,65 +699,65 @@ ID = LEGACY_OSA_TRACE
 # level and this funkyness is not easily dealable with, so be it...)
 ID = LEGACY_component_INFO
    DESC = component legacy logs - info level
-    GROUP = ALL:LEGACY_component:INFO:LEGACY
+    GROUP = ALL:LEGACY_component:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_component_ERROR
    DESC = component legacy logs - error level
-    GROUP = ALL:LEGACY_component:ERROR:LEGACY
+    GROUP = ALL:LEGACY_component:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_component_WARNING
    DESC = component legacy logs - warning level
-    GROUP = ALL:LEGACY_component:WARNING:LEGACY
+    GROUP = ALL:LEGACY_component:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_component_DEBUG
    DESC = component legacy logs - debug level
-    GROUP = ALL:LEGACY_component:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_component:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_component_TRACE
    DESC = component legacy logs - trace level
-    GROUP = ALL:LEGACY_component:TRACE:LEGACY
+    GROUP = ALL:LEGACY_component:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 ID = LEGACY_componentP_INFO
    DESC = componentP legacy logs - info level
-    GROUP = ALL:LEGACY_componentP:INFO:LEGACY
+    GROUP = ALL:LEGACY_componentP:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_componentP_ERROR
    DESC = componentP legacy logs - error level
-    GROUP = ALL:LEGACY_componentP:ERROR:LEGACY
+    GROUP = ALL:LEGACY_componentP:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_componentP_WARNING
    DESC = componentP legacy logs - warning level
-    GROUP = ALL:LEGACY_componentP:WARNING:LEGACY
+    GROUP = ALL:LEGACY_componentP:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_componentP_DEBUG
    DESC = componentP legacy logs - debug level
-    GROUP = ALL:LEGACY_componentP:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_componentP:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_componentP_TRACE
    DESC = componentP legacy logs - trace level
-    GROUP = ALL:LEGACY_componentP:TRACE:LEGACY
+    GROUP = ALL:LEGACY_componentP:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 #needed?
 ID = LEGACY_CLI_INFO
    DESC = CLI legacy logs - info level
-    GROUP = ALL:LEGACY_CLI:INFO:LEGACY
+    GROUP = ALL:LEGACY_CLI:LEGACY_GROUP_INFO:LEGACY
    FORMAT = string,log
 ID = LEGACY_CLI_ERROR
    DESC = CLI legacy logs - error level
-    GROUP = ALL:LEGACY_CLI:ERROR:LEGACY
+    GROUP = ALL:LEGACY_CLI:LEGACY_GROUP_ERROR:LEGACY
    FORMAT = string,log
 ID = LEGACY_CLI_WARNING
    DESC = CLI legacy logs - warning level
-    GROUP = ALL:LEGACY_CLI:WARNING:LEGACY
+    GROUP = ALL:LEGACY_CLI:LEGACY_GROUP_WARNING:LEGACY
    FORMAT = string,log
 ID = LEGACY_CLI_DEBUG
    DESC = CLI legacy logs - debug level
-    GROUP = ALL:LEGACY_CLI:DEBUG:LEGACY
+    GROUP = ALL:LEGACY_CLI:LEGACY_GROUP_DEBUG:LEGACY
    FORMAT = string,log
 ID = LEGACY_CLI_TRACE
    DESC = CLI legacy logs - trace level
-    GROUP = ALL:LEGACY_CLI:TRACE:LEGACY
+    GROUP = ALL:LEGACY_CLI:LEGACY_GROUP_TRACE:LEGACY
    FORMAT = string,log
 #for debug/test - not used
@@ -970,6 +970,226 @@ ID = VCD_VARIABLE_UE_INST_CNT_TX
    DESC = VCD variable UE_INST_CNT_TX
    GROUP = ALL:VCD:UE:VCD_VARIABLE
    FORMAT = ulong,value
+ID = VCD_VARIABLE_DCI_INFO
+    DESC = VCD variable DCI_INFO
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_BSR
+    DESC = VCD variable UE0_BSR
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_BO
+    DESC = VCD variable UE0_BO
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SCHEDULED
+    DESC = VCD variable UE0_SCHEDULED
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_TIMING_ADVANCE
+    DESC = VCD variable UE0_TIMING_ADVANCE
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SR_ENERGY
+    DESC = VCD variable UE0_SR_ENERGY
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SR_THRES
+    DESC = VCD variable UE0_SR_THRES
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RSSI0
+    DESC = VCD variable UE0_RSSI0
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RSSI1
+    DESC = VCD variable UE0_RSSI1
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RSSI2
+    DESC = VCD variable UE0_RSSI2
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RSSI3
+    DESC = VCD variable UE0_RSSI3
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RSSI4
+    DESC = VCD variable UE0_RSSI4
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RSSI5
+    DESC = VCD variable UE0_RSSI5
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RSSI6
+    DESC = VCD variable UE0_RSSI6
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RSSI7
+    DESC = VCD variable UE0_RSSI7
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RES0
+    DESC = VCD variable UE0_RES0
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RES1
+    DESC = VCD variable UE0_RES1
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RES2
+    DESC = VCD variable UE0_RES2
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RES3
+    DESC = VCD variable UE0_RES3
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RES4
+    DESC = VCD variable UE0_RES4
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RES5
+    DESC = VCD variable UE0_RES5
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RES6
+    DESC = VCD variable UE0_RES6
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RES7
+    DESC = VCD variable UE0_RES7
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_MCS0
+    DESC = VCD variable UE0_MCS0
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_MCS1
+    DESC = VCD variable UE0_MCS1
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_MCS2
+    DESC = VCD variable UE0_MCS2
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_MCS3
+    DESC = VCD variable UE0_MCS3
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_MCS4
+    DESC = VCD variable UE0_MCS4
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_MCS5
+    DESC = VCD variable UE0_MCS5
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_MCS6
+    DESC = VCD variable UE0_MCS6
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_MCS7
+    DESC = VCD variable UE0_MCS7
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RB0
+    DESC = VCD variable UE0_RB0
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RB1
+    DESC = VCD variable UE0_RB1
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RB2
+    DESC = VCD variable UE0_RB2
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RB3
+    DESC = VCD variable UE0_RB3
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RB4
+    DESC = VCD variable UE0_RB4
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RB5
+    DESC = VCD variable UE0_RB5
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RB6
+    DESC = VCD variable UE0_RB6
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_RB7
+    DESC = VCD variable UE0_RB7
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_ROUND0
+    DESC = VCD variable UE0_ROUND0
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_ROUND1
+    DESC = VCD variable UE0_ROUND1
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_ROUND2
+    DESC = VCD variable UE0_ROUND2
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_ROUND3
+    DESC = VCD variable UE0_ROUND3
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_ROUND4
+    DESC = VCD variable UE0_ROUND4
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_ROUND5
+    DESC = VCD variable UE0_ROUND5
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_ROUND6
+    DESC = VCD variable UE0_ROUND6
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_ROUND7
+    DESC = VCD variable UE0_ROUND7
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SFN0
+    DESC = VCD variable UE0_SFN0
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SFN1
+    DESC = VCD variable UE0_SFN1
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SFN2
+    DESC = VCD variable UE0_SFN2
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SFN3
+    DESC = VCD variable UE0_SFN3
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SFN4
+    DESC = VCD variable UE0_SFN4
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SFN5
+    DESC = VCD variable UE0_SFN5
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SFN6
+    DESC = VCD variable UE0_SFN6
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_SFN7
+    DESC = VCD variable UE0_SFN7
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
 #functions
@@ -1265,8 +1485,40 @@ ID = VCD_FUNCTION_PHY_UE_COMPUTE_PRACH
    DESC = VCD function PHY_UE_COMPUTE_PRACH
    GROUP = ALL:VCD:UE:VCD_FUNCTION
    FORMAT = int,value
-ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING
+ID = VCD_FUNCTION_PHY_ENB_ULSCH_MSG3
-    DESC = VCD function PHY_ENB_ULSCH_DECODING
+    DESC = VCD function PHY_ENB_ULSCH_MSG3
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING0
+    DESC = VCD function PHY_ENB_ULSCH_DECODING0
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING1
+    DESC = VCD function PHY_ENB_ULSCH_DECODING1
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING2
+    DESC = VCD function PHY_ENB_ULSCH_DECODING2
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING3
+    DESC = VCD function PHY_ENB_ULSCH_DECODING3
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING4
+    DESC = VCD function PHY_ENB_ULSCH_DECODING4
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING5
+    DESC = VCD function PHY_ENB_ULSCH_DECODING5
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING6
+    DESC = VCD function PHY_ENB_ULSCH_DECODING6
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_ENB_ULSCH_DECODING7
+    DESC = VCD function PHY_ENB_ULSCH_DECODING7
    GROUP = ALL:VCD:ENB:VCD_FUNCTION
    FORMAT = int,value
 ID = VCD_FUNCTION_PHY_ENB_SFGEN

--- a/common/utils/T/tracee/tracee.c
+++ b/common/utils/T/tracee/tracee.c
@@ -9,7 +9,7 @@ int main(void)
  T_connect_to_tracer("127.0.0.1", 2020);
  while (1) {
    getchar();
-    T(T_PUCCH_1AB_IQ, T_INT(0), T_INT(0), T_INT(frame), T_INT(0), T_INT(0), T_INT(0));
+    T(T_ENB_PHY_PUCCH_1AB_IQ, T_INT(0), T_INT(0), T_INT(frame), T_INT(0), T_INT(0), T_INT(0));
    frame++;
  }
  return 0;

--- a/common/utils/T/tracer/enb.c
+++ b/common/utils/T/tracer/enb.c
@@ -129,7 +129,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
  widget_add_child(g, line, input_signal_plot, -1);
  xy_plot_set_range(g, input_signal_plot, 0, 7680*10, 20, 70);
  input_signal_log = new_framelog(h, database,
-      "ENB_INPUT_SIGNAL", "subframe", "rxdata");
+      "ENB_PHY_INPUT_SIGNAL", "subframe", "rxdata");
  /* a skip value of 10 means to process 1 frame over 10, that is
   * more or less 10 frames per second
   */
@@ -151,40 +151,40 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
        new_color(g, i==0 || i==4 ? "#aaf" : "#eee"));
  timeview = new_view_time(3600, 10, g, timeline_plot);
  /* DL tick logging */
-  timelog = new_timelog(h, database, "ENB_DL_TICK");
+  timelog = new_timelog(h, database, "ENB_PHY_DL_TICK");
  subview = new_subview_time(timeview, 0, new_color(g, "#77c"), 3600*1000);
  logger_add_view(timelog, subview);
  /* DL DCI logging */
-  timelog = new_timelog(h, database, "ENB_DLSCH_UE_DCI");
+  timelog = new_timelog(h, database, "ENB_PHY_DLSCH_UE_DCI");
  subview = new_subview_time(timeview, 1, new_color(g, "#228"), 3600*1000);
  logger_add_view(timelog, subview);
  /* DL ACK */
-  timelog = new_timelog(h, database, "ENB_DLSCH_UE_ACK");
+  timelog = new_timelog(h, database, "ENB_PHY_DLSCH_UE_ACK");
  subview = new_subview_time(timeview, 2, new_color(g, "#282"), 3600*1000);
  logger_add_view(timelog, subview);
  /* DL NACK */
-  timelog = new_timelog(h, database, "ENB_DLSCH_UE_NACK");
+  timelog = new_timelog(h, database, "ENB_PHY_DLSCH_UE_NACK");
  subview = new_subview_time(timeview, 3, new_color(g, "#f22"), 3600*1000);
  logger_add_view(timelog, subview);
  /* UL tick logging */
-  timelog = new_timelog(h, database, "ENB_UL_TICK");
+  timelog = new_timelog(h, database, "ENB_PHY_UL_TICK");
  subview = new_subview_time(timeview, 4, new_color(g, "#77c"), 3600*1000);
  logger_add_view(timelog, subview);
  /* UL DCI logging */
-  timelog = new_timelog(h, database, "ENB_ULSCH_UE_DCI");
+  timelog = new_timelog(h, database, "ENB_PHY_ULSCH_UE_DCI");
  subview = new_subview_time(timeview, 5, new_color(g, "#228"), 3600*1000);
  logger_add_view(timelog, subview);
  /* UL retransmission without DCI logging */
-  timelog = new_timelog(h, database, "ENB_ULSCH_UE_NO_DCI_RETRANSMISSION");
+  timelog = new_timelog(h,database,"ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION");
  subview = new_subview_time(timeview, 5, new_color(g, "#f22"), 3600*1000);
  logger_add_view(timelog, subview);
  /* UL ACK */
-  timelog = new_timelog(h, database, "ENB_ULSCH_UE_ACK");
+  timelog = new_timelog(h, database, "ENB_PHY_ULSCH_UE_ACK");
  subview = new_subview_time(timeview, 6, new_color(g, "#282"), 3600*1000);
  logger_add_view(timelog, subview);
  /* UL NACK */
-  timelog = new_timelog(h, database, "ENB_ULSCH_UE_NACK");
+  timelog = new_timelog(h, database, "ENB_PHY_ULSCH_UE_NACK");
  subview = new_subview_time(timeview, 7, new_color(g, "#f22"), 3600*1000);
  logger_add_view(timelog, subview);
@@ -212,72 +212,73 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
  logger_add_view(timelog, subview);
  /* DL harq pids */
  for (i = 0; i < 8; i++) {
-    timelog = new_ticklog(h, database, "ENB_DLSCH_UE_DCI",
+    timelog = new_ticklog(h, database, "ENB_PHY_DLSCH_UE_DCI",
        "frame", "subframe");
    subview = new_subview_ticktime(timeview, i+1,
        new_color(g,"#55f"), 3600*1000);
    logger_add_view(timelog, subview);
    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_DLSCH_UE_DCI", i));
+        ticktime_filter(database, "ENB_PHY_DLSCH_UE_DCI", i));
  }
  /* DL ACK */
  for (i = 0; i < 8; i++) {
-    timelog = new_ticklog(h, database, "ENB_DLSCH_UE_ACK",
+    timelog = new_ticklog(h, database, "ENB_PHY_DLSCH_UE_ACK",
        "frame", "subframe");
    subview = new_subview_ticktime(timeview, i+1,
        new_color(g,"#282"), 3600*1000);
    logger_add_view(timelog, subview);
    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_DLSCH_UE_ACK", i));
+        ticktime_filter(database, "ENB_PHY_DLSCH_UE_ACK", i));
  }
  /* DL NACK */
  for (i = 0; i < 8; i++) {
-    timelog = new_ticklog(h, database, "ENB_DLSCH_UE_NACK",
+    timelog = new_ticklog(h, database, "ENB_PHY_DLSCH_UE_NACK",
        "frame", "subframe");
    subview = new_subview_ticktime(timeview, i+1,
        new_color(g,"#f22"), 3600*1000);
    logger_add_view(timelog, subview);
    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_DLSCH_UE_NACK", i));
+        ticktime_filter(database, "ENB_PHY_DLSCH_UE_NACK", i));
  }
  /* UL harq pids */
  for (i = 0; i < 8; i++) {
    /* first transmission */
-    timelog = new_ticklog(h, database, "ENB_ULSCH_UE_DCI",
+    timelog = new_ticklog(h, database, "ENB_PHY_ULSCH_UE_DCI",
        "frame", "subframe");
    subview = new_subview_ticktime(timeview, i+9+1,
        new_color(g,"#55f"), 3600*1000);
    logger_add_view(timelog, subview);
    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_ULSCH_UE_DCI", i));
+        ticktime_filter(database, "ENB_PHY_ULSCH_UE_DCI", i));
    /* retransmission */
-    timelog = new_ticklog(h, database, "ENB_ULSCH_UE_NO_DCI_RETRANSMISSION",
+    timelog = new_ticklog(h, database,
-        "frame", "subframe");
+        "ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", "frame", "subframe");
    subview = new_subview_ticktime(timeview, i+9+1,
        new_color(g,"#99f"), 3600*1000);
    logger_add_view(timelog, subview);
    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_ULSCH_UE_NO_DCI_RETRANSMISSION", i));
+        ticktime_filter(database,
+            "ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", i));
  }
  /* UL ACK */
  for (i = 0; i < 8; i++) {
-    timelog = new_ticklog(h, database, "ENB_ULSCH_UE_ACK",
+    timelog = new_ticklog(h, database, "ENB_PHY_ULSCH_UE_ACK",
        "frame", "subframe");
    subview = new_subview_ticktime(timeview, i+9+1,
        new_color(g,"#282"), 3600*1000);
    logger_add_view(timelog, subview);
    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_ULSCH_UE_ACK", i));
+        ticktime_filter(database, "ENB_PHY_ULSCH_UE_ACK", i));
  }
  /* UL NACK */
  for (i = 0; i < 8; i++) {
-    timelog = new_ticklog(h, database, "ENB_ULSCH_UE_NACK",
+    timelog = new_ticklog(h, database, "ENB_PHY_ULSCH_UE_NACK",
        "frame", "subframe");
    subview = new_subview_ticktime(timeview, i+9+1,
        new_color(g,"#f22"), 3600*1000);
    logger_add_view(timelog, subview);
    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_ULSCH_UE_NACK", i));
+        ticktime_filter(database, "ENB_PHY_ULSCH_UE_NACK", i));
  }
  /* phy/mac/rlc/pdcp/rrc textlog */
@@ -446,30 +447,30 @@ int main(int n, char **v)
    free(desc);
  }
-  on_off(database, "ENB_INPUT_SIGNAL", is_on, 1);
+  on_off(database, "ENB_PHY_INPUT_SIGNAL", is_on, 1);
-  on_off(database, "ENB_DL_TICK", is_on, 1);
+  on_off(database, "ENB_PHY_DL_TICK", is_on, 1);
-  on_off(database, "ENB_DLSCH_UE_DCI", is_on, 1);
+  on_off(database, "ENB_PHY_DLSCH_UE_DCI", is_on, 1);
-  on_off(database, "ENB_DLSCH_UE_ACK", is_on, 1);
+  on_off(database, "ENB_PHY_DLSCH_UE_ACK", is_on, 1);
-  on_off(database, "ENB_DLSCH_UE_NACK", is_on, 1);
+  on_off(database, "ENB_PHY_DLSCH_UE_NACK", is_on, 1);
-  on_off(database, "ENB_UL_TICK", is_on, 1);
+  on_off(database, "ENB_PHY_UL_TICK", is_on, 1);
-  on_off(database, "ENB_ULSCH_UE_DCI", is_on, 1);
+  on_off(database, "ENB_PHY_ULSCH_UE_DCI", is_on, 1);
-  on_off(database, "ENB_ULSCH_UE_NO_DCI_RETRANSMISSION", is_on, 1);
+  on_off(database, "ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", is_on, 1);
-  on_off(database, "ENB_ULSCH_UE_ACK", is_on, 1);
+  on_off(database, "ENB_PHY_ULSCH_UE_ACK", is_on, 1);
-  on_off(database, "ENB_ULSCH_UE_NACK", is_on, 1);
+  on_off(database, "ENB_PHY_ULSCH_UE_NACK", is_on, 1);
  on_off(database, "ENB_MASTER_TICK", is_on, 1);
  on_off(database, "LEGACY_RRC_INFO", is_on, 1);
  on_off(database, "LEGACY_RRC_ERROR", is_on, 1);
  on_off(database, "LEGACY_RRC_WARNING", is_on, 1);
-  view_add_log(eg.phyview, "ENB_DLSCH_UE_DCI", h, database, is_on);
+  view_add_log(eg.phyview, "ENB_PHY_DLSCH_UE_DCI", h, database, is_on);
-  view_add_log(eg.phyview, "ENB_DLSCH_UE_ACK", h, database, is_on);
+  view_add_log(eg.phyview, "ENB_PHY_DLSCH_UE_ACK", h, database, is_on);
-  view_add_log(eg.phyview, "ENB_DLSCH_UE_NACK", h, database, is_on);
+  view_add_log(eg.phyview, "ENB_PHY_DLSCH_UE_NACK", h, database, is_on);
-  view_add_log(eg.phyview, "ENB_ULSCH_UE_DCI", h, database, is_on);
+  view_add_log(eg.phyview, "ENB_PHY_ULSCH_UE_DCI", h, database, is_on);
-  view_add_log(eg.phyview, "ENB_ULSCH_UE_NO_DCI_RETRANSMISSION",
+  view_add_log(eg.phyview, "ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION",
      h, database, is_on);
-  view_add_log(eg.phyview, "ENB_ULSCH_UE_ACK", h, database, is_on);
+  view_add_log(eg.phyview, "ENB_PHY_ULSCH_UE_ACK", h, database, is_on);
-  view_add_log(eg.phyview, "ENB_ULSCH_UE_NACK", h, database, is_on);
+  view_add_log(eg.phyview, "ENB_PHY_ULSCH_UE_NACK", h, database, is_on);
  view_add_log(eg.macview, "ENB_MAC_UE_DL_SDU", h, database, is_on);
  view_add_log(eg.macview, "ENB_MAC_UE_UL_SCHEDULE", h, database, is_on);

--- a/common/utils/T/tracer/textlog.c
+++ b/common/utils/T/tracer/textlog.c
@@ -159,7 +159,7 @@ int main(int n, char **v)
    char *name, *desc;
    database_get_generic_description(database, i, &name, &desc);
    textlog = new_textlog(h, database, name, desc);
-//        "ENB_UL_CHANNEL_ESTIMATE",
+//        "ENB_PHY_UL_CHANNEL_ESTIMATE",
 //        "ev: {} eNB_id [eNB_ID] frame [frame] subframe [subframe]");
    logger_add_view(textlog, out);
    free(name);

--- a/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
@@ -334,7 +334,7 @@ int32_t lte_ul_channel_estimation(PHY_VARS_eNB *phy_vars_eNB,
 #if T_TRACER
      if (aa == 0)
-        T(T_ENB_UL_CHANNEL_ESTIMATE, T_INT(eNB_id), T_INT(UE_id),
+        T(T_ENB_PHY_UL_CHANNEL_ESTIMATE, T_INT(eNB_id), T_INT(UE_id),
          T_INT(phy_vars_eNB->proc[sched_subframe].frame_rx), T_INT(subframe),
          T_INT(0), T_BUFFER(ul_ch_estimates_time[0], 512  * 4));
 #endif

--- a/openair1/PHY/LTE_TRANSPORT/phich.c
+++ b/openair1/PHY/LTE_TRANSPORT/phich.c
@@ -1506,7 +1506,7 @@ void generate_phich_top(PHY_VARS_eNB *phy_vars_eNB,
        if ((ulsch_eNB[UE_id]->harq_processes[harq_pid]->dci_alloc == 0) &&
            (ulsch_eNB[UE_id]->harq_processes[harq_pid]->rar_alloc == 0) ) {
          if (ulsch_eNB[UE_id]->harq_processes[harq_pid]->phich_ACK==0 ) {
-            T(T_ENB_ULSCH_UE_NO_DCI_RETRANSMISSION, T_INT(phy_vars_eNB->Mod_id), T_INT(phy_vars_eNB->proc[sched_subframe].frame_tx),
+            T(T_ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION, T_INT(phy_vars_eNB->Mod_id), T_INT(phy_vars_eNB->proc[sched_subframe].frame_tx),
              T_INT(subframe), T_INT(UE_id), T_INT(ulsch_eNB[UE_id]->rnti), T_INT(harq_pid));
            LOG_D(PHY,"[eNB %d][PUSCH %d] frame %d, subframe %d : PHICH NACK / (no format0 DCI) Setting subframe_scheduling_flag\n",
                  phy_vars_eNB->Mod_id,harq_pid,phy_vars_eNB->proc[sched_subframe].frame_tx,subframe);

--- a/openair1/PHY/LTE_TRANSPORT/pucch.c
+++ b/openair1/PHY/LTE_TRANSPORT/pucch.c
@@ -799,7 +799,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
    phy_vars_eNB->pucch1_stats_thres[UE_id][(subframe<<10)+phy_vars_eNB->pucch1_stats_cnt[UE_id][subframe]] = sigma2_dB+pucch1_thres;
    phy_vars_eNB->pucch1_stats_cnt[UE_id][subframe] = (phy_vars_eNB->pucch1_stats_cnt[UE_id][subframe]+1)&1023;
-    T(T_PUCCH_1_ENERGY, T_INT(phy_vars_eNB->Mod_id), T_INT(UE_id), T_INT(frame), T_INT(subframe),
+    T(T_ENB_PHY_PUCCH_1_ENERGY, T_INT(phy_vars_eNB->Mod_id), T_INT(UE_id), T_INT(frame), T_INT(subframe),
      T_INT(stat_max), T_INT(sigma2_dB+pucch1_thres));
    /*
@@ -1044,7 +1044,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
 	phy_vars_eNB->pucch1ab_stats_cnt[UE_id][subframe] = (phy_vars_eNB->pucch1ab_stats_cnt[UE_id][subframe]+1)&1023;
      /* frame not available here - set to -1 for the moment */
-      T(T_PUCCH_1AB_IQ, T_INT(phy_vars_eNB->Mod_id), T_INT(UE_id), T_INT(-1), T_INT(subframe), T_INT(stat_re), T_INT(stat_im));
+      T(T_ENB_PHY_PUCCH_1AB_IQ, T_INT(phy_vars_eNB->Mod_id), T_INT(UE_id), T_INT(-1), T_INT(subframe), T_INT(stat_re), T_INT(stat_im));
      *payload = (stat_re<0) ? 1 : 0;

--- a/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
@@ -1840,7 +1840,7 @@ void rx_ulsch(PHY_VARS_eNB *phy_vars_eNB,
 #endif
-  T(T_PUSCH_IQ, T_INT(eNB_id), T_INT(UE_id), T_INT(phy_vars_eNB->proc[sched_subframe].frame_rx),
+  T(T_ENB_PHY_PUSCH_IQ, T_INT(eNB_id), T_INT(UE_id), T_INT(phy_vars_eNB->proc[sched_subframe].frame_rx),
    T_INT(subframe), T_INT(ulsch[UE_id]->harq_processes[harq_pid]->nb_rb),
    T_BUFFER(eNB_pusch_vars->rxdataF_comp[eNB_id][0],
             2 * /* ulsch[UE_id]->harq_processes[harq_pid]->nb_rb */ frame_parms->N_RB_UL *12*frame_parms->symbols_per_tti*2));

--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -598,7 +598,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX,1);
  start_meas(&phy_vars_eNB->phy_proc_tx);
-  T(T_ENB_DL_TICK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe));
+  T(T_ENB_PHY_DL_TICK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe));
  for (i=0; i<NUMBER_OF_UE_MAX; i++) {
    // If we've dropped the UE, go back to PRACH mode for this UE
@@ -1097,7 +1097,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
              phy_vars_eNB->Mod_id,DCI_pdu->dci_alloc[i].rnti,phy_vars_eNB->dlsch_eNB[(uint8_t)UE_id][0]->current_harq_pid,phy_vars_eNB->proc[sched_subframe].frame_tx,subframe);
-        T(T_ENB_DLSCH_UE_DCI, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id),
+        T(T_ENB_PHY_DLSCH_UE_DCI, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id),
          T_INT(DCI_pdu->dci_alloc[i].rnti), T_INT(DCI_pdu->dci_alloc[i].format),
          T_INT(phy_vars_eNB->dlsch_eNB[(int)UE_id][0]->current_harq_pid));
@@ -1151,7 +1151,7 @@ void phy_procedures_eNB_TX(unsigned char sched_subframe,PHY_VARS_eNB *phy_vars_e
      else
 	UE_id = i;
-      T(T_ENB_ULSCH_UE_DCI, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id),
+      T(T_ENB_PHY_ULSCH_UE_DCI, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id),
        T_INT(DCI_pdu->dci_alloc[i].rnti), T_INT(harq_pid));
      if (UE_id<0) {
@@ -1878,7 +1878,7 @@ void process_HARQ_feedback(uint8_t UE_id,
                  dlsch->rnti,dl_harq_pid[m],M,m,mp,dlsch_harq_proc->round);
 #endif
-            T(T_ENB_DLSCH_UE_NACK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id), T_INT(dlsch->rnti),
+            T(T_ENB_PHY_DLSCH_UE_NACK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id), T_INT(dlsch->rnti),
              T_INT(dl_harq_pid[m]));
            if (dlsch_harq_proc->round == 0)
@@ -1915,7 +1915,7 @@ void process_HARQ_feedback(uint8_t UE_id,
                  dlsch->rnti,dl_harq_pid[m],dlsch_harq_proc->round);
 #endif
-            T(T_ENB_DLSCH_UE_ACK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id), T_INT(dlsch->rnti),
+            T(T_ENB_PHY_DLSCH_UE_ACK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id), T_INT(dlsch->rnti),
              T_INT(dl_harq_pid[m]));
            ue_stats->dlsch_ACK[dl_harq_pid[m]][dlsch_harq_proc->round]++;
@@ -2748,9 +2748,9 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
  LOG_D(PHY,"[eNB %d] Frame %d: Doing phy_procedures_eNB_RX(%d)\n",phy_vars_eNB->Mod_id,frame, subframe);
 #endif
-  T(T_ENB_UL_TICK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe));
+  T(T_ENB_PHY_UL_TICK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe));
-  T(T_ENB_INPUT_SIGNAL, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(0),
+  T(T_ENB_PHY_INPUT_SIGNAL, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(0),
    T_BUFFER(&phy_vars_eNB->lte_eNB_common_vars.rxdata[0][0][subframe*phy_vars_eNB->lte_frame_parms.samples_per_tti],
             phy_vars_eNB->lte_frame_parms.samples_per_tti * 4));
@@ -2984,7 +2984,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
 	VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_ULSCH_MSG3,0);
      if (ret == (1+MAX_TURBO_ITERATIONS)) {
-        T(T_ENB_ULSCH_UE_NACK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(i), T_INT(phy_vars_eNB->ulsch_eNB[i]->rnti),
+        T(T_ENB_PHY_ULSCH_UE_NACK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(i), T_INT(phy_vars_eNB->ulsch_eNB[i]->rnti),
          T_INT(harq_pid));
        phy_vars_eNB->eNB_UE_stats[i].ulsch_round_errors[harq_pid][phy_vars_eNB->ulsch_eNB[i]->harq_processes[harq_pid]->round]++;
@@ -3089,7 +3089,7 @@ void phy_procedures_eNB_RX(const unsigned char sched_subframe,PHY_VARS_eNB *phy_
        }
      }  // ulsch in error
      else {
-        T(T_ENB_ULSCH_UE_ACK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(i), T_INT(phy_vars_eNB->ulsch_eNB[i]->rnti),
+        T(T_ENB_PHY_ULSCH_UE_ACK, T_INT(phy_vars_eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(i), T_INT(phy_vars_eNB->ulsch_eNB[i]->rnti),
          T_INT(harq_pid));
        if (phy_vars_eNB->ulsch_eNB[i]->Msg3_flag == 1) {

--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -862,6 +862,11 @@ void schedule_ulsch_rnti(module_id_t   module_idP,
            rballoc = mac_xface->computeRIV(frame_parms->N_RB_UL,
                                            first_rb[CC_id],
                                            rb_table[rb_table_index]);
+            T(T_ENB_MAC_UE_UL_SCHEDULE, T_INT(module_idP), T_INT(CC_id), T_INT(rnti), T_INT(frameP),
+              T_INT(subframeP), T_INT(harq_pid), T_INT(mcs), T_INT(first_rb[CC_id]), T_INT(rb_table[rb_table_index]),
+              T_INT(TBS));
 	    // bad indices : 20 (40 PRB), 21 (45 PRB), 22 (48 PRB)
            // increment for next UE allocation
            first_rb[CC_id]+=rb_table[rb_table_index];
@@ -876,7 +881,7 @@ void schedule_ulsch_rnti(module_id_t   module_idP,
 		    module_idP,harq_pid,rnti,CC_id,frameP,subframeP,UE_id,mcs,
 		    first_rb[CC_id],rb_table[rb_table_index],
 		    rb_table_index,TBS,harq_pid);
 	    // adjust total UL buffer status by TBS, wait for UL sdus to do final update
 	    LOG_D(MAC,"[eNB %d] CC_id %d UE %d/%x : adjusting ul_total_buffer, old %d, TBS %d\n", module_idP,CC_id,UE_id,rnti,UE_template->ul_total_buffer,TBS);
 	    if (UE_template->ul_total_buffer > TBS)
@@ -1100,9 +1105,9 @@ void schedule_ulsch_rnti(module_id_t   module_idP,
          }
 	  else {
-            T(T_ENB_MAC_UE_UL_SCHEDULE, T_INT(module_idP), T_INT(CC_id), T_INT(rnti), T_INT(frameP),
+            T(T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION, T_INT(module_idP), T_INT(CC_id), T_INT(rnti), T_INT(frameP),
              T_INT(subframeP), T_INT(harq_pid), T_INT(mcs), T_INT(first_rb[CC_id]), T_INT(rb_table[rb_table_index]),
-              T_INT(TBS));
+              T_INT(round));
            LOG_D(MAC,"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled (PHICH) UE %d (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d,round %d)\n",
                  module_idP,harq_pid,rnti,CC_id,frameP,subframeP,UE_id,mcs,
@@ -1120,10 +1125,6 @@ void schedule_ulsch_rnti(module_id_t   module_idP,
            }
-            T(T_ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION, T_INT(module_idP), T_INT(CC_id), T_INT(rnti), T_INT(frameP),
-              T_INT(subframeP), T_INT(harq_pid), T_INT(mcs), T_INT(first_rb[CC_id]), T_INT(rb_table[rb_table_index]),
-              T_INT(round));
            LOG_I(MAC,"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled UE retransmission (mcs %d, first rb %d, nb_rb %d, harq_pid %d, round %d)\n",
                  module_idP,UE_id,rnti,CC_id,frameP,subframeP,mcs,
                  first_rb[CC_id],UE_template->nb_rb_ul[harq_pid],