Merge branch 'code_cleanup_v1' into 'develop'

Code cleanup v1

See merge request oai/cn5g/oai-cn5g-udm!23

src/udm_app/udm_config.cpp

@@ -394,9 +394,70 @@ int udm_config::load_interface(
 //------------------------------------------------------------------------------
 std::string udm_config::get_udr_slice_selection_subscription_data_retrieval_uri(
     const std::string& supi, const oai::udm::model::PlmnId& plmn_id) {
+  return get_udr_url_base() + "/subscription-data/" + supi + "/" +
+         plmn_id.getMcc() + plmn_id.getMnc() + "/provisioned-data/am-data";
+}
+
+//------------------------------------------------------------------------------
+std::string udm_config::get_udr_access_and_mobility_subscription_data_uri(
+    const std::string& supi, const oai::udm::model::PlmnId& plmn_id) {
+  return get_udr_url_base() + "/subscription-data/" + supi + "/" +
+         plmn_id.getMcc() + plmn_id.getMnc() + "/provisioned-data/am-data";
+}
+
+//------------------------------------------------------------------------------
+std::string udm_config::get_udr_session_management_subscription_data_uri(
+    const std::string& supi, const oai::udm::model::PlmnId& plmn_id) {
+  return get_udr_url_base() + "/subscription-data/" + supi + "/" +
+         plmn_id.getMcc() + plmn_id.getMnc() + "/provisioned-data/sm-data";
+}
+
+//------------------------------------------------------------------------------
+std::string udm_config::get_udr_smf_selection_subscription_data_uri(
+    const std::string& supi, const oai::udm::model::PlmnId& plmn_id) {
+  return get_udr_url_base() + "/subscription-data/" + supi + "/" +
+         plmn_id.getMcc() + plmn_id.getMnc() +
+         "/provisioned-data/smf-selection-subscription-data";
+}
+
+//------------------------------------------------------------------------------
+std::string udm_config::get_udr_sdm_subscriptions_uri(const std::string& supi) {
+  return get_udr_url_base() + "/subscription-data/" + supi +
+         "/context-data/sdm-subscriptions";
+}
+
+//------------------------------------------------------------------------------
+std::string udm_config::get_udr_authentication_subscription_uri(
+    const std::string& supi) {
+  return get_udr_url_base() + "/subscription-data/" + supi +
+         NUDR_AUTHENTICATION_SUBSCRIPTION_ENDPOINT;
+}
+
+//------------------------------------------------------------------------------
+std::string udm_config::get_udr_authentication_status_uri(
+    const std::string& supi) {
+  return get_udr_url_base() + "/subscription-data/" + supi +
+         "/authentication-data/authentication-status";
+}
+
+//------------------------------------------------------------------------------
+std::string udm_config::get_udr_amf_3gpp_registration_uri(
+    const std::string& supi) {
+  return get_udr_url_base() + "/subscription-data/" + supi +
+         "/context-data/amf-3gpp-access";
+}
+
+//------------------------------------------------------------------------------
+std::string udm_config::get_udm_ueau_base() {
+  return std::string(inet_ntoa(*((struct in_addr*) &udr_addr.ipv4_addr))) +
+         ":" + std::to_string(udr_addr.port) + NUDM_UE_AU_BASE +
+         udr_addr.api_version;
+}
+//------------------------------------------------------------------------------
+std::string udm_config::get_udr_url_base() {
   return std::string(inet_ntoa(*((struct in_addr*) &udr_addr.ipv4_addr))) +
          ":" + std::to_string(udr_addr.port) + NUDR_DATA_REPOSITORY +
-         udr_addr.api_version + "/subscription-data/" + supi + "/" +
-         plmn_id.getMcc() + plmn_id.getMnc() + "/provisioned-data/am-data";
+         udr_addr.api_version;
 }
+
 }  // namespace oai::udm::config

src/udm_app/udm_config.hpp

@@ -103,6 +103,19 @@ class udm_config {
   void display();
   std::string get_udr_slice_selection_subscription_data_retrieval_uri(
       const std::string& supi, const oai::udm::model::PlmnId& plmn_id);
+  std::string get_udr_access_and_mobility_subscription_data_uri(
+      const std::string& supi, const oai::udm::model::PlmnId& plmn_id);
+  std::string get_udr_session_management_subscription_data_uri(
+      const std::string& supi, const oai::udm::model::PlmnId& plmn_id);
+  std::string get_udr_smf_selection_subscription_data_uri(
+      const std::string& supi, const oai::udm::model::PlmnId& plmn_id);
+  std::string get_udr_url_base();
+  std::string get_udr_sdm_subscriptions_uri(const std::string& supi);
+
+  std::string get_udr_authentication_subscription_uri(const std::string& supi);
+  std::string get_udr_authentication_status_uri(const std::string& supi);
+  std::string get_udr_amf_3gpp_registration_uri(const std::string& supi);
+  std::string get_udm_ueau_base();
 
   unsigned int instance;
   std::string pid_dir;