Changeset 770:90d705524ce0

Timestamp:

01/20/10 04:50:29 (8 months ago)

Author:

Shekhar <chandrasekhar.yadav@…>

Branch:

default

Message:

DTSv OI integration with IMMSv (#618)

Files:

• configure.ac (modified) (4 diffs)
• opensaf.spec.in (modified) (1 diff)
• osaf/cli/services/Makefile.am (modified) (1 diff)
• osaf/services/infrastructure/dtsv/dts/Makefile.am (modified) (3 diffs)
• osaf/services/infrastructure/dtsv/dts/dts_api.c (modified) (4 diffs)
• osaf/services/infrastructure/dtsv/dts/dts_cbop.c (modified) (3 diffs)
• osaf/services/infrastructure/dtsv/dts/dts_chkop.c (modified) (7 diffs)
• osaf/services/infrastructure/dtsv/dts/dts_ckpt_dec.c (modified) (2 diffs)
• osaf/services/infrastructure/dtsv/dts/dts_ckpt_edu.c (modified) (2 diffs)
• osaf/services/infrastructure/dtsv/dts/dts_ckpt_updt.c (modified) (9 diffs)
• osaf/services/infrastructure/dtsv/dts/dts_dl_api.c (modified) (1 diff)
• osaf/services/infrastructure/dtsv/dts/dts_glpolc.c (deleted)
• osaf/services/infrastructure/dtsv/dts/dts_imm.c (added)
• osaf/services/infrastructure/dtsv/dts/dts_log.c (modified) (1 diff)
• osaf/services/infrastructure/dtsv/dts/dts_logpolc.c (added)
• osaf/services/infrastructure/dtsv/dts/dts_mds.c (modified) (5 diffs)
• osaf/services/infrastructure/dtsv/dts/dts_mib.c (deleted)
• osaf/services/infrastructure/dtsv/dts/dts_nodepolc.c (deleted)
• osaf/services/infrastructure/dtsv/dts/dts_pvt.c (modified) (36 diffs)
• osaf/services/infrastructure/dtsv/dts/dts_svcpolc.c (deleted)
• osaf/services/infrastructure/dtsv/include/Makefile.am (modified) (2 diffs)
• osaf/services/infrastructure/dtsv/include/dta.h (modified) (1 diff)
• osaf/services/infrastructure/dtsv/include/dta_pvt.h (modified) (1 diff)
• osaf/services/infrastructure/dtsv/include/dts.h (modified) (2 diffs)
• osaf/services/infrastructure/dtsv/include/dts_ckpt_updt.h (modified) (1 diff)
• osaf/services/infrastructure/dtsv/include/dts_imm.h (added)
• osaf/services/infrastructure/dtsv/include/dts_log.h (modified) (3 diffs)
• osaf/services/infrastructure/dtsv/include/dts_mapi.h (deleted)
• osaf/services/infrastructure/dtsv/include/dts_pvt.h (modified) (14 diffs)
• osaf/services/infrastructure/dtsv/include/dtsv_msg.h (modified) (1 diff)
• osaf/services/infrastructure/dtsv/include/dtsvcli.h (modified) (2 diffs)
• osaf/services/infrastructure/dtsv/logstr/dts_logstr.c (modified) (1 diff)
• osaf/services/saf/immsv/config/imm.xml (modified) (3 diffs)
• osaf/snmp/miblib/Makefile.am (modified) (1 diff)
• osaf/snmp/mibs/ESMI-NCS-DTSV-MIB (deleted)
• osaf/snmp/mibs/Makefile.mibs (modified) (2 diffs)
• osaf/snmp/mibs/NCS-DTSV-MIB (deleted)
• osaf/snmp/pssv/Makefile.am (modified) (1 diff)
• osaf/snmp/subagt/Makefile.am (modified) (2 diffs)
• osaf/snmp/subagt/services/Makefile.am (modified) (1 diff)
• osaf/snmp/subagt/subagt_amf.c (modified) (1 diff)

configure.ac

@@ -622 +622 @@
         osaf/cli/services/Makefile
         osaf/cli/services/avsv/Makefile
-        osaf/cli/services/dtsv/Makefile
         osaf/cli/services/psr/Makefile
         osaf/snmp/Makefile
@@ -632 +631 @@
         osaf/snmp/miblib/avsv/Makefile
         osaf/snmp/miblib/avsv/avm/Makefile
-        osaf/snmp/miblib/dtsv/Makefile
-        osaf/snmp/miblib/dtsv/dts/Makefile
         osaf/snmp/miblib/pssv/Makefile
         osaf/snmp/miblib/pssv/pss/Makefile
@@ -641 +638 @@
         osaf/snmp/pssv/avsv/Makefile
         osaf/snmp/pssv/avsv/avm/Makefile
-        osaf/snmp/pssv/dtsv/Makefile
         osaf/snmp/scripts/Makefile
         osaf/snmp/scripts/ncs_snmpsubagt_clean
@@ -654 +650 @@
         osaf/snmp/subagt/services/avsv/Makefile
         osaf/snmp/subagt/services/avsv/avm/Makefile
-        osaf/snmp/subagt/services/dtsv/Makefile
         osaf/snmp/subagt/services/pssv/Makefile
         osaf/libs/Makefile

opensaf.spec.in

@@ -391 +391 @@
 %{_pkglibdir}/libcli_logstr.so.*
 %{_pkglibdir}/libcpsv_logstr.so.*
-%{_pkglibdir}/libdts_clicef.so.*
 %{_pkglibdir}/libdts_logstr.so.*
-%{_pkglibdir}/libdts_pssv.so.*
-%{_pkglibdir}/libdtsv_subagt.so.*
 %{_pkglibdir}/libedsv_logstr.so.*
 %{_pkglibdir}/libglsv_logstr.so.*

osaf/cli/services/Makefile.am

@@ -19 +19 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = avsv dtsv psr
+SUBDIRS = avsv psr

osaf/services/infrastructure/dtsv/dts/Makefile.am

@@ -27 +27 @@
         $(AM_CPPFLAGS) \
         -I$(top_srcdir)/osaf/services/infrastructure/dtsv/include \
-        -I$(top_srcdir)/osaf/services/infrastructure/masv/include
+        -I$(top_srcdir)/osaf/services/infrastructure/masv/include \
+        -I$(top_srcdir)/osaf/libs/common/immsv/include
 
 ncs_dts_SOURCES = \
         $(top_srcdir)/osaf/libs/core/common/ncs_main_pvt.c \
+        $(top_srcdir)/osaf/tools/safimm/src/immutil.c \
         dts_amf.c \
         dts_api.c \
@@ -41 +43 @@
         dts_def.c \
         dts_dl_api.c \
-        dts_glpolc.c \
         dts_log.c \
         dts_mds.c \
-        dts_mib.c \
-        dts_nodepolc.c \
+        dts_logpolc.c \
         dts_pvt.c \
         dts_seq.c \
-        dts_svcpolc.c \
         dts_tgt.c \
+        dts_imm.c \
         sysf_log.c
 
@@ -59 +59 @@
         $(top_builddir)/osaf/libs/saf/libSaAmf/libSaAmf.la \
         $(top_builddir)/osaf/libs/agents/infrastructure/rda/librda.la \
-        $(top_builddir)/osaf/snmp/miblib/dtsv/dts/libdts_miblib.la
+        $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOi.la \
+        $(top_builddir)/osaf/libs/saf/libSaImm/libSaImmOm.la

osaf/services/infrastructure/dtsv/dts/dts_api.c

@@ -205 +205 @@
                 return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_svc_create: MBCSv registration failed");
         }
