Commit 8280e28c authored by Tien-Thinh Nguyen's avatar Tien-Thinh Nguyen

Remove AMF addr from AUSF

parent fc482f37
...@@ -19,14 +19,6 @@ AUSF = ...@@ -19,14 +19,6 @@ AUSF =
UDM:{ UDM:{
IPV4_ADDRESS = "@UDM_IP_ADDRESS@"; # YOUR NETWORK CONFIG HERE IPV4_ADDRESS = "@UDM_IP_ADDRESS@"; # YOUR NETWORK CONFIG HERE
PORT = @UDM_PORT@; # YOUR NETWORK CONFIG HERE (default: 80) PORT = @UDM_PORT@; # YOUR NETWORK CONFIG HERE (default: 80)
API_VERSION = "@UDM_VERSION_NB@"; # YOUR AMF API VERSION FOR UDM CONFIG HERE API_VERSION = "@UDM_VERSION_NB@"; # YOUR API VERSION FOR UDM CONFIG HERE
}; };
# AMF Information
AMF:{
IPV4_ADDRESS = "@AMF_IP_ADDRESS@"; # YOUR NETWORK CONFIG HERE (default: 80)
PORT = @AMF_PORT@; # YOUR NETWORK CONFIG HERE (default: 80)
API_VERSION = "@AMF_VERSION_NB@"; # YOUR AMF API VERSION FOR UDM CONFIG HERE
};
}; };
...@@ -4,5 +4,3 @@ AUSF_NAME=OAI-AUSF ...@@ -4,5 +4,3 @@ AUSF_NAME=OAI-AUSF
SBI_IF_NAME=eth0 SBI_IF_NAME=eth0
UDM_IP_ADDRESS=192.168.66.8 UDM_IP_ADDRESS=192.168.66.8
UDM_VERSION_NB=v1 UDM_VERSION_NB=v1
AMF_IP_ADDRESS=192.168.66.2
AMF_VERSION_NB=v1
...@@ -5,7 +5,6 @@ set -euo pipefail ...@@ -5,7 +5,6 @@ set -euo pipefail
CONFIG_DIR="/openair-ausf/etc" CONFIG_DIR="/openair-ausf/etc"
SBI_PORT=${SBI_PORT:-80} SBI_PORT=${SBI_PORT:-80}
UDM_PORT=${UDM_PORT:-80} UDM_PORT=${UDM_PORT:-80}
AMF_PORT=${AMF_PORT:-80}
for c in ${CONFIG_DIR}/*.conf; do for c in ${CONFIG_DIR}/*.conf; do
# grep variable names (format: ${VAR}) from template to be rendered # grep variable names (format: ${VAR}) from template to be rendered
......
...@@ -59,10 +59,6 @@ ausf_config::ausf_config() : sbi(), ausf_name(), pid_dir(), instance() { ...@@ -59,10 +59,6 @@ ausf_config::ausf_config() : sbi(), ausf_name(), pid_dir(), instance() {
udm_addr.ipv4_addr.s_addr = INADDR_ANY; udm_addr.ipv4_addr.s_addr = INADDR_ANY;
udm_addr.port = 80; udm_addr.port = 80;
udm_addr.api_version = "v1"; udm_addr.api_version = "v1";
amf_addr.ipv4_addr.s_addr = INADDR_ANY;
amf_addr.port = 80;
amf_addr.api_version = "v1";
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
...@@ -154,29 +150,6 @@ int ausf_config::load(const std::string& config_file) { ...@@ -154,29 +150,6 @@ int ausf_config::load(const std::string& config_file) {
} }
udm_addr.api_version = udm_api_version; udm_addr.api_version = udm_api_version;
// AMF
const Setting& amf_cfg = ausf_cfg[AUSF_CONFIG_STRING_AMF];
struct in_addr amf_ipv4_addr;
unsigned int amf_port = 0;
std::string amf_api_version;
amf_cfg.lookupValue(AUSF_CONFIG_STRING_AMF_IPV4_ADDRESS, astring);
IPV4_STR_ADDR_TO_INADDR(
util::trim(astring).c_str(), amf_ipv4_addr,
"BAD IPv4 ADDRESS FORMAT FOR AMF !");
amf_addr.ipv4_addr = amf_ipv4_addr;
if (!(amf_cfg.lookupValue(AUSF_CONFIG_STRING_AMF_PORT, amf_port))) {
Logger::ausf_app().error(AUSF_CONFIG_STRING_AMF_PORT "failed");
throw(AUSF_CONFIG_STRING_AMF_PORT "failed");
}
amf_addr.port = amf_port;
if (!(amf_cfg.lookupValue(
AUSF_CONFIG_STRING_API_VERSION, amf_api_version))) {
Logger::ausf_app().error(AUSF_CONFIG_STRING_API_VERSION "failed");
throw(AUSF_CONFIG_STRING_API_VERSION "failed");
}
amf_addr.api_version = amf_api_version;
} catch (const SettingNotFoundException& nfex) { } catch (const SettingNotFoundException& nfex) {
Logger::ausf_app().error("%s : %s", nfex.what(), nfex.getPath()); Logger::ausf_app().error("%s : %s", nfex.what(), nfex.getPath());
return RETURNerror; return RETURNerror;
...@@ -204,14 +177,6 @@ void ausf_config::display() { ...@@ -204,14 +177,6 @@ void ausf_config::display() {
Logger::config().info(" Port..................: %lu ", udm_addr.port); Logger::config().info(" Port..................: %lu ", udm_addr.port);
Logger::config().info( Logger::config().info(
" API version...........: %s", udm_addr.api_version.c_str()); " API version...........: %s", udm_addr.api_version.c_str());
Logger::config().info("- AMF:");
Logger::config().info(
" IPv4 Addr.............: %s",
inet_ntoa(*((struct in_addr*) &amf_addr.ipv4_addr)));
Logger::config().info(" Port.................: %lu ", amf_addr.port);
Logger::config().info(
" API version..........: %s", amf_addr.api_version.c_str());
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
......
...@@ -61,10 +61,6 @@ ...@@ -61,10 +61,6 @@
#define AUSF_CONFIG_STRING_UDM_IPV4_ADDRESS "IPV4_ADDRESS" #define AUSF_CONFIG_STRING_UDM_IPV4_ADDRESS "IPV4_ADDRESS"
#define AUSF_CONFIG_STRING_UDM_PORT "PORT" #define AUSF_CONFIG_STRING_UDM_PORT "PORT"
#define AUSF_CONFIG_STRING_AMF "AMF"
#define AUSF_CONFIG_STRING_AMF_IPV4_ADDRESS "IPV4_ADDRESS"
#define AUSF_CONFIG_STRING_AMF_PORT "PORT"
using namespace libconfig; using namespace libconfig;
namespace config { namespace config {
...@@ -97,12 +93,6 @@ class ausf_config { ...@@ -97,12 +93,6 @@ class ausf_config {
unsigned int port; unsigned int port;
std::string api_version; std::string api_version;
} udm_addr; } udm_addr;
struct {
struct in_addr ipv4_addr;
unsigned int port;
std::string api_version;
} amf_addr;
}; };
} // namespace config } // namespace config
......
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