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
常顺宇
OpenXG-RAN
Commits
b40e2459
Commit
b40e2459
authored
Apr 25, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/fix-flexran-test-free' into develop_integration_2019_w17
parents
fef0f732
b39cb4e5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ci-scripts/main.py
ci-scripts/main.py
+1
-1
openair2/ENB_APP/flexran_agent_common.c
openair2/ENB_APP/flexran_agent_common.c
+1
-1
No files found.
ci-scripts/main.py
View file @
b40e2459
...
...
@@ -1211,7 +1211,7 @@ class SSHConnection():
logging
.
debug
(
'
\u001B
[1mUE ('
+
device_id
+
') IP Address is '
+
UE_IPAddress
+
'
\u001B
[0m'
)
for
ueipaddress
in
self
.
UEIPAddresses
:
if
ueipaddress
==
UE_IPAddress
:
logging
.
debug
(
'
\u001B
[1mUE ('
+
device_id
+
') IP Address '
+
UE_IPAddress
+
'
has been existed
!'
+
'
\u001B
[0m'
)
logging
.
debug
(
'
\u001B
[1mUE ('
+
device_id
+
') IP Address '
+
UE_IPAddress
+
'
: has already been allocated to another device
!'
+
'
\u001B
[0m'
)
ue_ip_status
-=
1
continue
self
.
UEIPAddresses
.
append
(
UE_IPAddress
)
...
...
openair2/ENB_APP/flexran_agent_common.c
View file @
b40e2459
...
...
@@ -298,7 +298,7 @@ int flexran_agent_destroy_enb_config_reply(Protocol__FlexranMessage *msg) {
free
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfoffset
);
if
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfperiod
)
free
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_rfperiod
);
if
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_sfalloc
)
;
if
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_sfalloc
)
free
(
reply
->
cell_config
[
i
]
->
mbsfn_subframe_config_sfalloc
);
if
(
reply
->
cell_config
[
i
]
->
si_config
)
{
...
...
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