Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-AIEngine
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
zdx
OpenXG-AIEngine
Commits
1c47a4ad
Commit
1c47a4ad
authored
Jan 16, 2021
by
root
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NVS Slice
parent
5f29bf4b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
11 deletions
+17
-11
c2py/build/libcjson.so
c2py/build/libcjson.so
+0
-0
c2py/build/libcjson.so
c2py/build/libcjson.so
+0
-0
c2py/build/libcjson.so.1
c2py/build/libcjson.so.1
+0
-0
c2py/build/libcjson.so.1
c2py/build/libcjson.so.1
+0
-0
ci-scripts/conf_files/enb.conf
ci-scripts/conf_files/enb.conf
+10
-10
openair2/ENB_APP/flexran_agent_ran_api.c
openair2/ENB_APP/flexran_agent_ran_api.c
+1
-0
openair2/LAYER2/MAC/slicing/slicing.c
openair2/LAYER2/MAC/slicing/slicing.c
+6
-1
No files found.
c2py/build/libcjson.so
deleted
120000 → 0
View file @
5f29bf4b
libcjson.so.1
\ No newline at end of file
c2py/build/libcjson.so
0 → 100755
View file @
1c47a4ad
File added
c2py/build/libcjson.so.1
deleted
120000 → 0
View file @
5f29bf4b
libcjson.so.1.7.14
\ No newline at end of file
c2py/build/libcjson.so.1
0 → 100755
View file @
1c47a4ad
File added
ci-scripts/conf_files/enb.conf
View file @
1c47a4ad
...
@@ -14,7 +14,7 @@ eNBs =
...
@@ -14,7 +14,7 @@ eNBs =
//
Tracking
area
code
,
0
x0000
and
0
xfffe
are
reserved
values
//
Tracking
area
code
,
0
x0000
and
0
xfffe
are
reserved
values
tracking_area_code
=
1
;
tracking_area_code
=
1
;
plmn_list
= ( {
mcc
=
208
;
mnc
=
9
5
;
mnc_length
=
2
; } );
plmn_list
= ( {
mcc
=
208
;
mnc
=
9
2
;
mnc_length
=
2
; } );
tr_s_preference
=
"local_mac"
tr_s_preference
=
"local_mac"
...
@@ -179,7 +179,7 @@ eNBs =
...
@@ -179,7 +179,7 @@ eNBs =
//////////
MME
parameters
:
//////////
MME
parameters
:
mme_ip_address
= ( {
ipv4
=
"192.168.174.13
1
"
;
mme_ip_address
= ( {
ipv4
=
"192.168.174.13
0
"
;
ipv6
=
"192:168:30::17"
;
ipv6
=
"192:168:30::17"
;
active
=
"yes"
;
active
=
"yes"
;
preference
=
"ipv4"
;
preference
=
"ipv4"
;
...
@@ -196,12 +196,12 @@ eNBs =
...
@@ -196,12 +196,12 @@ eNBs =
NETWORK_INTERFACES
:
NETWORK_INTERFACES
:
{
{
ENB_INTERFACE_NAME_FOR_S1_MME
=
"ens192"
;
ENB_INTERFACE_NAME_FOR_S1_MME
=
"ens192"
;
ENB_IPV4_ADDRESS_FOR_S1_MME
=
"192.168.174.13
0
"
;
ENB_IPV4_ADDRESS_FOR_S1_MME
=
"192.168.174.13
1/24
"
;
ENB_INTERFACE_NAME_FOR_S1U
=
"ens192"
;
ENB_INTERFACE_NAME_FOR_S1U
=
"ens192"
;
ENB_IPV4_ADDRESS_FOR_S1U
=
"192.168.174.13
0
"
;
ENB_IPV4_ADDRESS_FOR_S1U
=
"192.168.174.13
1/24
"
;
ENB_PORT_FOR_S1U
=
2152
;
# Spec 2152
ENB_PORT_FOR_S1U
=
2152
;
# Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C
=
"192.168.174.1
28
"
;
ENB_IPV4_ADDRESS_FOR_X2C
=
"192.168.174.1
31/24
"
;
ENB_PORT_FOR_X2C
=
36422
;
# Spec 36422
ENB_PORT_FOR_X2C
=
36422
;
# Spec 36422
};
};
}
}
...
@@ -216,9 +216,9 @@ MACRLCs = (
...
@@ -216,9 +216,9 @@ MACRLCs = (
# puSch10xSnr = 160;
# puSch10xSnr = 160;
# puCch10xSnr = 160;
# puCch10xSnr = 160;
num_cc
=
1
;
num_cc
=
1
;
local_
s
_if_name
=
"ens192"
;
local_
n
_if_name
=
"ens192"
;
remote_
s_address
=
"192.168.174.129
"
;
remote_
n_address
=
"192.168.174.132
"
;
local_
s_address
=
"192.168.174.130
"
;
local_
n_address
=
"192.168.174.131
"
;
local_s_portc
=
50001
;
local_s_portc
=
50001
;
remote_s_portc
=
50000
;
remote_s_portc
=
50000
;
local_s_portd
=
50011
;
local_s_portd
=
50011
;
...
@@ -264,8 +264,8 @@ THREAD_STRUCT = (
...
@@ -264,8 +264,8 @@ THREAD_STRUCT = (
NETWORK_CONTROLLER
:
NETWORK_CONTROLLER
:
{
{
FLEXRAN_ENABLED
=
"yes"
;
FLEXRAN_ENABLED
=
"yes"
;
FLEXRAN_INTERFACE_NAME
=
"
lo
"
;
FLEXRAN_INTERFACE_NAME
=
"
ens192
"
;
FLEXRAN_IPV4_ADDRESS
=
"1
27.0.0.1
"
;
FLEXRAN_IPV4_ADDRESS
=
"1
92.168.174.130
"
;
FLEXRAN_PORT
=
2210
;
FLEXRAN_PORT
=
2210
;
FLEXRAN_CACHE
=
"/mnt/oai_agent_cache"
;
FLEXRAN_CACHE
=
"/mnt/oai_agent_cache"
;
FLEXRAN_AWAIT_RECONF
=
"no"
;
FLEXRAN_AWAIT_RECONF
=
"no"
;
...
...
openair2/ENB_APP/flexran_agent_ran_api.c
View file @
1c47a4ad
...
@@ -3036,6 +3036,7 @@ int flexran_set_dl_slice_algo(mid_t mod_id, Protocol__FlexSliceAlgorithm algo) {
...
@@ -3036,6 +3036,7 @@ int flexran_set_dl_slice_algo(mid_t mod_id, Protocol__FlexSliceAlgorithm algo) {
mac
->
pre_processor_dl
=
static_dl_init
(
mod_id
,
cc_id
);
mac
->
pre_processor_dl
=
static_dl_init
(
mod_id
,
cc_id
);
break
;
break
;
default:
default:
//如未指定slice算法,则回归原有的调度!
mac
->
pre_processor_dl
.
algorithm
=
0
;
mac
->
pre_processor_dl
.
algorithm
=
0
;
mac
->
pre_processor_dl
.
dl
=
dlsch_scheduler_pre_processor
;
mac
->
pre_processor_dl
.
dl
=
dlsch_scheduler_pre_processor
;
mac
->
pre_processor_dl
.
dl_algo
.
data
=
mac
->
pre_processor_dl
.
dl_algo
.
setup
();
mac
->
pre_processor_dl
.
dl_algo
.
data
=
mac
->
pre_processor_dl
.
dl_algo
.
setup
();
...
...
openair2/LAYER2/MAC/slicing/slicing.c
View file @
1c47a4ad
...
@@ -325,6 +325,7 @@ void static_dl(module_id_t mod_id,
...
@@ -325,6 +325,7 @@ void static_dl(module_id_t mod_id,
max_num_ue
=
1
;
max_num_ue
=
1
;
break
;
break
;
}
}
//先给每个Slice里面
for
(
int
i
=
0
;
i
<
s
->
num
;
++
i
)
{
for
(
int
i
=
0
;
i
<
s
->
num
;
++
i
)
{
if
(
s
->
s
[
i
]
->
UEs
.
head
<
0
)
if
(
s
->
s
[
i
]
->
UEs
.
head
<
0
)
continue
;
continue
;
...
@@ -380,7 +381,7 @@ void static_dl(module_id_t mod_id,
...
@@ -380,7 +381,7 @@ void static_dl(module_id_t mod_id,
for
(
int
j
=
0
;
j
<
RBGsize
;
j
++
)
{
for
(
int
j
=
0
;
j
<
RBGsize
;
j
++
)
{
if
(
vrb_map
[
RBGsize
*
i
+
j
]
!=
0
)
{
if
(
vrb_map
[
RBGsize
*
i
+
j
]
!=
0
)
{
LOG_I
(
MAC
,
"%4d.%d DL scheduler allocation list: %s
\n
"
,
frame
,
subframe
,
t
);
LOG_I
(
MAC
,
"%4d.%d DL scheduler allocation list: %s
\n
"
,
frame
,
subframe
,
t
);
LOG_
E
(
MAC
,
"%4d.%d: UE %d allocated at locked RB %d/RBG %d
\n
"
,
frame
,
LOG_
I
(
MAC
,
"%4d.%d: UE %d allocated at locked RB %d/RBG %d
\n
"
,
frame
,
subframe
,
UE_id
,
RBGsize
*
i
+
j
,
i
);
subframe
,
UE_id
,
RBGsize
*
i
+
j
,
i
);
}
}
vrb_map
[
RBGsize
*
i
+
j
]
=
1
;
vrb_map
[
RBGsize
*
i
+
j
]
=
1
;
...
@@ -599,3 +600,7 @@ pp_impl_param_t static_ul_init(module_id_t mod_id, int CC_id) {
...
@@ -599,3 +600,7 @@ pp_impl_param_t static_ul_init(module_id_t mod_id, int CC_id) {
return
sttc
;
return
sttc
;
}
}
/************************ NVS Slicing Implementation ************************/
/************************ SVN19 Slicing Implementation ************************/
\ No newline at end of file
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