Commit 4ef20876 authored by Tien-Thinh Nguyen's avatar Tien-Thinh Nguyen

Remove redundant conf option (use_local_configuration)

parent 7e539e72
...@@ -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",
......
...@@ -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;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
......
...@@ -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();
......
...@@ -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(); };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment