osaf/services/saf/amf/amfd/include/sg.h |   6 +++++-
 osaf/services/saf/amf/amfd/sg.cc        |  31 ++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 12 deletions(-)


Problem: When an SG is extended with a new SU, it will not be instatiated or
assigned.

Reason: SG attributes saAmfSGNumPrefAssignedSUs and saAmfSGNumPrefInserviceSUs
are not calculated dynamically as SUs are added (and deleted).

Change: Add a shadow bool "xxx_configured" member of the SG struct
(following the same pattern as for SGautorepair). If the value of this member
is false, the value of the corresponding attribute will be calculated.

diff --git a/osaf/services/saf/amf/amfd/include/sg.h 
b/osaf/services/saf/amf/amfd/include/sg.h
--- a/osaf/services/saf/amf/amfd/include/sg.h
+++ b/osaf/services/saf/amf/amfd/include/sg.h
@@ -69,7 +69,11 @@ typedef struct avd_sg_tag {
                                 * Checkpointing - Sent as a one time update.
                                 */
 
-       bool saAmfSGAutoRepair_configured; /* True when user configures 
saAmfSGAutoRepair else false */
+       /* True when the corresponding configuration attribute is configured */
+       bool saAmfSGAutoRepair_configured;
+       bool saAmfSGNumPrefInserviceSUs_configured;
+       bool saAmfSGNumPrefAssignedSUs_configured;
+
    /******************** B.04 model 
*************************************************/
        SaNameT saAmfSGType;    /* Network order. */
        SaNameT saAmfSGSuHostNodeGroup; /* Network order. */
diff --git a/osaf/services/saf/amf/amfd/sg.cc b/osaf/services/saf/amf/amfd/sg.cc
--- a/osaf/services/saf/amf/amfd/sg.cc
+++ b/osaf/services/saf/amf/amfd/sg.cc
@@ -308,12 +308,14 @@ static AVD_SG *sg_create(const SaNameT *
                sg->saAmfSGNumPrefStandbySUs = 1;
        }
 
-       if 
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfSGNumPrefInserviceSUs"), 
attributes, 0, &sg->saAmfSGNumPrefInserviceSUs) != SA_AIS_OK) {
-               /* empty => later assign number of SUs */
+       if 
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfSGNumPrefInserviceSUs"),
+                       attributes, 0, &sg->saAmfSGNumPrefInserviceSUs) == 
SA_AIS_OK) {
+               sg->saAmfSGNumPrefInserviceSUs_configured = true;
        }
 
-       if 
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfSGNumPrefAssignedSUs"), 
attributes, 0, &sg->saAmfSGNumPrefAssignedSUs) != SA_AIS_OK) {
-               /* empty => later assign to saAmfSGNumPrefInserviceSUs */
+       if 
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfSGNumPrefAssignedSUs"),
+                       attributes, 0, &sg->saAmfSGNumPrefAssignedSUs) == 
SA_AIS_OK) {
+               sg->saAmfSGNumPrefAssignedSUs_configured = true;
        }
 
        sg->saAmfSGMaxActiveSIsperSU = -1; // magic number for no limit
@@ -871,16 +873,22 @@ static void ccb_apply_modify_hdlr(CcbUti
                                        sg->saAmfSGNumPrefStandbySUs = 
*((SaUint32T *)value);
                                TRACE("Modified saAmfSGNumPrefStandbySUs is 
'%u'", sg->saAmfSGNumPrefStandbySUs);
                        } else if (!strcmp(attribute->attrName, 
"saAmfSGNumPrefInserviceSUs")) {
-                               if (value_is_deleted)
+                               if (value_is_deleted) {
                                        sg->saAmfSGNumPrefInserviceSUs = 
sg_su_cnt(sg);
-                               else
+                                       
sg->saAmfSGNumPrefInserviceSUs_configured = false;
+                               } else {
                                        sg->saAmfSGNumPrefInserviceSUs = 
*((SaUint32T *)value);
+                                       
sg->saAmfSGNumPrefInserviceSUs_configured = true;
+                               }
                                TRACE("Modified saAmfSGNumPrefInserviceSUs is 
'%u'", sg->saAmfSGNumPrefInserviceSUs);
                        } else if (!strcmp(attribute->attrName, 
"saAmfSGNumPrefAssignedSUs")) {
-                               if (value_is_deleted)
+                               if (value_is_deleted)  {
                                        sg->saAmfSGNumPrefAssignedSUs = 
sg->saAmfSGNumPrefInserviceSUs;
-                               else
+                                       
sg->saAmfSGNumPrefAssignedSUs_configured = false;
+                               } else {
                                        sg->saAmfSGNumPrefAssignedSUs = 
*((SaUint32T *)value);
+                                       
sg->saAmfSGNumPrefAssignedSUs_configured = true;
+                               }
                                TRACE("Modified saAmfSGNumPrefAssignedSUs is 
'%u'", sg->saAmfSGNumPrefAssignedSUs);
                        } else if (!strcmp(attribute->attrName, 
"saAmfSGMaxActiveSIsperSU")) {
                                if (value_is_deleted)
@@ -1567,19 +1575,20 @@ void avd_sg_adjust_config(AVD_SG *sg)
        }
 
        /* adjust saAmfSGNumPrefInserviceSUs if not configured */
-       if (sg->saAmfSGNumPrefInserviceSUs == 0) {
+       if (sg->saAmfSGNumPrefInserviceSUs_configured == false) {
                sg->saAmfSGNumPrefInserviceSUs = sg_su_cnt(sg);
                if ((sg->sg_type->saAmfSgtRedundancyModel == 
SA_AMF_2N_REDUNDANCY_MODEL) &&
                                (sg->saAmfSGNumPrefInserviceSUs < 2)) {
                        sg->saAmfSGNumPrefInserviceSUs = 2;
-                       LOG_NO("'%s' saAmfSGNumPrefInserviceSUs adjusted to 2", 
sg->name.value);
                }
+               LOG_NO("'%s' saAmfSGNumPrefInserviceSUs adjusted to %u",
+                       sg->name.value, sg->saAmfSGNumPrefInserviceSUs);
        }
 
        /* adjust saAmfSGNumPrefAssignedSUs if not configured, only applicable 
for
         * the N-way and N-way active redundancy models
         */
-       if ((sg->saAmfSGNumPrefAssignedSUs == 0) &&
+       if ((sg->saAmfSGNumPrefAssignedSUs_configured == false) &&
                        ((sg->sg_type->saAmfSgtRedundancyModel == 
SA_AMF_N_WAY_REDUNDANCY_MODEL) ||
                                (sg->sg_type->saAmfSgtRedundancyModel == 
SA_AMF_N_WAY_ACTIVE_REDUNDANCY_MODEL))) {
                sg->saAmfSGNumPrefAssignedSUs = sg->saAmfSGNumPrefInserviceSUs;

------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to