ack, code review only/Thanks HansN
On 01/25/2016 05:35 AM, Gary Lee wrote:
> osaf/services/saf/amf/amfd/ckpt_dec.cc | 134
> ++++++++++++++++++++-----------
> osaf/services/saf/amf/amfd/ckpt_enc.cc | 121 +++++++++++++---------------
> osaf/services/saf/amf/amfd/ckpt_updt.cc | 94 +++++++++++-----------
> 3 files changed, 191 insertions(+), 158 deletions(-)
>
>
> diff --git a/osaf/services/saf/amf/amfd/ckpt_dec.cc
> b/osaf/services/saf/amf/amfd/ckpt_dec.cc
> --- a/osaf/services/saf/amf/amfd/ckpt_dec.cc
> +++ b/osaf/services/saf/amf/amfd/ckpt_dec.cc
> @@ -22,6 +22,7 @@
>
>
> ******************************************************************************/
>
> +#include <osaf_extended_name.h>
> #include <logtrace.h>
> #include <amfd.h>
> #include <cluster.h>
> @@ -208,7 +209,6 @@
> osaf_decode_uint32(ub, &cb->nodes_exit_cnt);
> }
>
> -
>
> /****************************************************************************\
> * Function: dec_cb_config
> *
> @@ -263,9 +263,12 @@
> AVD_AVND *avnd,
> const uint16_t peer_version)
> {
> + TRACE_ENTER();
> + SaNameT node_name;
> osaf_decode_uint32(ub, &avnd->node_info.nodeId);
> osaf_decode_saclmnodeaddresst(ub, &avnd->node_info.nodeAddress);
> - osaf_decode_sanamet(ub, &avnd->name);
> + osaf_decode_sanamet(ub, &node_name);
> + avnd->name = Amf::to_string(&node_name);
> osaf_decode_bool(ub, reinterpret_cast<bool*>(&avnd->node_info.member));
> osaf_decode_satimet(ub, &avnd->node_info.bootTimestamp);
> osaf_decode_uint64(ub,
> reinterpret_cast<uint64_t*>(&avnd->node_info.initialViewNumber));
> @@ -275,7 +278,8 @@
> osaf_decode_uint32(ub, reinterpret_cast<uint32_t*>(&avnd->node_state));
> osaf_decode_uint32(ub, reinterpret_cast<uint32_t*>(&avnd->type));
> osaf_decode_uint32(ub, &avnd->rcv_msg_id);
> - osaf_decode_uint32(ub, &avnd->snd_msg_id);
> + osaf_decode_uint32(ub, &avnd->snd_msg_id);
> + TRACE_LEAVE();
> }
>
>
> /****************************************************************************\
> @@ -314,7 +318,9 @@
>
> case NCS_MBCSV_ACT_RMV:
> /* Send only key information */
> - osaf_decode_sanamet(&dec->i_uba, &avnd.name);
> + SaNameT node_name;
> + osaf_decode_sanamet(&dec->i_uba, &node_name);
> + avnd.name = Amf::to_string(&node_name);
> break;
>
> default:
> @@ -333,7 +339,10 @@
>
> void decode_app(NCS_UBAID *ub, AVD_APP *app)
> {
> - osaf_decode_sanamet(ub, &app->name);
> + SaNameT app_name;
> +
> + osaf_decode_sanamet(ub, &app_name);
> + app->name = Amf::to_string(&app_name);
> osaf_decode_uint32(ub, (uint32_t*)&app->saAmfApplicationAdminState);
> osaf_decode_uint32(ub, &app->saAmfApplicationCurrNumSGs);
> }
> @@ -371,7 +380,10 @@
>
> static void decode_sg(NCS_UBAID *ub, AVD_SG *sg)
> {
> - osaf_decode_sanamet(ub, &sg->name);
> + SaNameT sg_name;
> +
> + osaf_decode_sanamet(ub, &sg_name);
> + sg->name = Amf::to_string(&sg_name);
> osaf_decode_uint32(ub, (uint32_t*)&sg->saAmfSGAdminState);
> osaf_decode_uint32(ub, &sg->saAmfSGNumCurrAssignedSUs);
> osaf_decode_uint32(ub, &sg->saAmfSGNumCurrInstantiatedSpareSUs);
> @@ -412,13 +424,18 @@
>
> static void decode_su(NCS_UBAID *ub, AVD_SU *su, uint16_t peer_version)
> {
> - osaf_decode_sanamet(ub, &su->name);
> + SaNameT su_name;
> + SaNameT node_name;
> +
> + osaf_decode_sanamet(ub, &su_name);
> + su->name = Amf::to_string(&su_name);
> osaf_decode_bool(ub, (bool*)&su->saAmfSUPreInstantiable);
> osaf_decode_uint32(ub, (uint32_t*)&su->saAmfSUOperState);
> osaf_decode_uint32(ub, (uint32_t*)&su->saAmfSUAdminState);
> osaf_decode_uint32(ub, (uint32_t*)&su->saAmfSuReadinessState);
> osaf_decode_uint32(ub, (uint32_t*)&su->saAmfSUPresenceState);
> - osaf_decode_sanamet(ub, &su->saAmfSUHostedByNode);
> + osaf_decode_sanamet(ub, &node_name);
> + su->saAmfSUHostedByNode = Amf::to_string(&node_name);
> osaf_decode_uint32(ub, &su->saAmfSUNumCurrActiveSIs);
> osaf_decode_uint32(ub, &su->saAmfSUNumCurrStandbySIs);
> osaf_decode_uint32(ub, &su->saAmfSURestartCount);
> @@ -473,13 +490,18 @@
> #endif
> TRACE_ENTER2("my_version: %u, to_version: %u", ver_compare,
> peer_version);
>
> - osaf_decode_sanamet(ub, &si->name);
> + SaNameT si_name;
> + SaNameT si_protected_by_sg;
> +
> + osaf_decode_sanamet(ub, &si_name);
> + si->name = Amf::to_string(&si_name);
> osaf_decode_uint32(ub, (uint32_t*)&si->saAmfSIAdminState);
> osaf_decode_uint32(ub, (uint32_t*)&si->saAmfSIAssignmentState);
> osaf_decode_uint32(ub, (uint32_t*)&si->saAmfSINumCurrActiveAssignments);
> osaf_decode_uint32(ub,
> (uint32_t*)&si->saAmfSINumCurrStandbyAssignments);
> osaf_decode_uint32(ub, (uint32_t*)&si->si_switch);
> - osaf_decode_sanamet(ub, &si->saAmfSIProtectedbySG);
> + osaf_decode_sanamet(ub, &si_protected_by_sg);
> + si->saAmfSIProtectedbySG = Amf::to_string(&si_protected_by_sg);
> osaf_decode_bool(ub, &si->alarm_sent);
>
> if (peer_version >= ver_compare) {
> @@ -670,12 +692,14 @@
> *
> \**************************************************************************/
> void decode_comp(NCS_UBAID *ub, AVD_COMP *comp) {
> - osaf_decode_sanamet(ub, &comp->comp_info.name);
> - osaf_decode_uint32(ub,
> reinterpret_cast<uint32_t*>(&comp->saAmfCompOperState));
> - osaf_decode_uint32(ub,
> reinterpret_cast<uint32_t*>(&comp->saAmfCompReadinessState));
> - osaf_decode_uint32(ub,
> reinterpret_cast<uint32_t*>(&comp->saAmfCompPresenceState));
> - osaf_decode_uint32(ub, &comp->saAmfCompRestartCount);
> - osaf_decode_sanamet(ub, &comp->saAmfCompCurrProxyName);
> + SaNameT proxy_name;
> + osaf_decode_sanamet(ub, &comp->comp_info.name);
> + osaf_decode_uint32(ub,
> reinterpret_cast<uint32_t*>(&comp->saAmfCompOperState));
> + osaf_decode_uint32(ub,
> reinterpret_cast<uint32_t*>(&comp->saAmfCompReadinessState));
> + osaf_decode_uint32(ub,
> reinterpret_cast<uint32_t*>(&comp->saAmfCompPresenceState));
> + osaf_decode_uint32(ub, &comp->saAmfCompRestartCount);
> + osaf_decode_sanamet(ub, &proxy_name);
> + comp->saAmfCompCurrProxyName = Amf::to_string(&proxy_name);
> }
>
>
> /****************************************************************************\
> @@ -838,11 +862,13 @@
> /*
> * Action in this case is just to update.
> */
> - osaf_decode_sanamet(&dec->i_uba, &avnd.name);
> + SaNameT name;
> + osaf_decode_sanamet(&dec->i_uba, &name);
> + avnd.name = Amf::to_string(&name);
> osaf_decode_uint32(&dec->i_uba,
> reinterpret_cast<uint32_t*>(&avnd.saAmfNodeAdminState));
>
> - if (nullptr == (avnd_struct = avd_node_get(&avnd.name))) {
> - LOG_ER("%s: node not found, nodeid=%s", __FUNCTION__,
> avnd.name.value);
> + if (nullptr == (avnd_struct = avd_node_get(avnd.name))) {
> + LOG_ER("%s: node not found, nodeid=%s", __FUNCTION__,
> avnd.name.c_str());
> return NCSCC_RC_FAILURE;
> }
>
> @@ -879,11 +905,13 @@
> /*
> * Action in this case is just to update.
> */
> - osaf_decode_sanamet(&dec->i_uba, &avnd.name);
> + SaNameT name;
> + osaf_decode_sanamet(&dec->i_uba, &name);
> + avnd.name = Amf::to_string(&name);
> osaf_decode_uint32(&dec->i_uba,
> reinterpret_cast<uint32_t*>(&avnd.saAmfNodeOperState));
>
> - if (nullptr == (avnd_struct = avd_node_get(&avnd.name))) {
> - LOG_ER("%s: node not found, nodeid=%s", __FUNCTION__,
> avnd.name.value);
> + if (nullptr == (avnd_struct = avd_node_get(avnd.name))) {
> + LOG_ER("%s: node not found, nodeid=%s", __FUNCTION__,
> avnd.name.c_str());
> return NCSCC_RC_FAILURE;
> }
>
> @@ -920,11 +948,13 @@
> /*
> * Action in this case is just to update.
> */
> - osaf_decode_sanamet(&dec->i_uba, &avnd.name);
> + SaNameT name;
> + osaf_decode_sanamet(&dec->i_uba, &name);
> + avnd.name = Amf::to_string(&name);
> osaf_decode_uint32(&dec->i_uba,
> reinterpret_cast<uint32_t*>(&avnd.node_state));
>
> - if (nullptr == (avnd_struct = avd_node_get(&avnd.name))) {
> - LOG_ER("%s: node not found, nodeid=%s", __FUNCTION__,
> avnd.name.value);
> + if (nullptr == (avnd_struct = avd_node_get(avnd.name))) {
> + LOG_ER("%s: node not found, nodeid=%s", __FUNCTION__,
> avnd.name.c_str());
> return NCSCC_RC_FAILURE;
> }
>
> @@ -1067,7 +1097,7 @@
> TRACE("ng_using_saAmfSGAdminState:%u",sg->ng_using_saAmfSGAdminState);
>
> TRACE_LEAVE2("'%s', saAmfSGAdminState=%u, sg_updt:%d",
> - sg->name.value, sg->saAmfSGAdminState,
> cb->async_updt_cnt.sg_updt);
> + sg->name.c_str(), sg->saAmfSGAdminState,
> cb->async_updt_cnt.sg_updt);
> return NCSCC_RC_SUCCESS;
> }
>
> @@ -1098,7 +1128,7 @@
> cb->async_updt_cnt.sg_updt++;
>
> TRACE_LEAVE2("'%s', saAmfSGNumCurrAssignedSUs=%u, sg_updt:%d",
> - sg->name.value, sg->saAmfSGNumCurrAssignedSUs,
> + sg->name.c_str(), sg->saAmfSGNumCurrAssignedSUs,
> cb->async_updt_cnt.sg_updt);
> return NCSCC_RC_SUCCESS;
> }
> @@ -1130,7 +1160,7 @@
> cb->async_updt_cnt.sg_updt++;
>
> TRACE_LEAVE2("'%s', saAmfSGNumCurrInstantiatedSpareSUs=%u, sg_updt:%d",
> - sg->name.value, sg->saAmfSGNumCurrInstantiatedSpareSUs,
> + sg->name.c_str(), sg->saAmfSGNumCurrInstantiatedSpareSUs,
> cb->async_updt_cnt.sg_updt);
> return NCSCC_RC_SUCCESS;
> }
> @@ -1162,7 +1192,7 @@
> cb->async_updt_cnt.sg_updt++;
>
> TRACE_LEAVE2("'%s', saAmfSGNumCurrNonInstantiatedSpareSUs=%u,
> sg_updt:%d",
> - sg->name.value, sg->saAmfSGNumCurrNonInstantiatedSpareSUs,
> + sg->name.c_str(), sg->saAmfSGNumCurrNonInstantiatedSpareSUs,
> cb->async_updt_cnt.sg_updt);
> return NCSCC_RC_SUCCESS;
> }
> @@ -1194,7 +1224,7 @@
> cb->async_updt_cnt.sg_updt++;
>
> TRACE_LEAVE2("'%s', adjust_state=%u, sg_updt:%d",
> - sg->name.value, sg->adjust_state, cb->async_updt_cnt.sg_updt);
> + sg->name.c_str(), sg->adjust_state, cb->async_updt_cnt.sg_updt);
> return NCSCC_RC_SUCCESS;
> }
>
> @@ -1225,7 +1255,7 @@
> cb->async_updt_cnt.sg_updt++;
>
> TRACE_LEAVE2("'%s', sg_fsm_state=%u, sg_updt:%d",
> - sg->name.value, sg->sg_fsm_state, cb->async_updt_cnt.sg_updt);
> + sg->name.c_str(), sg->sg_fsm_state, cb->async_updt_cnt.sg_updt);
> return NCSCC_RC_SUCCESS;
> }
>
> @@ -1285,15 +1315,15 @@
> AVD_SU *su = su_db->find(Amf::to_string(&name));
> if (su == nullptr) {
> TRACE("'%s' does not exist, creating it", name.value);
> - su = new AVD_SU(&name);
> - unsigned int rc = su_db->insert(Amf::to_string(&su->name), su);
> + su = new AVD_SU(Amf::to_string(&name));
> + unsigned int rc = su_db->insert(su->name, su);
> osafassert(rc == NCSCC_RC_SUCCESS);
> }
>
> osaf_decode_uint32(&dec->i_uba, (uint32_t*)&su->saAmfSUOperState);
>
> cb->async_updt_cnt.su_updt++;
> - avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUOperState",
> + avd_saImmOiRtObjectUpdate(su->name, "saAmfSUOperState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSUOperState);
>
> TRACE_LEAVE2("'%s', saAmfSUOperState=%u, su_updt:%d",
> @@ -1327,7 +1357,7 @@
>
> cb->async_updt_cnt.su_updt++;
>
> - avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUAdminState",
> + avd_saImmOiRtObjectUpdate(su->name, "saAmfSUAdminState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSUAdminState);
> TRACE_LEAVE2("'%s', saAmfSUAdminState=%u, su_updt:%d",
> name.value, su->saAmfSUAdminState, cb->async_updt_cnt.su_updt);
> @@ -1360,7 +1390,7 @@
>
> cb->async_updt_cnt.su_updt++;
>
> - avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUReadinessState",
> + avd_saImmOiRtObjectUpdate(su->name, "saAmfSUReadinessState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSuReadinessState);
> TRACE_LEAVE2("'%s', saAmfSuReadinessState=%u, su_updt:%d",
> name.value, su->saAmfSuReadinessState,
> cb->async_updt_cnt.su_updt);
> @@ -1393,7 +1423,7 @@
>
> cb->async_updt_cnt.su_updt++;
>
> - avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUPresenceState",
> + avd_saImmOiRtObjectUpdate(su->name, "saAmfSUPresenceState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSUPresenceState);
> TRACE_LEAVE2("'%s', saAmfSUPresenceState=%u, su_updt:%d",
> name.value, su->saAmfSUPresenceState,
> cb->async_updt_cnt.su_updt);
> @@ -1657,7 +1687,7 @@
> osaf_decode_sanamet(&dec->i_uba, &name);
> AVD_SI *si = si_db->find(Amf::to_string(&name));
> if (si == nullptr) {
> - si = avd_si_new(&name);
> + si = avd_si_new(Amf::to_string(&name));
> osafassert(si != nullptr);
> avd_si_db_add(si);
> }
> @@ -1818,6 +1848,7 @@
> static uint32_t dec_comp_proxy_comp_name(AVD_CL_CB *cb, NCS_MBCSV_CB_DEC
> *dec) {
> AVD_COMP comp;
> AVD_COMP *comp_struct {};
> + SaNameT proxy_name;
>
> TRACE_ENTER();
>
> @@ -1825,7 +1856,8 @@
> * Action in this case is just to update.
> */
> osaf_decode_sanamet(&dec->i_uba, &comp.comp_info.name);
> - osaf_decode_sanamet(&dec->i_uba, &comp.saAmfCompCurrProxyName);
> + osaf_decode_sanamet(&dec->i_uba, &proxy_name);
> + comp.saAmfCompCurrProxyName = Amf::to_string(&proxy_name);
>
> if (nullptr == (comp_struct =
> comp_db->find(Amf::to_string(&comp.comp_info.name))))
> osafassert(0);
> @@ -1877,12 +1909,14 @@
> */
> osaf_decode_sanamet(&dec->i_uba, &comp.comp_info.name);
> osaf_decode_uint32(&dec->i_uba, reinterpret_cast<uint32_t*>
> (&comp.saAmfCompOperState));
> -
> - comp_struct = avd_comp_get_or_create(&comp.comp_info.name);
> +
> + const std::string comp_name = Amf::to_string(&comp.comp_info.name);
> +
> + comp_struct = avd_comp_get_or_create(comp_name);
>
> /* Update the fields received in this checkpoint message */
> comp_struct->saAmfCompOperState = comp.saAmfCompOperState;
> - avd_saImmOiRtObjectUpdate(&comp_struct->comp_info.name,
> "saAmfCompOperState",
> + avd_saImmOiRtObjectUpdate(comp_name, "saAmfCompOperState",
> SA_IMM_ATTR_SAUINT32T,
> &comp_struct->saAmfCompOperState);
>
> cb->async_updt_cnt.comp_updt++;
> @@ -1917,8 +1951,10 @@
> osaf_decode_sanamet(&dec->i_uba, &comp.comp_info.name);
> osaf_decode_uint32(&dec->i_uba, reinterpret_cast<uint32_t*>
> (&comp.saAmfCompReadinessState));
>
> - if (nullptr == (comp_struct =
> comp_db->find(Amf::to_string(&comp.comp_info.name)))) {
> - LOG_ER("%s: comp not found, %s", __FUNCTION__,
> comp.comp_info.name.value);
> + const std::string comp_name(Amf::to_string(&comp.comp_info.name));
> +
> + if (nullptr == (comp_struct = comp_db->find(comp_name))) {
> + LOG_ER("%s: comp not found, %s", __FUNCTION__, comp_name.c_str());
> return NCSCC_RC_FAILURE;
> }
>
> @@ -1927,7 +1963,7 @@
>
> cb->async_updt_cnt.comp_updt++;
>
> - avd_saImmOiRtObjectUpdate(&comp_struct->comp_info.name,
> "saAmfCompReadinessState",
> + avd_saImmOiRtObjectUpdate(comp_name, "saAmfCompReadinessState",
> SA_IMM_ATTR_SAUINT32T,
> &comp_struct->saAmfCompReadinessState);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1968,7 +2004,7 @@
> comp_struct->saAmfCompPresenceState = comp.saAmfCompPresenceState;
>
> cb->async_updt_cnt.comp_updt++;
> - avd_saImmOiRtObjectUpdate(&comp_struct->comp_info.name,
> "saAmfCompPresenceState",
> + avd_saImmOiRtObjectUpdate(Amf::to_string(&comp_struct->comp_info.name),
> "saAmfCompPresenceState",
> SA_IMM_ATTR_SAUINT32T,
> &comp_struct->saAmfCompPresenceState);
>
> TRACE_LEAVE();
> @@ -2693,7 +2729,9 @@
>
> void decode_comp_cs_type_config(NCS_UBAID *ub, AVD_COMPCS_TYPE*
> comp_cs_type)
> {
> - osaf_decode_sanamet(ub, &comp_cs_type->name);
> + SaNameT name;
> + osaf_decode_sanamet(ub, &name);
> + comp_cs_type->name = Amf::to_string(&name);
> osaf_decode_uint32(ub, &comp_cs_type->saAmfCompNumCurrActiveCSIs);
> osaf_decode_uint32(ub, &comp_cs_type->saAmfCompNumCurrStandbyCSIs);
> }
> @@ -2796,7 +2834,7 @@
> osaf_decode_uint32(&dec->i_uba, (uint32_t*)&ng->saAmfNGAdminState);
> cb->async_updt_cnt.ng_updt++;
>
> - TRACE("'%s',saAmfNGAdminState:%d",ng->name.value,
> ng->saAmfNGAdminState);
> + TRACE("'%s',saAmfNGAdminState:%d",ng->name.c_str(),
> ng->saAmfNGAdminState);
> ng->admin_ng_pend_cbk.invocation = 0;
> ng->admin_ng_pend_cbk.admin_oper =
> static_cast<SaAmfAdminOperationIdT>(0);
> for (std::set<std::string>::const_iterator iter =
> ng->saAmfNGNodeList.begin();
> diff --git a/osaf/services/saf/amf/amfd/ckpt_enc.cc
> b/osaf/services/saf/amf/amfd/ckpt_enc.cc
> --- a/osaf/services/saf/amf/amfd/ckpt_enc.cc
> +++ b/osaf/services/saf/amf/amfd/ckpt_enc.cc
> @@ -281,7 +281,7 @@
> {
> osaf_encode_uint32(ub, avnd->node_info.nodeId);
> osaf_encode_saclmnodeaddresst(ub, &avnd->node_info.nodeAddress);
> - osaf_encode_sanamet(ub, &avnd->name);
> + osaf_encode_sanamet_o2(ub, avnd->name.c_str());
> osaf_encode_bool(ub, avnd->node_info.member);
> osaf_encode_satimet(ub, avnd->node_info.bootTimestamp);
> osaf_encode_uint64(ub, avnd->node_info.initialViewNumber);
> @@ -326,7 +326,7 @@
> break;
> case NCS_MBCSV_ACT_RMV:
> /* Send only key information */
> - osaf_encode_sanamet(&enc->io_uba, &avnd->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, avnd->name.c_str());
> break;
> default:
> osafassert(0);
> @@ -338,7 +338,7 @@
>
> void encode_app(NCS_UBAID *ub, const AVD_APP *app)
> {
> - osaf_encode_sanamet(ub, &app->name);
> + osaf_encode_sanamet_o2(ub, app->name.c_str());
> osaf_encode_uint32(ub, app->saAmfApplicationAdminState);
> osaf_encode_uint32(ub, app->saAmfApplicationCurrNumSGs);
> }
> @@ -374,7 +374,7 @@
> encode_app(&enc->io_uba, app);
> break;
> case NCS_MBCSV_ACT_RMV:
> - osaf_encode_sanamet(&enc->io_uba, &app->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, app->name.c_str());
> break;
> default:
> osafassert(0);
> @@ -386,7 +386,7 @@
>
> static void encode_sg(NCS_UBAID *ub, const AVD_SG *sg)
> {
> - osaf_encode_sanamet(ub, &sg->name);
> + osaf_encode_sanamet_o2(ub, sg->name.c_str());
> osaf_encode_uint32(ub, sg->saAmfSGAdminState);
> osaf_encode_uint32(ub, sg->saAmfSGNumCurrAssignedSUs);
> osaf_encode_uint32(ub, sg->saAmfSGNumCurrInstantiatedSpareSUs);
> @@ -420,7 +420,7 @@
> encode_sg(&enc->io_uba, sg);
> break;
> case NCS_MBCSV_ACT_RMV:
> - osaf_encode_sanamet(&enc->io_uba, &sg->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, sg->name.c_str());
> break;
> default:
> osafassert(0);
> @@ -432,13 +432,13 @@
>
> static void encode_su(NCS_UBAID *ub, AVD_SU *su, uint16_t peer_version)
> {
> - osaf_encode_sanamet(ub, &su->name);
> + osaf_encode_sanamet_o2(ub, su->name.c_str());
> osaf_encode_bool(ub, (bool)su->saAmfSUPreInstantiable); // TODO(hafe)
> change to bool
> osaf_encode_uint32(ub, su->saAmfSUOperState);
> osaf_encode_uint32(ub, su->saAmfSUAdminState);
> osaf_encode_uint32(ub, su->saAmfSuReadinessState);
> osaf_encode_uint32(ub, su->saAmfSUPresenceState);
> - osaf_encode_sanamet(ub, &su->saAmfSUHostedByNode);
> + osaf_encode_sanamet_o2(ub, su->saAmfSUHostedByNode.c_str());
> osaf_encode_uint32(ub, su->saAmfSUNumCurrActiveSIs);
> osaf_encode_uint32(ub, su->saAmfSUNumCurrStandbySIs);
> osaf_encode_uint32(ub, su->saAmfSURestartCount);
> @@ -474,7 +474,7 @@
> break;
> case NCS_MBCSV_ACT_RMV: {
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> break;
> }
> default:
> @@ -499,13 +499,13 @@
> #endif
> TRACE_ENTER2("my_version: %u, to_version: %u", ver_compare,
> peer_version);
>
> - osaf_encode_sanamet(ub, &si->name);
> + osaf_encode_sanamet_o2(ub, si->name.c_str());
> osaf_encode_uint32(ub, si->saAmfSIAdminState);
> osaf_encode_uint32(ub, si->saAmfSIAssignmentState);
> osaf_encode_uint32(ub, si->saAmfSINumCurrActiveAssignments);
> osaf_encode_uint32(ub, si->saAmfSINumCurrStandbyAssignments);
> osaf_encode_uint32(ub, si->si_switch);
> - osaf_encode_sanamet(ub, &si->saAmfSIProtectedbySG);
> + osaf_encode_sanamet_o2(ub, si->saAmfSIProtectedbySG.c_str());
> osaf_encode_bool(ub, si->alarm_sent);
>
> if (peer_version >= ver_compare) {
> @@ -548,7 +548,7 @@
> break;
> case NCS_MBCSV_ACT_RMV:
> /* Send only key information */
> - osaf_encode_sanamet(&enc->io_uba, &si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, si->name.c_str());
> break;
> default:
> osafassert(0);
> @@ -590,7 +590,7 @@
> /*
> * Send SI key.
> */
> - osaf_encode_sanamet(&enc->io_uba, &si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, si->name.c_str());
> break;
>
> case NCS_MBCSV_ACT_UPDATE:
> @@ -610,12 +610,13 @@
> const AVD_SG *sg,
> const uint16_t peer_version)
> {
> - osaf_encode_sanamet(ub, &sg->name);
> - osaf_encode_sanamet(ub, &sg->si_tobe_redistributed->name);
> - osaf_encode_sanamet(ub, &sg->min_assigned_su->name);
> - osaf_encode_sanamet(ub, &sg->max_assigned_su->name);
> + osaf_encode_sanamet_o2(ub, sg->name.c_str());
> + osaf_encode_sanamet_o2(ub, sg->si_tobe_redistributed->name.c_str());
> + osaf_encode_sanamet_o2(ub, sg->min_assigned_su->name.c_str());
> + osaf_encode_sanamet_o2(ub, sg->max_assigned_su->name.c_str());
> }
>
> +
> /*********************************************************************
> * @brief encodes si transfer parameters
> * @param[in] cb
> @@ -634,7 +635,7 @@
>
> case NCS_MBCSV_ACT_RMV:
> /* Send only key information */
> - osaf_encode_sanamet(&enc->io_uba, &sg->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, sg->name.c_str());
> break;
>
> default:
> @@ -649,14 +650,14 @@
> const AVD_SU_SI_REL *susi,
> const uint16_t peer_version)
> {
> - osaf_encode_sanamet(ub, &susi->su->name);
> - osaf_encode_sanamet(ub, &susi->si->name);
> + osaf_encode_sanamet_o2(ub, susi->su->name.c_str());
> + osaf_encode_sanamet_o2(ub, susi->si->name.c_str());
> osaf_encode_uint32(ub, susi->state);
> osaf_encode_uint32(ub, susi->fsm);
> if (peer_version >= AVD_MBCSV_SUB_PART_VERSION_3) {
> osaf_encode_bool(ub, static_cast<bool>(susi->csi_add_rem));
> - osaf_encode_sanamet(ub, &susi->comp_name);
> - osaf_encode_sanamet(ub, &susi->csi_name);
> + osaf_encode_sanamet_o2(ub, susi->comp_name.c_str());
> + osaf_encode_sanamet_o2(ub, susi->csi_name.c_str());
> };
> }
>
> @@ -725,7 +726,7 @@
> osaf_encode_uint32(ub, comp->saAmfCompReadinessState);
> osaf_encode_uint32(ub, comp->saAmfCompPresenceState);
> osaf_encode_uint32(ub, comp->saAmfCompRestartCount);
> - osaf_encode_sanamet(ub, &comp->saAmfCompCurrProxyName);
> + osaf_encode_sanamet_o2(ub, comp->saAmfCompCurrProxyName.c_str());
> }
>
>
> /****************************************************************************\
> @@ -790,7 +791,7 @@
> switch (enc->io_action) {
> case NCS_MBCSV_ACT_ADD:
> case NCS_MBCSV_ACT_RMV:
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> break;
> case NCS_MBCSV_ACT_UPDATE:
> default:
> @@ -864,7 +865,7 @@
> * error. Call EDU encode to encode this field.
> */
> if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - osaf_encode_sanamet(&enc->io_uba, &avnd->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, avnd->name.c_str());
> osaf_encode_uint32(&enc->io_uba, avnd->saAmfNodeAdminState);
> } else
> osafassert(0);
> @@ -898,7 +899,7 @@
> * error. Call EDU encode to encode this field.
> */
> if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - osaf_encode_sanamet(&enc->io_uba, &avnd->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, avnd->name.c_str());
> osaf_encode_uint32(&enc->io_uba, avnd->saAmfNodeOperState);
> } else
> osafassert(0);
> @@ -932,7 +933,7 @@
> * error. Call EDU encode to encode this field.
> */
> if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> - osaf_encode_sanamet(&enc->io_uba, &avnd->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, avnd->name.c_str());
> osaf_encode_uint32(&enc->io_uba, avnd->node_state);
> } else
> osafassert(0);
> @@ -1028,7 +1029,7 @@
>
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SG *sg = (AVD_SG *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
> - osaf_encode_sanamet(&enc->io_uba, &sg->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, sg->name.c_str());
> osaf_encode_uint32(&enc->io_uba, sg->saAmfSGAdminState);
>
> TRACE_LEAVE();
> @@ -1054,7 +1055,7 @@
>
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SG *sg = (AVD_SG *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
> - osaf_encode_sanamet(&enc->io_uba, &sg->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, sg->name.c_str());
> osaf_encode_uint32(&enc->io_uba, sg->saAmfSGNumCurrAssignedSUs);
>
> TRACE_LEAVE();
> @@ -1080,7 +1081,7 @@
>
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SG *sg = (AVD_SG *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
> - osaf_encode_sanamet(&enc->io_uba, &sg->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, sg->name.c_str());
> osaf_encode_uint32(&enc->io_uba,
> sg->saAmfSGNumCurrInstantiatedSpareSUs);
>
> TRACE_LEAVE();
> @@ -1106,7 +1107,7 @@
>
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SG *sg = (AVD_SG *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
> - osaf_encode_sanamet(&enc->io_uba, &sg->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, sg->name.c_str());
> osaf_encode_uint32(&enc->io_uba,
> sg->saAmfSGNumCurrNonInstantiatedSpareSUs);
>
> TRACE_LEAVE();
> @@ -1132,7 +1133,7 @@
>
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SG *sg = (AVD_SG *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
> - osaf_encode_sanamet(&enc->io_uba, &sg->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, sg->name.c_str());
> osaf_encode_uint32(&enc->io_uba, sg->adjust_state);
>
> TRACE_LEAVE();
> @@ -1158,7 +1159,7 @@
>
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SG *sg = (AVD_SG *)(NCS_INT64_TO_PTR_CAST(enc->io_reo_hdl));
> - osaf_encode_sanamet(&enc->io_uba, &sg->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, sg->name.c_str());
> osaf_encode_uint32(&enc->io_uba, sg->sg_fsm_state);
>
> TRACE_LEAVE();
> @@ -1183,7 +1184,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_bool(&enc->io_uba, su->saAmfSUPreInstantiable);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1207,7 +1208,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_uint32(&enc->io_uba, su->saAmfSUOperState);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1231,7 +1232,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_uint32(&enc->io_uba, su->saAmfSUAdminState);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1255,7 +1256,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_uint32(&enc->io_uba, su->saAmfSuReadinessState);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1279,7 +1280,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_uint32(&enc->io_uba, su->saAmfSUPresenceState);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1303,7 +1304,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_uint32(&enc->io_uba, su->saAmfSUNumCurrActiveSIs);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1327,7 +1328,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_uint32(&enc->io_uba, su->saAmfSUNumCurrStandbySIs);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1351,7 +1352,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_bool(&enc->io_uba, su->term_state);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1375,7 +1376,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_uint32(&enc->io_uba, su->su_switch);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1399,7 +1400,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_uint32(&enc->io_uba, su->su_act_state);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1423,7 +1424,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SU *su = (AVD_SU *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &su->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> osaf_encode_uint32(&enc->io_uba, su->saAmfSURestartCount);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1448,7 +1449,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SI *si = (AVD_SI *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, si->name.c_str());
> osaf_encode_uint32(&enc->io_uba, si->saAmfSIAdminState);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1473,7 +1474,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SI *si = (AVD_SI *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, si->name.c_str());
> osaf_encode_uint32(&enc->io_uba, si->saAmfSIAssignmentState);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1492,7 +1493,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SI *si = (AVD_SI *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, si->name.c_str());
> osaf_encode_uint32(&enc->io_uba, si->si_dep_state);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1517,7 +1518,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SI *si = (AVD_SI *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, si->name.c_str());
> osaf_encode_uint32(&enc->io_uba, si->saAmfSINumCurrActiveAssignments);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1542,7 +1543,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SI *si = (AVD_SI *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, si->name.c_str());
> osaf_encode_uint32(&enc->io_uba, si->saAmfSINumCurrStandbyAssignments);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1567,7 +1568,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SI *si = (AVD_SI *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, si->name.c_str());
> osaf_encode_uint32(&enc->io_uba, si->si_switch);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1592,7 +1593,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_SI *si = (AVD_SI *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, si->name.c_str());
> osaf_encode_bool(&enc->io_uba, si->alarm_sent);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> @@ -1622,7 +1623,7 @@
> */
> if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> osaf_encode_sanamet(&enc->io_uba, &comp->comp_info.name);
> - osaf_encode_sanamet(&enc->io_uba, &comp->saAmfCompCurrProxyName);
> + osaf_encode_sanamet_o2(&enc->io_uba,
> comp->saAmfCompCurrProxyName.c_str());
> } else {
> osafassert(0);
> }
> @@ -1771,9 +1772,7 @@
> * error. Call EDU encode to encode this field.
> */
> if (NCS_MBCSV_ACT_UPDATE == enc->io_action) {
> -
> osaf_encode_sanamet(&enc->io_uba, &comp->comp_info.name);
> -
> osaf_encode_uint32(&enc->io_uba, comp->saAmfCompRestartCount);
> } else {
> osafassert(0);
> @@ -2065,7 +2064,6 @@
> static uint32_t enc_cs_si_config(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC *enc,
> uint32_t *num_of_obj)
> {
> uint32_t status = NCSCC_RC_SUCCESS;
> - SaNameT si_name;
> TRACE_ENTER();
>
> /*
> @@ -2076,7 +2074,6 @@
> const AVD_SI *si = it->second;
> encode_si(cb, &enc->io_uba, si, enc->i_peer_version);
>
> - si_name = si->name;
> (*num_of_obj)++;
> }
>
> @@ -2113,7 +2110,7 @@
> status = enc_su_oper_list(cb, sg, enc);
>
> if (status != NCSCC_RC_SUCCESS) {
> - LOG_ER("%s: encode failed, %s", __FUNCTION__,
> sg->name.value);
> + LOG_ER("%s: encode failed, %s", __FUNCTION__,
> sg->name.c_str());
> return NCSCC_RC_FAILURE;
> }
>
> @@ -2153,7 +2150,7 @@
> if (nullptr == sg->admin_si)
> continue;
>
> - osaf_encode_sanamet(&enc->io_uba, &sg->admin_si->name);
> + osaf_encode_sanamet_o2(&enc->io_uba,
> sg->admin_si->name.c_str());
>
> (*num_of_obj)++;
> }
> @@ -2379,7 +2376,7 @@
> * Now walk through the entire SU operation list and encode it.
> */
> for (const auto& su : sg->su_oper_list) {
> - osaf_encode_sanamet(&enc->io_uba, &(su->name));
> + osaf_encode_sanamet_o2(&enc->io_uba, su->name.c_str());
> num_of_opr_su++;
> }
>
> @@ -2398,7 +2395,7 @@
> const AVD_COMPCS_TYPE *comp_cs_type,
> const uint16_t peer_version)
> {
> - osaf_encode_sanamet(ub, &comp_cs_type->name);
> + osaf_encode_sanamet_o2(ub, comp_cs_type->name.c_str());
> osaf_encode_uint32(ub, comp_cs_type->saAmfCompNumCurrActiveCSIs);
> osaf_encode_uint32(ub, comp_cs_type->saAmfCompNumCurrStandbyCSIs);
> }
> @@ -2461,7 +2458,6 @@
> \**************************************************************************/
> static uint32_t enc_cs_comp_cs_type_config(AVD_CL_CB *cb, NCS_MBCSV_CB_ENC
> *enc, uint32_t *num_of_obj)
> {
> - SaNameT dn = {0};
> TRACE_ENTER();
>
> /*
> @@ -2472,7 +2468,6 @@
> AVD_COMPCS_TYPE *compcstype = it->second;
> encode_comp_cs_type_config(&enc->io_uba, compcstype,
> enc->i_peer_version);
>
> - dn = compcstype->name;
> (*num_of_obj)++;
> }
>
> @@ -2492,7 +2487,7 @@
> TRACE_ENTER();
> osafassert(NCS_MBCSV_ACT_UPDATE == enc->io_action);
> const AVD_AMF_NG *ng = (AVD_AMF_NG *)enc->io_reo_hdl;
> - osaf_encode_sanamet(&enc->io_uba, &ng->name);
> + osaf_encode_sanamet_o2(&enc->io_uba, ng->name.c_str());
> osaf_encode_uint32(&enc->io_uba, ng->saAmfNGAdminState);
> TRACE_LEAVE();
> return NCSCC_RC_SUCCESS;
> diff --git a/osaf/services/saf/amf/amfd/ckpt_updt.cc
> b/osaf/services/saf/amf/amfd/ckpt_updt.cc
> --- a/osaf/services/saf/amf/amfd/ckpt_updt.cc
> +++ b/osaf/services/saf/amf/amfd/ckpt_updt.cc
> @@ -49,12 +49,12 @@
> uint32_t rc = NCSCC_RC_SUCCESS;
> AVD_AVND *node;
>
> - TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_node->name.value);
> + TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_node->name.c_str());
>
> osafassert (action == NCS_MBCSV_ACT_UPDATE);
>
> - if (nullptr == (node = avd_node_get(&ckpt_node->name))) {
> - LOG_ER("avd_node_get FAILED for '%s'", ckpt_node->name.value);
> + if (nullptr == (node = avd_node_get(ckpt_node->name))) {
> + LOG_ER("avd_node_get FAILED for '%s'", ckpt_node->name.c_str());
> rc = NCSCC_RC_FAILURE;
> goto done;
> }
> @@ -98,15 +98,15 @@
> {
> uint32_t rc = NCSCC_RC_SUCCESS;
>
> - TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_app->name.value);
> + TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_app->name.c_str());
>
> osafassert (action == NCS_MBCSV_ACT_UPDATE);
>
> - AVD_APP *app = app_db->find(Amf::to_string(&ckpt_app->name));
> + AVD_APP *app = app_db->find(ckpt_app->name);
> if (app == nullptr) {
> - TRACE("'%s' does not exist, creating it", ckpt_app->name.value);
> - app = new AVD_APP(&ckpt_app->name);
> - app_db->insert(Amf::to_string(&app->name), app);
> + TRACE("'%s' does not exist, creating it",
> ckpt_app->name.c_str());
> + app = new AVD_APP(ckpt_app->name);
> + app_db->insert(app->name, app);
> osafassert(rc == NCSCC_RC_SUCCESS);
> goto done;
> }
> @@ -140,12 +140,12 @@
> uint32_t rc = NCSCC_RC_SUCCESS;
> AVD_SG *sg;
>
> - TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_sg->name.value);
> + TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_sg->name.c_str());
>
> osafassert (action == NCS_MBCSV_ACT_UPDATE);
>
> - if (nullptr == (sg = sg_db->find(Amf::to_string(&ckpt_sg->name)))) {
> - LOG_ER("sg_db->find() FAILED for '%s'", ckpt_sg->name.value);
> + if (nullptr == (sg = sg_db->find(ckpt_sg->name))) {
> + LOG_ER("sg_db->find() FAILED for '%s'", ckpt_sg->name.c_str());
> rc = NCSCC_RC_FAILURE;
> goto done;
> }
> @@ -183,12 +183,12 @@
> uint32_t rc = NCSCC_RC_SUCCESS;
> AVD_SU *su;
>
> - TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_su->name.value);
> + TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_su->name.c_str());
>
> osafassert (action == NCS_MBCSV_ACT_UPDATE);
>
> - if (nullptr == (su = su_db->find(Amf::to_string(&ckpt_su->name)))) {
> - LOG_ER("su_db->find FAILED for '%s'", ckpt_su->name.value);
> + if (nullptr == (su = su_db->find(ckpt_su->name))) {
> + LOG_ER("su_db->find FAILED for '%s'", ckpt_su->name.c_str());
> rc = NCSCC_RC_FAILURE;
> goto done;
> }
> @@ -200,18 +200,18 @@
> su->saAmfSUPresenceState = ckpt_su->saAmfSUPresenceState;
> su->saAmfSUNumCurrActiveSIs = ckpt_su->saAmfSUNumCurrActiveSIs;
> su->saAmfSUNumCurrStandbySIs = ckpt_su->saAmfSUNumCurrStandbySIs;
> - memcpy(&su->saAmfSUHostedByNode, &ckpt_su->saAmfSUHostedByNode,
> sizeof(SaNameT));
> + su->saAmfSUHostedByNode = ckpt_su->saAmfSUHostedByNode;
> su->term_state = ckpt_su->term_state;
> su->su_switch = ckpt_su->su_switch;
> su->saAmfSURestartCount = ckpt_su->saAmfSURestartCount;
>
> - avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUOperState",
> + avd_saImmOiRtObjectUpdate(su->name, "saAmfSUOperState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSUOperState);
> - avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUAdminState",
> + avd_saImmOiRtObjectUpdate(su->name, "saAmfSUAdminState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSUAdminState);
> - avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUReadinessState",
> + avd_saImmOiRtObjectUpdate(su->name, "saAmfSUReadinessState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSuReadinessState);
> - avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUPresenceState",
> + avd_saImmOiRtObjectUpdate(su->name, "saAmfSUPresenceState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSUPresenceState);
> done:
> TRACE_LEAVE2("%u", rc);
> @@ -238,11 +238,11 @@
> uint32_t rc = NCSCC_RC_FAILURE;
> AVD_SI *si;
>
> - TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_si->name.value);
> + TRACE_ENTER2("%s - '%s'", action_name[action], ckpt_si->name.c_str());
>
> osafassert (action == NCS_MBCSV_ACT_UPDATE);
>
> - if (nullptr == (si = avd_si_get(&ckpt_si->name))) {
> + if (nullptr == (si = avd_si_get(ckpt_si->name))) {
> LOG_WA("%s: avd_si_get FAILED", __FUNCTION__);
> goto done;
> }
> @@ -254,7 +254,7 @@
> si->saAmfSIAssignmentState = ckpt_si->saAmfSIAssignmentState;
> si->saAmfSIProtectedbySG = ckpt_si->saAmfSIProtectedbySG;
> si->alarm_sent = ckpt_si->alarm_sent;
> - si->sg_of_si = sg_db->find(Amf::to_string(&si->saAmfSIProtectedbySG));
> + si->sg_of_si = sg_db->find(si->saAmfSIProtectedbySG);
>
> rc = NCSCC_RC_SUCCESS;
> done:
> @@ -351,7 +351,7 @@
>
> switch (action) {
> case NCS_MBCSV_ACT_ADD:
> - sg_ptr->si_tobe_redistributed =
> avd_si_get(&si_trans_ckpt->si_name);
> + sg_ptr->si_tobe_redistributed =
> avd_si_get(Amf::to_string(&si_trans_ckpt->si_name));
> sg_ptr->min_assigned_su =
> su_db->find(Amf::to_string(&si_trans_ckpt->min_su_name));
> sg_ptr->max_assigned_su =
> su_db->find(Amf::to_string(&si_trans_ckpt->max_su_name));
> break;
> @@ -399,11 +399,11 @@
>
> TRACE_ENTER2("'%s' '%s'", su_si_ckpt->si_name.value,
> su_si_ckpt->su_name.value);
>
> - su_si_rel_ptr = avd_susi_find(cb, &su_si_ckpt->su_name,
> &su_si_ckpt->si_name);
> + su_si_rel_ptr = avd_susi_find(cb, Amf::to_string(&su_si_ckpt->su_name),
> Amf::to_string(&su_si_ckpt->si_name));
>
> su_ptr = su_db->find(Amf::to_string(&su_si_ckpt->su_name));
> osafassert(su_ptr);
> - si_ptr_up = avd_si_get(&su_si_ckpt->si_name);
> + si_ptr_up = avd_si_get(Amf::to_string(&su_si_ckpt->si_name));
> osafassert(si_ptr_up);
>
> /* Since csi_add_rem flag is not memset in older versions, make sure it
> is set here. */
> @@ -431,29 +431,29 @@
> su_si_rel_ptr->state = su_si_ckpt->state;
> su_si_rel_ptr->csi_add_rem = su_si_ckpt->csi_add_rem;
> if (su_si_rel_ptr->csi_add_rem) {
> - su_si_rel_ptr->comp_name =
> su_si_ckpt->comp_name;
> - su_si_rel_ptr->csi_name = su_si_ckpt->csi_name;
> - TRACE("compcsi create for '%s' '%s'",
> su_si_rel_ptr->comp_name.value, su_si_rel_ptr->csi_name.value);
> - if ((comp_ptr =
> comp_db->find(Amf::to_string(&(su_si_rel_ptr->comp_name)))) == nullptr) {
> - LOG_ER("comp_db->find() FAILED for
> '%s'", su_si_rel_ptr->comp_name.value);
> + su_si_rel_ptr->comp_name =
> Amf::to_string(&su_si_ckpt->comp_name);
> + su_si_rel_ptr->csi_name =
> Amf::to_string(&su_si_ckpt->csi_name);
> + TRACE("compcsi create for '%s' '%s'",
> su_si_rel_ptr->comp_name.c_str(), su_si_rel_ptr->csi_name.c_str());
> + if ((comp_ptr =
> comp_db->find(su_si_rel_ptr->comp_name)) == nullptr) {
> + LOG_ER("comp_db->find() FAILED for
> '%s'", su_si_rel_ptr->comp_name.c_str());
> return NCSCC_RC_FAILURE;
> }
> - if ((csi_ptr =
> csi_db->find(Amf::to_string(&(su_si_rel_ptr->csi_name)))) == nullptr) {
> + if ((csi_ptr =
> csi_db->find(su_si_rel_ptr->csi_name)) == nullptr) {
> /* This condition will arise if there
> is some delay in the ccb apply callback
> * So create csi and add it to the
> csi_db here, later in the ccb apply callback
> * attributes will be updated and csi
> will be added to the model
> */
> - csi_ptr =
> csi_create(&su_si_rel_ptr->csi_name);
> + csi_ptr =
> csi_create(su_si_rel_ptr->csi_name);
> osafassert(csi_ptr);
> }
> if ((avd_compcsi_create(su_si_rel_ptr, csi_ptr,
> comp_ptr, false)) == nullptr) {
> LOG_ER("avd_compcsi_create FAILED for
> csi '%s' comp '%s'",
> -
> su_si_rel_ptr->csi_name.value,su_si_rel_ptr->comp_name.value);
> +
> su_si_rel_ptr->csi_name.c_str(),su_si_rel_ptr->comp_name.c_str());
> return NCSCC_RC_FAILURE;
> }
> } else {
> -
> memset(&(su_si_rel_ptr->comp_name),0,sizeof(SaNameT));
> -
> memset(&(su_si_rel_ptr->csi_name),0,sizeof(SaNameT));
> + su_si_rel_ptr->comp_name = "";
> + su_si_rel_ptr->csi_name = "";
> }
> } else {
> LOG_ER("%s:%u", __FUNCTION__, __LINE__);
> @@ -532,14 +532,14 @@
> {
> uint32_t rc = NCSCC_RC_FAILURE;
> AVD_COMP *comp;
> - const SaNameT *dn = &ckpt_comp->comp_info.name;
> + const std::string& dn = Amf::to_string(&ckpt_comp->comp_info.name);
>
> - TRACE_ENTER2("%s - '%s'", action_name[action], dn->value);
> + TRACE_ENTER2("%s - '%s'", action_name[action], dn.c_str());
>
> - osafassert (action == NCS_MBCSV_ACT_UPDATE);
> + osafassert(action == NCS_MBCSV_ACT_UPDATE);
>
> - if (nullptr == (comp = comp_db->find(Amf::to_string(dn)))) {
> - LOG_ER("comp_db->find() FAILED for '%s'", dn->value);
> + if (nullptr == (comp = comp_db->find(dn))) {
> + LOG_ER("comp_db->find() FAILED for '%s'", dn.c_str());
> goto done;
> }
> comp->saAmfCompOperState = ckpt_comp->saAmfCompOperState;
> @@ -548,11 +548,11 @@
> comp->saAmfCompReadinessState = ckpt_comp->saAmfCompReadinessState;
> /* SaNameT struct copy */
> comp->saAmfCompCurrProxyName = ckpt_comp->saAmfCompCurrProxyName;
> - avd_saImmOiRtObjectUpdate(&comp->comp_info.name, "saAmfCompOperState",
> + avd_saImmOiRtObjectUpdate(dn, "saAmfCompOperState",
> SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompOperState);
> - avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> "saAmfCompReadinessState",
> + avd_saImmOiRtObjectUpdate(dn, "saAmfCompReadinessState",
> SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompReadinessState);
> - avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> "saAmfCompPresenceState",
> + avd_saImmOiRtObjectUpdate(dn, "saAmfCompPresenceState",
> SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompPresenceState);
>
> rc = NCSCC_RC_SUCCESS;
> @@ -581,14 +581,14 @@
> {
> uint32_t rc = NCSCC_RC_FAILURE;
> AVD_COMPCS_TYPE *ccst;
> - const SaNameT *dn = &ckpt_compcstype->name;
> + const std::string& dn = ckpt_compcstype->name;
>
> - TRACE_ENTER2("%s - '%s'", action_name[action], dn->value);
> + TRACE_ENTER2("%s - '%s'", action_name[action], dn.c_str());
>
> osafassert (action == NCS_MBCSV_ACT_UPDATE);
>
> - if (nullptr == (ccst = compcstype_db->find(Amf::to_string(dn)))) {
> - LOG_ER("compcstype_db->find()FAILED for '%s'", dn->value);
> + if (nullptr == (ccst = compcstype_db->find(dn))) {
> + LOG_ER("compcstype_db->find()FAILED for '%s'", dn.c_str());
> goto done;
> }
> ccst->saAmfCompNumCurrActiveCSIs =
> ckpt_compcstype->saAmfCompNumCurrActiveCSIs;
>
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
