osaf/services/saf/amf/amfd/include/su.h | 3 +- osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 14 +++--- osaf/services/saf/amf/amfd/sg_nored_fsm.cc | 16 ++++---- osaf/services/saf/amf/amfd/sg_npm_fsm.cc | 16 ++++---- osaf/services/saf/amf/amfd/sg_nway_fsm.cc | 20 +++++----- osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc | 16 ++++---- osaf/services/saf/amf/amfd/su.cc | 51 ++++++++++++++------------- 7 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/include/su.h b/osaf/services/saf/amf/amfd/include/su.h --- a/osaf/services/saf/amf/amfd/include/su.h +++ b/osaf/services/saf/amf/amfd/include/su.h @@ -88,6 +88,7 @@ class AVD_SU { struct avd_sutype *su_type; AVD_SU *su_list_su_type_next; + void set_admin_state(SaAmfAdminStateT admin_state); void set_pres_state(SaAmfPresenceStateT state); void set_readiness_state(SaAmfReadinessStateT readiness_state); void set_oper_state(SaAmfOperationalStateT state); @@ -157,8 +158,6 @@ extern void avd_su_add_comp(struct avd_c */ extern SaAisErrorT avd_su_config_get(const SaNameT *sg_name, struct avd_sg_tag *sg); -extern void avd_su_admin_state_set(AVD_SU *su, SaAmfAdminStateT admin_state); - /** * Class constructor, must be called before any other function */ diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc --- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc +++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc @@ -941,7 +941,7 @@ static uint32_t avd_sg_2n_su_fault_su_op m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -2050,7 +2050,7 @@ static uint32_t avd_sg_2n_susi_sucss_su_ * are quiesced */ if ((su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) && ((all_quiesced(su) || all_unassigned(su)))) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -2232,7 +2232,7 @@ static uint32_t avd_sg_2n_susi_sucss_su_ /* the admin state of the SU is shutdown change it to lock. */ if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -2741,7 +2741,7 @@ uint32_t avd_sg_2n_susi_fail_func(AVD_CL /* the admin state of the SU is shutdown change it to lock. */ if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -3055,7 +3055,7 @@ static void avd_sg_2n_node_fail_su_oper( m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); /* the admin state of the SU is shutdown change it to lock. */ if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -3082,7 +3082,7 @@ static void avd_sg_2n_node_fail_su_oper( /* the admin state of the SU is shutdown change it to lock. */ if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -3787,7 +3787,7 @@ uint32_t avd_sg_2n_su_admin_fail(AVD_CL_ /* add the SU to the operation list and change the SG FSM to SG realign. */ avd_sg_su_oper_list_add(cb, su, false); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); m_AVD_SET_SG_FSM(cb, (su->sg_of_su), AVD_SG_FSM_SG_REALIGN); } /* else (avd_su_state_determine(su) == SA_AMF_HA_ACTIVE) */ } /* if ((su->admin_state == NCS_ADMIN_STATE_SHUTDOWN) || diff --git a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc --- a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc +++ b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc @@ -234,7 +234,7 @@ uint32_t avd_sg_nored_su_fault_func(AVD_ m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -273,7 +273,7 @@ uint32_t avd_sg_nored_su_fault_func(AVD_ m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -510,7 +510,7 @@ uint32_t avd_sg_nored_susi_sucss_func(AV m_AVD_CLEAR_SG_ADMIN_SI(cb, (su->sg_of_su)); avd_sg_su_oper_list_add(cb, su, false); } else if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -596,7 +596,7 @@ uint32_t avd_sg_nored_susi_sucss_func(AV m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -786,7 +786,7 @@ uint32_t avd_sg_nored_susi_fail_func(AVD m_AVD_CLEAR_SG_ADMIN_SI(cb, (su->sg_of_su)); avd_sg_su_oper_list_add(cb, su, false); } else if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { su->list_of_susi->state = SA_AMF_HA_QUIESCED; m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, (su->list_of_susi), AVSV_CKPT_AVD_SI_ASS); @@ -819,7 +819,7 @@ uint32_t avd_sg_nored_susi_fail_func(AVD m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { su->list_of_susi->state = SA_AMF_HA_QUIESCED; m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(cb, (su->list_of_susi), AVSV_CKPT_AVD_SI_ASS); @@ -1025,7 +1025,7 @@ void avd_sg_nored_node_fail_func(AVD_CL_ m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if ((su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) && (old_state == SA_AMF_HA_QUIESCING)) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); @@ -1067,7 +1067,7 @@ void avd_sg_nored_node_fail_func(AVD_CL_ m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if ((su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) && (old_state == SA_AMF_HA_QUIESCING)) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); diff --git a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc --- a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc +++ b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc @@ -988,7 +988,7 @@ static uint32_t avd_sg_npm_su_fault_su_o m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -1308,7 +1308,7 @@ static uint32_t avd_sg_npm_su_fault_sg_r m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -1715,7 +1715,7 @@ static uint32_t avd_sg_npm_susi_sucss_sg m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -2566,7 +2566,7 @@ static uint32_t avd_sg_npm_susi_sucss_su /* If the admin state of the SU is shutdown change it to lock*/ if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -3050,7 +3050,7 @@ uint32_t avd_sg_npm_susi_fail_func(AVD_C m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -3667,7 +3667,7 @@ static void avd_sg_npm_node_fail_sg_relg m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -3808,7 +3808,7 @@ static void avd_sg_npm_node_fail_su_oper m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -4367,7 +4367,7 @@ uint32_t avd_sg_npm_su_admin_fail(AVD_CL /* add the SU to the operation list and change the SG FSM to SG realign. */ avd_sg_su_oper_list_add(cb, su, false); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); m_AVD_SET_SG_FSM(cb, (su->sg_of_su), AVD_SG_FSM_SG_REALIGN); } /* else (su->list_of_susi->state == SA_AMF_HA_ACTIVE) */ break; /* case AVD_SG_FSM_STABLE: */ diff --git a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc --- a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc +++ b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc @@ -734,7 +734,7 @@ uint32_t avd_sg_nway_su_admin_fail(AVD_C } if (SA_AMF_ADMIN_SHUTTING_DOWN == su->saAmfSUAdminState) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } /* transition to sg-realign state */ @@ -1814,7 +1814,7 @@ uint32_t avd_sg_nway_su_fault_sg_realign if ((SA_AMF_ADMIN_SHUTTING_DOWN == su->saAmfSUAdminState) || (SA_AMF_ADMIN_SHUTTING_DOWN == su_node_ptr->saAmfNodeAdminState)) { if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); su->set_readiness_state(SA_AMF_READINESS_OUT_OF_SERVICE); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); @@ -1969,7 +1969,7 @@ uint32_t avd_sg_nway_su_fault_su_oper(AV if ((SA_AMF_ADMIN_SHUTTING_DOWN == su->saAmfSUAdminState) || (SA_AMF_ADMIN_SHUTTING_DOWN == su_node_ptr->saAmfNodeAdminState)) { if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -2435,7 +2435,7 @@ uint32_t avd_sg_nway_susi_succ_sg_realig /* if su-shutdown semantics in progress, mark it locked */ if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); @@ -2526,7 +2526,7 @@ uint32_t avd_sg_nway_susi_succ_sg_realig /* if su-shutdown semantics in progress, mark it locked */ if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); @@ -2629,7 +2629,7 @@ uint32_t avd_sg_nway_susi_succ_sg_realig m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -2777,7 +2777,7 @@ uint32_t avd_sg_nway_susi_succ_su_oper(A /* if su-shutdown semantics in progress, mark it locked */ if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -2816,7 +2816,7 @@ uint32_t avd_sg_nway_susi_succ_su_oper(A /* if su-shutdown semantics in progress, mark it locked */ if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -3272,7 +3272,7 @@ void avd_sg_nway_node_fail_su_oper(AVD_C m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -3654,7 +3654,7 @@ void avd_sg_nway_node_fail_sg_realign(AV if (true == is_su_present) { m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { diff --git a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc --- a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc +++ b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc @@ -397,7 +397,7 @@ uint32_t avd_sg_nacvred_su_fault_func(AV if (flag == true) { m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -429,7 +429,7 @@ uint32_t avd_sg_nacvred_su_fault_func(AV m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -756,7 +756,7 @@ uint32_t avd_sg_nacvred_susi_sucss_func( } } else if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -950,7 +950,7 @@ uint32_t avd_sg_nacvred_susi_sucss_func( m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -1179,7 +1179,7 @@ uint32_t avd_sg_nacvred_susi_fail_func(A } } else if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -1250,7 +1250,7 @@ uint32_t avd_sg_nacvred_susi_fail_func(A m_AVD_SET_SG_FSM(cb, (su->sg_of_su), AVD_SG_FSM_SG_REALIGN); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -1494,7 +1494,7 @@ void avd_sg_nacvred_node_fail_func(AVD_C m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { @@ -1547,7 +1547,7 @@ void avd_sg_nacvred_node_fail_func(AVD_C } m_AVD_GET_SU_NODE_PTR(cb, su, su_node_ptr); if (su->saAmfSUAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); } else if (su_node_ptr->saAmfNodeAdminState == SA_AMF_ADMIN_SHUTTING_DOWN) { m_AVD_IS_NODE_LOCK((su_node_ptr), flag); if (flag == true) { 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 @@ -810,19 +810,21 @@ void AVD_SU::set_readiness_state(SaAmfRe TRACE_LEAVE(); } -void avd_su_admin_state_set(AVD_SU *su, SaAmfAdminStateT admin_state) -{ - SaAmfAdminStateT old_state = su->saAmfSUAdminState; - +void AVD_SU::set_admin_state(SaAmfAdminStateT admin_state) { + SaAmfAdminStateT old_state = saAmfSUAdminState; + osafassert(admin_state <= SA_AMF_ADMIN_SHUTTING_DOWN); - TRACE_ENTER2("'%s' %s => %s", su->name.value, avd_adm_state_name[old_state], avd_adm_state_name[admin_state]); - 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, "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); + TRACE_ENTER2("'%s' %s => %s", name.value, + avd_adm_state_name[old_state], avd_adm_state_name[admin_state]); + saflog(LOG_NOTICE, amfSvcUsrName, "%s AdmState %s => %s", name.value, + avd_adm_state_name[saAmfSUAdminState], + avd_adm_state_name[admin_state]); + saAmfSUAdminState = admin_state; + avd_saImmOiRtObjectUpdate(&name, "saAmfSUAdminState", + SA_IMM_ATTR_SAUINT32T, &saAmfSUAdminState); + m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, this, AVSV_CKPT_SU_ADMIN_STATE); + avd_send_admin_state_chg_ntf(&name, SA_AMF_NTFID_SU_ADMIN_STATE, + old_state, saAmfSUAdminState); } /** @@ -944,7 +946,7 @@ static void su_admin_op_cb(SaImmOiHandle /* Validation has passed and admin operation should be done. Proceed with it... */ switch (op_id) { case SA_AMF_ADMIN_UNLOCK: - avd_su_admin_state_set(su, SA_AMF_ADMIN_UNLOCKED); + su->set_admin_state(SA_AMF_ADMIN_UNLOCKED); if (((m_AVD_APP_SU_IS_INSVC(su, node)) || (su->sg_of_su->sg_ncs_spec == true)) && ((su->saAmfSUPreInstantiable) ? (su->saAmfSUPresenceState == SA_AMF_PRESENCE_INSTANTIATED):true)) { @@ -977,7 +979,7 @@ static void su_admin_op_cb(SaImmOiHandle } } else { su->set_readiness_state(SA_AMF_READINESS_OUT_OF_SERVICE); - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); report_admin_op_error(immoi_handle, invocation, SA_AIS_ERR_FAILED_OPERATION, NULL, "SG redundancy model specific handler failed"); goto done; @@ -992,7 +994,7 @@ static void su_admin_op_cb(SaImmOiHandle case SA_AMF_ADMIN_LOCK: if (su->list_of_susi == NULL) { su->set_readiness_state(SA_AMF_READINESS_OUT_OF_SERVICE); - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); avd_sg_app_su_inst_func(cb, su->sg_of_su); avd_saImmOiAdminOperationResult(immoi_handle, invocation, SA_AIS_OK); goto done; @@ -1001,7 +1003,7 @@ static void su_admin_op_cb(SaImmOiHandle back_red_state = su->saAmfSuReadinessState; back_admin_state = su->saAmfSUAdminState; su->set_readiness_state(SA_AMF_READINESS_OUT_OF_SERVICE); - avd_su_admin_state_set(su, adm_state); + su->set_admin_state(adm_state); if (su->sg_of_su->su_admin_down(cb, su, node) != NCSCC_RC_SUCCESS) is_oper_successful = false; @@ -1019,7 +1021,7 @@ static void su_admin_op_cb(SaImmOiHandle } } else { su->set_readiness_state(back_red_state); - avd_su_admin_state_set(su, back_admin_state); + su->set_admin_state(back_admin_state); report_admin_op_error(immoi_handle, invocation, SA_AIS_ERR_FAILED_OPERATION, NULL, "SG redundancy model specific handler failed"); goto done; @@ -1031,7 +1033,7 @@ static void su_admin_op_cb(SaImmOiHandle /* For non-preinstantiable SU lock-inst is same as lock */ if ( su->saAmfSUPreInstantiable == false ) { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED_INSTANTIATION); + su->set_admin_state(SA_AMF_ADMIN_LOCKED_INSTANTIATION); avd_saImmOiAdminOperationResult(immoi_handle, invocation, SA_AIS_OK); goto done; } @@ -1054,7 +1056,7 @@ static void su_admin_op_cb(SaImmOiHandle (su->saAmfSUPresenceState == SA_AMF_PRESENCE_INSTANTIATION_FAILED) || (su->saAmfSUPresenceState == SA_AMF_PRESENCE_TERMINATION_FAILED)) { /* No need to terminate the SUs in Unins/Inst Failed/Term Failed state */ - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED_INSTANTIATION); + su->set_admin_state(SA_AMF_ADMIN_LOCKED_INSTANTIATION); avd_saImmOiAdminOperationResult(immoi_handle, invocation, SA_AIS_OK); m_AVD_SET_SU_TERM(cb, su, true); LOG_NO("'%s' presence state is '%u'", su_name->value, su->saAmfSUPresenceState); @@ -1068,8 +1070,7 @@ static void su_admin_op_cb(SaImmOiHandle and so store the callback parameters to send response later on. */ if (avd_snd_presence_msg(cb, su, true) == NCSCC_RC_SUCCESS) { m_AVD_SET_SU_TERM(cb, su, true); - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED_INSTANTIATION); - + su->set_admin_state(SA_AMF_ADMIN_LOCKED_INSTANTIATION); su->pend_cbk.admin_oper = static_cast<SaAmfAdminOperationIdT>(op_id); su->pend_cbk.invocation = invocation; @@ -1079,7 +1080,7 @@ static void su_admin_op_cb(SaImmOiHandle "Internal error, could not send message to avnd"); goto done; } else { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED_INSTANTIATION); + su->set_admin_state(SA_AMF_ADMIN_LOCKED_INSTANTIATION); avd_saImmOiAdminOperationResult(immoi_handle, invocation, SA_AIS_OK); m_AVD_SET_SU_TERM(cb, su, true); } @@ -1099,7 +1100,7 @@ static void su_admin_op_cb(SaImmOiHandle /* Adjusting saAmfSGMaxActiveSIsperSU and saAmfSGMaxStandbySIsperSU is required when SG and SUs/Comps are created in different CCBs. */ avd_sg_adjust_config(su->sg_of_su); - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); avd_saImmOiAdminOperationResult(immoi_handle, invocation, SA_AIS_OK); goto done; } @@ -1120,7 +1121,7 @@ static void su_admin_op_cb(SaImmOiHandle and so store the callback parameters to send response later on. */ if (avd_snd_presence_msg(cb, su, false) == NCSCC_RC_SUCCESS) { m_AVD_SET_SU_TERM(cb, su, false); - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); su->pend_cbk.admin_oper = static_cast<SaAmfAdminOperationIdT>(op_id); su->pend_cbk.invocation = invocation; @@ -1130,7 +1131,7 @@ static void su_admin_op_cb(SaImmOiHandle report_admin_op_error(immoi_handle, invocation, SA_AIS_ERR_TRY_AGAIN, NULL, "Internal error, could not send message to avnd"); } else { - avd_su_admin_state_set(su, SA_AMF_ADMIN_LOCKED); + su->set_admin_state(SA_AMF_ADMIN_LOCKED); avd_saImmOiAdminOperationResult(immoi_handle, invocation, SA_AIS_OK); m_AVD_SET_SU_TERM(cb, su, false); } ------------------------------------------------------------------------------ Start Your Social Network Today - Download eXo Platform Build your Enterprise Intranet with eXo Platform Software Java Based Open Source Intranet - Social, Extensible, Cloud Ready Get Started Now And Turn Your Intranet Into A Collaboration Platform http://p.sf.net/sfu/ExoPlatform _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel