Skip to content

O
OpenXG-NRF
Commit 1d093799 authored by Mohammed Ismail's avatar Mohammed Ismail
Browse files
Options

Merge branch 'nf_profile_update' into 'develop' 

nf_profile_update

See merge request oai/cn5g/oai-cn5g-nrf!15
parents b302f710 95076b72
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 14 deletions
src/common/utils/api_conversions.cpp
View file @ 1d093799
...@@ -83,16 +83,18 @@ bool api_conv::profile_api_to_nrf_profile( ...@@ -83,16 +83,18 @@ bool api_conv::profile_api_to_nrf_profile(
Logger::nrf_app().debug( Logger::nrf_app().debug(
"\tSNSSAI (SD, SST): %d, %s", sn.sST, sn.sD.c_str()); "\tSNSSAI (SD, SST): %d, %s", sn.sST, sn.sD.c_str());
} }
// if (api_profile.plmnListIsSet()){ if (api_profile.plmnListIsSet()) {
// std::vector<PlmnId> &plmnid = api_profile.getPlmnList(); NFProfile nf_profile = api_profile;
// for (auto s : plmnid) { std::vector<PlmnId>& plmnid = nf_profile.getPlmnList();
// plmn_t sn = {}; for (auto s : plmnid) {
// sn.mcc = s.getMcc(); plmn_t sn = {};
// sn.mnc = s.getMnc(); sn.mcc = s.getMcc();
// profile.get()->add_plmn_list(sn); sn.mnc = s.getMnc();
// Logger::nrf_app().debug( profile.get()->add_plmn_list(sn);
// "\tPLMN_List (MCC, MNS): %s, %s", sn.mcc.c_str(), sn.mnc.c_str()); Logger::nrf_app().debug(
// } "\tPLMN_List (MCC, MNC): %s, %s", sn.mcc.c_str(), sn.mnc.c_str());
}
}
if (api_profile.fqdnIsSet()) { if (api_profile.fqdnIsSet()) {
profile.get()->set_fqdn(api_profile.getFqdn()); profile.get()->set_fqdn(api_profile.getFqdn());
Logger::nrf_app().debug("\tFQDN: %s", api_profile.getFqdn().c_str()); Logger::nrf_app().debug("\tFQDN: %s", api_profile.getFqdn().c_str());
...@@ -119,12 +121,14 @@ bool api_conv::profile_api_to_nrf_profile( ...@@ -119,12 +121,14 @@ bool api_conv::profile_api_to_nrf_profile(
// for (auto address : ipv6_addr) { // for (auto address : ipv6_addr) {
// struct in6_addr addr6 = {}; // struct in6_addr addr6 = {};
// unsigned char buf_in_addr[sizeof(struct in6_addr)]; // unsigned char buf_in_addr[sizeof(struct in6_addr)];
// if (inet_pton(AF_INET6, util::trim(address).c_str(), buf_in_addr) == 1) // if (inet_pton(AF_INET6, util::trim(address).c_str(), buf_in_addr) ==
// 1)
// { // {
// memcpy(&addr6, buf_in_addr, sizeof(struct in6_addr)); // memcpy(&addr6, buf_in_addr, sizeof(struct in6_addr));
// } else { // } else {
// Logger::nrf_app().warn( // Logger::nrf_app().warn(
// "Address conversion: Bad value %s", util::trim(address).c_str()); // "Address conversion: Bad value %s",
// util::trim(address).c_str());
// } // }
// Logger::nrf_app().debug("\tIPv6 Addr: %s", address.c_str()); // Logger::nrf_app().debug("\tIPv6 Addr: %s", address.c_str());
...@@ -304,8 +308,8 @@ bool api_conv::subscription_api_to_nrf_subscription( ...@@ -304,8 +308,8 @@ bool api_conv::subscription_api_to_nrf_subscription(
sub_condition_api.amfCond.getAmfRegionId(); sub_condition_api.amfCond.getAmfRegionId();
} break; } break;
case GUAMI_LIST_COND: { case GUAMI_LIST_COND: {
Logger::nrf_app().debug("Subscription condition type: GUAMI_LIST_COND"); Logger::nrf_app().debug("Subscription condition type:
sub_condition.type = GUAMI_LIST_COND; GUAMI_LIST_COND"); sub_condition.type = GUAMI_LIST_COND;
// TODO: // TODO:
} break; } break;
case NETWOTK_SLICE_COND: { case NETWOTK_SLICE_COND: {
......
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