From daa013f9ba05a7058b6ef67b3e4e5800fefaa23a Mon Sep 17 00:00:00 2001
From: Stefan Spettel <stefan.spettel@phine.tech>
Date: Tue, 4 Apr 2023 18:59:38 +0200
Subject: [PATCH] style(pcf): move policy config to inner layer pcf
Signed-off-by: Stefan Spettel <stefan.spettel@phine.tech>
---
etc/config.yaml | 9 +++++----
src/pcf_app/pcf_config.hpp | 13 +++++++------
src/pcf_app/sm_policy/policy_provisioning_file.cpp | 10 +++++++---
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/etc/config.yaml b/etc/config.yaml
index 6104d3e..3df2944 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 7f13cfd..9910efd 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 375973a..59717a7 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;
--
GitLab