Removed CU-UP checks from nr-softmodem

common/ngran_types.h

@@ -43,12 +43,12 @@ typedef enum {
   ngran_eNB_DU    = 6,
   ngran_gNB_DU    = 7,
   ngran_eNB_MBMS_STA  = 8,
-  ngran_gNB_CUCP,
-  ngran_gNB_CUUP
+  ngran_gNB_CUCP  = 9,
+  ngran_gNB_CUUP  = 10
 } ngran_node_t;
 
 #define NODE_IS_MONOLITHIC(nOdE_TyPe) ((nOdE_TyPe) == ngran_eNB    || (nOdE_TyPe) == ngran_ng_eNB    || (nOdE_TyPe) == ngran_gNB)
-#define NODE_IS_CU(nOdE_TyPe)         ((nOdE_TyPe) == ngran_eNB_CU || (nOdE_TyPe) == ngran_ng_eNB_CU || (nOdE_TyPe) == ngran_gNB_CU || (nOdE_TyPe) == ngran_gNB_CUCP ||(nOdE_TyPe) == ngran_gNB_CUUP )
+#define NODE_IS_CU(nOdE_TyPe)         ((nOdE_TyPe) == ngran_eNB_CU || (nOdE_TyPe) == ngran_ng_eNB_CU || (nOdE_TyPe) == ngran_gNB_CU || (nOdE_TyPe) == ngran_gNB_CUCP || (nOdE_TyPe) == ngran_gNB_CUUP)
 #define NODE_IS_DU(nOdE_TyPe)         ((nOdE_TyPe) == ngran_eNB_DU || (nOdE_TyPe) == ngran_gNB_DU)
 #define NODE_IS_MBMS(nOdE_TyPe)       ((nOdE_TyPe) == ngran_eNB_MBMS_STA)
 

executables/nr-softmodem.c

@@ -316,12 +316,10 @@ int create_gNB_tasks(void) {
   RC.nrrrc = (gNB_RRC_INST **)malloc(RC.nb_nr_inst*sizeof(gNB_RRC_INST *));
   LOG_I(PHY, "%s() RC.nb_nr_inst:%d RC.nrrrc:%p\n", __FUNCTION__, RC.nb_nr_inst, RC.nrrrc);
   ngran_node_t node_type = get_node_type();
-  if (node_type != ngran_gNB_CUUP) {
-    for (int gnb_id = gnb_id_start; (gnb_id < gnb_id_end) ; gnb_id++) {
-      RC.nrrrc[gnb_id] = (gNB_RRC_INST*)calloc(1,sizeof(gNB_RRC_INST));
-      LOG_I(PHY, "%s() Creating RRC instance RC.nrrrc[%d]:%p (%d of %d)\n", __FUNCTION__, gnb_id, RC.nrrrc[gnb_id], gnb_id+1, gnb_id_end);
-      configure_nr_rrc(gnb_id);
-    }
+  for (int gnb_id = gnb_id_start; (gnb_id < gnb_id_end) ; gnb_id++) {
+    RC.nrrrc[gnb_id] = (gNB_RRC_INST*)calloc(1,sizeof(gNB_RRC_INST));
+    LOG_I(PHY, "%s() Creating RRC instance RC.nrrrc[%d]:%p (%d of %d)\n", __FUNCTION__, gnb_id, RC.nrrrc[gnb_id], gnb_id+1, gnb_id_end);
+    configure_nr_rrc(gnb_id);
   }
 
   if (RC.nb_nr_inst > 0 &&
@@ -339,8 +337,7 @@ int create_gNB_tasks(void) {
   /* For the CU case the gNB registration with the AMF might have to take place after the F1 setup, as the PLMN info
      * can originate from the DU. Add check on whether x2ap is enabled to account for ENDC NSA scenario.*/
   if ((get_softmodem_params()->sa || is_x2ap_enabled()) &&
-      !NODE_IS_DU(node_type) &&
-      node_type != ngran_gNB_CUUP) {
+      !NODE_IS_DU(node_type)) {
     /* Try to register each gNB */
     //registered_gnb = 0;
     __attribute__((unused)) uint32_t register_gnb_pending = gNB_app_register (gnb_id_start, gnb_id_end);
@@ -368,8 +365,7 @@ int create_gNB_tasks(void) {
   }
 
   if (get_softmodem_params()->sa &&
-      !NODE_IS_DU(node_type) &&
-      node_type != ngran_gNB_CUUP ) {
+      !NODE_IS_DU(node_type)) {
 
     char*             gnb_ipv4_address_for_NGU      = NULL;
     uint32_t          gnb_port_for_NGU              = 0;
@@ -405,11 +401,9 @@ int create_gNB_tasks(void) {
 
     LOG_I(NR_RRC,"Creating NR RRC gNB Task\n");
 
-    if (node_type != ngran_gNB_CUUP) {
-      if (itti_create_task (TASK_RRC_GNB, rrc_gnb_task, NULL) < 0) {
-        LOG_E(NR_RRC, "Create task for NR RRC gNB failed\n");
-        return -1;
-      }
+    if (itti_create_task (TASK_RRC_GNB, rrc_gnb_task, NULL) < 0) {
+      LOG_E(NR_RRC, "Create task for NR RRC gNB failed\n");
+      return -1;
     }
 
     // If CU

openair2/GNB_APP/gnb_app.c

@@ -172,13 +172,7 @@ void *gNB_app_task(void *args_p)
     }
 
     if (node_type == ngran_gNB_CUUP) {
-      if (itti_create_task(TASK_CUUP_E1, E1AP_CUUP_task, NULL) < 0)
-        AssertFatal(false, "Create task for E1AP UP failed\n");
-      MessageDef *msg = RCconfig_NR_CU_E1();
-      if (msg)
-        itti_send_msg_to_task(TASK_CUUP_E1, 0, msg);
-      else
-        AssertFatal(false, "Send inti to task for E1AP UP failed\n");
+      AssertFatal(false, "To run CU-UP use executable cu-up\n");
     }
 
     if (NODE_IS_DU(node_type)) {

openair2/RRC/NR/rrc_gNB.c

@@ -692,7 +692,6 @@ rrc_gNB_generate_defaultRRCReconfiguration(
       break;
 
     case ngran_gNB_DU:
-    case ngran_gNB_CUUP:
       // nothing to do for DU
       AssertFatal(1==0,"nothing to do for DU\n");
       break;
@@ -4208,7 +4207,6 @@ rrc_gNB_generate_SecurityModeCommand(
       break;
 
     case ngran_gNB_DU:
-    case ngran_gNB_CUUP:
       // nothing to do for DU
       AssertFatal(1==0,"nothing to do for DU\n");
       break;
@@ -4268,7 +4266,6 @@ rrc_gNB_generate_UECapabilityEnquiry(
       break;
 
     case ngran_gNB_DU:
-    case ngran_gNB_CUUP:
       // nothing to do for DU
       AssertFatal(1==0,"nothing to do for DU\n");
       break;