Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-SMF
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
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-SMF
Commits
4ef20876
Commit
4ef20876
authored
Feb 17, 2021
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant conf option (use_local_configuration)
parent
7e539e72
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
11 deletions
+5
-11
etc/smf.conf
etc/smf.conf
+0
-1
src/smf_app/smf_app.cpp
src/smf_app/smf_app.cpp
+1
-1
src/smf_app/smf_config.cpp
src/smf_app/smf_config.cpp
+0
-8
src/smf_app/smf_config.hpp
src/smf_app/smf_config.hpp
+4
-1
No files found.
etc/smf.conf
View file @
4ef20876
...
@@ -117,7 +117,6 @@ SMF =
...
@@ -117,7 +117,6 @@ SMF =
LOCAL_CONFIGURATION
:
LOCAL_CONFIGURATION
:
{
{
USE_LOCAL_CONFIGURATION
=
"yes"
;
SESSION_MANAGEMENT_SUBSCRIPTION_LIST
= (
SESSION_MANAGEMENT_SUBSCRIPTION_LIST
= (
{
NSSAI_SST
=
222
,
NSSAI_SD
=
"123"
,
DNN
=
"default"
,
DEFAULT_SESSION_TYPE
=
"IPV4"
,
DEFAULT_SSC_MODE
=
1
,
{
NSSAI_SST
=
222
,
NSSAI_SD
=
"123"
,
DNN
=
"default"
,
DEFAULT_SESSION_TYPE
=
"IPV4"
,
DEFAULT_SSC_MODE
=
1
,
QOS_PROFILE_5QI
=
6
,
QOS_PROFILE_PRIORITY_LEVEL
=
1
,
QOS_PROFILE_ARP_PRIORITY_LEVEL
=
1
,
QOS_PROFILE_ARP_PREEMPTCAP
=
"NOT_PREEMPT"
,
QOS_PROFILE_5QI
=
6
,
QOS_PROFILE_PRIORITY_LEVEL
=
1
,
QOS_PROFILE_ARP_PRIORITY_LEVEL
=
1
,
QOS_PROFILE_ARP_PREEMPTCAP
=
"NOT_PREEMPT"
,
...
...
src/smf_app/smf_app.cpp
View file @
4ef20876
...
@@ -1371,7 +1371,7 @@ bool smf_app::scid_2_smf_context(
...
@@ -1371,7 +1371,7 @@ bool smf_app::scid_2_smf_context(
bool
smf_app
::
use_local_configuration_subscription_data
(
bool
smf_app
::
use_local_configuration_subscription_data
(
const
std
::
string
&
dnn_selection_mode
)
{
const
std
::
string
&
dnn_selection_mode
)
{
// TODO: should be implemented
// TODO: should be implemented
return
smf_cfg
.
local_configuration
;
return
smf_cfg
.
use_local_subscription_info
;
}
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
...
...
src/smf_app/smf_config.cpp
View file @
4ef20876
...
@@ -689,14 +689,6 @@ int smf_config::load(const string& config_file) {
...
@@ -689,14 +689,6 @@ int smf_config::load(const string& config_file) {
const
Setting
&
local_cfg
=
smf_cfg
[
SMF_CONFIG_STRING_LOCAL_CONFIGURATION
];
const
Setting
&
local_cfg
=
smf_cfg
[
SMF_CONFIG_STRING_LOCAL_CONFIGURATION
];
string
local_configuration_str
=
{};
string
local_configuration_str
=
{};
local_cfg
.
lookupValue
(
SMF_CONFIG_STRING_USE_LOCAL_CONFIGURATION
,
local_configuration_str
);
if
(
boost
::
iequals
(
local_configuration_str
,
"yes"
))
{
local_configuration
=
true
;
}
else
{
local_configuration
=
false
;
}
const
Setting
&
session_management_subscription_list_cfg
=
const
Setting
&
session_management_subscription_list_cfg
=
local_cfg
[
SMF_CONFIG_STRING_SESSION_MANAGEMENT_SUBSCRIPTION_LIST
];
local_cfg
[
SMF_CONFIG_STRING_SESSION_MANAGEMENT_SUBSCRIPTION_LIST
];
count
=
session_management_subscription_list_cfg
.
getLength
();
count
=
session_management_subscription_list_cfg
.
getLength
();
...
...
src/smf_app/smf_config.hpp
View file @
4ef20876
...
@@ -112,7 +112,6 @@
...
@@ -112,7 +112,6 @@
#define SMF_CONFIG_STRING_NRF_PORT "PORT"
#define SMF_CONFIG_STRING_NRF_PORT "PORT"
#define SMF_CONFIG_STRING_LOCAL_CONFIGURATION "LOCAL_CONFIGURATION"
#define SMF_CONFIG_STRING_LOCAL_CONFIGURATION "LOCAL_CONFIGURATION"
#define SMF_CONFIG_STRING_USE_LOCAL_CONFIGURATION "USE_LOCAL_CONFIGURATION"
#define SMF_CONFIG_STRING_SESSION_MANAGEMENT_SUBSCRIPTION_LIST \
#define SMF_CONFIG_STRING_SESSION_MANAGEMENT_SUBSCRIPTION_LIST \
"SESSION_MANAGEMENT_SUBSCRIPTION_LIST"
"SESSION_MANAGEMENT_SUBSCRIPTION_LIST"
#define SMF_CONFIG_STRING_NSSAI_SST "NSSAI_SST"
#define SMF_CONFIG_STRING_NSSAI_SST "NSSAI_SST"
...
@@ -315,6 +314,10 @@ class smf_config {
...
@@ -315,6 +314,10 @@ class smf_config {
}
}
sbi_http2_port
=
8080
;
sbi_http2_port
=
8080
;
sbi_api_version
=
"v1"
;
sbi_api_version
=
"v1"
;
use_local_subscription_info
=
false
;
register_nrf
=
false
;
discover_upf
=
false
;
};
};
~
smf_config
();
~
smf_config
();
void
lock
()
{
m_rw_lock
.
lock
();
};
void
lock
()
{
m_rw_lock
.
lock
();
};
...
...
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