Ack.
Thanks,
Praveen
On 27-May-14 8:09 PM, Hans Feldt wrote:
> osaf/services/saf/amf/amfd/app.cc | 1 -
> osaf/services/saf/amf/amfd/apptype.cc | 1 +
> osaf/services/saf/amf/amfd/ckpt_dec.cc | 1 +
> osaf/services/saf/amf/amfd/ckpt_updt.cc | 1 +
> osaf/services/saf/amf/amfd/imm.cc | 1 +
> osaf/services/saf/amf/amfd/include/Makefile.am | 1 +
> osaf/services/saf/amf/amfd/include/app.h | 3 -
> osaf/services/saf/amf/amfd/include/sg.h | 30 +------------
> osaf/services/saf/amf/amfd/include/sgtype.h | 60
> ++++++++++++++++++++++++++
> osaf/services/saf/amf/amfd/main.cc | 1 +
> osaf/services/saf/amf/amfd/sgtype.cc | 2 +-
> 11 files changed, 69 insertions(+), 33 deletions(-)
>
>
> diff --git a/osaf/services/saf/amf/amfd/app.cc
> b/osaf/services/saf/amf/amfd/app.cc
> --- a/osaf/services/saf/amf/amfd/app.cc
> +++ b/osaf/services/saf/amf/amfd/app.cc
> @@ -22,7 +22,6 @@
> #include <app.h>
> #include <cluster.h>
> #include <imm.h>
> -#include <si.h>
>
> AmfDb<AVD_APP> *app_db = 0;
>
> diff --git a/osaf/services/saf/amf/amfd/apptype.cc
> b/osaf/services/saf/amf/amfd/apptype.cc
> --- a/osaf/services/saf/amf/amfd/apptype.cc
> +++ b/osaf/services/saf/amf/amfd/apptype.cc
> @@ -22,6 +22,7 @@
> #include <imm.h>
> #include <si.h>
> #include <util.h>
> +#include <sgtype.h>
>
> AmfDb<AVD_APP_TYPE> *app_type_db = 0;
>
> diff --git a/osaf/services/saf/amf/amfd/ckpt_dec.cc
> b/osaf/services/saf/amf/amfd/ckpt_dec.cc
> --- a/osaf/services/saf/amf/amfd/ckpt_dec.cc
> +++ b/osaf/services/saf/amf/amfd/ckpt_dec.cc
> @@ -26,6 +26,7 @@
> #include <amfd.h>
> #include <cluster.h>
> #include <si_dep.h>
> +#include <sg.h>
>
> extern "C" const AVSV_DECODE_CKPT_DATA_FUNC_PTR
> avd_dec_data_func_list[AVSV_CKPT_MSG_MAX];
>
> diff --git a/osaf/services/saf/amf/amfd/ckpt_updt.cc
> b/osaf/services/saf/amf/amfd/ckpt_updt.cc
> --- a/osaf/services/saf/amf/amfd/ckpt_updt.cc
> +++ b/osaf/services/saf/amf/amfd/ckpt_updt.cc
> @@ -17,6 +17,7 @@
>
> #include <logtrace.h>
> #include <amfd.h>
> +#include <sg.h>
> #include <csi.h>
> #include <app.h>
>
> diff --git a/osaf/services/saf/amf/amfd/imm.cc
> b/osaf/services/saf/amf/amfd/imm.cc
> --- a/osaf/services/saf/amf/amfd/imm.cc
> +++ b/osaf/services/saf/amf/amfd/imm.cc
> @@ -39,6 +39,7 @@
> #include <imm.h>
> #include <cluster.h>
> #include <app.h>
> +#include <sgtype.h>
> #include <sg.h>
> #include <su.h>
> #include <sutype.h>
> diff --git a/osaf/services/saf/amf/amfd/include/Makefile.am
> b/osaf/services/saf/amf/amfd/include/Makefile.am
> --- a/osaf/services/saf/amf/amfd/include/Makefile.am
> +++ b/osaf/services/saf/amf/amfd/include/Makefile.am
> @@ -41,6 +41,7 @@ noinst_HEADERS = \
> pg.h \
> proc.h \
> sg.h \
> + sgtype.h \
> si.h \
> su.h \
> sutcomptype.h \
> diff --git a/osaf/services/saf/amf/amfd/include/app.h
> b/osaf/services/saf/amf/amfd/include/app.h
> --- a/osaf/services/saf/amf/amfd/include/app.h
> +++ b/osaf/services/saf/amf/amfd/include/app.h
> @@ -31,9 +31,6 @@
> #include <si.h>
> #include "db_template.h"
>
> -struct avd_sg_tag;
> -struct avd_si_tag;
> -
> typedef struct avd_app_type_tag {
> SaNameT name;
> SaNameT *sgAmfApptSGTypes;
> 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
> @@ -36,9 +36,9 @@
>
> #include <saAmf.h>
> #include <ncspatricia.h>
> +#include <cb.h>
> #include <def.h>
> -#include <su.h>
> -#include <si.h>
> +#include <sgtype.h>
> #include <amf_defs.h>
> #include <amf_d2nmsg.h>
>
> @@ -243,27 +243,6 @@ typedef struct avd_sg_tag {
>
> } AVD_SG;
>
> -typedef struct avd_amf_sg_type_tag {
> - NCS_PATRICIA_NODE tree_node; /* key will be sg type name */
> - SaNameT name;
> - bool saAmfSgtDefAutoRepair_configured; /* True when user configures
> saAmfSGDefAutoRepair else false */
> - /******************** B.04 model
> *************************************************/
> - SaNameT *saAmfSGtValidSuTypes; /* array of DNs, size in number_su_type
> */
> - SaAmfRedundancyModelT saAmfSgtRedundancyModel;
> - SaBoolT saAmfSgtDefAutoRepair;
> - SaBoolT saAmfSgtDefAutoAdjust;
> - SaTimeT saAmfSgtDefAutoAdjustProb;
> - SaTimeT saAmfSgtDefCompRestartProb;
> - SaUint32T saAmfSgtDefCompRestartMax;
> - SaTimeT saAmfSgtDefSuRestartProb;
> - SaUint32T saAmfSgtDefSuRestartMax;
> - /******************** B.04 model
> *************************************************/
> -
> - uint32_t number_su_type; /* size of array saAmfSGtValidSuTypes */
> - struct avd_sg_tag *list_of_sg;
> -
> -} AVD_AMF_SG_TYPE;
> -
> #define m_AVD_SET_SG_ADJUST(cb,sg,state) {\
> TRACE("adjust_state %u => %u", sg->adjust_state, state); \
> sg->adjust_state = state;\
> @@ -347,11 +326,6 @@ extern void avd_sg_add_su(AVD_SU *su);
> extern void avd_sg_remove_su(AVD_SU *su);
> extern void avd_sg_constructor(void);
>
> -extern SaAisErrorT avd_sgtype_config_get(void);
> -extern AVD_AMF_SG_TYPE *avd_sgtype_get(const SaNameT *dn);
> -extern void avd_sgtype_add_sg(AVD_SG *sg);
> -extern void avd_sgtype_remove_sg(AVD_SG *sg);
> -extern void avd_sgtype_constructor(void);
> extern void avd_sg_admin_state_set(AVD_SG* sg, SaAmfAdminStateT state);
> extern void avd_sg_nwayact_screening_for_si_distr(AVD_SG *avd_sg);
> extern void avd_sg_nway_screen_si_distr_equal(AVD_SG *sg);
> diff --git a/osaf/services/saf/amf/amfd/include/sgtype.h
> b/osaf/services/saf/amf/amfd/include/sgtype.h
> new file mode 100644
> --- /dev/null
> +++ b/osaf/services/saf/amf/amfd/include/sgtype.h
> @@ -0,0 +1,60 @@
> +/* -*- OpenSAF -*-
> + *
> + * (C) Copyright 2008-2014 The OpenSAF Foundation
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
> + * or FITNESS FOR A PARTICULAR PURPOSE. This file and program are licensed
> + * under the GNU Lesser General Public License Version 2.1, February 1999.
> + * The complete license can be accessed from the following location:
> + * http://opensource.org/licenses/lgpl-license.php
> + * See the Copying file included with the OpenSAF distribution for full
> + * licensing terms.
> + *
> + * Author(s): Emerson Network Power, Ericsson
> + *
> + */
> +
> +/*****************************************************************************
> +
> + DESCRIPTION: Service Group Type class
> +
> +******************************************************************************
> +*/
> +
> +#ifndef AVD_SGTYPE_H
> +#define AVD_SGTYPE_H
> +
> +#include <saAmf.h>
> +#include <ncspatricia.h>
> +
> +struct avd_sg_tag;
> +
> +typedef struct avd_amf_sg_type_tag {
> + NCS_PATRICIA_NODE tree_node; /* key will be sg type name */
> + SaNameT name;
> + bool saAmfSgtDefAutoRepair_configured; /* True when user configures
> saAmfSGDefAutoRepair else false */
> + /******************** B.04 model
> *************************************************/
> + SaNameT *saAmfSGtValidSuTypes; /* array of DNs, size in number_su_type
> */
> + SaAmfRedundancyModelT saAmfSgtRedundancyModel;
> + SaBoolT saAmfSgtDefAutoRepair;
> + SaBoolT saAmfSgtDefAutoAdjust;
> + SaTimeT saAmfSgtDefAutoAdjustProb;
> + SaTimeT saAmfSgtDefCompRestartProb;
> + SaUint32T saAmfSgtDefCompRestartMax;
> + SaTimeT saAmfSgtDefSuRestartProb;
> + SaUint32T saAmfSgtDefSuRestartMax;
> + /******************** B.04 model
> *************************************************/
> +
> + uint32_t number_su_type; /* size of array saAmfSGtValidSuTypes */
> + struct avd_sg_tag *list_of_sg;
> +
> +} AVD_AMF_SG_TYPE;
> +
> +SaAisErrorT avd_sgtype_config_get(void);
> +AVD_AMF_SG_TYPE *avd_sgtype_get(const SaNameT *dn);
> +void avd_sgtype_add_sg(struct avd_sg_tag *sg);
> +void avd_sgtype_remove_sg(struct avd_sg_tag *sg);
> +void avd_sgtype_constructor(void);
> +
> +#endif
> diff --git a/osaf/services/saf/amf/amfd/main.cc
> b/osaf/services/saf/amf/amfd/main.cc
> --- a/osaf/services/saf/amf/amfd/main.cc
> +++ b/osaf/services/saf/amf/amfd/main.cc
> @@ -52,6 +52,7 @@
> #include <si_dep.h>
> #include <hlt.h>
> #include <clm.h>
> +#include <sgtype.h>
> #include <sutcomptype.h>
> #include <sutype.h>
> #include <su.h>
> diff --git a/osaf/services/saf/amf/amfd/sgtype.cc
> b/osaf/services/saf/amf/amfd/sgtype.cc
> --- a/osaf/services/saf/amf/amfd/sgtype.cc
> +++ b/osaf/services/saf/amf/amfd/sgtype.cc
> @@ -25,7 +25,7 @@
> #include <sutype.h>
> #include <ckpt_msg.h>
> #include <ntf.h>
> -#include <sg.h>
> +#include <sgtype.h>
> #include <proc.h>
>
> static NCS_PATRICIA_TREE sgtype_db;
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
