Merge branch 'develop' into feature-44-dedicated-drb

.gitlab-ci.yml

@@ -34,6 +34,4 @@ job1:
    - cat $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml
    - exce_log=`egrep -i 'warning|error|critical|exception' $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log  |cat `
    - if [ -n "$exce_log" ]; then  echo -e "\e[31mThere are errors in $NFS_TEST_RESULTS_DIR/log/python_autotest.log. Please check the logs\e[0m" ; fi
-   - exce_log=`egrep -i 'warning|error|critical|exception' $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log |cat `
-   - if [ -n "$exce_log" ]; then echo -e "\e[31mThere are errors in $NFS_TEST_RESULTS_DIR/log/python_autotest_cleanup.log. Please check the logs\e[0m" ; fi
    

cmake_targets/CMakeLists.txt

@@ -1672,7 +1672,7 @@ target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES}  ${option_HW_lib}  ${option_TP_lib} ${XFORMS_LIBRARIES} )
 target_link_libraries (lte-softmodem-nos1 ${LIBBOOST_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1  ${LIB_LMS_LIBRARIES})
-target_link_libraries (lte-softmodem ${T_LIB})
+target_link_libraries (lte-softmodem-nos1 ${T_LIB})
 
 # rrh
 ################################

cmake_targets/autotests/README.txt

@@ -239,7 +239,7 @@ Obj.#   Case#   Test#	Description
 
 02                      Functional test case
 
-03                      Non-Functional test case
+03                      Autotests specific to OAI UE
 
 04                      Failure test case 
  
@@ -249,6 +249,4 @@ Obj.#   Case#   Test#	Description
 #TODO: Add test cases for 10,20 MHz
 #TODO: Add test cases for TDD/FDD 
 #TODO: Test and compile seperately for Rel8/Rel10
-#TODO: Case03.py eMBMS test case
-
+#TODO: Case03.py eMBMS test case
\ No newline at end of file
-

cmake_targets/autotests/tools/iperf_script

@@ -34,6 +34,8 @@
 #arg2 interface
 #arg3 iperf arguments
 
+echo "Start time of script: `date`"
+
 args=($*)
 timeout=${args[0]}
 iface=${args[1]}
@@ -48,17 +50,57 @@ echo "iface = $iface"
 echo "iperf_args = ${iperf_args[@]}"
 echo "ip_client = $ip_client"
 
-sleep $timeout
-
-echo " Waiting for IP Address..."
-while true; do var=`ifconfig $iface` ;sleep 1; if [ "$var" != "" ]; then break; fi ; done ; sleep 5
 
-if [ -n "$ip_client" ]; then
-echo "Waiting for route to be setup before iperf makes connection..."
-  var=`route -n | grep $ip_client`
-  if ["$var" != "" ] ; then break; fi
 
+# Test an IP address for validity:
+# Usage:
+#      valid_ip IP_ADDRESS
+#      if [[ $? -eq 0 ]]; then echo good; else echo bad; fi
+#   OR
+#      if valid_ip IP_ADDRESS; then echo good; else echo bad; fi
+#
+function valid_ip()
+{
+    local  ip=$1
+    local  stat=1
+
+    if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+        OIFS=$IFS
+        IFS='.'
+        ip=($ip)
+        IFS=$OIFS
+        [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
+            && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
+        stat=$?
+    fi
+    return $stat
+}
+
+if valid_ip $iface; then 
+  echo "$iface is Valid IP Address. Checking for connectivity..."
+  ping -c 1 $iface >& /dev/null
+  while  [ "$?" != "0" ]; do
+     ping -c 1 $iface >& /dev/null
+  done
+  echo "$iface connectivity achieved at `date`, Seconds = $SECONDS"  
+
+else 
+
+  echo "Waiting for Interface $iface to come up..."
+  while true; do var=`ifconfig $iface` ;sleep 1; if [ "$var" != "" ]; then break; fi ; done 
+  echo "$iface is now available at `date` , Seconds = $SECONDS"
 fi
-sleep 5
 
+
+#if [ -n "$ip_client" ]; then
+#echo "Waiting for route to be setup before iperf makes connection..."
+#  var=`route -n | grep $ip_client`
+#  if ["$var" != "" ] ; then break; fi
+#
+#fi
+
+echo "Sleeping for additional $timeout seconds"
+sleep $timeout
+
+echo "Starting iperf at `date` , Seconds = $SECONDS ...."
 iperf ${iperf_args[@]}

common/utils/T/T_messages.txt

@@ -95,6 +95,10 @@ ID = ENB_MAC_UE_UL_CE
     DESC = MAC uplink UE received control element
     GROUP = ALL:MAC:ENB
     FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,ce
+ID = ENB_MAC_UE_DL_PDU_WITH_DATA
+    DESC = MAC downlink PDU for an UE
+    GROUP = ALL:MAC:ENB
+    FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : buffer,data
 
 #RLC logs
 ID = ENB_RLC_DL

common/utils/T/tracer/event_selector.c

@@ -34,11 +34,14 @@ static void scroll(void *private, gui *g,
   int number_of_lines;
   int new_line;
   int inc;
+  int *d = notification_data;
+  int key_modifiers = *d;
 
   textlist_state(g, w, &visible_lines, &start_line, &number_of_lines);
   inc = 10;
   if (inc > visible_lines - 2) inc = visible_lines - 2;
   if (inc < 1) inc = 1;
+  if (key_modifiers & KEY_CONTROL) inc = 1;
   if (!strcmp(notification, "scrollup")) inc = -inc;
 
   new_line = start_line + inc;

common/utils/T/tracer/gui/gui.h

@@ -83,8 +83,8 @@ int new_color(gui *gui, char *color);
 /* notifications */
 /* known notifications:
  * - textlist:
- *      - scrollup   { void *: NULL }
- *      - scrolldown { void *: NULL }
+ *      - scrollup   { int: key_modifiers }
+ *      - scrolldown { int: key_modifiers }
  *      - click      { int [2]: line, button }
  * - label:
  *      - click      { int: button } (if enabled)

common/utils/T/tracer/gui/textlist.c

@@ -54,11 +54,11 @@ static void button(gui *_g, widget *_this, int x, int y,
   x -= this->common.x;
   /* scroll up */
   if (button == 4 && up == 0) {
-    gui_notify(g, "scrollup", _this, NULL);
+    gui_notify(g, "scrollup", _this, &key_modifiers);
   }
   /* scroll down */
   if (button == 5 && up == 0) {
-    gui_notify(g, "scrolldown", _this, NULL);
+    gui_notify(g, "scrolldown", _this, &key_modifiers);
   }
   /* button 1/2/3 click */
   if (button >= 1 && button <= 3 && up == 0) {

common/utils/T/tracer/view/textlist.c

@@ -89,6 +89,8 @@ static void scroll(void *private, gui *g,
   int number_of_lines;
   int new_line;
   int inc;
+  int *d = notification_data;
+  int key_modifiers = *d;
 
   if (pthread_mutex_lock(&this->lock)) abort();
 
@@ -96,6 +98,7 @@ static void scroll(void *private, gui *g,
   inc = 10;
   if (inc > visible_lines - 2) inc = visible_lines - 2;
   if (inc < 1) inc = 1;
+  if (key_modifiers & KEY_CONTROL) inc = 1;
   if (!strcmp(notification, "scrollup")) inc = -inc;
 
   new_line = start_line + inc;
@@ -122,7 +125,19 @@ static void click(void *private, gui *g,
 
   if (pthread_mutex_lock(&this->lock)) abort();
 
-  if (button == 1) this->autoscroll = 1 - this->autoscroll;
+  if (button == 1) this->autoscroll = 1;
+  if (button == 3) this->autoscroll = 0;
+
+  if (this->autoscroll) {
+    int visible_lines, start_line, number_of_lines;
+    textlist_state(this->g, this->w, &visible_lines, &start_line,
+        &number_of_lines);
+    start_line = number_of_lines - visible_lines;
+    if (start_line < 0) start_line = 0;
+    textlist_set_start_line(this->g, this->w, start_line);
+    /* this call is not necessary, but if things change in textlist... */
+    widget_dirty(this->g, this->w);
+  }
 
   if (pthread_mutex_unlock(&this->lock)) abort();
 }

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -6389,6 +6389,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
     if (ulsch->harq_processes[harq_pid]->first_tx==1) {
       //      ulsch->harq_processes[harq_pid]->Ndi                                   = 1;
       ulsch->harq_processes[harq_pid]->first_tx=0;
+      ulsch->harq_processes[harq_pid]->DCINdi= ndi;
       ulsch->harq_processes[harq_pid]->round = 0;
     } else {
       if (ulsch->harq_processes[harq_pid]->DCINdi!=ndi) { // new SDU opportunity

openair2/LAYER2/MAC/eNB_scheduler_dlsch.c

@@ -1127,6 +1127,9 @@ schedule_ue_spec(
                   module_idP, CC_id, frameP, UE_RNTI(module_idP,UE_id), TBS);
           }
 
+          T(T_ENB_MAC_UE_DL_PDU_WITH_DATA, T_INT(module_idP), T_INT(CC_id), T_INT(rnti), T_INT(frameP), T_INT(subframeP),
+            T_INT(harq_pid), T_BUFFER(UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0], TBS));
+
           aggregation = process_ue_cqi(module_idP,UE_id);
           UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid] = nb_rb;
 

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am.c

@@ -103,7 +103,7 @@ rlc_am_get_buffer_occupancy_in_bytes (
   }
 
 #endif
-  return rlc_pP->status_buffer_occupancy + rlc_pP->retransmission_buffer_occupancy + rlc_pP->sdu_buffer_occupancy + max_li_overhead + header_overhead;
+  return rlc_pP->status_buffer_occupancy + rlc_pP->retrans_num_bytes_to_retransmit + rlc_pP->sdu_buffer_occupancy + max_li_overhead + header_overhead;
 }
 //-----------------------------------------------------------------------------
 void