diff --git a/etc/config.yaml b/etc/config.yaml index 6104d3ea1fa9dab5aca0d4d5698f7f8458cbef03..3df29449600c241a7a74b9549d7eb526010e9afc 100644 --- a/etc/config.yaml +++ b/etc/config.yaml @@ -220,7 +220,8 @@ local_subscription_infos: session_ambr_ul: "1000Mbps" session_ambr_dl: "1000Mbps" -local_policy: - policy_decisions_path: /openair-pcf/policies/policy_decisions - pcc_rules_path: /openair-pcf/policies/pcc_rules - traffic_rules_path: /openair-pcf/policies/traffic_rules \ No newline at end of file +pcf: + local_policy: + policy_decisions_path: /openair-pcf/policies/policy_decisions + pcc_rules_path: /openair-pcf/policies/pcc_rules + traffic_rules_path: /openair-pcf/policies/traffic_rules \ No newline at end of file diff --git a/src/pcf_app/pcf_config.hpp b/src/pcf_app/pcf_config.hpp index 7f13cfd6b74cdcfe4605c6e2efbae51da229d008..9910efdeb1be706af36378df2bc74f64d16596a4 100644 --- a/src/pcf_app/pcf_config.hpp +++ b/src/pcf_app/pcf_config.hpp @@ -37,14 +37,15 @@ class pcf_config : public oai::config::config { public: explicit pcf_config( const std::string& config_path, bool log_stdout, bool log_rot_file) - : config(config_path, oai::config::PCF_CONFIG_NAME, log_stdout, log_rot_file) { - + : config( + config_path, oai::config::PCF_CONFIG_NAME, log_stdout, + log_rot_file) { m_used_sbi_values = {oai::config::PCF_CONFIG_NAME, oai::config::NRF_CONFIG_NAME}; - m_used_config_values = {oai::config::LOG_LEVEL_CONFIG_NAME, - oai::config::REGISTER_NF_CONFIG_NAME, - oai::config::NF_LIST_CONFIG_NAME, - oai::config::LOCAL_POLICY_CONFIG_NAME}; + m_used_config_values = { + oai::config::LOG_LEVEL_CONFIG_NAME, + oai::config::REGISTER_NF_CONFIG_NAME, oai::config::NF_LIST_CONFIG_NAME, + oai::config::LOCAL_POLICY_CONFIG_NAME, oai::config::PCF_CONFIG_NAME}; update_used_nfs(); } diff --git a/src/pcf_app/sm_policy/policy_provisioning_file.cpp b/src/pcf_app/sm_policy/policy_provisioning_file.cpp index 375973a0f9a2b9b7a712c8296d72ef9a1052536e..59717a713a7e21ca74cf8f924070b2da563e8147 100644 --- a/src/pcf_app/sm_policy/policy_provisioning_file.cpp +++ b/src/pcf_app/sm_policy/policy_provisioning_file.cpp @@ -53,15 +53,19 @@ bool policy_provisioning_file::read_all_policy_files() { std::vector<YAML::Node> pcc_rules; std::vector<YAML::Node> policy_decisions; - if (!read_all_files_in_dir(pcf_cfg->get_policy().get_traffic_rules_path(), traffic_controls)) { + if (!read_all_files_in_dir( + pcf_cfg->get_pcf_policy().get_traffic_rules_path(), + traffic_controls)) { Logger::pcf_app().warn("Could not load Traffic Control Description files"); } - if (!read_all_files_in_dir(pcf_cfg->get_policy().get_pcc_rules_path(), pcc_rules)) { + if (!read_all_files_in_dir( + pcf_cfg->get_pcf_policy().get_pcc_rules_path(), pcc_rules)) { Logger::pcf_app().error("Could not load mandatory PCC rules"); return false; } if (!read_all_files_in_dir( - pcf_cfg->get_policy().get_policy_decisions_path(), policy_decisions)) { + pcf_cfg->get_pcf_policy().get_policy_decisions_path(), + policy_decisions)) { Logger::pcf_app().error( "Could not load mandatory policy decisions configuration"); return false;