On 12/04/2013 02:00 PM, [email protected] wrote:
> opensaf.spec.in | 1 +
> osaf/services/saf/clmsv/config/Makefile.am | 3 +-
> osaf/services/saf/clmsv/config/clmna.conf | 14 ++
> osaf/services/saf/clmsv/config/clmsv_objects.xml | 85
> ++++++++++++++++
> osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml | 17 +++
> osaf/services/saf/clmsv/config/clmsv_sc_template.xml | 17 +++
> osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in | 21 +++
> 7 files changed, 157 insertions(+), 1 deletions(-)
>
>
> diff --git a/opensaf.spec.in b/opensaf.spec.in
> --- a/opensaf.spec.in
> +++ b/opensaf.spec.in
> @@ -1014,6 +1014,7 @@ fi
> %defattr(-,root,root)
> %dir %{_pkgclcclidir}
> %dir %{_pkglibdir}
> +%config(noreplace) %{_pkgsysconfdir}/clmna.conf
> %{_pkglibdir}/osafclmna
> %{_pkgclcclidir}/osaf-noded
>
> diff --git a/osaf/services/saf/clmsv/config/Makefile.am
> b/osaf/services/saf/clmsv/config/Makefile.am
> --- a/osaf/services/saf/clmsv/config/Makefile.am
> +++ b/osaf/services/saf/clmsv/config/Makefile.am
> @@ -19,7 +19,8 @@ include $(top_srcdir)/Makefile.common
> MAINTAINERCLEANFILES = Makefile.in
>
> dist_pkgsysconf_DATA = \
> - $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf
> + $(top_srcdir)/osaf/services/saf/clmsv/config/clmd.conf \
> + $(top_srcdir)/osaf/services/saf/clmsv/config/clmna.conf
>
> if ENABLE_IMMXML
>
> diff --git a/osaf/services/saf/clmsv/config/clmna.conf
> b/osaf/services/saf/clmsv/config/clmna.conf
> new file mode 100644
> --- /dev/null
> +++ b/osaf/services/saf/clmsv/config/clmna.conf
> @@ -0,0 +1,14 @@
> +# This file contains configuration for the SAF CLM service
> +# See the file services/clmsv/README for more configuration options.
> +
> +# Uncomment the next line if you want to run the CLM server through valgrind
> +#export TOOL="valgrind --leak-check=full --log-file=/tmp/log.valgrind"
> +
> +# Uncomment the next line to enable trace
> +#args="--tracemask=0xffffffff"
> +
> +# Healthcheck keys
> +export CLMNA_ENV_HEALTHCHECK_KEY="Default"
> +
> +# Uncomment the next line to enable info level logging
> +#args="--loglevel=info"
> diff --git a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> --- a/osaf/services/saf/clmsv/config/clmsv_objects.xml
> +++ b/osaf/services/saf/clmsv/config/clmsv_objects.xml
> @@ -106,4 +106,89 @@
> <value>1</value>
> </attr>
> </object>
> +
> + <object class="SaAmfCompBaseType">
> + <dn>safCompType=OpenSafCompTypeCLMNA</dn>
CLMND?
> + </object>
> + <object class="SaAmfCompType">
> + <dn>safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA</dn>
saVersion=1 would be better
adding 4.0.0 was a mistake I did
> + <attr>
> + <name>saAmfCtSwBundle</name>
> + <value>safSmfBundle=OpenSAF</value>
> + </attr>
> + <attr>
> + <name>saAmfCtCompCategory</name>
> + <value>1</value>
> + </attr>
> + <attr>
> + <name>saAmfCtDefClcCliTimeout</name>
> + <value>10000000000</value>
> + </attr>
> + <attr>
> + <name>saAmfCtDefCallbackTimeout</name>
> + <value>10000000000</value>
> + </attr>
> + <attr>
> + <name>saAmfCtRelPathInstantiateCmd</name>
> + <value>osaf-noded</value>
and then noded?
> + </attr>
> + <attr>
> + <name>saAmfCtDefInstantiateCmdArgv</name>
> + <value>instantiate</value>
> + </attr>
> + <attr>
> + <name>saAmfCtDefInstantiationLevel</name>
> + <value>2</value>
> + </attr>
> + <attr>
> + <name>saAmfCtRelPathCleanupCmd</name>
> + <value>osaf-clmd</value>
> + </attr>
> + <attr>
> + <name>saAmfCtDefCleanupCmdArgv</name>
> + <value>stop</value>
> + </attr>
> + <attr>
> + <name>saAmfCtDefQuiescingCompleteTimeout</name>
> + <value>10000000000</value>
> + </attr>
> + <attr>
> + <name>saAmfCtDefRecoveryOnError</name>
> + <value>6</value>
> + </attr>
> + <attr>
> + <name>saAmfCtDefDisableRestart</name>
> + <value>1</value>
> + </attr>
> + </object>
> + <object class="SaAmfHealthcheckType">
> +
> <dn>safHealthcheckKey=Default,safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA</dn>
> + <attr>
> + <name>saAmfHctDefPeriod</name>
> + <value>240000000000</value>
> + </attr>
> + <attr>
> + <name>saAmfHctDefMaxDuration</name>
> + <value>180000000000</value>
> + </attr>
> + </object>
> + <object class="SaAmfCSBaseType">
> + <dn>safCSType=CLMNA-OpenSAF</dn>
> + </object>
> + <object class="SaAmfCSType">
> + <dn>safVersion=4.0.0,safCSType=CLMNA-OpenSAF</dn>
> + </object>
> + <object class="SaAmfSutCompType">
> +
> <dn>safMemberCompType=safVersion=4.0.0\,safCompType=OpenSafCompTypeCLMNA,safVersion=4.0.0,safSuType=OpenSafSuTypeND</dn>
> + </object>
> + <object class="SaAmfSvcTypeCSTypes">
> +
> <dn>safMemberCSType=safVersion=4.0.0\,safCSType=CLMNA-OpenSAF,safVersion=4.0.0,safSvcType=NoRed-OpenSAF</dn>
> + </object>
> + <object class="SaAmfCtCsType">
> +
> <dn>safSupportedCsType=safVersion=4.0.0\,safCSType=CLMNA-OpenSAF,safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA</dn>
> + <attr>
> + <name>saAmfCtCompCapability</name>
> + <value>1</value>
> + </attr>
> + </object>
> </imm:IMM-contents>
> diff --git a/osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml
> b/osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml
> --- a/osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml
> +++ b/osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml
> @@ -10,6 +10,23 @@
> <object class="SaAmfCompCsType">
>
> <dn>safSupportedCsType=safVersion=4.0.0\,safCSType=CLM-OpenSAF,safComp=CLM,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
> </object>
> + <object class="SaAmfComp">
> + <dn>safComp=CLMNA,safSu=SC_2_1,safSg=NoRed,safApp=OpenSAF</dn>
> + <attr>
> + <name>saAmfCompType</name>
> +
> <value>safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA</value>
> + </attr>
> + </object>
> + <object class="SaAmfCSI">
> + <dn>safCsi=CLMNA,safSi=NoRed_TOKEN,safApp=OpenSAF</dn>
> + <attr>
> + <name>saAmfCSType</name>
> + <value>safVersion=4.0.0,safCSType=CLMNA-OpenSAF</value>
> + </attr>
> + </object>
> + <object class="SaAmfCompCsType">
> +
> <dn>safSupportedCsType=safVersion=4.0.0\,safCSType=CLMNA-OpenSAF,safComp=CLMNA,safSu=SC_2_1,safSg=NoRed,safApp=OpenSAF</dn>
> + </object>
> <object class="SaClmNode">
> <dn>safNode=CLM_TOKEN,safCluster=myClmCluster</dn>
> <!-- By default, no SaClmNode is mapped to SaPlmEE. If this mapping is
> needed then uncomment the following lines -->
> diff --git a/osaf/services/saf/clmsv/config/clmsv_sc_template.xml
> b/osaf/services/saf/clmsv/config/clmsv_sc_template.xml
> --- a/osaf/services/saf/clmsv/config/clmsv_sc_template.xml
> +++ b/osaf/services/saf/clmsv/config/clmsv_sc_template.xml
> @@ -18,4 +18,21 @@
> </attr>
>
> </object>
> + <object class="SaAmfComp">
> + <dn>safComp=CLMNA,safSu=SC_2_1,safSg=NoRed,safApp=OpenSAF</dn>
> + <attr>
> + <name>saAmfCompType</name>
> +
> <value>safVersion=4.0.0,safCompType=OpenSafCompTypeCLMNA</value>
> + </attr>
> + </object>
> + <object class="SaAmfCSI">
> + <dn>safCsi=CLMNA,safSi=NoRed_TOKEN,safApp=OpenSAF</dn>
> + <attr>
> + <name>saAmfCSType</name>
> + <value>safVersion=4.0.0,safCSType=CLMNA-OpenSAF</value>
> + </attr>
> + </object>
> + <object class="SaAmfCompCsType">
> +
> <dn>safSupportedCsType=safVersion=4.0.0\,safCSType=CLMNA-OpenSAF,safComp=CLMNA,safSu=SC_2_1,safSg=NoRed,safApp=OpenSAF</dn>
> + </object>
> </imm:IMM-contents>
> diff --git a/osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in
> b/osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in
> --- a/osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in
> +++ b/osaf/services/saf/clmsv/nodeagent/scripts/osaf-noded.in
> @@ -25,6 +25,7 @@ if [ ! -r $osafdirfile ]; then
> else
> . $osafdirfile
> . $pkgsysconfdir/nid.conf
> + . $pkgsysconfdir/clmna.conf
> fi
>
> binary=$pkglibdir/$prog
> @@ -33,10 +34,12 @@ lockfile=$lockdir/$initscript
>
> RETVAL=0
> NIDSERV="CLMNA"
> +COMPNAMEFILE=$pkglocalstatedir/clmna_comp_name
>
> start() {
> export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
> [ -x $binary ] || exit 5
> + export CLMNA_COMP_NAME_FILE=$COMPNAMEFILE
> echo -n "Starting $prog: "
> start_daemon -p $pidfile $binary $args
> RETVAL=$?
> @@ -49,6 +52,24 @@ start() {
> return $RETVAL
> }
>
> +instantiate() {
> + echo -n "AMF Instantiating $prog: "
> + echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
> + TEMP=`cat $COMPNAMEFILE`
> + if [ -e $lockfile ]; then
> + killproc -p $pidfile $binary -USR1
> + else
> + start_daemon -p $pidfile $binary $args
> + fi
> + RETVAL=$?
> + if [ $RETVAL -eq 0 ]; then
> + log_success_msg
> + else
> + log_failure_msg
> + fi
> + return $RETVAL
> +}
> +
> stop() {
> echo -n "Stopping $prog: "
> killproc -p $pidfile $binary
>
> ------------------------------------------------------------------------------
> Sponsored by Intel(R) XDK
> Develop, test and display web and hybrid apps with a single code base.
> Download it for free now!
> http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
> _______________________________________________
> Opensaf-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/opensaf-devel
>
>
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
