Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-AMF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG-AMF
Commits
ab969441
Commit
ab969441
authored
Feb 08, 2022
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue for NSSAI
parent
48953689
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
src/amf-app/amf_n1.cpp
src/amf-app/amf_n1.cpp
+6
-3
src/sbi/amf_server/model/Nssai.cpp
src/sbi/amf_server/model/Nssai.cpp
+3
-0
src/sbi/amf_server/model/Nssai.h
src/sbi/amf_server/model/Nssai.h
+1
-0
No files found.
src/amf-app/amf_n1.cpp
View file @
ab969441
...
...
@@ -4027,8 +4027,9 @@ bool amf_n1::get_slice_selection_subscription_data_from_conf_file(
gc
=
amf_n2_inst
->
assoc_id_2_gnb_context
(
unc
.
get
()
->
gnb_assoc_id
);
// Find the common NSSAIs between Requested NSSAIs and Subscribed NSSAIs
std
::
vector
<
oai
::
amf
::
model
::
Snssai
>
common_snssais
=
nssai
.
getDefaultSingleNssais
();
std
::
vector
<
oai
::
amf
::
model
::
Snssai
>
common_snssais
;
// nssai.getDefaultSingleNssais();
for
(
auto
ta
:
gc
->
s_ta_list
)
{
for
(
auto
p
:
ta
.
b_plmn_list
)
{
...
...
@@ -4050,10 +4051,12 @@ bool amf_n1::get_slice_selection_subscription_data_from_conf_file(
}
}
nssai
.
setDefaultSingleNssais
(
common_snssais
);
// Print out the list of subscribed NSSAIs
for
(
auto
n
:
nssai
.
getDefaultSingleNssais
())
{
Logger
::
amf_n1
().
debug
(
"S-NSSAI (SST %d, SD %s)"
,
n
.
getSst
(),
n
.
getSd
().
c_str
());
"
Default Single NSSAIs:
S-NSSAI (SST %d, SD %s)"
,
n
.
getSst
(),
n
.
getSd
().
c_str
());
}
return
true
;
...
...
src/sbi/amf_server/model/Nssai.cpp
View file @
ab969441
...
...
@@ -85,6 +85,9 @@ void Nssai::unsetSupportedFeatures() {
std
::
vector
<
Snssai
>&
Nssai
::
getDefaultSingleNssais
()
{
return
m_DefaultSingleNssais
;
}
void
Nssai
::
setDefaultSingleNssais
(
std
::
vector
<
Snssai
>&
snssais
)
{
m_DefaultSingleNssais
=
snssais
;
}
std
::
vector
<
Snssai
>&
Nssai
::
getSingleNssais
()
{
return
m_SingleNssais
;
}
...
...
src/sbi/amf_server/model/Nssai.h
View file @
ab969441
...
...
@@ -75,6 +75,7 @@ class Nssai {
///
/// </summary>
std
::
vector
<
Snssai
>&
getDefaultSingleNssais
();
void
setDefaultSingleNssais
(
std
::
vector
<
Snssai
>&
snssais
);
/// <summary>
///
/// </summary>
...
...
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