Enable s1ap task and initial s1 configuration at gNB to be reused for ngap and N2 interface for now

cmake_targets/CMakeLists.txt

@@ -2853,7 +2853,7 @@ add_executable(nr-softmodem
 
 target_link_libraries (nr-softmodem
   -Wl,--start-group
-  UTIL HASHTABLE SCTP_CLIENT NGAP_LIB UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS NR_GTPV1U SECU_CN SECU_OSA
+  UTIL HASHTABLE SCTP_CLIENT NGAP_LIB S1AP_LIB S1AP_ENB UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS NR_GTPV1U SECU_CN SECU_OSA
   ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} RRC_LIB NR_RRC_LIB 
   S1AP_LIB S1AP_ENB L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB ${PROTO_AGENT_LIB} ${FSPT_MSG_LIB}

executables/nr-softmodem.c

@@ -381,44 +381,32 @@ int create_gNB_tasks(uint32_t gnb_nb) {
   }
 
   if (gnb_nb > 0) {
-    /* Last task to create, others task must be ready before its start */
-    /*if (itti_create_task (TASK_GNB_APP, gNB_app_task, NULL) < 0) {
-      LOG_E(GNB_APP, "Create task for gNB APP failed\n");
-      return -1;
-    }*/
     if(itti_create_task(TASK_SCTP, sctp_eNB_task, NULL) < 0){
     	LOG_E(SCTP, "Create task for SCTP failed\n");
     	return -1;
     }
     if (is_x2ap_enabled()) {
-    	if(itti_create_task(TASK_X2AP, x2ap_task, NULL) < 0){
-    		LOG_E(X2AP, "Create task for X2AP failed\n");
-    	}
+      if(itti_create_task(TASK_X2AP, x2ap_task, NULL) < 0){
+        LOG_E(X2AP, "Create task for X2AP failed\n");
+      }
     }
     else {
-    	LOG_I(X2AP, "X2AP is disabled.\n");
+      LOG_I(X2AP, "X2AP is disabled.\n");
     }
   }
 
   if (EPC_MODE_ENABLED && (get_softmodem_params()->phy_test==0 && get_softmodem_params()->do_ra==0)) {
     if (gnb_nb > 0) {
-      /*if (itti_create_task (TASK_SCTP, sctp_eNB_task, NULL) < 0) {
-        LOG_E(SCTP, "Create task for SCTP failed\n");
-        return -1;
-      }
-
-      if (itti_create_task (TASK_S1AP, s1ap_eNB_task, NULL) < 0) {
-        LOG_E(S1AP, "Create task for S1AP failed\n");
-        return -1;
-      }*/
-
-
       if(!emulate_rf){
         if (itti_create_task (TASK_UDP, udp_eNB_task, NULL) < 0) {
           LOG_E(UDP_, "Create task for UDP failed\n");
           return -1;
         }
       }
+      if (itti_create_task (TASK_S1AP, s1ap_eNB_task, NULL) < 0) {
+        LOG_E(S1AP, "Create task for S1AP failed\n");
+        return -1;
+      }
 
       if (itti_create_task (TASK_GTPV1_U, &gtpv1u_gNB_task, NULL) < 0) {
         LOG_E(GTPU, "Create task for GTPV1U failed\n");
@@ -430,8 +418,8 @@ int create_gNB_tasks(uint32_t gnb_nb) {
 
   if (gnb_nb > 0) {
     if (itti_create_task (TASK_GNB_APP, gNB_app_task, NULL) < 0) {
-		  LOG_E(GNB_APP, "Create task for gNB APP failed\n");
-		  return -1;
+      LOG_E(GNB_APP, "Create task for gNB APP failed\n");
+      return -1;
 	}
     LOG_I(NR_RRC,"Creating NR RRC gNB Task\n");
 

openair2/GNB_APP/gnb_app.c

@@ -75,26 +75,26 @@ static void configure_nr_rrc(uint32_t gnb_id)
 static uint32_t gNB_app_register(uint32_t gnb_id_start, uint32_t gnb_id_end)//, const Enb_properties_array_t *enb_properties)
 {
   uint32_t         gnb_id;
-  //MessageDef      *msg_p;
+  MessageDef      *msg_p;
   uint32_t         register_gnb_pending = 0;
 
   for (gnb_id = gnb_id_start; (gnb_id < gnb_id_end) ; gnb_id++) {
     {
-      //s1ap_register_enb_req_t *s1ap_register_gNB; //Type Temporarily reuse
+      s1ap_register_enb_req_t *s1ap_register_gNB; //Type Temporarily reuse
 
       // note:  there is an implicit relationship between the data structure and the message name 
-      /*msg_p = itti_alloc_new_message (TASK_GNB_APP, S1AP_REGISTER_ENB_REQ); //Message Temporarily reuse
+      msg_p = itti_alloc_new_message (TASK_GNB_APP, S1AP_REGISTER_ENB_REQ); //Message Temporarily reuse
 
-      RCconfig_NR_S1(msg_p, gnb_id);*/
+      RCconfig_NR_S1(msg_p, gnb_id);
 
       if (gnb_id == 0) RCconfig_nr_gtpu();
 
-      /*s1ap_register_gNB = &S1AP_REGISTER_ENB_REQ(msg_p); //Message Temporarily reuse
-      LOG_I(GNB_APP,"default drx %d\n",s1ap_register_gNB->default_drx);*/
+      s1ap_register_gNB = &S1AP_REGISTER_ENB_REQ(msg_p); //Message Temporarily reuse
+      LOG_I(GNB_APP,"default drx %d\n",s1ap_register_gNB->default_drx);
 
       LOG_I(GNB_APP,"[gNB %d] gNB_app_register for instance %d\n", gnb_id, GNB_MODULE_ID_TO_INSTANCE(gnb_id));
 
-      //itti_send_msg_to_task (TASK_S1AP, GNB_MODULE_ID_TO_INSTANCE(gnb_id), msg_p);
+      itti_send_msg_to_task (TASK_S1AP, GNB_MODULE_ID_TO_INSTANCE(gnb_id), msg_p);
 
       register_gnb_pending++;
     }

openair2/GNB_APP/gnb_config.c

@@ -801,11 +801,12 @@ int RCconfig_NR_S1(MessageDef *msg_p, uint32_t i) {
 	    paramdef_t SCTPParams[]  = GNBSCTPPARAMS_DESC;
 	    paramdef_t NETParams[]  =  GNBNETPARAMS_DESC;
 	    char aprefix[MAX_OPTNAME_SIZE*2 + 8];
+	    sprintf(aprefix, "%s.[%i]", GNB_CONFIG_STRING_GNB_LIST, k);
 	    
 	    S1AP_REGISTER_ENB_REQ (msg_p).eNB_id = gnb_id;
       
 	    if (strcmp(*(GNBParamList.paramarray[k][GNB_CELL_TYPE_IDX].strptr), "CELL_MACRO_GNB") == 0) {
-	      S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_MACRO_ENB;
+	      S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_MACRO_GNB;
 	    } else  if (strcmp(*(GNBParamList.paramarray[k][GNB_CELL_TYPE_IDX].strptr), "CELL_HOME_GNB") == 0) {
 	      S1AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_HOME_ENB;
 	    } else {