osaf/services/saf/amf/amfd/si.cc | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
When an Application/SI is removed from the AMF model SI unassigned alarms will
be generated. This patch clears those alarms since the SI is anyway being
removed by an administrator.
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
@@ -375,6 +375,14 @@ void avd_si_delete(AVD_SI *si)
avd_svctype_remove_si(si);
avd_app_remove_si(si->app, si);
avd_sg_remove_si(si->sg_of_si, si);
+
+ // clear any pending alarms for this 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);
+ }
+
rc = ncs_patricia_tree_del(&si_db, &si->tree_node);
osafassert(rc == NCSCC_RC_SUCCESS);
delete si;
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
