ack, code review only/Rgds. HansN
On 04/02/14 07:02, Hans Feldt wrote:
> osaf/services/saf/amf/amfd/comp.cc | 23 ++++++++--------
> osaf/services/saf/amf/amfd/imm.cc | 44
> +++++++++++++++----------------
> osaf/services/saf/amf/amfd/include/imm.h | 2 +-
> osaf/services/saf/amf/amfd/node.cc | 12 ++++----
> osaf/services/saf/amf/amfd/si.cc | 8 ++--
> osaf/services/saf/amf/amfd/siass.cc | 6 ++-
> osaf/services/saf/amf/amfd/su.cc | 24 ++++++++--------
> 7 files changed, 59 insertions(+), 60 deletions(-)
>
>
> diff --git a/osaf/services/saf/amf/amfd/comp.cc
> b/osaf/services/saf/amf/amfd/comp.cc
> --- a/osaf/services/saf/amf/amfd/comp.cc
> +++ b/osaf/services/saf/amf/amfd/comp.cc
> @@ -98,9 +98,8 @@ void avd_comp_pres_state_set(AVD_COMP *c
> }
>
> comp->saAmfCompPresenceState = pres_state;
> - avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> -
> const_cast<SaImmAttrNameT>("saAmfCompPresenceState"),
> - SA_IMM_ATTR_SAUINT32T,
> &comp->saAmfCompPresenceState);
> + avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> "saAmfCompPresenceState",
> + SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompPresenceState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, comp,
> AVSV_CKPT_COMP_PRES_STATE);
>
> if(comp->saAmfCompPresenceState == SA_AMF_PRESENCE_INSTANTIATION_FAILED)
> @@ -130,8 +129,8 @@ void avd_comp_oper_state_set(AVD_COMP *c
> comp->comp_info.name.value,
> avd_oper_state_name[comp->saAmfCompOperState],
> avd_oper_state_name[oper_state]);
>
> comp->saAmfCompOperState = oper_state;
> - avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> -
> const_cast<SaImmAttrNameT>("saAmfCompOperState"), SA_IMM_ATTR_SAUINT32T,
> &comp->saAmfCompOperState);
> + avd_saImmOiRtObjectUpdate(&comp->comp_info.name, "saAmfCompOperState",
> + SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompOperState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, comp,
> AVSV_CKPT_COMP_OPER_STATE);
> }
>
> @@ -145,8 +144,8 @@ void avd_comp_readiness_state_set(AVD_CO
> comp->comp_info.name.value,
> avd_readiness_state_name[comp->saAmfCompReadinessState],
> avd_readiness_state_name[readiness_state]);
> comp->saAmfCompReadinessState = readiness_state;
> - avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> -
> const_cast<SaImmAttrNameT>("saAmfCompReadinessState"), SA_IMM_ATTR_SAUINT32T,
> &comp->saAmfCompReadinessState);
> + avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> "saAmfCompReadinessState",
> + SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompReadinessState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, comp,
> AVSV_CKPT_COMP_READINESS_STATE);
> }
>
> @@ -282,16 +281,16 @@ static void comp_add_to_model(AVD_COMP *
> avd_comp_oper_state_set(comp, SA_AMF_OPERATIONAL_ENABLED);
>
> /* Set runtime cached attributes. */
> - avd_saImmOiRtObjectUpdate(&su->name,
> const_cast<SaImmAttrNameT>("saAmfSUPreInstantiable"),
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUPreInstantiable",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSUPreInstantiable);
>
> - avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> const_cast<SaImmAttrNameT>("saAmfCompReadinessState"),
> + avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> "saAmfCompReadinessState",
> SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompReadinessState);
>
> - avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> const_cast<SaImmAttrNameT>("saAmfCompOperState"),
> + avd_saImmOiRtObjectUpdate(&comp->comp_info.name, "saAmfCompOperState",
> SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompOperState);
>
> - avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> const_cast<SaImmAttrNameT>("saAmfCompPresenceState"),
> + avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> "saAmfCompPresenceState",
> SA_IMM_ATTR_SAUINT32T, &comp->saAmfCompPresenceState);
>
> m_AVSV_SEND_CKPT_UPDT_ASYNC_ADD(avd_cb, comp,
> AVSV_CKPT_AVD_COMP_CONFIG);
> @@ -1556,7 +1555,7 @@ static void comp_ccb_apply_delete_hdlr(s
> /* if SU is not being deleted and the PreInstantiable state has changed
> * then update the IMM with the new value for saAmfSUPreInstantiable */
> if (su_delete == false && old_val != comp->su->saAmfSUPreInstantiable) {
> - avd_saImmOiRtObjectUpdate(&comp->su->name,
> const_cast<SaImmAttrNameT>("saAmfSUPreInstantiable"),
> + avd_saImmOiRtObjectUpdate(&comp->su->name,
> "saAmfSUPreInstantiable",
> SA_IMM_ATTR_SAUINT32T,
> &comp->su->saAmfSUPreInstantiable);
> /* If SU becomes NPI then enable saAmfSUFailover flag Sec
> 3.11.1.3.2 AMF-B.04.01 spec */
> if (!comp->su->saAmfSUPreInstantiable) {
> diff --git a/osaf/services/saf/amf/amfd/imm.cc
> b/osaf/services/saf/amf/amfd/imm.cc
> --- a/osaf/services/saf/amf/amfd/imm.cc
> +++ b/osaf/services/saf/amf/amfd/imm.cc
> @@ -1479,7 +1479,7 @@ void avd_saImmOiRtObjectUpdate_sync(cons
> * @param attrValueType
> * @param value
> */
> -void avd_saImmOiRtObjectUpdate(const SaNameT *dn, SaImmAttrNameT
> attributeName,
> +void avd_saImmOiRtObjectUpdate(const SaNameT *dn, const char *attributeName,
> SaImmValueTypeT attrValueType, void *value)
> {
> TRACE_ENTER();
> @@ -1565,25 +1565,20 @@ void avd_imm_update_runtime_attrs(void)
> /* Update SU Class runtime cached attributes. */
> su = avd_su_getnext(&su_name);
> while (su != NULL) {
> - avd_saImmOiRtObjectUpdate(&su->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSUPreInstantiable"), SA_IMM_ATTR_SAUINT32T,
> - &su->saAmfSUPreInstantiable);
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUPreInstantiable",
> + SA_IMM_ATTR_SAUINT32T, &su->saAmfSUPreInstantiable);
>
> - avd_saImmOiRtObjectUpdate(&su->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSUHostedByNode"), SA_IMM_ATTR_SANAMET,
> - &su->saAmfSUHostedByNode);
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUHostedByNode",
> + SA_IMM_ATTR_SANAMET, &su->saAmfSUHostedByNode);
>
> - avd_saImmOiRtObjectUpdate(&su->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSUPresenceState"), SA_IMM_ATTR_SAUINT32T,
> - &su->saAmfSUPresenceState);
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUPresenceState",
> + SA_IMM_ATTR_SAUINT32T, &su->saAmfSUPresenceState);
>
> - avd_saImmOiRtObjectUpdate(&su->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSUOperState"), SA_IMM_ATTR_SAUINT32T,
> - &su->saAmfSUOperState);
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUOperState",
> + SA_IMM_ATTR_SAUINT32T, &su->saAmfSUOperState);
>
> - avd_saImmOiRtObjectUpdate(&su->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSUReadinessState"), SA_IMM_ATTR_SAUINT32T,
> - &su->saAmfSuReadinessState);
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUReadinessState",
> + SA_IMM_ATTR_SAUINT32T, &su->saAmfSuReadinessState);
>
> su = avd_su_getnext(&su->name);
> }
> @@ -1592,13 +1587,16 @@ void avd_imm_update_runtime_attrs(void)
> comp = avd_comp_getnext(&comp_name);
> while (comp != NULL) {
> avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> -
> const_cast<SaImmAttrNameT>("saAmfCompReadinessState"), SA_IMM_ATTR_SAUINT32T,
> &comp->saAmfCompReadinessState);
> + "saAmfCompReadinessState", SA_IMM_ATTR_SAUINT32T,
> + &comp->saAmfCompReadinessState);
>
> avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> -
> const_cast<SaImmAttrNameT>("saAmfCompOperState"), SA_IMM_ATTR_SAUINT32T,
> &comp->saAmfCompOperState);
> + "saAmfCompOperState", SA_IMM_ATTR_SAUINT32T,
> + &comp->saAmfCompOperState);
>
> avd_saImmOiRtObjectUpdate(&comp->comp_info.name,
> -
> const_cast<SaImmAttrNameT>("saAmfCompPresenceState"), SA_IMM_ATTR_SAUINT32T,
> &comp->saAmfCompPresenceState);
> + "saAmfCompPresenceState", SA_IMM_ATTR_SAUINT32T,
> + &comp->saAmfCompPresenceState);
>
> comp = avd_comp_getnext(&comp->comp_info.name);
> }
> @@ -1606,8 +1604,8 @@ void avd_imm_update_runtime_attrs(void)
> /* Update Node Class runtime cached attributes. */
> node = avd_node_getnext(&node_name);
> while (node != NULL) {
> - avd_saImmOiRtObjectUpdate(&node->name,
> const_cast<SaImmAttrNameT>("saAmfNodeOperState"),
> - SA_IMM_ATTR_SAUINT32T,
> &node->saAmfNodeOperState);
> + avd_saImmOiRtObjectUpdate(&node->name, "saAmfNodeOperState",
> + SA_IMM_ATTR_SAUINT32T, &node->saAmfNodeOperState);
>
> node = avd_node_getnext(&node->name);
> }
> @@ -1615,8 +1613,8 @@ void avd_imm_update_runtime_attrs(void)
> /* Update Node Class runtime cached attributes. */
> si = avd_si_getnext(&si_name);
> while (si != NULL) {
> - avd_saImmOiRtObjectUpdate(&si->name,
> const_cast<SaImmAttrNameT>("saAmfSIAssignmentState"),
> - SA_IMM_ATTR_SAUINT32T,
> &si->saAmfSIAssignmentState);
> + avd_saImmOiRtObjectUpdate(&si->name, "saAmfSIAssignmentState",
> + SA_IMM_ATTR_SAUINT32T, &si->saAmfSIAssignmentState);
>
> si = avd_si_getnext(&si->name);
> }
> diff --git a/osaf/services/saf/amf/amfd/include/imm.h
> b/osaf/services/saf/amf/amfd/include/imm.h
> --- a/osaf/services/saf/amf/amfd/include/imm.h
> +++ b/osaf/services/saf/amf/amfd/include/imm.h
> @@ -135,7 +135,7 @@ SaAisErrorT avd_imm_default_OK_completed
> extern unsigned int avd_imm_config_get(void);
> extern void avd_saImmOiRtObjectUpdate_sync(const SaNameT *dn,
> SaImmAttrNameT attributeName, SaImmValueTypeT attrValueType, void
> *value);
> -extern void avd_saImmOiRtObjectUpdate(const SaNameT* dn, SaImmAttrNameT
> attributeName,
> +extern void avd_saImmOiRtObjectUpdate(const SaNameT* dn, const char
> *attributeName,
> SaImmValueTypeT attrValueType, void* value);
> extern void avd_saImmOiRtObjectCreate(const SaImmClassNameT className,
> const SaNameT *parentName, const SaImmAttrValuesT_2 **attrValues);
> diff --git a/osaf/services/saf/amf/amfd/node.cc
> b/osaf/services/saf/amf/amfd/node.cc
> --- a/osaf/services/saf/amf/amfd/node.cc
> +++ b/osaf/services/saf/amf/amfd/node.cc
> @@ -396,8 +396,8 @@ void avd_node_oper_state_set(AVD_AVND *n
> * event. Since we dont update oper_state in avnd_down because
> the role is
> * not set to Active(there is no implementer), so updating now.
> */
> - avd_saImmOiRtObjectUpdate(&node->name,
> const_cast<SaImmAttrNameT>("saAmfNodeOperState"),
> - SA_IMM_ATTR_SAUINT32T,
> &node->saAmfNodeOperState);
> + avd_saImmOiRtObjectUpdate(&node->name, "saAmfNodeOperState",
> + SA_IMM_ATTR_SAUINT32T, &node->saAmfNodeOperState);
> return;
> }
>
> @@ -407,8 +407,8 @@ void avd_node_oper_state_set(AVD_AVND *n
> saflog(LOG_NOTICE, amfSvcUsrName, "%s OperState %s => %s",
> node->name.value,
> avd_oper_state_name[node->saAmfNodeOperState],
> avd_oper_state_name[oper_state]);
> node->saAmfNodeOperState = oper_state;
> - avd_saImmOiRtObjectUpdate(&node->name,
> const_cast<SaImmAttrNameT>("saAmfNodeOperState"),
> - SA_IMM_ATTR_SAUINT32T,
> &node->saAmfNodeOperState);
> + avd_saImmOiRtObjectUpdate(&node->name, "saAmfNodeOperState",
> + SA_IMM_ATTR_SAUINT32T, &node->saAmfNodeOperState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, node,
> AVSV_CKPT_AVND_OPER_STATE);
>
> /* notification */
> @@ -703,8 +703,8 @@ void node_admin_state_set(AVD_AVND *node
> saflog(LOG_NOTICE, amfSvcUsrName, "%s AdmState %s => %s",
> node->name.value,
> avd_adm_state_name[node->saAmfNodeAdminState],
> avd_adm_state_name[admin_state]);
> node->saAmfNodeAdminState = admin_state;
> - avd_saImmOiRtObjectUpdate(&node->name,
> const_cast<SaImmAttrNameT>("saAmfNodeAdminState"),
> - SA_IMM_ATTR_SAUINT32T,
> &node->saAmfNodeAdminState);
> + avd_saImmOiRtObjectUpdate(&node->name, "saAmfNodeAdminState",
> + SA_IMM_ATTR_SAUINT32T, &node->saAmfNodeAdminState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, node,
> AVSV_CKPT_AVND_ADMIN_STATE);
> avd_send_admin_state_chg_ntf(&node->name,
> SA_AMF_NTFID_NODE_ADMIN_STATE, old_state, node->saAmfNodeAdminState);
> }
> diff --git a/osaf/services/saf/amf/amfd/si.cc
> b/osaf/services/saf/amf/amfd/si.cc
> --- a/osaf/services/saf/amf/amfd/si.cc
> +++ b/osaf/services/saf/amf/amfd/si.cc
> @@ -492,7 +492,7 @@ static void si_add_to_model(AVD_SI *si)
> avd_app_add_si(si->app, si);
> avd_sg_add_si(si->sg_of_si, si);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_ADD(avd_cb, si, AVSV_CKPT_AVD_SI_CONFIG);
> - avd_saImmOiRtObjectUpdate(&si->name,
> const_cast<SaImmAttrNameT>("saAmfSIAssignmentState"),
> + avd_saImmOiRtObjectUpdate(&si->name, "saAmfSIAssignmentState",
> SA_IMM_ATTR_SAUINT32T, &si->saAmfSIAssignmentState);
>
> done:
> @@ -1313,7 +1313,7 @@ static void si_update_ass_state(AVD_SI *
> si->alarm_sent = false;
> }
>
> - avd_saImmOiRtObjectUpdate(&si->name,
> const_cast<SaImmAttrNameT>("saAmfSIAssignmentState"),
> + avd_saImmOiRtObjectUpdate(&si->name, "saAmfSIAssignmentState",
> SA_IMM_ATTR_SAUINT32T, &si->saAmfSIAssignmentState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, si,
> AVSV_CKPT_SI_ASSIGNMENT_STATE);
> }
> @@ -1401,8 +1401,8 @@ void avd_si_admin_state_set(AVD_SI* si,
> saflog(LOG_NOTICE, amfSvcUsrName, "%s AdmState %s => %s",
> si->name.value,
> avd_adm_state_name[si->saAmfSIAdminState],
> avd_adm_state_name[state]);
> si->saAmfSIAdminState = state;
> - avd_saImmOiRtObjectUpdate(&si->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSIAdminState"), SA_IMM_ATTR_SAUINT32T,
> &si->saAmfSIAdminState);
> + avd_saImmOiRtObjectUpdate(&si->name, "saAmfSIAdminState",
> + SA_IMM_ATTR_SAUINT32T, &si->saAmfSIAdminState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, si,
> AVSV_CKPT_SI_ADMIN_STATE);
> avd_send_admin_state_chg_ntf(&si->name, SA_AMF_NTFID_SI_ADMIN_STATE,
> old_state, si->saAmfSIAdminState);
> }
> diff --git a/osaf/services/saf/amf/amfd/siass.cc
> b/osaf/services/saf/amf/amfd/siass.cc
> --- a/osaf/services/saf/amf/amfd/siass.cc
> +++ b/osaf/services/saf/amf/amfd/siass.cc
> @@ -118,14 +118,16 @@ void avd_susi_update(AVD_SU_SI_REL *susi
> saflog(LOG_NOTICE, amfSvcUsrName, "HA State %s of %s for %s",
> avd_ha_state[ha_state], susi->su->name.value,
> susi->si->name.value);
>
> -
> avd_saImmOiRtObjectUpdate(&dn,const_cast<SaImmAttrNameT>("saAmfSISUHAState"),
> SA_IMM_ATTR_SAUINT32T, &ha_state);
> + avd_saImmOiRtObjectUpdate(&dn, "saAmfSISUHAState",
> + SA_IMM_ATTR_SAUINT32T, &ha_state);
>
> /* Update all CSI assignments */
> for (compcsi = susi->list_of_csicomp; compcsi != NULL; compcsi =
> compcsi->susi_csicomp_next) {
> avsv_create_association_class_dn(&compcsi->comp->comp_info.name,
> &compcsi->csi->name, "safCSIComp", &dn);
>
> -
> avd_saImmOiRtObjectUpdate(&dn,const_cast<SaImmAttrNameT>("saAmfCSICompHAState"),
> SA_IMM_ATTR_SAUINT32T, &ha_state);
> + avd_saImmOiRtObjectUpdate(&dn, "saAmfCSICompHAState",
> + SA_IMM_ATTR_SAUINT32T, &ha_state);
> }
> }
>
> diff --git a/osaf/services/saf/amf/amfd/su.cc
> b/osaf/services/saf/amf/amfd/su.cc
> --- a/osaf/services/saf/amf/amfd/su.cc
> +++ b/osaf/services/saf/amf/amfd/su.cc
> @@ -666,16 +666,16 @@ static void su_add_to_model(AVD_SU *su)
> }
>
> done:
> - avd_saImmOiRtObjectUpdate(&su->name,
> const_cast<SaImmAttrNameT>("saAmfSUPreInstantiable"),
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUPreInstantiable",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSUPreInstantiable);
>
> - avd_saImmOiRtObjectUpdate(&su->name,
> const_cast<SaImmAttrNameT>("saAmfSUHostedByNode"),
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUHostedByNode",
> SA_IMM_ATTR_SANAMET, &su->saAmfSUHostedByNode);
>
> - avd_saImmOiRtObjectUpdate(&su->name,
> const_cast<SaImmAttrNameT>("saAmfSUPresenceState"),
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUPresenceState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSUPresenceState);
>
> - avd_saImmOiRtObjectUpdate(&su->name,
> const_cast<SaImmAttrNameT>("saAmfSUReadinessState"),
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUReadinessState",
> SA_IMM_ATTR_SAUINT32T, &su->saAmfSuReadinessState);
>
> TRACE_LEAVE();
> @@ -771,8 +771,8 @@ void avd_su_pres_state_set(AVD_SU *su, S
> /* alarm & notifications */
> avd_send_su_pres_state_chg_ntf(&su->name, old_state,
> su->saAmfSUPresenceState);
> }
> - avd_saImmOiRtObjectUpdate(&su->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSUPresenceState"), SA_IMM_ATTR_SAUINT32T,
> &su->saAmfSUPresenceState);
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUPresenceState",
> + SA_IMM_ATTR_SAUINT32T, &su->saAmfSUPresenceState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, su, AVSV_CKPT_SU_PRES_STATE);
> }
>
> @@ -794,8 +794,8 @@ void avd_su_oper_state_set(AVD_SU *su, S
> /* alarm & notifications */
> avd_send_oper_chg_ntf(&su->name, SA_AMF_NTFID_SU_OP_STATE, old_state,
> su->saAmfSUOperState);
>
> - avd_saImmOiRtObjectUpdate(&su->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSUOperState"), SA_IMM_ATTR_SAUINT32T,
> &su->saAmfSUOperState);
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUOperState",
> + SA_IMM_ATTR_SAUINT32T, &su->saAmfSUOperState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, su, AVSV_CKPT_SU_OPER_STATE);
> }
>
> @@ -814,8 +814,8 @@ void avd_su_readiness_state_set(AVD_SU *
> saflog(LOG_NOTICE, amfSvcUsrName, "%s ReadinessState %s => %s",
> su->name.value,
> avd_readiness_state_name[su->saAmfSuReadinessState],
> avd_readiness_state_name[readiness_state]);
> su->saAmfSuReadinessState = readiness_state;
> - avd_saImmOiRtObjectUpdate(&su->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSUReadinessState"), SA_IMM_ATTR_SAUINT32T,
> &su->saAmfSuReadinessState);
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUReadinessState",
> + SA_IMM_ATTR_SAUINT32T, &su->saAmfSuReadinessState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, su,
> AVSV_CKPT_SU_READINESS_STATE);
>
> /* Since Su readiness state has changed, we need to change it for all
> the component in this SU.*/
> @@ -845,8 +845,8 @@ void avd_su_admin_state_set(AVD_SU *su,
> saflog(LOG_NOTICE, amfSvcUsrName, "%s AdmState %s => %s",
> su->name.value,
> avd_adm_state_name[su->saAmfSUAdminState],
> avd_adm_state_name[admin_state]);
> su->saAmfSUAdminState = admin_state;
> - avd_saImmOiRtObjectUpdate(&su->name,
> -
> const_cast<SaImmAttrNameT>("saAmfSUAdminState"), SA_IMM_ATTR_SAUINT32T,
> &su->saAmfSUAdminState);
> + avd_saImmOiRtObjectUpdate(&su->name, "saAmfSUAdminState",
> + SA_IMM_ATTR_SAUINT32T, &su->saAmfSUAdminState);
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, su, AVSV_CKPT_SU_ADMIN_STATE);
> avd_send_admin_state_chg_ntf(&su->name, SA_AMF_NTFID_SU_ADMIN_STATE,
> old_state, su->saAmfSUAdminState);
> }
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
