Ack.
Thanks
-Nagu
> -----Original Message-----
> From: Praveen Malviya
> Sent: 17 July 2014 15:14
> To: hans.fe...@ericsson.com; Nagendra Kumar
> Cc: opensaf-devel@lists.sourceforge.net
> Subject: [PATCH 1 of 1] amfd : use OUT_OF_SERVICE as probableCause in alarm
> notifications [#363]
>
> osaf/services/saf/amf/amfd/comp.cc | 4 ++--
> osaf/services/saf/amf/amfd/ntf.cc | 14 +++++++-------
> osaf/services/saf/amf/amfd/si.cc | 4 ++--
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
>
> At present AMF uses SA_NTF_SOFTWARE_ERROR as proable cause while
> reporting alarms.
>
> This patch modifies it to SA_NTF_OUT_OF_SERVICE as it seems more approriate
> as per ticket description.
>
> 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
> @@ -93,13 +93,13 @@ void avd_comp_pres_state_set(AVD_COMP *c
> if ((comp->saAmfCompPresenceState ==
> SA_AMF_PRESENCE_TERMINATION_FAILED) &&
> (pres_state ==
> SA_AMF_PRESENCE_UNINSTANTIATED)){
> avd_alarm_clear(&comp->comp_info.name,
> - SA_AMF_NTFID_COMP_CLEANUP_FAILED,
> SA_NTF_SOFTWARE_ERROR);
> + SA_AMF_NTFID_COMP_CLEANUP_FAILED,
> SA_NTF_OUT_OF_SERVICE);
> }
>
> if ((comp->saAmfCompPresenceState ==
> SA_AMF_PRESENCE_INSTANTIATION_FAILED) &&
> (pres_state ==
> SA_AMF_PRESENCE_UNINSTANTIATED)){
> avd_alarm_clear(&comp->comp_info.name,
> -
> SA_AMF_NTFID_COMP_INSTANTIATION_FAILED,
> SA_NTF_SOFTWARE_ERROR);
> +
> SA_AMF_NTFID_COMP_INSTANTIATION_FAILED,
> SA_NTF_OUT_OF_SERVICE);
> }
>
>
> diff --git a/osaf/services/saf/amf/amfd/ntf.cc
> b/osaf/services/saf/amf/amfd/ntf.cc
> --- a/osaf/services/saf/amf/amfd/ntf.cc
> +++ b/osaf/services/saf/amf/amfd/ntf.cc
> @@ -52,7 +52,7 @@ void avd_send_comp_inst_failed_alarm(con
> (SaUint8T*)add_text,
> SA_SVC_AMF,
>
> SA_AMF_NTFID_COMP_INSTANTIATION_FAILED,
> - SA_NTF_SOFTWARE_ERROR,
> + SA_NTF_OUT_OF_SERVICE,
> SA_NTF_SEVERITY_MAJOR,
> (NCSCONTEXT)node_name,
> 1 /* add_info is node_name */);
> @@ -84,7 +84,7 @@ void avd_send_comp_clean_failed_alarm(co
> (SaUint8T*)add_text,
> SA_SVC_AMF,
> SA_AMF_NTFID_COMP_CLEANUP_FAILED,
> - SA_NTF_SOFTWARE_ERROR,
> + SA_NTF_OUT_OF_SERVICE,
> SA_NTF_SEVERITY_MAJOR,
> (NCSCONTEXT)node_name,
> 1 /* add_info is node_name */);
> @@ -118,7 +118,7 @@ void avd_send_cluster_reset_alarm(const
> (SaUint8T*)add_text,
> SA_SVC_AMF,
> SA_AMF_NTFID_CLUSTER_RESET,
> - SA_NTF_SOFTWARE_ERROR,
> + SA_NTF_OUT_OF_SERVICE,
> SA_NTF_SEVERITY_MAJOR,
> NULL,
> 0 /* No add_info */);
> @@ -149,7 +149,7 @@ void avd_send_si_unassigned_alarm(const
> (SaUint8T*)add_text,
> SA_SVC_AMF,
> SA_AMF_NTFID_SI_UNASSIGNED,
> - SA_NTF_SOFTWARE_ERROR,
> + SA_NTF_OUT_OF_SERVICE,
> SA_NTF_SEVERITY_MAJOR,
> NULL,
> 0 /* No add_info */);
> @@ -181,7 +181,7 @@ void avd_send_comp_proxy_status_unproxie
> (SaUint8T*)add_text,
> SA_SVC_AMF,
> SA_AMF_NTFID_COMP_UNPROXIED,
> - SA_NTF_SOFTWARE_ERROR,
> + SA_NTF_OUT_OF_SERVICE,
> SA_NTF_SEVERITY_MAJOR,
> NULL,
> 0 /* No add_info */);
> @@ -737,14 +737,14 @@ void avd_send_error_report_ntf(const SaN
> (SaUint8T*)add_text,
> SA_SVC_AMF,
> SA_AMF_NTFID_ERROR_REPORT,
> - SA_NTF_SOFTWARE_ERROR,
> + SA_NTF_OUT_OF_SERVICE,
> SA_NTF_SEVERITY_MAJOR,
> (NCSCONTEXT) &add_info,
> 1 /* No add_info */);
>
> } else {
> avd_alarm_clear(name, SA_AMF_NTFID_ERROR_CLEAR,
> - SA_NTF_SOFTWARE_ERROR);
> + SA_NTF_OUT_OF_SERVICE);
> }
>
> TRACE_LEAVE();
> 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
> @@ -371,7 +371,7 @@ void avd_si_delete(AVD_SI *si)
> if ((si->alarm_sent == true) &&
> (avd_cb->avail_state_avd == SA_AMF_HA_ACTIVE)) {
> avd_alarm_clear(&si->name,
> SA_AMF_NTFID_SI_UNASSIGNED,
> - SA_NTF_SOFTWARE_ERROR);
> + SA_NTF_OUT_OF_SERVICE);
> }
>
> si_db->erase(Amf::to_string(&si->name));
> @@ -1258,7 +1258,7 @@ void AVD_SI::update_ass_state()
>
> /* Clear of alarm */
> if ((oldState == SA_AMF_ASSIGNMENT_UNASSIGNED)
> && alarm_sent) {
> - avd_alarm_clear(&name,
> SA_AMF_NTFID_SI_UNASSIGNED, SA_NTF_SOFTWARE_ERROR);
> + avd_alarm_clear(&name,
> SA_AMF_NTFID_SI_UNASSIGNED,
> +SA_NTF_OUT_OF_SERVICE);
>
> m_AVSV_SEND_CKPT_UPDT_ASYNC_UPDT(avd_cb, this,
> AVSV_CKPT_SI_ALARM_SENT);
> }
>
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
