Hi Praveen,

Ack (Test only).

Thanks,
Quyen


-----Original Message-----
From: [email protected] [mailto:[email protected]] 
Sent: Wednesday, November 18, 2015 12:42 PM
To: [email protected]; [email protected];
[email protected]
Cc: [email protected]
Subject: [PATCH 1 of 1] amfd: change saAmfSIPrefActiveAssignments after
adjusting assignments [#1489]

 osaf/services/saf/amf/amfd/si.cc |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


AMFD asserts for following CCB modification:
immcfg -a saAmfSIPrefActiveAssignments= safSi=All-NWayActive,safApp=DemoApp

When AMFD gets CCB apply callback, it is setting
saAmfSIPrefActiveAssignments to its
default value 1 before adjusting assignments.

Patch fixes the problem by setting saAmfSIPrefActiveAssignments only after
adjusting assignments.

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
@@ -1145,10 +1145,11 @@ static void si_ccb_apply_modify_hdlr(Ccb
 
                if (!strcmp(attribute->attrName,
"saAmfSIPrefActiveAssignments")) {
 
-                       if (value_is_deleted)
-                               mod_pref_assignments =
si->saAmfSIPrefActiveAssignments = 1;
-                       else
+                       if (value_is_deleted) {
+                               mod_pref_assignments = 1;
+                       } else {
                                mod_pref_assignments = *((SaUint32T
*)attr_mod->modAttr.attrValues[0]);
+                       }
 
                        if (avd_cb->avail_state_avd != SA_AMF_HA_ACTIVE) {
                                si->saAmfSIPrefActiveAssignments =
mod_pref_assignments;


------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to