Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
4527c668
Commit
4527c668
authored
Apr 12, 2022
by
Manu Agrawal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added SIDL Delivery and Conf file Changes
parent
a0f643c7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
0 deletions
+53
-0
ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
+11
-0
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+17
-0
openair2/ENB_APP/enb_config.h
openair2/ENB_APP/enb_config.h
+1
-0
openair2/ENB_APP/enb_paramdef.h
openair2/ENB_APP/enb_paramdef.h
+24
-0
No files found.
ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
View file @
4527c668
...
@@ -203,6 +203,17 @@ eNBs =
...
@@ -203,6 +203,17 @@ eNBs =
}
}
);
);
# IP Address, port numbers and SSMode for System Simulator
SSConfig
= (
{
hostIp
=
"127.0.0.1"
;
#Host IP for System Simulator
Sys_port
=
7777
;
#Port Number for System Simulator Sys Port
Srb_port
=
7778
;
#Port Number for System Simulator Srb Port
Vng_port
=
7779
;
#Port Number for System Simulator VNG Port
SSMode
=
2
;
#SSMode: 0 - eNB , 1- SYS_PORT test , 2- Only SRB_PORT test
}
);
MACRLCs
= (
MACRLCs
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
...
...
openair2/ENB_APP/enb_config.c
View file @
4527c668
...
@@ -204,6 +204,22 @@ void RCconfig_L1(void) {
...
@@ -204,6 +204,22 @@ void RCconfig_L1(void) {
}
}
}
}
void
RCconfig_ssparam
(
void
)
{
paramdef_t
SSConfig_Params
[]
=
SSPARAMS_DESC
;
paramlist_def_t
SSConfig_ParamList
=
{
CONFIG_SS
,
NULL
,
0
};
config_getlist
(
&
SSConfig_ParamList
,
SSConfig_Params
,
sizeof
(
SSConfig_Params
)
/
sizeof
(
paramdef_t
),
NULL
);
if
(
SSConfig_ParamList
.
numelt
>
0
)
{
RC
.
ss
.
hostIp
=
strdup
(
*
(
SSConfig_ParamList
.
paramarray
[
0
][
CONFIG_SS_HOSTIP_IDX
].
strptr
));
RC
.
ss
.
Sysport
=
*
(
SSConfig_ParamList
.
paramarray
[
0
][
CONFIG_SS_SYSPORT_IDX
].
iptr
);
RC
.
ss
.
Srbport
=
*
(
SSConfig_ParamList
.
paramarray
[
0
][
CONFIG_SS_SRBPORT_IDX
].
iptr
);
RC
.
ss
.
Vngport
=
*
(
SSConfig_ParamList
.
paramarray
[
0
][
CONFIG_SS_VNGPORT_IDX
].
iptr
);
RC
.
mode
=
*
(
SSConfig_ParamList
.
paramarray
[
0
][
CONFIG_SS_MODE_IDX
].
iptr
);
}
LOG_A
(
ENB_APP
,
"SS_Config:SSMode %d, hostIp=%s, Sysport=%d, Srbport=%d Vngport=%d
\n
"
,
RC
.
mode
,
RC
.
ss
.
hostIp
,
RC
.
ss
.
Sysport
,
RC
.
ss
.
Srbport
,
RC
.
ss
.
Vngport
);
}
void
RCconfig_macrlc
(
int
macrlc_has_f1
[
MAX_MAC_INST
])
{
void
RCconfig_macrlc
(
int
macrlc_has_f1
[
MAX_MAC_INST
])
{
int
j
;
int
j
;
paramdef_t
MacRLC_Params
[]
=
MACRLCPARAMS_DESC
;
paramdef_t
MacRLC_Params
[]
=
MACRLCPARAMS_DESC
;
...
@@ -3206,6 +3222,7 @@ void read_config_and_init(void) {
...
@@ -3206,6 +3222,7 @@ void read_config_and_init(void) {
RCconfig_L1
();
RCconfig_L1
();
LOG_I
(
PHY
,
"%s() RC.nb_L1_inst: %d
\n
"
,
__FUNCTION__
,
RC
.
nb_L1_inst
);
LOG_I
(
PHY
,
"%s() RC.nb_L1_inst: %d
\n
"
,
__FUNCTION__
,
RC
.
nb_L1_inst
);
RCconfig_macrlc
(
macrlc_has_f1
);
RCconfig_macrlc
(
macrlc_has_f1
);
RCconfig_ssparam
();
LOG_I
(
MAC
,
"%s() RC.nb_macrlc_inst: %d
\n
"
,
__FUNCTION__
,
RC
.
nb_macrlc_inst
);
LOG_I
(
MAC
,
"%s() RC.nb_macrlc_inst: %d
\n
"
,
__FUNCTION__
,
RC
.
nb_macrlc_inst
);
if
(
RC
.
nb_L1_inst
>
0
)
if
(
RC
.
nb_L1_inst
>
0
)
...
...
openair2/ENB_APP/enb_config.h
View file @
4527c668
...
@@ -102,6 +102,7 @@ typedef struct ru_config_s {
...
@@ -102,6 +102,7 @@ typedef struct ru_config_s {
extern
void
RCconfig_flexran
(
void
);
extern
void
RCconfig_flexran
(
void
);
extern
void
RCconfig_L1
(
void
);
extern
void
RCconfig_L1
(
void
);
extern
void
RCconfig_ssparam
(
void
);
extern
void
RCconfig_macrlc
(
int
macrlc_has_f1
[
MAX_MAC_INST
]);
extern
void
RCconfig_macrlc
(
int
macrlc_has_f1
[
MAX_MAC_INST
]);
extern
void
UE_config_stub_pnf
(
void
);
extern
void
UE_config_stub_pnf
(
void
);
extern
int
RCconfig_gtpu
(
void
);
extern
int
RCconfig_gtpu
(
void
);
...
...
openair2/ENB_APP/enb_paramdef.h
View file @
4527c668
...
@@ -332,7 +332,31 @@ typedef enum {
...
@@ -332,7 +332,31 @@ typedef enum {
{ .s1 = { config_check_intval, MNC_DIGIT_LENGTH_OKVALUES, 2 } }, \
{ .s1 = { config_check_intval, MNC_DIGIT_LENGTH_OKVALUES, 2 } }, \
}
}
/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
/* SS configuration */
#define CONFIG_SS "SSConfig"
#define CONFIG_SS_HOSTIP "hostIp"
#define CONFIG_SS_SYSPORT "Sys_port"
#define CONFIG_SS_SRBPORT "Srb_port"
#define CONFIG_SS_VNGPORT "Vng_port"
#define CONFIG_SS_MODE "SSMode"
#define CONFIG_SS_HOSTIP_IDX 0
#define CONFIG_SS_SYSPORT_IDX 1
#define CONFIG_SS_SRBPORT_IDX 2
#define CONFIG_SS_VNGPORT_IDX 3
#define CONFIG_SS_MODE_IDX 4
#define SSPARAMS_DESC { \
{CONFIG_SS_HOSTIP , NULL, 0, uptr:NULL, defstrval:"0.0.0.0", TYPE_STRING, 0}, \
{CONFIG_SS_SYSPORT , NULL, 0, uptr:NULL, defintval:0000, TYPE_UINT, 0}, \
{CONFIG_SS_SRBPORT , NULL, 0, uptr:NULL, defintval:0000, TYPE_UINT, 0}, \
{CONFIG_SS_VNGPORT , NULL, 0, uptr:NULL, defintval:0000, TYPE_UINT, 0}, \
{CONFIG_SS_MODE , NULL, 0, uptr:NULL, defintval:0000, TYPE_UINT, 0}, \
}
/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
#define ENB_CONFIG_STRING_MBMS_CONFIGURATION_DATA_LIST "mbms_configuration_data_list"
#define ENB_CONFIG_STRING_MBMS_CONFIGURATION_DATA_LIST "mbms_configuration_data_list"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment