Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d

targets/COMMON/create_tasks.c

@@ -59,7 +59,7 @@ int create_tasks(uint32_t enb_nb) {
   rc = itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL);
   AssertFatal(rc >= 0, "Create task for RRC eNB failed\n");
 
-  if (EPC_MODE_ENABLED && ! ( split73==SPLIT73_DU ) ) {
+  if (get_softmodem_params()->emulate_l1 || (EPC_MODE_ENABLED && split73 != SPLIT73_DU)) {
     rc = itti_create_task(TASK_SCTP, sctp_eNB_task, NULL);
     AssertFatal(rc >= 0, "Create task for SCTP failed\n");
   }
@@ -73,12 +73,13 @@ int create_tasks(uint32_t enb_nb) {
     }
     rc = itti_create_task(TASK_GTPV1_U, gtpv1u_eNB_task, NULL);
     AssertFatal(rc >= 0, "Create task for GTPV1U failed\n");
-    if (is_x2ap_enabled()) {
+  }
+
+  if (is_x2ap_enabled()) {
       rc = itti_create_task(TASK_X2AP, x2ap_task, NULL);
       AssertFatal(rc >= 0, "Create task for X2AP failed\n");
-    } else {
+  } else {
       LOG_I(X2AP, "X2AP is disabled.\n");
-    }
   }
 
   if (NODE_IS_CU(type)) {

targets/COMMON/create_tasks_mbms.c

@@ -51,6 +51,7 @@
 int create_tasks_mbms(uint32_t enb_nb) {
  // LOG_D(ENB_APP, "%s(enb_nb:%d\n", __FUNCTION__, enb_nb);
  // ngran_node_t type = RC.rrc[0]->node_type;
+  AssertFatal(!get_softmodem_params()->nsa, "In NSA mode\n");
   int rc;
 
   if (enb_nb == 0) return 0;

targets/COMMON/create_tasks_ue.c

@@ -22,6 +22,7 @@
 # include "intertask_interface.h"
 # include "create_tasks.h"
 # include "common/utils/LOG/log.h"
+# include "executables/softmodem-common.h"
 
   #include "sctp_eNB_task.h"
   #include "s1ap_eNB.h"
@@ -63,6 +64,15 @@ int create_tasks_ue(uint32_t ue_nb) {
       LOG_E(RRC, "Create task for RRC UE failed\n");
       return -1;
     }
+
+    if (get_softmodem_params()->nsa) {
+      init_connections_with_nr_ue();
+      LOG_I(RRC, "Started LTE-NR link in the LTE UE\n");
+      if (itti_create_task (TASK_RRC_NSA_UE, recv_msgs_from_nr_ue, NULL) < 0) {
+        LOG_E(RRC, "Create task for RRC NSA UE failed\n");
+        return -1;
+      }
+    }
   }
 
   itti_wait_ready(0);

targets/COMMON/openairinterface5g_limits.h

@@ -28,7 +28,7 @@
 
 #        ifndef PHYSIM
 #            ifndef UE_EXPANSION
-#                    define NUMBER_OF_UE_MAX 4
+#                    define NUMBER_OF_UE_MAX 40
 #                    define NUMBER_OF_NR_UE_MAX 4
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 1
 #                    define NUMBER_OF_CONNECTED_gNB_MAX 1