-
-        /* Register with OAC and MIB-LIB */
-        if (dts_register_tables(inst) != NCSCC_RC_SUCCESS) {
-                m_NCS_SEL_OBJ_DESTROY(inst->sighdlr_sel_obj);
-                dtsv_mbcsv_deregister(inst);
-                dts_mds_unreg(inst, TRUE);
-                inst->created = FALSE;
-                ncs_patricia_tree_destroy(&inst->svc_tbl);
-                ncs_patricia_tree_destroy(&inst->dta_list);
-                ncs_patricia_tree_destroy(&inst->libname_asciispec_tree);
-                ncs_patricia_tree_destroy(&inst->svcid_asciispec_tree);
-
-                m_DTS_UNLK(&inst->lock);
-                m_DTS_LK_DLT(&inst->lock);
-                return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_svc_create: MIB table registration failed");
-        }
-
-        /* DTS PSSv integration changes -  Send playback request to PSR */
-        if (inst->ha_state == SA_AMF_HA_ACTIVE) {
-                if (dts_mab_snd_warmboot_req(inst) != NCSCC_RC_SUCCESS) {
-                        m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_svc_create: Failed PSS playback");
-                }
-        }
 #ifdef __NCSINC_LINUX__
         {
@@ -241 +218 @@
                 if (dts_create_log_dir_path(inst->log_path) != NCSCC_RC_SUCCESS) {
                         m_NCS_SEL_OBJ_DESTROY(inst->sighdlr_sel_obj);
-                        dts_unregister_tables(inst);
                         dtsv_mbcsv_deregister(inst);
                         dts_mds_unreg(inst, TRUE);
@@ -259 +235 @@
         strcpy(inst->log_path, LOG_PATH);
 #endif
-
+        inst->imm_init_done = FALSE;
         m_DTS_UNLK(&inst->lock);
 
@@ -368 +344 @@
         ncs_patricia_tree_destroy(&inst->svcid_asciispec_tree);
         ncs_patricia_tree_destroy(&inst->libname_asciispec_tree);
-
-        /* Deregister MIB tables from OAC. */
-        retval = dts_unregister_tables(inst);
-        if (retval != NCSCC_RC_SUCCESS)
-                retval = m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_svc_destroy: Failed to deregister MIB tables from OAC");
 
         m_NCS_SEL_OBJ_DESTROY(inst->sighdlr_sel_obj);

osaf/services/infrastructure/dtsv/dts/dts_cbop.c

@@ -25 +25 @@
 
   FUNCTIONS INCLUDED in this module:
-  dtsv_cirbuff_op_table_register     - Register CB operation table.
-  dtsv_populate_cirbuff_op_tbl_info  - CB operation table information.
-  dtsv_populate_cirbuff_op_var_info  - CB op table var info.
-  dtsv_cirbuff_op_set_obj            - CB set operation.
-  dtsv_cirbuff_op_get_obj            - CB get operation.
-  dtsv_extract_cirbuff_op_obj        - CB extract operation.
-  dtsv_next_cirbuff_op_obj           - CB next operation.
-  dtsv_setrow_cirbuff_op_obj         - CB set-row operation.
   dump_global_buffer_log             - CB - dump global buffer log.
   dump_per_node_buffer_log           - CB - dump per node buffer log.
@@ -50 +42 @@
 
 /* Static vriable declarations */
-static NCSMIB_OBJ_INFO objinfo;
-static NCSMIB_VAR_INFO varinfo[dtsvCirBuffOpMax_Id];
 static uns16 idx[2];
 
-/* Local routines for this table */
-static uns32 dtsv_cirbuff_op_set_obj(NCSCONTEXT cb, NCSMIB_ARG *arg, NCSMIB_VAR_INFO *var_info, NCS_BOOL flag);
-static uns32 dtsv_cirbuff_op_get_obj(NCSCONTEXT cb, NCSMIB_ARG *arg, NCSCONTEXT *data);
-
-static uns32
-dtsv_extract_cirbuff_op_obj(NCSMIB_PARAM_VAL *param_val, NCSMIB_VAR_INFO *var_info, NCSCONTEXT data, NCSCONTEXT buffer);
-static uns32
-dtsv_next_cirbuff_op_obj(NCSCONTEXT cb, NCSMIB_ARG *arg, NCSCONTEXT *data, uns32 *next_inst_id, uns32 *next_inst_len);
-static uns32
-dtsv_setrow_cirbuff_op_obj(NCSCONTEXT cb, NCSMIB_ARG *args,
-                           NCSMIB_SETROW_PARAM_VAL *params, struct ncsmib_obj_info *objinfo, NCS_BOOL flag);
 
 static uns32 dump_global_buffer_log(DTS_CB *inst, uns8 device);
@@ -70 +49 @@
 static uns32 dump_svc_per_node_buffer_log(DTS_CB *inst, SVC_KEY *key, uns8 device);
 
-static void dtsv_populate_cirbuff_op_tbl_info(NCSMIB_TBL_INFO *pInfo);
-static void dtsv_populate_cirbuff_op_var_info(NCSMIB_VAR_INFO *pInfo);
-/**************************************************************************
- Function: dtsv_cirbuff_op_table_register
- Purpose:  Circular Buffer Operation table register routine
- Input:    void
- Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
- Notes:  
-**************************************************************************/
-uns32 dtsv_cirbuff_op_table_register(void)
-{
-        NCSMIBLIB_REQ_INFO reqinfo;
-        uns32 rc = NCSCC_RC_SUCCESS;
-
-        memset(&reqinfo, 0, sizeof(reqinfo));
-        memset(&objinfo, 0, sizeof(objinfo));
-
-        /* Populate the Table Information */
-        dtsv_populate_cirbuff_op_tbl_info(&objinfo.tbl_info);
-
-        /* Populate the Var Infoamtion */
-        objinfo.var_info = varinfo;
-        dtsv_populate_cirbuff_op_var_info(objinfo.var_info);
-
-        /* Register the Group table */
-        reqinfo.req = NCSMIBLIB_REQ_REGISTER;
-        reqinfo.info.i_reg_info.obj_info = &objinfo;
-        rc = ncsmiblib_process_req(&reqinfo);
-        return rc;
-}
-
-/**************************************************************************
- Function: dtsv_populate_cirbuff_op_tbl_info
- Purpose:  This routine popultaes the Circular Buffer Operation table information
- Input:    pInfo: Pointer to NCSMIB_TBL_INFO structure
- Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
- Notes:  
-**************************************************************************/
-static void dtsv_populate_cirbuff_op_tbl_info(NCSMIB_TBL_INFO *pInfo)
-{
-        /* Populate the Index Array */
-        idx[0] = dtsvCirbuffOpIndexNode_Id;
-        idx[1] = dtsvCirbuffOpIndexService_Id;
-
-        /* Set Table params */
-        pInfo->table_id = NCSMIB_TBL_DTSV_CIRBUFF_OP;
-        pInfo->table_of_scalars = FALSE;
-        pInfo->index_in_this_tbl = TRUE;
-        pInfo->idx_data.index_info.num_index_ids = 2;
-        pInfo->idx_data.index_info.index_param_ids = idx;
-        pInfo->num_objects = dtsvCirBuffOpMax_Id - 1;
-        pInfo->row_in_one_data_struct = TRUE;
-
-        /* Set Table function handlers */
-        pInfo->set = dtsv_cirbuff_op_set_obj;
-        pInfo->get = dtsv_cirbuff_op_get_obj;
-        pInfo->next = dtsv_next_cirbuff_op_obj;
-        pInfo->setrow = dtsv_setrow_cirbuff_op_obj;
-        pInfo->extract = dtsv_extract_cirbuff_op_obj;
-}
-
-/**************************************************************************
- Function: dtsv_populate_cirbuff_op_var_info
- Purpose:  This routine populates the Circular Buffer Operation param information
- Input:    pInfo: Pointer to NCSMIB_VAR_INFO structures
- Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
- Notes:  
-**************************************************************************/
-static void dtsv_populate_cirbuff_op_var_info(NCSMIB_VAR_INFO *pInfo)
-{
-        /* dtsvCirbuffOpIndexNode_Id */
-        pInfo[dtsvCirbuffOpIndexNode_Id - 1].offset =
-            (uns16)((long)&CIR_BUFFER_OP_TABLE_NULL->my_key.node - (long)CIR_BUFFER_OP_TABLE_NULL);
-        pInfo[dtsvCirbuffOpIndexNode_Id - 1].len = sizeof(CIR_BUFFER_OP_TABLE_NULL->my_key.node);
-        pInfo[dtsvCirbuffOpIndexNode_Id - 1].access = NCSMIB_ACCESS_READ_WRITE;
-        pInfo[dtsvCirbuffOpIndexNode_Id - 1].status = NCSMIB_OBJ_CURRENT;
-        pInfo[dtsvCirbuffOpIndexNode_Id - 1].set_when_down = FALSE;
-        pInfo[dtsvCirbuffOpIndexNode_Id - 1].fmat_id = NCSMIB_FMAT_INT;
-        pInfo[dtsvCirbuffOpIndexNode_Id - 1].obj_type = NCSMIB_OTHER_INT_OBJ_TYPE;
-
-        /* dtsvCirbuffOpIndexService_Id */
-        pInfo[dtsvCirbuffOpIndexService_Id - 1].offset =
-            (uns16)((long)&CIR_BUFFER_OP_TABLE_NULL->my_key.ss_svc_id - (long)CIR_BUFFER_OP_TABLE_NULL);
-        pInfo[dtsvCirbuffOpIndexService_Id - 1].len = sizeof(CIR_BUFFER_OP_TABLE_NULL->my_key.ss_svc_id);
-        pInfo[dtsvCirbuffOpIndexService_Id - 1].access = NCSMIB_ACCESS_READ_WRITE;
-        pInfo[dtsvCirbuffOpIndexService_Id - 1].status = NCSMIB_OBJ_CURRENT;
-        pInfo[dtsvCirbuffOpIndexService_Id - 1].set_when_down = FALSE;
-        pInfo[dtsvCirbuffOpIndexService_Id - 1].fmat_id = NCSMIB_FMAT_INT;
-        pInfo[dtsvCirbuffOpIndexService_Id - 1].obj_type = NCSMIB_OTHER_INT_OBJ_TYPE;
-
-        /* dtsvCirbuffOpOperation */
-        pInfo[dtsvCirbuffOpOperation - 1].offset =
-            (uns16)((long)&CIR_BUFFER_OP_TABLE_NULL->operation - (long)CIR_BUFFER_OP_TABLE_NULL);
-        pInfo[dtsvCirbuffOpOperation - 1].len = sizeof(CIR_BUFFER_OP_TABLE_NULL->operation);
-        pInfo[dtsvCirbuffOpOperation - 1].access = NCSMIB_ACCESS_READ_WRITE;
-        pInfo[dtsvCirbuffOpOperation - 1].status = NCSMIB_OBJ_CURRENT;
-        pInfo[dtsvCirbuffOpOperation - 1].set_when_down = FALSE;
-        pInfo[dtsvCirbuffOpOperation - 1].fmat_id = NCSMIB_FMAT_INT;
-        pInfo[dtsvCirbuffOpOperation - 1].obj_type = NCSMIB_OTHER_INT_OBJ_TYPE;
-
-        /* dtsvCirbuffOpDevice */
-        pInfo[dtsvCirbuffOpOperation - 1].offset =
-            (uns16)((long)&CIR_BUFFER_OP_TABLE_NULL->op_device - (long)CIR_BUFFER_OP_TABLE_NULL);
-        pInfo[dtsvCirbuffOpDevice - 1].len = sizeof(CIR_BUFFER_OP_TABLE_NULL->op_device);
-        pInfo[dtsvCirbuffOpDevice - 1].access = NCSMIB_ACCESS_READ_WRITE;
-        pInfo[dtsvCirbuffOpDevice - 1].status = NCSMIB_OBJ_CURRENT;
-        pInfo[dtsvCirbuffOpDevice - 1].set_when_down = FALSE;
-        pInfo[dtsvCirbuffOpDevice - 1].fmat_id = NCSMIB_FMAT_INT;
-        pInfo[dtsvCirbuffOpDevice - 1].obj_type = NCSMIB_OTHER_INT_OBJ_TYPE;
-}
-
-/**************************************************************************
-* Function: dtsv_cirbuff_op_set_obj
-* Purpose:  Circular Buffer Operation table's set object routine
-* Input:    cb       : DTS_CB pointer
-*           arg      : MIB arg pointer
-*           var_info : varinfo pointer
-*           flag     : Tells the operation to be performed           
-* Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
-* Notes:  
-**************************************************************************/
-static uns32 dtsv_cirbuff_op_set_obj(NCSCONTEXT cb, NCSMIB_ARG *arg, NCSMIB_VAR_INFO *var_info, NCS_BOOL flag)
-{
-        /* Operation not supported for this table. Only SetRow Operation */
-        return NCSCC_RC_FAILURE;
-}
-
-/**************************************************************************
-* Function: dtsv_cirbuff_op_get_obj
-* Purpose:  Circular Buffer Operation table's get object routine
-* Input:    cb       : DTS_CB pointer
-*           arg      : MIB arg pointer*        
-*           data     : Pointer of the data structure   
-* Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
-* Notes:  
-**************************************************************************/
-static uns32 dtsv_cirbuff_op_get_obj(NCSCONTEXT cb, NCSMIB_ARG *arg, NCSCONTEXT *data)
-{
-        /* Operation not supported for this table. Only SetRow Operation */
-        return NCSCC_RC_FAILURE;
-}
-
-/**************************************************************************
-* Function: dtsv_extract_cirbuff_op_obj
-* Purpose:  Circular Buffer Operation table's extract object value routine
-* Input:    param_val: Param pointer
-*           var_info : var_info pointer
-*           data     : Pointer to the data structure
-*           buffer   : Buffer to get the octect data           
-* Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
-* Notes:  
-**************************************************************************/
-static uns32
-dtsv_extract_cirbuff_op_obj(NCSMIB_PARAM_VAL *param_val, NCSMIB_VAR_INFO *var_info, NCSCONTEXT data, NCSCONTEXT buffer)
-{
-        /* Operation not supported for this table. Only SetRow Operation */
-        return NCSCC_RC_FAILURE;
-}
-
-/**************************************************************************
-* Function: dtsv_next_cirbuff_op_obj
-* Purpose:  Circular Buffer Operation table's next object routine
-* Input:    cb    : DTS_CB pointer
-*           arg   : Mib arg
-*           data  : Pointer to the data structure
-* Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
-* Notes:  
-**************************************************************************/
-static uns32
-dtsv_next_cirbuff_op_obj(NCSCONTEXT cb, NCSMIB_ARG *arg, NCSCONTEXT *data, uns32 *next_inst_id, uns32 *next_inst_len)
-{
-/* Operation not supported for this table. Only SetRow Operation */
-        return NCSCC_RC_FAILURE;
-}
-
-/**************************************************************************
- Function: dtsv_setrow_cirbuff_op_obj
-
- Purpose:  Circular Buffer Operation table's setrow routine
-
- Input:    cb       : DTS_CB pointer
-           arg      : Mib arg pointer
-           params   : Poinet to param structure
-           objinfo  : Pointer to object info structure
-           flag     : Flase to perform setrow operation other wise testrow
-
- Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
- Notes:  
-**************************************************************************/
-static uns32
-dtsv_setrow_cirbuff_op_obj(NCSCONTEXT cb, NCSMIB_ARG *args,
-                           NCSMIB_SETROW_PARAM_VAL *params, struct ncsmib_obj_info *objinfo, NCS_BOOL flag)
-{
-        DTS_CB *inst = (DTS_CB *)cb;
-
-        SVC_KEY key;
-        uns8 operation, op_device = 0;
-        uns32 paramid = 0;
-
-        memset(&key, 0, sizeof(SVC_KEY));
-
-        for (paramid = dtsvCirbuffOpIndexNode_Id; paramid < dtsvCirBuffOpMax_Id; paramid++) {
-                if (!(params[paramid - 1].set_flag))
-                        return NCSCC_RC_FAILURE;
-
-                if (paramid == dtsvCirbuffOpIndexNode_Id)
-                        key.node = params[paramid - 1].param.info.i_int;
-                else if (paramid == dtsvCirbuffOpIndexService_Id)
-                        key.ss_svc_id = params[paramid - 1].param.info.i_int;
-                else if (paramid == dtsvCirbuffOpOperation)
-                        operation = (uns8)params[paramid - 1].param.info.i_int;
-                else if (paramid == dtsvCirbuffOpDevice)
-                        op_device = (uns8)params[paramid - 1].param.info.i_int;
-                else
-                        return NCSCC_RC_FAILURE;
-        }
-
-        if ((key.node == 0) && (key.ss_svc_id == 0)) {
-                return (dump_global_buffer_log(inst, op_device));
-        } else if (key.ss_svc_id == 0) {
-                return (dump_per_node_buffer_log(inst, key.node, op_device));
-        } else {
-                return (dump_svc_per_node_buffer_log(inst, &key, op_device));
-        }
-
-        return NCSCC_RC_SUCCESS;
-}
 
 /**************************************************************************

osaf/services/infrastructure/dtsv/dts/dts_chkop.c

@@ -40 +40 @@
 
 #include "dts.h"
+#include "dts_imm.h"
+
 static uns32 dtsv_mbcsv_callback(NCS_MBCSV_CB_ARG *arg);
 static uns32 dtsv_mbcsv_process_enc_cb(DTS_CB *cb, NCS_MBCSV_CB_ARG *arg);
@@ -73 +75 @@
 {
         SaAmfHAStateT prev_haState = cb->ha_state;
+        SaAisErrorT error = SA_AIS_OK;
 
         /*
@@ -106 +109 @@
         if ((prev_haState == SA_AMF_HA_ACTIVE) && (haState == SA_AMF_HA_QUIESCED)) {
                 m_DTS_DBG_SINK(NCSCC_RC_SUCCESS, "dts_role_change: DTS going ACTIVE --> QUIESCED");
+
+                /* Give up our IMM OI implementer role */
+                error = dts_saImmOiImplementerClear(cb->immOiHandle);
+                if (error != SA_AIS_OK) {
+                        m_DTS_DBG_SINK(NCSFL_SEV_ERROR, "saImmOiImplementerClear failed");
+                }
 
                 /* Change MDS VDEST */
@@ -182 +191 @@
                    return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_role_change: DTS fail-over failed");
                    } */
+                if (prev_haState == SA_AMF_HA_QUIESCED)
+                         dts_imm_declare_implementer(cb);
+
+                if (prev_haState == SA_AMF_HA_STANDBY) {
+                        dts_imm_declare_implementer(cb);
+
+                        /* get default global configuration from global scalar object */
+                        dts_configure_global_policy(); /* order must be followed for these three calls */
+                        /* Loads all NodeLogPolicy objects from IMMSv */
+                        dts_read_log_policies("OpenSAFDtsvNodeLogPolicy");
+                        /* Loads all ServiceLogPolicy objects from IMMSv */
+                        dts_read_log_policies("OpenSAFDtsvServiceLogPolicy");
+                }
 
                 /* Once it becomes active, it IS in-sync with itself */
@@ -511 +533 @@
                                 if (TRUE == cb->cold_sync_in_progress) {
                                         if (NCSCC_RC_SUCCESS != dtsv_validate_reo_type_in_csync(cb,
-                                                                                                arg->info.decode.
-                                                                                                i_reo_type)) {
+                                                                                                arg->info.
+                                                                                                decode.i_reo_type)) {
                                                 /* Free userbuff and return without decoding */
                                                 ncs_reset_uba(&arg->info.decode.i_uba);
@@ -559 +581 @@
 
                         if ((NCS_MBCSV_MSG_COLD_SYNC_RESP_COMPLETE == arg->info.decode.i_msg_type) &&
-                            (NCSCC_RC_SUCCESS == status))
-                        {
+                            (NCSCC_RC_SUCCESS == status)) {
                                 cb->in_sync = TRUE;
                                 cb->cold_sync_in_progress = FALSE;
@@ -771 +792 @@
         mbcsv_arg.i_mbcsv_hdl = cb->mbcsv_hdl;
         mbcsv_arg.info.open.i_pwe_hdl = (uns32)cb->mds_hdl;
-        /* Smik - Here CB hdl is required supplying oac_hdl from DTS CB */
-        mbcsv_arg.info.open.i_client_hdl = cb->oac_hdl;
 
         if (NCSCC_RC_SUCCESS != ncs_mbcsv_svc(&mbcsv_arg)) {

osaf/services/infrastructure/dtsv/dts/dts_ckpt_dec.c

@@ -203 +203 @@
         return status;
 }
-
 /****************************************************************************\
  * Function: dtsv_decode_ckpt_dta_dest_list_config
@@ -663 +662 @@
         while (svc != NULL) {
                 nt_key = svc->ntwk_key;
-                if ((svc->dta_count == 0) && (svc->row_exist == FALSE) && (svc->my_key.ss_svc_id != 0)) {
+                if ((svc->dta_count == 0) && (svc->my_key.ss_svc_id != 0)) {
                         /* Remove the service entry now */
                         if (&svc->device.cir_buffer != NULL)

osaf/services/infrastructure/dtsv/dts/dts_ckpt_edu.c

@@ -264 +264 @@
                  (long)&((DTS_SVC_REG_TBL *)0)->per_node_logging, 0, NULL},
                 {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                 (long)&((DTS_SVC_REG_TBL *)0)->row_status, 0, NULL},
-                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
                  (long)&((DTS_SVC_REG_TBL *)0)->my_key.node, 0, NULL},
                 {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
@@ -302 +300 @@
                 {EDU_EXEC, ncs_edp_uns8, 0, 0, 0,
                  (long)&((DTS_SVC_REG_TBL *)0)->device.buff_log_fmt_change, 0, NULL},
-                {EDU_EXEC, ncs_edp_ncs_bool, 0, 0, 0,
-                 (long)&((DTS_SVC_REG_TBL *)0)->row_exist, 0, NULL},
                 {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
         };

osaf/services/infrastructure/dtsv/dts/dts_ckpt_updt.c

@@ -37 +37 @@
 
 #include "dts.h"
+#include "dts_imm.h"
 
 static uns32 dts_stby_global_filtering_policy_change(DTS_CB *cb);
@@ -306 +307 @@
 
                                         /* Check if svc entry is required or not */
-                                        if ((svc->dta_count == 0) && (svc->row_exist == FALSE)) {
+                                        if (svc->dta_count == 0) {
                                                 if (&svc->device.cir_buffer != NULL)
                                                         dts_circular_buffer_free(&svc->device.cir_buffer);
@@ -423 +424 @@
                                         /*async update for new svc_reg, so initialize node param */
                                         node_reg_ptr->per_node_logging = NODE_LOGGING;
-                                        node_reg_ptr->row_status = NCSMIB_ROWSTATUS_NOTINSERVICE;
-                                        node_reg_ptr->row_exist = FALSE;
-                                        /*node_reg_ptr->num_svcs  = svcreg->num_svcs; */
 
                                         /* Copy attributes of node policy & op device */
@@ -570 +568 @@
                                                 while ((svc_ptr != NULL) && (svc_ptr->my_key.node == key.node)) {
                                                         switch (cb->cli_bit_map) {
-                                                        case ncsDtsvNodeMessageLogging_ID:
+                                                        case osafDtsvNodeMessageLogging_ID:
                                                                 if (svcreg->per_node_logging == NCS_SNMP_FALSE)
                                                                         svc_ptr->device.new_file = TRUE;
                                                                 break;
 
-                                                                /* In case of row-status activation only, propagate the
-                                                                 * node level filters to corr svc filter policy 
-                                                                 * settings. Logging policy would anyways be init 
-                                                                 * on switch-over/fail-over. 
-                                                                 */
-                                                        case ncsDtsvNodeRowStatus_ID:
-                                                                svc_ptr->svc_policy.category_bit_map =
-                                                                    svcreg->svc_policy.category_bit_map;
-                                                                svc_ptr->svc_policy.enable = svcreg->svc_policy.enable;
-                                                                svc_ptr->svc_policy.severity_bit_map =
-                                                                    svcreg->svc_policy.severity_bit_map;
-                                                                break;
-
                                                                 /* Change the filter policies only if the node update
                                                                  * is sent for an active rowstatus node entry 
                                                                  */
-                                                        case ncsDtsvNodeCategoryBitMap_ID:
-                                                                if (svcreg->row_status == NCSMIB_ROWSTATUS_ACTIVE)
+                                                        case osafDtsvNodeCategoryBitMap_ID:
                                                                         svc_ptr->svc_policy.category_bit_map =
                                                                             svcreg->svc_policy.category_bit_map;
                                                                 break;
 
-                                                        case ncsDtsvNodeLoggingState_ID:
-                                                                if (svcreg->row_status == NCSMIB_ROWSTATUS_ACTIVE)
+                                                        case osafDtsvNodeLoggingState_ID:
                                                                         svc_ptr->svc_policy.enable =
                                                                             svcreg->svc_policy.enable;
                                                                 break;
 
-                                                        case ncsDtsvNodeSeverityBitMap_ID:
-                                                                if (svcreg->row_status == NCSMIB_ROWSTATUS_ACTIVE)
+                                                        case osafDtsvNodeSeverityBitMap_ID:
                                                                         svc_ptr->svc_policy.severity_bit_map =
                                                                             svcreg->svc_policy.severity_bit_map;
@@ -685 +667 @@
                                 if (cb->svc_rmv_mds_dest == 0) {
                                         /* RMV updt corresponding to row destroy op on Act */
-                                        if ((svc_ptr->dta_count == 0) &&
-                                            ((svc_ptr->row_exist == FALSE)
-                                             || (cb->cli_bit_map == ncsDtsvServiceRowStatus_ID)
-                                             || (cb->cli_bit_map == ncsDtsvNodeRowStatus_ID))) {
+                                        if (svc_ptr->dta_count == 0) {
                                                 if (&svc_ptr->device.cir_buffer != NULL)
                                                         dts_circular_buffer_free(&svc_ptr->device.cir_buffer);
@@ -772 +751 @@
                                                                 /*ncs_destroy_queue(&to_reg->svc_list); */
                                                                 ncs_patricia_tree_del(&cb->dta_list,
-                                                                                      (NCS_PATRICIA_NODE *)&to_reg->
-                                                                                      node);
+                                                                                      (NCS_PATRICIA_NODE *)
+                                                                                      &to_reg->node);
                                                                 m_LOG_DTS_EVT(DTS_EV_DTA_DEST_RMV_SUCC, 0, key.node,
                                                                               (uns32)to_reg->dta_addr);
@@ -801 +780 @@
                                 }
 
-                                /* Delete svc entry when dta_count is zero & either row_exist is 
-                                 * False. Rowstatus delete is already taken care of. 
+                                /* Delete svc entry when dta_count is zero 
+                                 * Rowstatus delete is already taken care of. 
                                  */
-                                else if ((svc_ptr->dta_count == 0) && (svc_ptr->row_exist == FALSE)) {
+                                else if (svc_ptr->dta_count == 0) {
                                         /* No need of policy handles */
                                         /* Now delete the svc entry from the patricia tree */
@@ -985 +964 @@
                         if (cb->cli_bit_map != 0) {
                                 switch (cb->cli_bit_map) {
-                                case ncsDtsvGlobalMessageLogging_ID:
+                                case osafDtsvGlobalMessageLogging_ID:
                                         cb->g_policy.device.new_file = TRUE;
                                         /*dts_circular_buffer_clear(&cb->g_policy.device.cir_buffer); */
-                                case ncsDtsvGlobalCategoryBitMap_ID:
-                                case ncsDtsvGlobalLoggingState_ID:
-                                case ncsDtsvGlobalSeverityBitMap_ID:
+                                case osafDtsvGlobalCategoryBitMap_ID:
+                                case osafDtsvGlobalLoggingState_ID:
+                                case osafDtsvGlobalSeverityBitMap_ID:
                                         /* This case changes have to propagated to all svcs */
                                         if (NCSCC_RC_SUCCESS != dts_stby_global_filtering_policy_change(cb)) {
@@ -1055 +1034 @@
 
                 /* Set the Node Policy as per the Global Policy */
-                if (cb->cli_bit_map == ncsDtsvGlobalLoggingState_ID)
+                if (cb->cli_bit_map == osafDtsvGlobalLoggingState_ID)
                         service->svc_policy.enable = cb->g_policy.g_policy.enable;
-                if (cb->cli_bit_map == ncsDtsvGlobalCategoryBitMap_ID)
+                if (cb->cli_bit_map == osafDtsvGlobalCategoryBitMap_ID)
                         service->svc_policy.category_bit_map = cb->g_policy.g_policy.category_bit_map;
-                if (cb->cli_bit_map == ncsDtsvGlobalSeverityBitMap_ID)
+                if (cb->cli_bit_map == osafDtsvGlobalSeverityBitMap_ID)
                         service->svc_policy.severity_bit_map = cb->g_policy.g_policy.severity_bit_map;
-                if (cb->cli_bit_map == ncsDtsvGlobalMessageLogging_ID) {
+                if (cb->cli_bit_map == osafDtsvGlobalMessageLogging_ID) {
                         service->device.new_file = TRUE;
                 }

osaf/services/infrastructure/dtsv/dts/dts_dl_api.c

@@ -255 +255 @@
                 m_NCS_IPC_RELEASE(&gl_dts_mbx, NULL);
                 inst->created = FALSE;
-                dts_unregister_tables(inst);
                 dtsv_mbcsv_deregister(inst);
                 dts_mds_unreg(inst, TRUE);

osaf/services/infrastructure/dtsv/dts/dts_log.c

@@ -230 +230 @@
 }
 
+
+
+
+void _dts_log(uns8 severity, const char *function, const char *format, ...)
+{
+        char preamble[128];
+        char str[128];
+        va_list ap;
+
+        va_start(ap, format);
+        snprintf(preamble, sizeof(preamble), "%s - %s", function, format);
+        vsnprintf(str, sizeof(str), preamble, ap);
+        va_end(ap);
+
+        ncs_logmsg(NCS_SERVICE_ID_DTSV, DTS_LID_GENLOG, DTS_FC_GENLOG, NCSFL_LC_HEADLINE, severity, NCSFL_TYPE_TC, str);
+}
 #endif   /* (DTS_LOG == 1) */

osaf/services/infrastructure/dtsv/dts/dts_mds.c

@@ -77 +77 @@
 
         /* store the info returned by MDS */
-        cb->oac_hdl = vda_info.info.vdest_create.o_pwe1_oac_hdl;
         cb->mds_hdl = vda_info.info.vdest_create.o_mds_pwe1_hdl;
         /* Smik - New additions */
@@ -124 +123 @@
                 cb->created = FALSE;
                 dts_mds_unreg(cb, TRUE);
-                return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_mds_reg: Event subscription failed!!");
+                return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_mds_reg: DTA Event subscription failed!!");
+        }
+
+        /* DTS is subscribing for IMMMD MDS service */
+        memset(&svc_to_mds_info, 0, sizeof(NCSMDS_INFO));
+        svc_to_mds_info.i_mds_hdl = cb->mds_hdl;
+        svc_to_mds_info.i_svc_id = NCSMDS_SVC_ID_DTS;
+        svc_to_mds_info.i_op = MDS_SUBSCRIBE;
+        svc_to_mds_info.info.svc_subscribe.i_scope = NCSMDS_SCOPE_INTRANODE;
+        svc_to_mds_info.info.svc_subscribe.i_num_svcs = DTS_NUM_SVCS_TO_SUBSCRIBE;
+        svc_ids_array[0] = NCSMDS_SVC_ID_IMMND;
+        svc_to_mds_info.info.svc_subscribe.i_svc_ids = svc_ids_array;
+
+        if (ncsmds_api(&svc_to_mds_info) != NCSCC_RC_SUCCESS) {
+                cb->created = FALSE;
+                dts_mds_unreg(cb, TRUE);
+                return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_mds_reg: IMMND Event subscription failed!!");
         }
 
@@ -312 +327 @@
                         if (0 != msg)
                                 m_MMGR_FREE_DTSV_MSG(msg);
-                        return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_handle_signal:IPC send failed");
+                        return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "QUIESCED_COMPL MSG  IPC send failed");
                 }
                 break;
@@ -457 +472 @@
         memset(msg, '\0', sizeof(DTSV_MSG));
 
-        msg->msg_type = DTS_DTA_EVT_RCV;
+        if(svc_info.i_svc_id == NCSMDS_SVC_ID_IMMND)
+                msg->msg_type = DTS_IMMND_EVT_RCV;
+        else
+                msg->msg_type = DTS_DTA_EVT_RCV;
+
         msg->node = svc_info.i_node_id;
         msg->data.data.evt.change = svc_info.i_change;
@@ -568 +587 @@
                                                       (uns32)(dta_ptr->dta_addr));
 
-                                        if ((svc->dta_count == 0) && (svc->row_exist == FALSE)) {
+                                        if (svc->dta_count == 0) {
                                                 dts_circular_buffer_free(&svc->device.cir_buffer);
                                                 dev = &svc->device;

osaf/services/infrastructure/dtsv/dts/dts_pvt.c

@@ -49 +49 @@
 
 #include "dts.h"
+#include "dts_imm.h"
+#include <poll.h>
+
+#define FD_USR1 0
+#define FD_AMF 0
+#define FD_MBCSV 1
+#define FD_MBX 2
+#define FD_IMM 3
+
+static nfds_t nfds = 3;
 
 #define m_DTS_COMP_NAME_FILE OSAF_LOCALSTATEDIR "ncs_dts_comp_name"
 
+static struct pollfd fds[4];
 static uns32 dts_stby_initialize(DTS_CB *cb);
 
@@ -72 +83 @@
 
 /*****************************************************************************
-   dts_do_evts
+  dts_do_evts
 *****************************************************************************/
 void dts_do_evts(SYSF_MBX *mbx)
 {
         uns32 status;
-        /*fd_set          readfds; */
-        NCS_SEL_OBJ_SET readfds;
-        NCS_SEL_OBJ numfds, mbx_fd, ncs_amf_sel_obj, ncs_mbcsv_sel_obj;
+        NCS_SEL_OBJ mbx_fd;
         SaAisErrorT saf_status = SA_AIS_OK;
-        int count;
-
-        ncs_amf_sel_obj.raise_obj = 0;
-        ncs_amf_sel_obj.rmv_obj = 0;
-        ncs_mbcsv_sel_obj.raise_obj = 0;
-        ncs_mbcsv_sel_obj.rmv_obj = 0;
-
-        /*numfds = dts_cb.numfds;
-           readfds = dts_cb.readfds; */
+
+        mbx_fd = ncs_ipc_get_sel_obj(mbx);
+
+        fds[FD_MBX].fd = mbx_fd.rmv_obj;
+        fds[FD_MBX].events = POLLIN;
+        fds[FD_USR1].fd = dts_cb.sighdlr_sel_obj.rmv_obj;
+        fds[FD_USR1].events = POLLIN;
+        fds[FD_MBCSV].fd = dts_cb.mbcsv_sel_obj;
+        fds[FD_MBCSV].events = POLLIN;
 
         while (1) {
-                /* re-intialize the FDs and count */
-                numfds.raise_obj = 0;
-                numfds.rmv_obj = 0;
-                m_NCS_SEL_OBJ_ZERO(&readfds);
-
-                mbx_fd = m_NCS_IPC_GET_SEL_OBJ(mbx);
-                m_NCS_SEL_OBJ_SET(mbx_fd, &readfds);
-                numfds = m_GET_HIGHER_SEL_OBJ(mbx_fd, numfds);
-
-                if (dts_cb.dts_amf_sel_obj != 0) {
-                        m_SET_FD_IN_SEL_OBJ((uns32)dts_cb.dts_amf_sel_obj, ncs_amf_sel_obj);
-                        m_NCS_SEL_OBJ_SET(ncs_amf_sel_obj, &readfds);
-                        numfds = m_GET_HIGHER_SEL_OBJ(ncs_amf_sel_obj, numfds);
-                }
-
-                /* Add signal hdlr selection obj to readfds */
-                if (dts_cb.sighdlr_sel_obj.rmv_obj != 0) {
-                        m_NCS_SEL_OBJ_SET(dts_cb.sighdlr_sel_obj, &readfds);
-                        numfds = m_GET_HIGHER_SEL_OBJ(dts_cb.sighdlr_sel_obj, numfds);
-                }
-
-                /* Add mbcsv selection obj to readfds */
-                if (dts_cb.mbcsv_sel_obj != 0) {
-                        m_SET_FD_IN_SEL_OBJ((uns32)dts_cb.mbcsv_sel_obj, ncs_mbcsv_sel_obj);
-                        m_NCS_SEL_OBJ_SET(ncs_mbcsv_sel_obj, &readfds);
-                        numfds = m_GET_HIGHER_SEL_OBJ(ncs_mbcsv_sel_obj, numfds);
-                }
-
-                /*dts_cb.numfds = numfds;
-                   dts_cb.readfds = readfds; */
-
-                /* wait for the requests indefinately */
-                count = m_NCS_SEL_OBJ_SELECT(numfds, &readfds, NULL, NULL, NULL);
-                if (count > 0) {
-                        /* MBCSv FD is selected */
-                        if (m_NCS_SEL_OBJ_ISSET(ncs_mbcsv_sel_obj, &readfds)) {
-                                status = dtsv_mbcsv_dispatch(&dts_cb, SA_DISPATCH_ALL);
-                                if (status != NCSCC_RC_SUCCESS)
-                                        m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_do_evts: Error received");
-
-                                m_NCS_SEL_OBJ_CLR(ncs_mbcsv_sel_obj, &readfds);
-                        }
-
-                        /* AMF FD is selected */
-                        if (m_NCS_SEL_OBJ_ISSET(ncs_amf_sel_obj, &readfds)) {
-                                /* process the event from AMF */
+
+                /* wait for the requests indefinitely */
+                int ret = poll(fds, nfds, -1);
+
+                if (ret == -1) {
+                        if (errno == EINTR)
+                                continue;
+                        m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "poll failed");
+                }
+
+                /* MBCSv FD is selected */
+                if (fds[FD_MBCSV].revents & POLLIN) {
+                        status = dtsv_mbcsv_dispatch(&dts_cb, SA_DISPATCH_ALL);
+                        if (status != NCSCC_RC_SUCCESS)
+                                m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_do_evts: Error received");
+                }
+
+                /* AMF FD is selected */
+                if (fds[FD_AMF].revents & POLLIN) {
+                        /* Initialize, get selection object and register with AMF */
+                        if (dts_cb.amf_hdl != 0) {
                                 saf_status = saAmfDispatch(dts_cb.amf_hdl, SA_DISPATCH_ALL);
                                 if (saf_status != SA_AIS_OK) {
+                                        printf("saAmfDispatch failed \n");
                                         /* log the error  */
                                         m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_do_evts: AMF Dispatch failing");
+                                } else
+                                        printf(" saAmfDispatch successful \n");
+                        } else {
+                                status = dts_amf_register(&dts_cb);
+                                if (status == NCSCC_RC_SUCCESS) {
+                                        printf("AMF registration success\n");
+                                        fds[FD_AMF].fd = dts_cb.dts_amf_sel_obj;
+                                } else {
+                                        printf("AMF registration failed \n");
+                                        exit(1);
                                 }
-
-                                /* clear the bit off for this fd */
-                                m_NCS_SEL_OBJ_CLR(ncs_amf_sel_obj, &readfds);
+                        }       /* Else amf_hdl!=0 */
+                }
+                /* Process the messages on the Mail box */
+                if (fds[FD_MBX].revents & POLLIN) {
+                        /* process native requests of MASv */
+                        status = dts_do_evt((DTSV_MSG *)m_NCS_IPC_NON_BLK_RECEIVE(mbx, NULL));
+                        if (status != NCSCC_RC_SUCCESS) {
+                                /*m_DTS_DBG_SINK(NCSCC_RC_FAILURE,
+                                   "dts_do_evts: Error received....debug!!"); */
                         }
-
-                        /* request from AMF is serviced */
-                        /* Signal handler FD is selected */
-                        if (m_NCS_SEL_OBJ_ISSET(dts_cb.sighdlr_sel_obj, &readfds)) {
-                                m_LOG_DTS_API(DTS_AMF_UP_SIG);
-                                status = dts_handle_signal();
-                                if (status != NCSCC_RC_SUCCESS)
-                                        m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_do_evts: Error received");
-                                m_NCS_SEL_OBJ_RMV_IND(dts_cb.sighdlr_sel_obj, TRUE, TRUE);
-                                m_NCS_SEL_OBJ_CLR(dts_cb.sighdlr_sel_obj, &readfds);
+                }
+
+                if (fds[FD_IMM].revents & POLLIN) {
+                        /* dispatch all the IMMSv pending callbacks */
+                        saf_status = saImmOiDispatch(dts_cb.immOiHandle, SA_DISPATCH_ONE);
+                        if (saf_status == SA_AIS_ERR_BAD_HANDLE) {
+                                nfds = FD_IMM;
+                                dts_cb.imm_init_done = FALSE;
+                                m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "IMMSv Dispatch failed");
+                                break;
                         }
-
-                        /* Process the messages on the Mail box */
-                        if (m_NCS_SEL_OBJ_ISSET(mbx_fd, &readfds)) {
-                                /* process native requests of MASv */
-                                status = dts_do_evt((DTSV_MSG *)m_NCS_IPC_NON_BLK_RECEIVE(mbx, NULL));
-                                if (status != NCSCC_RC_SUCCESS) {
-                                        /*m_DTS_DBG_SINK(NCSCC_RC_FAILURE,
-                                           "dts_do_evts: Error received....debug!!"); */
-                                }
-                                m_NCS_SEL_OBJ_CLR(mbx_fd, &readfds);
-                        }
-
-                        readfds = dts_cb.readfds;
-                        numfds = dts_cb.numfds;
-                } /*end of if */
-                else {
-                        m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_do_evts: select failed");
-                }
+                }
+
         }                       /*end of while */
-        return;
 }
 
@@ -214 +198 @@
                         rc = dts_dump_seq_msg(inst, FALSE);
                         break;
-                        /*Smik - handle AMF up */
-                case DTS_AMF_COMPONENTIZE:
-                        rc = dts_amf_register(inst);
-                        break;
 
                         /* Added a case for handling msg_type DTS_QUIESCED_CMPLT.
@@ -287 +267 @@
 
                 }
-        } /*end of if */
-        else {
-                switch (msg->msg_type) {
-                case DTS_AMF_COMPONENTIZE:
-                        rc = dts_amf_register(inst);
-                        break;
-
-                default:
-                        break;
-                }
-        }                       /*end of else */
+        }
+        if ((SA_AMF_HA_ACTIVE == inst->ha_state) || (SA_AMF_HA_STANDBY == inst->ha_state)) {
+                if (msg->msg_type == DTS_IMMND_EVT_RCV)
+                        rc = dts_handle_immnd_event(msg);
+        }
 
         if (0 != msg) {
@@ -308 +282 @@
 
         return rc;
-}
-
-/**************************************************************************\
- Function: dts_handle_signal
-
- Purpose:  Function used for handling the signal frm AMF being up. 
-
- Input:    None.
-
- Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
-
- Notes:  
-\**************************************************************************/
-uns32 dts_handle_signal(void)
-{
-        DTSV_MSG *msg = NULL;
-
-        msg = m_MMGR_ALLOC_DTSV_MSG;
-
-        if (msg == NULL)
-                return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_handle_signal: Failed to allocate memory for DTSV_MSG");
-
-        memset(msg, 0, sizeof(DTSV_MSG));
-        msg->msg_type = DTS_AMF_COMPONENTIZE;
-
-        /* Post this message to DTS mailbox */
-        if (m_DTS_SND_MSG(&gl_dts_mbx, msg, NCS_IPC_PRIORITY_NORMAL) != NCSCC_RC_SUCCESS) {
-                if (0 != msg)
-                        m_MMGR_FREE_DTSV_MSG(msg);
-                return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_handle_signal:IPC send failed");
-        }
-        return NCSCC_RC_SUCCESS;
 }
 
@@ -385 +327 @@
 
 /**************************************************************************\
+ Function: dts_reg_with_imm
+
+ Purpose:  Function used for handling the DTA up down events received
+           from MDS.
+
+ Input:    msg : Event message received from the MDS.
+
+ Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
+
+ Notes:  
+\**************************************************************************/
+void dts_reg_with_imm(DTS_CB *inst)
+{
+        SaAisErrorT error = SA_AIS_OK;
+
+        dts_imm_declare_implementer(inst);
+        /* get default global configuration from global scalar object */
+        dts_configure_global_policy(); /* order must be followed for these calls */
+        /* loads all the NodeLogPolicy objects from IMMSv */
+        dts_read_log_policies("OpenSAFDtsvNodeLogPolicy");
+        /* loads all the ServiceLogPolicy objects from IMMSv */
+        dts_read_log_policies("OpenSAFDtsvServiceLogPolicy");
+}
+
+/**************************************************************************\
  Function: dts_register_service
 
@@ -399 +366 @@
 uns32 dts_register_service(DTSV_MSG *msg)
 {
+        printf("-------  %s  --------\n", __FUNCTION__);
         DTS_CB *inst = &dts_cb;
         SVC_KEY key, nt_key;
@@ -443 +411 @@
 
                 node_reg->per_node_logging = NODE_LOGGING;
-                node_reg->row_status = NCSMIB_ROWSTATUS_NOTINSERVICE;
                 node_reg->my_node = node_reg;
 
-                /* Set the node policy to default and add the node into the patricia tree */
                 dts_default_node_policy_set(&node_reg->svc_policy, &node_reg->device, key.node);
-
                 if (ncs_patricia_tree_add(&inst->svc_tbl, (NCS_PATRICIA_NODE *)node_reg) != NCSCC_RC_SUCCESS) {
                         m_LOG_DTS_EVT(DTS_EV_SVC_REG_ENT_ADD_FAIL, key.ss_svc_id, key.node, (uns32)msg->dest_addr);
@@ -593 +558 @@
                 m_LOG_DTS_EVT(DTS_EV_DTA_SVC_ADD, key.ss_svc_id, key.node, (uns32)to_reg->dta_addr);
 
-                svc->row_status = NCSMIB_ROWSTATUS_NOTINSERVICE;
-                svc->row_exist = FALSE;
-
                 /* newly created service, set all the policies to default 
                  * then add new entry to the patricia tree */
                 svc->per_node_logging = NCS_SNMP_FALSE;
                 /*svc->num_svcs         = 0; */
-
                 dts_default_svc_policy_set(svc);
-
                 if (ncs_patricia_tree_add(&inst->svc_tbl, (NCS_PATRICIA_NODE *)svc) != NCSCC_RC_SUCCESS) {
                         m_LOG_DTS_EVT(DTS_EV_SVC_REG_ENT_ADD_FAIL, key.ss_svc_id, key.node, (uns32)msg->dest_addr);
@@ -715 +675 @@
         m_DTS_UNLK(&inst->lock);
         m_LOG_DTS_LOCK(DTS_LK_UNLOCKED, &inst->lock);
-
         if (dts_mds_send_msg(msg, dta_key, inst->mds_hdl) != NCSCC_RC_SUCCESS) {
                 m_LOG_DTS_SVC_PRVDR(DTS_SP_MDS_SND_MSG_FAILED);
                 return m_DTS_DBG_SINK(NCSCC_RC_FAILURE, "dts_register_service: DTS: MDS send failed");
         }
-        m_LOG_DTS_EVT(DTS_EV_SVC_REG_SUCCESSFUL, key.ss_svc_id, key.node, (uns32)dta_key);
-
+/*      m_LOG_DTS_EVT(DTS_EV_SVC_REG_SUCCESSFUL, key.ss_svc_id, key.node, (uns32)dta_key); */
         return NCSCC_RC_SUCCESS;
 }
@@ -740 +698 @@
 uns32 dts_unregister_service(DTSV_MSG *msg)
 {
+        printf("-------  %s  --------\n", __FUNCTION__);
         DTS_CB *inst = &dts_cb;
         SVC_KEY key, nt_key;
@@ -758 +717 @@
         m_LOG_DTS_EVT(DTS_EV_SVC_DE_REG_REQ_RCV, msg->data.data.reg.svc_id, msg->node, (uns32)msg->dest_addr);
 
-        if (((node = (DTS_SVC_REG_TBL *)ncs_patricia_tree_get(&inst->svc_tbl,
-                                                              (const uns8 *)&nt_key)) == NULL)
+        if (((node = (DTS_SVC_REG_TBL *)ncs_patricia_tree_get(&inst->svc_tbl, (const uns8 *)&nt_key)) == NULL)
             || (node->dta_count == 0)) {
                 m_LOG_DTS_HEADLINE(DTS_HDLN_NULL_INST);
@@ -856 +814 @@
         node->num_svcs--;
 
-        /* Close the open file and let the service log to a new file if 
-         * the rowstatus is active
-         */
+        /* Close the open file and let the service log to a new file */
         node->device.new_file = TRUE;
         node->device.cur_file_size = 0;
@@ -864 +820 @@
         /* Check whether we still need this patricia entry. 
          * If no then delete it and free mem */
-        if ((node->dta_count == 0) && (node->row_exist == FALSE)) {
+        if (node->dta_count == 0) {
                 node->v_cd_list = NULL;
                 dts_circular_buffer_free(&dev->cir_buffer);
@@ -1070 +1026 @@
                         m_MMGR_FREE_OCT(msg->data.data.msg.log_msg.hdr.fmat_type);
                         return NCSCC_RC_FAILURE;
-                }
-                /* 
-                 * Check whether the row status is set to active. If it is active then 
-                 * use user configured policies, else log using default policies.
-                 */
-                else if ((node->my_node->row_status == NCSMIB_ROWSTATUS_ACTIVE)
-                         && (node->my_node->per_node_logging == NCS_SNMP_TRUE)) {
+                } else if (node->my_node->per_node_logging == NCS_SNMP_TRUE) {
                         /* 
                          * If per node logging is set then log the per node log file, 
@@ -1083 +1033 @@
                         rc = dtsv_log_msg(msg, &node->my_node->svc_policy, &node->my_node->device, PER_NODE_FILE, spec);
 
-                } else if (node->row_status == NCSMIB_ROWSTATUS_ACTIVE) {
-                        rc = dtsv_log_msg(msg, &node->svc_policy, &node->device, PER_SVC_FILE, spec);
                 } else {
                         /* 
@@ -1279 +1227 @@
 void dts_default_policy_set(DEFAULT_POLICY *dflt_plcy)
 {
+        printf("-------  %s  --------\n", __FUNCTION__);
         /* Set Default Node Policies */
 
@@ -1321 +1270 @@
 void dts_global_policy_set(GLOBAL_POLICY *gpolicy)
 {
+        printf("-------  %s  --------\n", __FUNCTION__);
         gpolicy->global_logging = GLOBAL_LOGGING;
 
@@ -1359 +1309 @@
  Purpose:  This Function is used for setting the default policies of the 
            node which are just registered with the DTS and also if the 
-           user creates the new row in the table.
+           user creates the new imm object.
 
  Input:    npolicy  : Node policy table.
@@ -1371 +1321 @@
 void dts_default_node_policy_set(POLICY *npolicy, OP_DEVICE *device, uns32 node_id)
 {
+        printf("-------  %s  --------\n", __FUNCTION__);
         uns8 global_sev_filter = dts_cb.g_policy.g_policy.severity_bit_map;
         uns32 global_cat_filter = dts_cb.g_policy.g_policy.category_bit_map;
@@ -1409 +1360 @@
  Purpose:  This Function is used for setting the default policies of the 
            services which are just registered with the DTS and also if the 
-           user creates the new row in the table.
+           user creates the new imm object.
 
  Input:    spolicy  : Service policy table.
@@ -1422 +1373 @@
 void dts_default_svc_policy_set(DTS_SVC_REG_TBL *service)
 {
+        printf("-------  %s  --------\n", __FUNCTION__);
         POLICY *spolicy = &service->svc_policy;
         OP_DEVICE *device = &service->device;
@@ -1427 +1379 @@
         uns32 global_cat_filter = dts_cb.g_policy.g_policy.category_bit_map;
 
-        /* Service filter policy would take from node filter if node 
-         *            rowstatus is Active. otherwise it'll take frm global filter 
-         */
-        if ((service->my_node != NULL) && (service->my_node->row_status == NCSMIB_ROWSTATUS_ACTIVE)) {
+        /* Service filter policy would take from node filter if node */
+        if (service->my_node != NULL) {
                 spolicy->enable = service->my_node->svc_policy.enable;
                 spolicy->category_bit_map = service->my_node->svc_policy.category_bit_map;
                 spolicy->severity_bit_map = service->my_node->svc_policy.severity_bit_map;
+
         } else {
                 spolicy->enable = dts_cb.g_policy.g_policy.enable;
@@ -1439 +1390 @@
                 spolicy->severity_bit_map = global_sev_filter;
         }
-
         spolicy->log_dev = SVC_LOG_DEV;
         spolicy->log_file_size = SVC_LOGFILE_SIZE;
@@ -1565 +1515 @@
 uns32 dts_send_filter_config_msg(DTS_CB *inst, DTS_SVC_REG_TBL *svc, DTA_DEST_LIST *dta)
 {
+        printf("-------  %s  --------\n", __FUNCTION__);
         DTSV_MSG msg;
         if (dta == NULL)
@@ -1585 +1536 @@
         /* No need of policy handles */
         /*msg.data.data.msg_fltr.policy_hdl = svc->svc_hdl; */
+        printf("enable_log = %d, category_bit_map = %d, severity_bit_map = %d\n", msg.data.data.msg_fltr.enable_log, msg.data.data.msg_fltr.category_bit_map, msg.data.data.msg_fltr.severity_bit_map);
 
         if (dts_mds_send_msg(&msg, dta->dta_addr, inst->mds_hdl) != NCSCC_RC_SUCCESS)
@@ -1757 +1709 @@
 uns32 dts_create_new_pat_entry(DTS_CB *inst, DTS_SVC_REG_TBL **node, uns32 node_id, SS_SVC_ID svc_id, uns8 log_level)
 {
+        printf("-------  %s  --------\n", __FUNCTION__);
         DTS_SVC_REG_TBL *parent_node;
         SVC_KEY nt_key;
@@ -1769 +1722 @@
         (*node)->my_key.node = node_id;
         (*node)->my_key.ss_svc_id = svc_id;
-        /*  Network order key added */
+        /* Network order key added */
         (*node)->ntwk_key.node = m_NCS_OS_HTONL(node_id);
         (*node)->ntwk_key.ss_svc_id = m_NCS_OS_HTONL(svc_id);
@@ -1775 +1728 @@
 
         (*node)->per_node_logging = log_level;
-        (*node)->row_status = NCSMIB_ROWSTATUS_NOTINSERVICE;
         /* 
          * If service id is 0 it meand it is a node entry.
@@ -1797 +1749 @@
                 /*ncs_create_queue(&(*node)->v_cd_list); */
                 (*node)->v_cd_list = NULL;
-
                 dts_default_svc_policy_set((*node));
         }
@@ -1863 +1814 @@
 
                         device = &node->device;
-                        /*Check whether row status is set to Active. if it is active, then
-                         * initialize as per user configured policy, else initialize using
-                         * default policies */
-                        if (node->row_status == NCSMIB_ROWSTATUS_ACTIVE) {
-                                policy = &node->svc_policy;
-                                if ((node->per_node_logging == NCS_SNMP_TRUE) && (key.ss_svc_id == 0)) {
-                                        m_DTS_STBY_INIT(policy, device, PER_NODE_FILE);
-                                } else if (key.ss_svc_id != 0) {
-                                        m_DTS_STBY_INIT(policy, device, PER_SVC_FILE);
-                                }
-                        } /*end of Rowstatus active */
-                        else {
-                                if ((cb->dflt_plcy.node_dflt.per_node_logging == NCS_SNMP_TRUE) && (key.ss_svc_id == 0)) {
-                                        policy = &cb->dflt_plcy.node_dflt.policy;
-                                        m_DTS_STBY_INIT(policy, device, PER_NODE_FILE);
-                                } else if (key.ss_svc_id != 0) {
-                                        policy = &cb->dflt_plcy.svc_dflt.policy;
-                                        m_DTS_STBY_INIT(policy, device, PER_SVC_FILE);
-                                }       /*end of else per_node_logging = TRUE */
+                        policy = &node->svc_policy;
+                        if ((node->per_node_logging == NCS_SNMP_TRUE) && (key.ss_svc_id == 0)) {
+                                m_DTS_STBY_INIT(policy, device, PER_NODE_FILE);
+                        } else if (key.ss_svc_id != 0) {
+                                m_DTS_STBY_INIT(policy, device, PER_SVC_FILE);
                         }
                         /* Go to the next node(not service) in the tree */
@@ -2046 +1983 @@
 void dts_add_svc_to_dta(DTA_DEST_LIST *dta, DTS_SVC_REG_TBL *svc)
 {
+        printf("-------  %s  --------\n", __FUNCTION__);
         SVC_ENTRY *dta_svc_entry, *tmp;
 
@@ -2558 +2496 @@
                 fprintf(fp, "\nKey: {Node=%d, Svc_ID=%d}", svc->my_key.node, svc->my_key.ss_svc_id);
                 fprintf(fp, "\nNetwork-order Key: {Node=%u, Svc_ID=%u}", svc->ntwk_key.node, svc->ntwk_key.ss_svc_id);
-                fprintf(fp, "\nPer_node_logging: %d, RowStatus: %d, Row Exists: %d", svc->per_node_logging,
-                        svc->row_status, svc->row_exist);
+                fprintf(fp, "\nPer_node_logging: %d", svc->per_node_logging);
 
                 fprintf(fp, "\nPolicy info:\n------------------");
@@ -2737 +2674 @@
                 printf("\nKey: {Node=%d, Svc_ID=%d}", svc->my_key.node, svc->my_key.ss_svc_id);
                 printf("\nNetwork-order Key: {Node=%d, Svc_ID=%d}", svc->ntwk_key.node, svc->ntwk_key.ss_svc_id);
-                printf("\nPer_node_logging: %d, RowStatus: %d, Row Exists: %d", svc->per_node_logging, svc->row_status,
-                       svc->row_exist);
+                printf("\nPer_node_logging: %d", svc->per_node_logging);
 
                 printf("\nPolicy info:\n------------------");
@@ -2906 +2842 @@
 
                 printf("\nKey: {Node=%d, Svc_ID=%d}", svc->my_key.node, svc->my_key.ss_svc_id);
-                printf("\nPer_node_logging: %d, RowStatus: %d, Row Exists: %d", svc->per_node_logging, svc->row_status,
-                       svc->row_exist);
+                printf("\nPer_node_logging: %d", svc->per_node_logging);
 
                 printf("\nPolicy info:\n------------------");
@@ -2960 +2895 @@
         return;
 }
+
+/**************************************************************************\
+ Function: dts_handle_immnd_event
+
+ Purpose:  Function used for handling the DTA up down events received
+           from MDS.
+
+ Input:    msg : Event message received from the MDS.
+
+ Returns:  NCSCC_RC_SUCCESSS/NCSCC_RC_FAILURE
+
+ Notes:  
+\**************************************************************************/
+uns32 dts_handle_immnd_event(DTSV_MSG *msg)
+{
+        SaAisErrorT error = SA_AIS_OK;
+        DTS_CB *inst = &dts_cb;
+
+        m_DTS_LK(&inst->lock);
+        m_LOG_DTS_LOCK(DTS_LK_LOCKED, &inst->lock);
+
+        m_LOG_DTS_SVC_PRVDR(DTS_SP_MDS_RCV_EVT);
+
+        switch (msg->data.data.evt.change) {    /* Review change type */
+        case NCSMDS_DOWN:
+                break;
+        case NCSMDS_UP:
+                m_LOG_DTS_DBGSTRLL(DTS_SERVICE, "Received IMMND up event for :", msg->node, (uns32)msg->dest_addr);
+                if (inst->imm_init_done == FALSE) {
+                        if (dts_imm_initialize(inst) != SA_AIS_OK) {
+                                printf("imm initialize failed\n");
+                                exit(1);
+                        }
+                        if (inst->ha_state == SA_AMF_HA_ACTIVE) {
+                                dts_reg_with_imm(inst);
+                        }
+
+                        fds[FD_IMM].fd = inst->imm_sel_obj;
+                        fds[FD_IMM].events = POLLIN;
+                        nfds = FD_IMM + 1;
+                        inst->imm_init_done = TRUE;
+                }
+                break;
+
+        default:
+                break;
+        }                       /* End Switch */
+        m_DTS_UNLK(&inst->lock);
+        m_LOG_DTS_LOCK(DTS_LK_UNLOCKED, &inst->lock);
+
+        return NCSCC_RC_SUCCESS;
+}

osaf/services/infrastructure/dtsv/include/Makefile.am

@@ -38 +38 @@
         dts.h \
         dts_log.h \
-        dts_mapi.h \
         dts_mem.h \
         dts_opt.h \
@@ -46 +45 @@
         dtsv_mem.h \
         dtsv_msg.h \
-        sysf_log.h
+        sysf_log.h \
+        dts_imm.h
+        

osaf/services/infrastructure/dtsv/include/dta.h

@@ -56 +56 @@
 #include "ncsencdec.h"
 #include "ncs_stack.h"
-#include "ncs_mib.h"
 #include "ncs_mtbl.h"
 #include "ncs_log.h"

osaf/services/infrastructure/dtsv/include/dta_pvt.h

@@ -257 +257 @@
 
   D i s t r i b u t e d    T r a c i n g    A g e n t    L o c k s
-
- The DTA locks follow the lead of the master MIB Access Broker setting
- to determine what type of lock to implement.
 
 *************************************************************************/

osaf/services/infrastructure/dtsv/include/dts.h

@@ -56 +56 @@
 #include "ncsencdec.h"
 #include "ncs_stack.h"
-#include "ncs_mib.h"
 #include "ncs_mtbl.h"
 #include "ncs_log.h"
 #include "ncs_lib.h"
 #include "ncs_util.h"
-#include "ncsmiblib.h"
 
 #if (NCS_CLI == 1)
@@ -102 +100 @@
 #include "dta_api.h"
 #include "dta_papi.h"
-#include "dts_mapi.h"
 #include "dts_log.h"
 #include "dts_api.h"

osaf/services/infrastructure/dtsv/include/dts_ckpt_updt.h

@@ -49 +49 @@
 #define m_DTS_SET_SVC_REG_TBL(svc, param) \
 {  \
-   svc->row_status = param->row_status; \
-   svc->row_exist = param->row_exist; \
    svc->per_node_logging = param->per_node_logging; \
    svc->svc_policy.enable = param->svc_policy.enable; \

osaf/services/infrastructure/dtsv/include/dts_log.h

@@ -256 +256 @@
         DTS_FC_CIRBUFF,
         DTS_FC_STR,
-        DTS_FC_UPDT
+        DTS_FC_UPDT,
+        DTS_FC_GENLOG
 } DTS_FLEX_SETS;
 
@@ -285 +286 @@
         DTS_LID_ASYNC_UPDT,
         DTS_LID_FLOW_UP,
-        DTS_LID_FLOW_DOWN
+        DTS_LID_FLOW_DOWN,
+        DTS_LID_GENLOG
 } DTS_LOG_IDS;
 
@@ -312 +314 @@
 EXTERN_C void log_dts_dbg_name(uns8 id, char *str, uns32 svc_id, char *svc);
 EXTERN_C void log_dts_chkp_evt(uns8 id);
+
+#define dts_log(severity, format, args...) _dts_log((severity), __FUNCTION__, (format), ##args)
+void _dts_log(uns8 severity, const char *function, const char *format, ...);
 
 #define m_LOG_DTS_HEADLINE(id)             log_dts_headline (id    )

osaf/services/infrastructure/dtsv/include/dts_pvt.h

@@ -17 +17 @@
 
 #include <configmake.h>
-
+#include "saImmOi.h"
 /*****************************************************************************
 ..............................................................................
@@ -61 +61 @@
 #define EXPANDED_FORMAT      0x02
 
-#ifndef NCSDTSV_CLI_MIB_FETCH_TIMEOUT
-#define NCSDTSV_CLI_MIB_FETCH_TIMEOUT 600
-#endif
 
 #define  DTS_AMF_HEALTH_CHECK_KEY  "A9FD64E12C12"       /* Some randomely generated key */
@@ -352 +349 @@
         NCS_BOOL dflt_logging;  /* TRUE - Logging enabled by default, 
                                    FALSE - Logging Disabled by default */
-        /* Align datatype with NCS-DTSV-MIB object */
+        /* Align datatype with IMM  object */
         uns32 g_num_log_files;  /*Number of old log files to be saved per service or per node */
         /*Smik - Added for console printing */
@@ -391 +388 @@
         NCS_BOOL per_node_logging;      /* Set to TRUE if Node Logging is used
                                            Set to FALSE if Service Logging is used */
-        uns32 row_status;
 
         SVC_KEY my_key;         /* Key used for searching the element, Node ID + Service ID */
@@ -405 +401 @@
         POLICY svc_policy;      /* Service policy table */
         OP_DEVICE device;
-        NCS_BOOL row_exist;
         /*NCSFL_ASCII_SPEC        *my_spec; */
         struct dts_svc_reg_tbl *my_node;
@@ -474 +469 @@
         char cb_log_str[SYSF_FL_LOG_BUFF_SIZE];
 
-        uns32 oac_hdl;
         MDS_HDL mds_hdl;
         NCSCONTEXT task_handle;
@@ -506 +500 @@
         SaAmfRecommendedRecoveryT recommendedRecovery;
 
-        /* Table Handles */
-        uns32 global_tbl_row_hdl;
-        uns32 node_tbl_row_hdl;
-        uns32 svc_tbl_row_hdl;
-        uns32 cirbuff_op_tbl_row_hdl;
-        /* Table handle for DTSv CLI command table */
-        uns32 cmd_op_tbl_row_hdl;
-
         /* 
          * MBCSv related variables.
@@ -559 +545 @@
         SaInvocationT csi_cb_invocation;
 
-        uns8 cli_bit_map;       /*Bit map to reflect change made in global
+        uns8 cli_bit_map;       /*Bit map to reflect change made in global
                                    policy or node policy through CLI */
         MDS_DEST svc_rmv_mds_dest;      /*MDS_DEST corrsp to DTA from which 
@@ -567 +553 @@
                                            spec loaded for this service.
                                            Needed only for checkpointing. */
+        SaImmOiHandleT immOiHandle;     
+        SaSelectionObjectT imm_sel_obj;
 #if (DTS_FLOW == 1)
         uns32 msg_count;
 #endif
+        NCS_BOOL imm_init_done;
 
 } DTS_CB;
@@ -890 +879 @@
 } \
 
-/* Define the Ranks for the persistent MIB tables */
+/* Define the Ranks for the persistent IMM Objects */
 typedef enum {
         DTSV_TBL_RANK_MIN = 1,
@@ -916 +905 @@
 EXTERN_C uns32 dts_handle_signal(void);
 EXTERN_C uns32 dts_handle_dta_event(DTSV_MSG *msg);
+EXTERN_C uns32 dts_handle_immnd_event(DTSV_MSG *msg);
 EXTERN_C uns32 dts_register_service(DTSV_MSG *msg);
 EXTERN_C uns32 dts_unregister_service(DTSV_MSG *msg);
@@ -937 +927 @@
 dts_create_new_pat_entry(DTS_CB *inst, DTS_SVC_REG_TBL **node, uns32 node_id, SS_SVC_ID svc_id, uns8 log_level);
 
-/***************************************************************************
- * DTSv defines for functions added for PSSv integration
- ***************************************************************************/
-EXTERN_C uns32 dts_mab_snd_warmboot_req(DTS_CB *cb);
-EXTERN_C uns32 dtsv_policy_set_oct(NCSMIB_ARG *arg, NCSCONTEXT data);
-EXTERN_C uns32 dtsv_node_extract_oct(NCSMIB_PARAM_VAL *param_val,
-                                     NCSMIB_VAR_INFO *var_info, NCSCONTEXT data, NCSCONTEXT buffer);
-EXTERN_C uns32 dtsv_node_policy_set_oct(DTS_CB *cb, NCSMIB_ARG *arg, POLICY *policy);
-EXTERN_C uns32 dtsv_svc_extract_oct(NCSMIB_PARAM_VAL *param_val,
-                                    NCSMIB_VAR_INFO *var_info, NCSCONTEXT data, NCSCONTEXT buffer);
-EXTERN_C uns32 dtsv_svc_policy_set_oct(DTS_CB *cb, NCSMIB_ARG *arg, POLICY *policy);
-EXTERN_C uns32 dtsv_global_extract_oct(NCSMIB_PARAM_VAL *param_val,
-                                       NCSMIB_VAR_INFO *var_info, NCSCONTEXT data, NCSCONTEXT buffer);
-EXTERN_C uns32 dtsv_global_policy_set_oct(DTS_CB *cb, NCSMIB_ARG *arg, POLICY *policy);
-EXTERN_C uns32 ncsdtsvscalars_tbl_reg(void);
-EXTERN_C uns32 ncsdtsvnodelogpolicyentry_tbl_reg(void);
-EXTERN_C uns32 ncsdtsvservicelogpolicyentry_tbl_reg(void);
 
 /************************************************************************
@@ -980 +953 @@
 EXTERN_C uns32 dts_free_msg_content(NCSFL_NORMAL *msg);
 
-/************************************************************************
-MIB Requests Processing functions
-************************************************************************/
-EXTERN_C void dtsv_populate_global_policy_mibinfo(void);
-EXTERN_C void dtsv_populate_node_policy_mibinfo(void);
-EXTERN_C void dtsv_populate_svc_policy_mibinfo(void);
-EXTERN_C uns32 ncs_dtsv_mib_request(NCSMIB_ARG *mib_args);
-EXTERN_C uns32 dtsv_global_policy_table_register(void);
-EXTERN_C uns32 dtsv_node_policy_table_register(void);
-EXTERN_C uns32 dtsv_svc_policy_table_register(void);
-EXTERN_C uns32 dtsv_cirbuff_op_table_register(void);
-
-EXTERN_C uns32 dtsv_policy_tbl_req(NCSMIB_ARG *args);
 
 /************************************************************************
@@ -1019 +979 @@
 EXTERN_C int32 dts_open_conf_cons(DTS_CB *cb, uns32 mode, char *str);
 
-/*****************************************************************************
-MIB Registration and Request handling routines 
-*****************************************************************************/
-
-EXTERN_C uns32 dts_register_tables(DTS_CB *inst);
-EXTERN_C uns32 dts_unregister_tables(DTS_CB *inst);
-EXTERN_C uns32 dts_mib_request(struct ncsmib_arg *mib_args);
 
 /************************************************************************

osaf/services/infrastructure/dtsv/include/dtsv_msg.h

@@ -101 +101 @@
         /* Message type indicating the congestion state of DTS as seen by DTA */
         DTS_CONGESTION_HIT,
-        DTS_CONGESTION_CLEAR
+        DTS_CONGESTION_CLEAR,
+        DTS_IMMND_EVT_RCV
 } DTS_SVC_MSG_TYPE;
 

osaf/services/infrastructure/dtsv/include/dtsvcli.h

@@ -30 +30 @@
 #define DTSVCLI_H
 
-#define DTSV_MOTV   NCSDTSV_CLI_MIB_FETCH_TIMEOUT       /* defined in dtsv-opt.h */
-#define MIB_VERR     "\nMIB returned error code"
 
 EXTERN_C uns32 ncsdtsv_cef_load_lib_req(NCS_LIB_REQ_INFO *libreq);
@@ -58 +56 @@
 EXTERN_C uns32 dtsv_cef_set_dflt_plcy(NCSCLI_ARG_SET *arg_list, NCSCLI_CEF_DATA *cef_data);
 
-EXTERN_C uns32 dtsv_cfg_mib_arg(NCSMIB_ARG *mib,
-                                uns32 *index,
-                                uns32 index_len, NCSMIB_TBL_ID tid, uns32 usr_hdl, uns32 ss_hdl, NCSMIB_RSP_FNC rspfnc);
-
-EXTERN_C uns32 dtsv_set_mib_int(NCSMIB_ARG *mib,
-                                uns32 pid, uns32 r_status, uns32 val, NCSMIB_REQ_FNC reqfnc, char *err);
-
-EXTERN_C uns32 dtsv_set_mib_oct(NCSMIB_ARG *mib,
-                                uns32 pid, uns32 r_status, NCSCONTEXT val, uns16 len, NCSMIB_REQ_FNC reqfnc, char *err);
-
-EXTERN_C uns32 dtsv_set_mib_int_val(NCSMIB_ARG *mib, uns32 pid, uns32 val, NCSMIB_REQ_FNC reqfnc, char *err);
-
-EXTERN_C uns32 dtsv_chk_mib_rsp(char *err, NCSMIB_ARG *arg, uns32 key);
-
-EXTERN_C uns32 dtsv_cirbuff_setrow(NCSMIB_ARG *mib,
-                                   NCSMIB_REQ_FNC reqfunc,
-                                   uns32 node_id, uns32 svc_id, uns32 operation, uns8 device, char *err);
-
-EXTERN_C uns32 dtsv_get_mib_int(NCSMIB_ARG *mib, uns32 pid, uns8 *val, NCSMIB_REQ_FNC reqfnc, char *err);
-
-EXTERN_C uns32 dtsv_get_mib_oct(NCSMIB_ARG *mib,
-                                uns32 pid, NCSCONTEXT val, uns32 *len, NCSMIB_REQ_FNC reqfnc, char *err);
-
-EXTERN_C uns32 dtsv_send_cmd_mib_req(NCSMIB_ARG *mib, NCSCLI_CEF_DATA *cef_data, char *err);
-
-EXTERN_C uns32 dtsv_cli_display(uns32 cli_hdl, char *str);
-EXTERN_C uns32 dtsv_cli_done(uns8 *string, uns32 status, uns32 cli_hdl);
-EXTERN_C uns32 dtsv_cli_cmd_rsp(NCSMIB_ARG *resp, uns32 cli_hdl);
-
-#define m_RETURN_DTSV_CLI_DONE(st,s,k)   dtsv_cli_done(st,s,k)
 
 #endif

osaf/services/infrastructure/dtsv/logstr/dts_logstr.c

@@ -302 +302 @@
          "DTS %s CONGESTION EVENT HIT. INFO & DEBUG severity logs will be dropped for NODE: 0x%08lx & Process Id: %ld\n\n"},
         {DTS_LID_FLOW_DOWN, "TLL", "DTS %s CONGESTION EVENT CLEARED. NODE: 0x%08lx Process Id: %ld\n\n"},
+        {DTS_LID_GENLOG, NCSFL_TYPE_TC, "%s %s\n"},
         {0, 0, 0}
 };

osaf/services/saf/immsv/config/imm.xml

@@ -1455 +1455 @@
                 </attr>
         </class>
+        <class name="OpenSAFDtsvGlobalLogPolicy">
+                <category>SA_CONFIG</category>
+                <rdn>   
+                        <name>opensafGlobalLogPolicy</name>
+                        <type>SA_STRING_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_INITIALIZED</flag>
+                </rdn>  
+                <attr>
+                        <name>osafDtsvGlobalMessageLogging</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr> 
+                <attr>
+                        <name>osafDtsvGlobalLogDevice</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                </attr> 
+                <attr>  
+                        <name>osafDtsvGlobalLogFileSize</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>1000</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalFileLogCompFormat</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalCircularBuffSize</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>111</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalCirBuffCompFormat</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalLoggingState</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>1</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalCategoryBitMap</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>-1</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalSeverityBitMap</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>252</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalNumOfLogFiles</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>10</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalLogMsgSequencing</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalCloseOpenFiles</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr>
+        </class>
+        <class name="OpenSAFDtsvNodeLogPolicy">
+                <category>SA_CONFIG</category>
+                <rdn>
+                        <name>opensafNodeLogPolicy</name>
+                        <type>SA_STRING_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_INITIALIZED</flag>
+                </rdn>
+                <attr>
+                        <name>osafDtsvNodeMessageLogging</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvNodeLogDevice</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                </attr>
+                <attr>
+                        <name>osafDtsvNodeLogFileSize</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>1000</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvNodeFileLogCompFormat</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvNodeCircularBuffSize</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>120</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvNodeCirBuffCompFormat</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvNodeLoggingState</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>1</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvNodeCategoryBitMap</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>-1</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvNodeSeverityBitMap</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>252</default-value>
+                </attr>
+        </class>
+        <class name="OpenSAFDtsvServiceLogPolicy">
+                <category>SA_CONFIG</category>
+                <rdn>
+                        <name>opensafServiceLogPolicy</name>
+                        <type>SA_STRING_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_INITIALIZED</flag>
+                </rdn>
+                <attr>
+                        <name>osafDtsvServiceLogDevice</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                </attr>
+                <attr>
+                        <name>osafDtsvServiceLogFileSize</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>1000</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvServiceFileLogCompFormat</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvServiceCircularBuffSize</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>12</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvServiceCirBuffCompFormat</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>0</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvServiceLoggingState</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>1</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvServiceCategoryBitMap</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>-1</default-value>
+                </attr>
+                <attr>
+                        <name>osafDtsvServiceSeverityBitMap</name>
+                        <type>SA_UINT32_T</type>
+                        <category>SA_CONFIG</category>
+                        <flag>SA_WRITABLE</flag>
+                        <default-value>252</default-value>
+                </attr>
+        </class>
 
         <class name="SaMsgQueue">
@@ -2006 +2233 @@
                 </attr>
         </object>
+        <object class="SaAmfApplication">
+                <dn>safApp=safDtsvService</dn>
+                <attr>
+                        <name>saAmfAppType</name>
+                        <value>safVersion=4.0.0,safAppType=OpenSafApplicationType</value>
+                </attr>
+        </object>
         <object class="SaLogStreamConfig">
                 <dn>safLgStrCfg=saLogAlarm,safApp=safLogService</dn>
@@ -4276 +4510 @@
                 </attr>
         </object>
+        <object class="OpenSAFDtsvGlobalLogPolicy">
+                <dn>opensafGlobalLogPolicy=safDtsv,safApp=safDtsvService</dn>
+                <attr>
+                        <name>osafDtsvGlobalMessageLogging</name>
+                        <value>0</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalLogDevice</name>
+                        <value>128</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalLogFileSize</name>
+                        <value>1000</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalFileLogCompFormat</name>
+                        <value>0</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalCircularBuffSize</name>
+                        <value>111</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalCirBuffCompFormat</name>
+                        <value>0</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalLoggingState</name>
+                        <value>1</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalSeverityBitMap</name>
+                        <value>252</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalNumOfLogFiles</name>
+                        <value>10</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalLogMsgSequencing</name>
+                        <value>0</value>
+                </attr>
+                <attr>
+                        <name>osafDtsvGlobalCloseOpenFiles</name>
+                         <value>0</value>
+                </attr>
+        </object>
 </imm:IMM-contents>

osaf/snmp/miblib/Makefile.am

@@ -19 +19 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = avsv dtsv pssv
+SUBDIRS = avsv pssv

osaf/snmp/mibs/Makefile.mibs

@@ -3 +3 @@
    ESMI-NCS-AVM-MIB \
    ESMI-NCS-AVSV-MIB \
-   ESMI-NCS-DTSV-MIB \
    ESMI-NCS-PSR-MIB \
    ESMI-SAF-AMF-MIB \
@@ -9 +8 @@
    NCS-AVM-MIB \
    NCS-AVSV-MIB \
-   NCS-DTSV-MIB \
    NCS-PSR-MIB \
    SAF-AIS-TC-MIB \

osaf/snmp/pssv/Makefile.am

@@ -19 +19 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = config avsv dtsv
+SUBDIRS = config avsv

osaf/snmp/subagt/Makefile.am

@@ -41 +41 @@
         $(AM_CPPFLAGS) \
         -I$(top_builddir)/osaf/snmp/subagt/services/avsv \
-        -I$(top_builddir)/osaf/snmp/subagt/services/dtsv \
         -I$(top_builddir)/osaf/snmp/subagt/services/avsv/avm \
         -I$(top_srcdir)/osaf/services/infrastructure/masv/include
@@ -64 +63 @@
         $(top_builddir)/osaf/snmp/subagt/services/avsv/avm/libavm_subagt.la \
         $(top_builddir)/osaf/snmp/subagt/services/avsv/libavsv_subagt.la \
-        $(top_builddir)/osaf/snmp/subagt/services/dtsv/libdtsv_subagt.la \
         $(top_builddir)/osaf/libs/agents/infrastructure/rda/librda.la

osaf/snmp/subagt/services/Makefile.am

@@ -19 +19 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = avsv dtsv pssv
+SUBDIRS = avsv pssv

osaf/snmp/subagt/subagt_amf.c

@@ -48 +48 @@
 
 #include "avsv_subagt_init.h"
-#include "dtsv_subagt_init.h"
 #include "avm_subagt_init.h"
 #include "rda_papi.h"