style(config): move policy cfg to pcf inner level

Signed-off-by: Stefan Spettel <stefan.spettel@phine.tech>

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

oai-cn5g-common-src @ 6d39d4d4

-Subproject commit f50ec52f7c806f34366345f02d358ad2ebf90027
+Subproject commit 6d39d4d4c36536115d43608eb78104ae84d490bc

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();
   }

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;