maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

near_ric_ip_addr added. The config needs to be defined in OAI's config file

Browse Source
This commit is contained in:
mir
2023-07-07 13:48:38 +02:00
committed by Robert Schmidt
parent 483c5436e5
commit bb3d8b8201
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-softmodem.c
+6 -4
View File
@@ -697,14 +697,16 @@ int main( int argc, char **argv ) {
//////////////////////////////////
//////////////////////////////////
//// Init the E2 Agent
sm_io_ag_ran_t io = init_ran_func_ag();
fr_args_t args = init_fr_args(0, NULL);
// OAI Wrapper
e2_agent_args_t oai_args = RCconfig_NR_E2agent();
if(oai_args.sm_dir != NULL)
memcpy(args.libs_dir, oai_args.sm_dir, 128);
AssertFatal(oai_args.sm_dir != NULL , "Please, specify the directory where the SMs are located in the config file, i.e., e2_agent = {near_ric_ip_addr = \"127.0.0.1\"; sm_dir = \"/usr/local/lib/flexric/\");} ");
AssertFatal(oai_args.ip != NULL , "Please, specify the IP address of the nearRT-RIC in the config file, i.e., e2_agent = {near_ric_ip_addr = \"127.0.0.1\"; sm_dir = \"/usr/local/lib/flexric/\"");
fr_args_t args = {.ip = oai_args.ip}; // init_fr_args(0, NULL);
memcpy(args.libs_dir, oai_args.sm_dir, 128);
sleep(1);
const gNB_RRC_INST* rrc = RC.nrrrc[0];
openair2/ENB_APP/enb_paramdef.h
+1 -1
View File
@@ -1322,7 +1322,7 @@ typedef struct srb1_params_s {
/* E2 Agent configuration */
#define CONFIG_STRING_E2AGENT "e2_agent"
#define E2AGENT_CONFIG_IP "ip"
#define E2AGENT_CONFIG_IP "near_ric_ip_addr"
//#define E2AGENT_CONFIG_PORT "port"
#define E2AGENT_CONFIG_SMDIR "sm_dir"
openair2/GNB_APP/gnb_config.c
+6 -3
View File
@@ -2271,10 +2271,13 @@ e2_agent_args_t RCconfig_NR_E2agent(void)
return (e2_agent_args_t) { 0 };
}
e2_agent_args_t dst = {0};
if(e2agent_params[E2AGENT_CONFIG_IP_IDX].strptr != NULL)
dst.ip = *e2agent_params[E2AGENT_CONFIG_IP_IDX].strptr;
if(e2agent_params[E2AGENT_CONFIG_SMDIR_IDX].strptr != NULL)
if (e2agent_params[E2AGENT_CONFIG_SMDIR_IDX].strptr != NULL)
dst.sm_dir = *e2agent_params[E2AGENT_CONFIG_SMDIR_IDX].strptr;
if (e2agent_params[E2AGENT_CONFIG_IP_IDX].strptr != NULL)
dst.ip = *e2agent_params[E2AGENT_CONFIG_IP_IDX].strptr;
return dst;
}
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+1 -1
View File
@@ -267,7 +267,7 @@ log_config :
};
e2_agent = {
address = "127.0.0.1";
near_ric_ip_addr = "127.0.0.1";
#sm_dir = "/path/where/the/SMs/are/located/"
sm_dir = "/usr/local/lib/flexric/"
};