The structure file already changed along time. But the PR document
still reference to the old path.
e.g. osaf/services/saf/immsvREADME
---
00-README.conf | 2 +-
00-README.unittest | 19 +++++--------------
python/pyosaf/saAmf.py | 2 +-
python/pyosaf/saLog.py | 2 +-
python/pyosaf/saSmf.py | 2 +-
samples/smfsv/README | 6 +++---
src/ais/include/saAmf_B_04_02.h | 2 +-
src/ais/include/saImmOi_A_2_11.h | 2 +-
src/ais/include/saImmOi_A_2_15.h | 2 +-
src/ais/include/saImmOm_A_2_11.h | 2 +-
src/ais/include/saImmOm_A_2_12.h | 2 +-
src/ais/include/saImmOm_A_2_13.h | 2 +-
src/ais/include/saImmOm_A_2_14.h | 2 +-
src/ais/include/saImmOm_A_2_15.h | 2 +-
src/ais/include/saImmOm_A_2_16.h | 2 +-
src/ais/include/saImmOm_A_2_17.h | 2 +-
src/ckpt/apitest/README | 4 ++--
src/clm/README | 13 ++++++-------
src/clm/clmd/clmd.conf | 2 +-
src/dtm/dtmnd/dtmd.conf | 2 +-
src/imm/README | 24 ++++++++++++------------
src/imm/apitest/README | 3 ++-
src/imm/immd/immd.conf | 2 +-
src/imm/immnd/immnd.conf | 2 +-
src/imm/immnd/immnd_mds.c | 2 +-
src/imm/immpbed/immpbe_daemon.cc | 2 +-
src/log/README | 15 +++++++--------
src/log/README_LONGDN | 5 ++---
src/log/apitest/README | 3 +--
src/log/logd/logd.conf | 2 +-
src/ntf/README | 24 +++++++++++-------------
src/ntf/apitest/README | 2 +-
src/ntf/ntfd/ntfd.conf | 3 +--
src/plm/README | 25 ++++++++++++-------------
src/plm/apitest/README | 3 ++-
src/plm/plmd/plmd.conf | 2 +-
src/smf/README | 17 ++++++++---------
src/smf/smfd/smfd.conf | 2 +-
src/smf/smfnd/smfnd.conf | 2 +-
39 files changed, 99 insertions(+), 115 deletions(-)
diff --git a/00-README.conf b/00-README.conf
index d347b7c9a..52371a7f2 100644
--- a/00-README.conf
+++ b/00-README.conf
@@ -570,7 +570,7 @@ Interface: The specified command is given the DN of the
SaSmfSwBundle instance t
The specified command must return 0 (zero) on success.
-Note: The OpenSAF default implemetation is located at
osaf/services/saf/smfsv/scripts/smf-bundle-check.
+Note: The OpenSAF default implementation is located at
src/smf/scripts/smf-bundle-check.
Earlier default implementation of the command (which was never called
from SMF) requires a bundle
name as input parameter.
From OpenSAF 4.4 the input parameter shall be the DN of the bundle to
check.
diff --git a/00-README.unittest b/00-README.unittest
index f297bccd0..e598dbf02 100644
--- a/00-README.unittest
+++ b/00-README.unittest
@@ -24,23 +24,16 @@ make -j 4
To build and run the unit tests
make check
-A unit test report will be written on the console. Unit test logs etc. can be
found under the tests directory.
+A unit test report will be written on the console. Unit test logs are available
+in the test output directory produced by the build.
-Gtest unit test code to be placed at each service under
service/saf/"service"/tests, example:
+Gtest unit test code is placed with each service under src/"service"/apitest,
example:
-services/saf/amf/
+src/amf/
├── amfd
-│ ├── include
-│ ├── scripts
-│ └── tests
├── amfnd
-│ ├── include
-│ ├── scripts
-│ └── tests
├── amfwdog
-│ ├── scripts
-│ └── tests
-└── config
+└── apitest
The test code to have the following naming convention as below:
tests will be in file xxxx_test.cc, where xxxx is the name of the unit test
case,
@@ -48,5 +41,3 @@ mocks will be in file mock_xxxx.cc, where xxxx is the name of
the mock.
No need to call the RUN_ALL_TESTS() macro, it is included in gtest_main and
gmock_main
and are automatically linked with the unit test cases.
-
-
diff --git a/python/pyosaf/saAmf.py b/python/pyosaf/saAmf.py
index 510a34c89..5a5f65c5e 100644
--- a/python/pyosaf/saAmf.py
+++ b/python/pyosaf/saAmf.py
@@ -22,7 +22,7 @@ from pyosaf.saAis import SaAisErrorT, SaInvocationT, SaNameT,
SaUint64T, \
SaUint16T, Const, BYREF, PY3
from pyosaf.saNtf import SaNtfIdentifierT, SaNtfCorrelationIdsT
-# Only mirrors API calls implemented in osaf/libs/agents/saf/ava/ava_api.c
+# Only mirrors API calls implemented in src/amf/agent.
# If it ain't implemented here (or is commented out here),
# it probably ain't implemented there!
diff --git a/python/pyosaf/saLog.py b/python/pyosaf/saLog.py
index 039a47d4a..5bec3995c 100644
--- a/python/pyosaf/saLog.py
+++ b/python/pyosaf/saLog.py
@@ -23,7 +23,7 @@ from pyosaf.saAis import SaUint64T, Const, SaUint16T,
SaVersionT, SaStringT, \
SaUint8T, SaSizeT, SaInt8T, SaLimitValueT, PY3
from pyosaf import saNtf
-# Only mirrors API calls implemented in osaf/libs/agents/saf/lga/lga_api.c
+# Only mirrors API calls implemented in src/log/agent/lga_api.cc.
# If it ain't implemented here, it probably ain't implemented there!
logdll = CDLL('libSaLog.so.1')
diff --git a/python/pyosaf/saSmf.py b/python/pyosaf/saSmf.py
index aa5836c89..7e743e8b5 100644
--- a/python/pyosaf/saSmf.py
+++ b/python/pyosaf/saSmf.py
@@ -19,7 +19,7 @@ from ctypes import CDLL, POINTER, Structure, CFUNCTYPE
from pyosaf.saAis import SaUint64T, SaUint32T, SaEnumT, Enumeration, BYREF, \
SaSizeT, SaStringT, SaInvocationT, SaNameT, SaUint8T
-# Only mirrors API calls implemented in osaf/libs/agents/saf/smfa/smfa_api.c
+# Only mirrors API calls implemented in src/smf/agent/smfa_api.c.
# If it ain't implemented here (or is commented out here),
# it probably ain't implemented there!
diff --git a/samples/smfsv/README b/samples/smfsv/README
index a763e08e4..df7264365 100644
--- a/samples/smfsv/README
+++ b/samples/smfsv/README
@@ -96,9 +96,9 @@ Logging:
Configuration
-------------
-The configuration delivered in
-"$OPENSAFD/osaf/services/saf/immsv/config/imm.xml" contain information
-enough to be able to iterate over all nodes and over a payload and system
controllers node group.
+The IMM configuration templates in "$OPENSAFD/src/imm/config/" contain
+enough information to iterate over all nodes and over a payload and system
+controllers node group. The generated configuration is deployed as imm.xml.
How to run smf-demo
-------------------
diff --git a/src/ais/include/saAmf_B_04_02.h b/src/ais/include/saAmf_B_04_02.h
index f8b31d60f..d2cab1c19 100644
--- a/src/ais/include/saAmf_B_04_02.h
+++ b/src/ais/include/saAmf_B_04_02.h
@@ -25,7 +25,7 @@
* These additions are currently NON STANDARD. Intention is to get these
* additions approved formally by SAF in the future.
*
- * Note: For detailed explanation of these new resources, see
osaf/services/saf/amf/README.
+ * Note: For detailed explanation of these new resources, see src/amf/README.
*/
#ifndef _SA_AMF_B_04_02_H
diff --git a/src/ais/include/saImmOi_A_2_11.h b/src/ais/include/saImmOi_A_2_11.h
index 67f44517c..584a4597a 100644
--- a/src/ais/include/saImmOi_A_2_11.h
+++ b/src/ais/include/saImmOi_A_2_11.h
@@ -23,7 +23,7 @@
* These additions are currently NON STANDARD. But the intention is to get
these
* additions approved formally by SAF in the future.
*
- * For detailed explanation of the new API, see
osaf/services/saf/immsv/README.
+ * For detailed explanation of the new API, see src/imm/README.
*/
diff --git a/src/ais/include/saImmOi_A_2_15.h b/src/ais/include/saImmOi_A_2_15.h
index 9c2868d46..6f6f1f310 100644
--- a/src/ais/include/saImmOi_A_2_15.h
+++ b/src/ais/include/saImmOi_A_2_15.h
@@ -23,7 +23,7 @@
* These additions are currently NON STANDARD. But the intention is to get
these
* additions approved formally by SAF in the future.
*
- * For detailed explanation of the new API, see
osaf/services/saf/immsv/README.
+ * For detailed explanation of the new API, see src/imm/README.
*/
diff --git a/src/ais/include/saImmOm_A_2_11.h b/src/ais/include/saImmOm_A_2_11.h
index 0615d6668..585283939 100644
--- a/src/ais/include/saImmOm_A_2_11.h
+++ b/src/ais/include/saImmOm_A_2_11.h
@@ -23,7 +23,7 @@
* These additions are currently NON STANDARD. But the intention is to get
these
* additions approved formally by SAF in the future.
*
- * For detailed explanation of the new API, see
osaf/services/saf/immsv/README.
+ * For detailed explanation of the new API, see src/imm/README.
*/
diff --git a/src/ais/include/saImmOm_A_2_12.h b/src/ais/include/saImmOm_A_2_12.h
index aa03fbae3..d2ce9c2a3 100644
--- a/src/ais/include/saImmOm_A_2_12.h
+++ b/src/ais/include/saImmOm_A_2_12.h
@@ -23,7 +23,7 @@
* These additions are currently NON STANDARD. But the intention is to get
these
* additions approved formally by SAF in the future.
*
- * For detailed explanation of the new API, see
osaf/services/saf/immsv/README.
+ * For detailed explanation of the new API, see src/imm/README.
*/
diff --git a/src/ais/include/saImmOm_A_2_13.h b/src/ais/include/saImmOm_A_2_13.h
index 97e9958ce..edbfa01ac 100644
--- a/src/ais/include/saImmOm_A_2_13.h
+++ b/src/ais/include/saImmOm_A_2_13.h
@@ -23,7 +23,7 @@
* These additions are currently NON STANDARD. But the intention is to get
these
* additions approved formally by SAF in the future.
*
- * For detailed explanation of the new API, see
osaf/services/saf/immsv/README.
+ * For detailed explanation of the new API, see src/imm/README.
*/
diff --git a/src/ais/include/saImmOm_A_2_14.h b/src/ais/include/saImmOm_A_2_14.h
index 73ee7c601..d356b3a22 100644
--- a/src/ais/include/saImmOm_A_2_14.h
+++ b/src/ais/include/saImmOm_A_2_14.h
@@ -23,7 +23,7 @@
* These additions are currently NON STANDARD. But the intention is to get
these
* additions approved formally by SAF in the future.
*
- * For detailed explanation of the new API, see
osaf/services/saf/immsv/README.
+ * For detailed explanation of the new API, see src/imm/README.
*/
diff --git a/src/ais/include/saImmOm_A_2_15.h b/src/ais/include/saImmOm_A_2_15.h
index 4068a87ab..c5995551d 100644
--- a/src/ais/include/saImmOm_A_2_15.h
+++ b/src/ais/include/saImmOm_A_2_15.h
@@ -23,7 +23,7 @@
* These additions are currently NON STANDARD. But the intention is to get
these
* additions approved formally by SAF in the future.
*
- * For detailed explanation of the new API, see
osaf/services/saf/immsv/README.
+ * For detailed explanation of the new API, see src/imm/README.
*/
diff --git a/src/ais/include/saImmOm_A_2_16.h b/src/ais/include/saImmOm_A_2_16.h
index be95d7587..a95032082 100644
--- a/src/ais/include/saImmOm_A_2_16.h
+++ b/src/ais/include/saImmOm_A_2_16.h
@@ -23,7 +23,7 @@
* These additions are currently NON STANDARD. But the intention is to get
these
* additions approved formally by SAF in the future.
*
- * For detailed explanation of the new API, see
osaf/services/saf/immsv/README.
+ * For detailed explanation of the new API, see src/imm/README.
*/
diff --git a/src/ais/include/saImmOm_A_2_17.h b/src/ais/include/saImmOm_A_2_17.h
index 007e0e2f7..8118bb11a 100644
--- a/src/ais/include/saImmOm_A_2_17.h
+++ b/src/ais/include/saImmOm_A_2_17.h
@@ -23,7 +23,7 @@
* These additions are currently NON STANDARD. But the intention is to get
these
* additions approved formally by SAF in the future.
*
- * For detailed explanation of the new API, see
osaf/services/saf/immsv/README.
+ * For detailed explanation of the new API, see src/imm/README.
*/
diff --git a/src/ckpt/apitest/README b/src/ckpt/apitest/README
index 94908d694..9c67535a8 100644
--- a/src/ckpt/apitest/README
+++ b/src/ckpt/apitest/README
@@ -23,7 +23,8 @@ test the API extensively. Checking all possible error
conditions etc.
The test suite is not distributed but can of course be run on every node in
the system which kind of makes it distributed.
-The CKPT test suite uses the unit test framework in OpenSAF
(tests/unit_test_fw).
+The CKPT test suite uses GoogleTest/GoogleMock, configured through GTEST_DIR
and
+GMOCK_DIR as described in the top-level unit-test documentation.
2. Building and installing
@@ -60,4 +61,3 @@ test case, a new function for new test case should be
defined. Then, it should
be included in the test case list below in same file.
__attribute__ ((constructor)) static void ckpt_cpa_test_constructor(void) {
-
diff --git a/src/clm/README b/src/clm/README
index d2dada18c..b2be3fdbc 100644
--- a/src/clm/README
+++ b/src/clm/README
@@ -100,13 +100,13 @@ CLMSv depends on the following services:
DIRECTORY STRUCTURE
-osaf/libs/common/clmsv/include - common header files used by CLMS, CLMNA, CLMA
-osaf/libs/agents/saf/clma - Implementation of the CLM agent library
-osaf/services/saf/clmsv/clms - Implementation of the CLM server
-osaf/services/saf/clmsv/nodeagent - Implementation of the CLM Node Agent.
-osaf/services/saf/clmsv/config - Configuration files for the CLMS and CLMNA
+src/clm/common - common header files used by CLMD, CLMNA, and CLMA
+src/clm/agent - implementation of the CLM agent library
+src/clm/clmd - implementation of the CLM server
+src/clm/clmnd - implementation of the CLM Node Agent
+src/clm/config - configuration files for the CLMD and CLMNA
-tests/clmsv - CLMSv test suites
+src/clm/apitest - CLM test suites
CONFIGURATION FILES
@@ -119,4 +119,3 @@ CONTRIBUTORS/MAINTAINERS
Meena Sangeeta <[email protected]>
Manoj Lalavat <[email protected]>
-
diff --git a/src/clm/clmd/clmd.conf b/src/clm/clmd/clmd.conf
index 3e26daa4a..8c9a5edc1 100644
--- a/src/clm/clmd/clmd.conf
+++ b/src/clm/clmd/clmd.conf
@@ -1,5 +1,5 @@
# This file contains configuration for the SAF CLM service
-# See the file services/clmsv/README for more configuration options.
+# See the file src/clm/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"
diff --git a/src/dtm/dtmnd/dtmd.conf b/src/dtm/dtmnd/dtmd.conf
index 4c1c58f8d..a1843d53e 100644
--- a/src/dtm/dtmnd/dtmd.conf
+++ b/src/dtm/dtmnd/dtmd.conf
@@ -1,6 +1,6 @@
# Following configuration is only valid when MDS transport is chosen as TCP.
# This file contains configuration for the DTM service
-# See the file osaf/services/infrastructure/dtm/README for more configuration
options.
+# See the file src/dtm/README for more configuration options.
# Uncomment the next line if you want to run dtm through valgrind
#export DTMTOOL="valgrind --leak-check=full --log-file=/tmp/dtm.valgrind"
diff --git a/src/imm/README b/src/imm/README
index 4fa62a25f..013782357 100644
--- a/src/imm/README
+++ b/src/imm/README
@@ -17,7 +17,7 @@
GENERAL
=======
-This directory (osaf/services/saf/immsv) contains an implementation of the
+This directory (src/imm) contains an implementation of the
SAF IMM service version A.02.01.
Application programmers intending to interface with immsv should primarily read
@@ -454,7 +454,7 @@ To enable this feature the folowing three steps are needed.
2) ++++++CONFIGURE PBE DEPLOYMENT+++++++++
- Edit 'osaf/services/saf/immsv/config/immnd.conf' or in the
+ Edit 'src/imm/immnd/immnd.conf' or in the
deployed system typically '/etc/opensaf/immnd.conf'.
Ensure the IMMSV_ROOT_DIRECTORY points to a shared file system,
@@ -1717,7 +1717,7 @@ OpenSAF 4.4 adds the enhancement of supporting 2PBE.
The 2PBE enhancement allows the IMM to have PBE configured so that it
does not rely on a shared filesystem, such as DRBD.
-See: osaf/services/saf/immsv/README.2PBE for details.
+See: src/imm/README.2PBE for details.
immadm supports argument for explicitly setting admin-owner (4.4)
================================================================
@@ -1746,7 +1746,7 @@ version A.2.13.
A new attribute definition flag has been defined:
#define SA_IMM_ATTR_NO_DANGLING 0x0000000004000000
-See: osaf/services/saf/immsv/README.NO_DANGLING for details.
+See: src/imm/README.NO_DANGLING for details.
Support search for objects having NO_DANGLING refrence to a target (4.4)
========================================================================
@@ -1756,7 +1756,7 @@ for finding all objects that have a NO_DANGLING reference
to a provided
target. This feature is available for clients that register with imm API
version A.2.13.
-See: osaf/services/saf/immsv/README.NO_DANGLING for details.
+See: src/imm/README.NO_DANGLING for details.
Support for saImmOmCcbAbort() and saImmOmCcbValidate() (4.5)
@@ -2111,14 +2111,14 @@ This enhancement is mainly intended to assist the
maintainers
of OpenSAF in troubleshouting resource/performance issues.
It is not intended to be an end-user utility.
-See: osaf/services/saf/immsv/README.RESOURCE_DISPLAY for details.
+See: src/imm/README.RESOURCE_DISPLAY for details.
#938 IMM Access control (4.5)
=============================
http://sourceforge.net/p/opensaf/tickets/938/
OpenSAF 4.5 adds the immsv enhancement of supporting access control of imma
clients.
-See: osaf/services/saf/immsv/README.ACCESS_CONTROL for details.
+See: src/imm/README.ACCESS_CONTROL for details.
Notes on upgrading from OpenSAF 4.[1,2,3,4] to OpenSAF (4.5)
@@ -2333,7 +2333,7 @@ IMM API that replaces SaNameT with SaStringT and
SA_IMM_ATTR_DN (4.6)
=====================================================================
http://sourceforge.net/p/opensaf/tickets/643
-See: osaf/services/saf/immsv/README.SASTRINGT_API for details.
+See: src/imm/README.SASTRINGT_API for details.
Notes on upgrading from OpenSAF 4.[1,2,3,4,5] to OpenSAF (4.6)
@@ -2777,7 +2777,7 @@ provided during absent SC depends on the particular
service. In the case
of the IMM service, the service provided during SC absence is in essence
only the reading of config data.
-See: osaf/services/saf/immsv/README.SC_ABSENCE for details.
+See: src/imm/README.SC_ABSENCE for details.
Add attribute definition flag SA_IMM_ATTR_STRONG_DEFAULT (5.0)
@@ -3166,7 +3166,7 @@ The most important data structures for the IMMA library
are:
IMMA_CB.imma_continuations: Collection of IMMA_CONTINUATION_RECORDs
Common message types and message layouts are found under
-osaf/libs/common/immsv/include in the files immsv_evt.h and immsv_evt_model.h
+src/imm/common in the files immsv_evt.h and immsv_evt_model.h
STATE MACHINES
@@ -3312,8 +3312,8 @@ the pieces that may have resulted from log rotation of
the trace stream.
TEST
-Currently a "tetware like" test suite can be found in 'tests/immsv/'.
-See tests/immsv/README for instructions.
+Currently a "tetware like" test suite can be found in 'src/imm/apitest/'.
+See src/imm/apitest/README for instructions.
TODO
diff --git a/src/imm/apitest/README b/src/imm/apitest/README
index 77e6182fb..b12541bff 100644
--- a/src/imm/apitest/README
+++ b/src/imm/apitest/README
@@ -23,7 +23,8 @@ test the API extensively. Checking all possible error
conditions etc.
The test suite is not distributed but can of course be run on every node in
the system which kind of makes it distributed.
-The IMM test suite uses the unit test framework in OpenSAF
(tests/unit_test_fw).
+The IMM test suite uses GoogleTest/GoogleMock, configured through GTEST_DIR and
+GMOCK_DIR as described in the top-level unit-test documentation.
There are two independent suites for management and implementer respectively.
diff --git a/src/imm/immd/immd.conf b/src/imm/immd/immd.conf
index a5b327314..460dc73e9 100644
--- a/src/imm/immd/immd.conf
+++ b/src/imm/immd/immd.conf
@@ -1,5 +1,5 @@
# This file contains configuration for the SAF IMM service
-# See the file osaf/services/saf/immsv/README for more configuration options.
+# See the file src/imm/README for more configuration options.
# Uncomment the next line if you want to run immd through valgrind
#export IMMDTOOL="valgrind --leak-check=full --log-file=/tmp/immd.valgrind"
diff --git a/src/imm/immnd/immnd.conf b/src/imm/immnd/immnd.conf
index 7d54371a5..ec2ec8c1d 100644
--- a/src/imm/immnd/immnd.conf
+++ b/src/imm/immnd/immnd.conf
@@ -1,5 +1,5 @@
# This file contains configuration for the SAF IMM service
-# See the file osaf/services/saf/immsv/README for more configuration options.
+# See the file src/imm/README for more configuration options.
# Uncomment the next line if you want to run immnd through valgrind
#export IMMNDTOOL="valgrind --leak-check=full --log-file=/tmp/immnd.valgrind"
diff --git a/src/imm/immnd/immnd_mds.c b/src/imm/immnd/immnd_mds.c
index 97bb807b9..c5b584625 100644
--- a/src/imm/immnd/immnd_mds.c
+++ b/src/imm/immnd/immnd_mds.c
@@ -66,7 +66,7 @@ SaAisErrorT immnd_mds_client_not_busy(IMMSV_SEND_INFO *s_info)
It could also happen if one handle is used concurrently
by several client threads, making concurrent synchronous calls.
- This is not allowed though, see osaf/services/saf/immsv/README.
+ This is not allowed though, see src/imm/README.
*/
if (s_info->mSynReqCount < 255) {
diff --git a/src/imm/immpbed/immpbe_daemon.cc b/src/imm/immpbed/immpbe_daemon.cc
index ad6383775..6c6f6f9a6 100644
--- a/src/imm/immpbed/immpbe_daemon.cc
+++ b/src/imm/immpbed/immpbe_daemon.cc
@@ -218,7 +218,7 @@ ccb_abort:
slave, the opposite is (almost) true. The RTO thread will execute all sqlite
access, except for one important case, explained below. Second,
pbeBeginTrans() and pbeCommitTrans() implement a spinlock, see
- osaf/libs/common/immsv/immpbe_dump.cc. Thus interference is detected before
+ src/imm/common/immpbe_dump.cc. Thus interference is detected before
any transactional operations are allowed to begin. Third, at the slave, the
only sqlite operation performed by the main thread is the commit of an
sqlite
transaction for a regular CCB. The start of the sqlite transaction for a
diff --git a/src/log/README b/src/log/README
index d38bb708b..f0306fcd2 100644
--- a/src/log/README
+++ b/src/log/README
@@ -18,7 +18,7 @@
GENERAL
=======
-This directory (logsv) contains an implementation of the SAF LOG service
+This directory (src/log) contains an implementation of the SAF LOG service
version A.02.01.
The LOG service is implemented as a server process executing on the controllers
@@ -49,12 +49,11 @@ logsv depends of the following other OpenSAF services:
DIRECTORY STRUCTURE
===================
-services/logsv/inc Common header files used by both lga and lgs
-services/logsv/lga LOG library implementation
-services/logsv/lgs LOG server
-services/logsv/utils saflogger command
-lib/lib_SaLog LOG library staging
-tests/logsv/src Test suite
+src/log/common Common header files used by both lga and lgs
+src/log/agent LOG library implementation
+src/log/logd LOG server
+src/log/tools saflogger command
+src/log/apitest Test suite
DATA STRUCTURES
@@ -377,7 +376,7 @@ For fatal errors syslog is used.
TEST
====
-Currently a simple unit test can be found in 'tests/logsv/src'. The test suite
+Currently a simple unit test can be found in 'src/log/apitest'. The test suite
is built by the main make system and is either install by 'make install' or by
installing the tools rpm.
diff --git a/src/log/README_LONGDN b/src/log/README_LONGDN
index 04928d004..21042d1f7 100644
--- a/src/log/README_LONGDN
+++ b/src/log/README_LONGDN
@@ -43,7 +43,7 @@ II) IMPLEMENTATION (#1315)
1) saflogger Tool - Option `-f`
-------------------------------------------------
-Refer to `~/osaf/tools/saflog/saflogger/README` for information.
+Refer to `~/src/log/tools/README` for information.
2) LOG Agent
@@ -124,11 +124,10 @@ places using strcpy()
4) Test Cases
-----------------------------
-Refer to `~/tests/logsv/README` for information.
+Refer to `~/src/log/apitest` for information.
III. REFERENCES
=======================
1) OpenSAF_Extensions_PR.odt
-
diff --git a/src/log/apitest/README b/src/log/apitest/README
index e31803227..ff6e4e6ae 100644
--- a/src/log/apitest/README
+++ b/src/log/apitest/README
@@ -73,5 +73,4 @@ are set to make sure the long DN work.
Users can refer to these test cases to see how to pass long DN data to LOG
APIs,
and what are precondition settings for using extended SaNameT.
-These test cases are located in the file `~/tests/logsv/tet_log_longDN.c`
-
+These test cases are located in the file `~/src/log/apitest/tet_log_longDN.c`
diff --git a/src/log/logd/logd.conf b/src/log/logd/logd.conf
index a9d3273b7..a4ee99bd9 100644
--- a/src/log/logd/logd.conf
+++ b/src/log/logd/logd.conf
@@ -1,5 +1,5 @@
# This file contains configuration for the SAF LOG service
-# See the file osaf/services/saf/logsv/README for more configuration options.
+# See the file src/log/README for more configuration options.
#NOTE! Environment variables defined in this file,
# except LGSV_ENV_HEALTHCHECK_KEY,
# will not be used if an object of the OpenSafLogConfig class exists in
IMM.
diff --git a/src/ntf/README b/src/ntf/README
index 155d00ba1..3f673b357 100644
--- a/src/ntf/README
+++ b/src/ntf/README
@@ -16,7 +16,7 @@
#
GENERAL
-This directory (services/ntfsv) contains an implementation of the SAF
+This directory (src/ntf) contains an implementation of the SAF
Notification Service version A.01.01.
Application programmers intending to interface with ntfsv should primarily read
@@ -97,16 +97,15 @@ ntfsv depends of the following other OpenSAF services:
DIRECTORY STRUCTURE
-osaf/libs/common/ntfsv/include/ Common header files used by both ntfa
and ntfs,
+src/ntf/common/ Common header files used by both ntfa
and ntfs,
implementation used by both server and library.
-osaf/libs/agents/saf/ntfa ntf library implementation
-osaf/services/saf/ntfsv/ntfs ntf server
-osaf/services/saf/ntfsv/ntfimcnd ntfimcn deamon
-osaf/tools/safntf/ntfsend ntfsend ntfsubscribe command
-osaf/tools/safntf/ntfsubscribe ntfsubscribe command
-osaf/tools/safntf/ntfread ntfread command
-osaf/libs/saf/libSaNtf NTF library staging
-tests/ntfsv Test suite
+src/ntf/agent NTF library implementation
+src/ntf/ntfd NTF server
+src/ntf/ntfimcnd NTF IMCN daemon
+src/ntf/tools/ntfsend ntfsend command
+src/ntf/tools/ntfsubscribe ntfsubscribe command
+src/ntf/tools/ntfread ntfread command
+src/ntf/apitest Test suite
MAIN FILES
ntfs:
@@ -295,7 +294,7 @@ the pieces that may have resulted from log rotation of the
trace stream.
TEST
-Currently a simple unit test can be found in 'tests/ntfsv'. The test suite
+Currently a simple unit test can be found in 'src/ntf/apitest'. The test suite
is built by the main make system and is either install by 'make install' or by
installing the tools rpm.
@@ -365,7 +364,7 @@ Changes at NTFA (NTF-CLM integration):
Other Changes and tests (NTF-CLM integration):
===================================
1)SAF version of commands ntfread, ntfsend and ntfsubscribe is now updated to
A.01.02.
-2)New file tests/ntfsv/tet_ntf_clm.c contains tests for this functionality.
For running
+2)New file src/ntf/apitest/tet_ntf_clm.cc contains tests for this
functionality. For running
these tests atleast two nodes are required as CLM admin operation are not
supported on active
controller. These tests are not included in the testlist if run on active
controller.
@@ -393,4 +392,3 @@ Reader API
CONTRIBUTORS/MAINTAINERS
Arne Eriksson <[email protected]>
Hans Feldt
-
diff --git a/src/ntf/apitest/README b/src/ntf/apitest/README
index 4532340e6..cb960a3ac 100644
--- a/src/ntf/apitest/README
+++ b/src/ntf/apitest/README
@@ -25,7 +25,7 @@ A few things must be done in order to activate PBE:
(1) configure the build with --enable-imm-pbe flag (configure --enable-imm-pbe)
-(2) edit the osaf/services/saf/immsv/config/immnd.conf file.
+(2) edit the src/imm/immnd/immnd.conf file.
uncomment the three environment variables IMMSV_ROOT_DIRECTORY, IMMSV_LOAD_FILE
and IMMSV_PBE_FILE.
diff --git a/src/ntf/ntfd/ntfd.conf b/src/ntf/ntfd/ntfd.conf
index 8df0fbf13..a6e67f50c 100644
--- a/src/ntf/ntfd/ntfd.conf
+++ b/src/ntf/ntfd/ntfd.conf
@@ -1,5 +1,5 @@
# This file contains configuration for the SAF NTF service
-# See the file osaf/services/saf/ntfsv/README for more configuration options.
+# See the file src/ntf/README for more configuration options.
# Uncomment the next line if you want to run the log server through valgrind
#export TOOL="valgrind --leak-check=full
--log-file=$pkglogdir/$osafservice.%p.valgrind --trace-children=yes"
@@ -56,4 +56,3 @@ export NTFSV_ENV_HEALTHCHECK_KEY="Default"
# The default timeout is 10s, uncomment the next line to configure the logger
recored timeout.
# The range can be configure from 5s to 30s.
# export NTFSV_LOGGER_RECORD_TIMEOUT=10
-
diff --git a/src/plm/README b/src/plm/README
index 85ffbca15..200d990ab 100644
--- a/src/plm/README
+++ b/src/plm/README
@@ -32,7 +32,7 @@ CONTENTS:
GENERAL
-------
-This directory (services/plmsv) contains an implementation of the SAF-AIS-PLM
+This directory (src/plm) contains an implementation of the SAF-AIS-PLM
service version A.01.02.
Application programmers intending to interface with plmsv should primarily read
@@ -112,24 +112,23 @@ libplmsv_common.so
DIRECTORY STRUCTURE
-------------------
-Agent code can be found in
-osaf/libs/agents/saf/plma
-osaf/libs/common/plmsv ( common to agent and server )
+Agent code can be found in
+src/plm/agent
+src/plm/common (common to agent and server)
Include files are located under
-osaf/libs/saf/include
-osaf/libs/common/plmsv/include
+src/ais/include
+src/plm/common
-PLMC code
-contrib/plmc
+PLMC code
+src/plm/plmcd
PLMS code
-osaf/libs/common/plmsv/plms
-osaf/services/saf/plmsv/plms
-osaf/libs/common/plmsv
+src/plm/plmd
+src/plm/common
config files under
-osaf/services/saf/plmsv/config
+src/plm/config
BUILD PROCEDURE
---------------
@@ -169,7 +168,7 @@ libraries installed on the target before starting opensaf.
TEST CODE
---------
-Sample test code can be found in directory tests/plmsv/plms.
+Sample test code can be found in directory src/plm/apitest.
Invoke make command
Please find the built executable plmtest.
Please note that this has dependency on opensaf core, libSaPlm.so and
diff --git a/src/plm/apitest/README b/src/plm/apitest/README
index 5a423277c..5d6f6a3a4 100644
--- a/src/plm/apitest/README
+++ b/src/plm/apitest/README
@@ -20,7 +20,8 @@
This directory tree contains a unit test suite for PLM A.01.02. The goal is to
test the API extensively. Checking all possible error conditions etc.
-The PLM test suite uses the unit test framework in OpenSAF
(tests/unit_test_fw).
+The PLM test suite uses GoogleTest/GoogleMock, configured through GTEST_DIR and
+GMOCK_DIR as described in the top-level unit-test documentation.
2. Building and installing
diff --git a/src/plm/plmd/plmd.conf b/src/plm/plmd/plmd.conf
index 6701c3756..34e9a58b6 100644
--- a/src/plm/plmd/plmd.conf
+++ b/src/plm/plmd/plmd.conf
@@ -1,5 +1,5 @@
# This file contains configuration for the SAF PLM service
-# See the file services/plmsv/README for more configuration options.
+# See the file src/plm/README for more configuration options.
# Uncomment the next line if you want to run plms through valgrind
#export PLMSTOOL="valgrind --leak-check=full --log-file=/tmp/plms.valgrind"
diff --git a/src/smf/README b/src/smf/README
index fffc00301..ca328318c 100644
--- a/src/smf/README
+++ b/src/smf/README
@@ -17,7 +17,7 @@
GENERAL
=======
-This directory (smfsv) contains an implementation of the SAF SMF service
+This directory (src/smf) contains an implementation of the SAF SMF service
version A.01.02.
The SMF service is implemented as a director process (smfd) executing on the
controllers
@@ -57,14 +57,13 @@ smfsv depends of the following other OpenSAF services:
DIRECTORY STRUCTURE
===================
-services/saf/smfsv/config Configuration files
-services/saf/smfsv/doc SMF code documentation
-services/saf/smfsv/schema XML schema files
-services/saf/smfsv/scripts SMF script files
-services/saf/smfsv/smfd SMF director implementation
-services/saf/smfsv/smfnd SMF node director implementation
-libs/agents/saf/smfa SMF Agent implementation
-libs/common/smfsv/include/ Common include files between smfd and
smfnd
+src/smf/config Configuration files
+src/smf/README* SMF code documentation
+src/smf/scripts SMF script files
+src/smf/smfd SMF director implementation
+src/smf/smfnd SMF node director implementation
+src/smf/agent SMF Agent implementation
+src/smf/common Common include files between smfd and smfnd
FILE STRUCTURE
==============
diff --git a/src/smf/smfd/smfd.conf b/src/smf/smfd/smfd.conf
index c9b7a7f03..ae69a35f0 100644
--- a/src/smf/smfd/smfd.conf
+++ b/src/smf/smfd/smfd.conf
@@ -1,5 +1,5 @@
# This file contains configuration for the SMFD service
-# See the file services/smfsv/README for more configuration options.
+# See the file src/smf/README for more configuration options.
# Uncomment the next line if you want to run through valgrind
#export TOOL="valgrind --leak-check=full --log-file=/tmp/log.valgrind"
diff --git a/src/smf/smfnd/smfnd.conf b/src/smf/smfnd/smfnd.conf
index 9382da5ef..3152c18ef 100644
--- a/src/smf/smfnd/smfnd.conf
+++ b/src/smf/smfnd/smfnd.conf
@@ -1,5 +1,5 @@
# This file contains configuration for the SMFND service
-# See the file services/smfsv/README for more configuration options.
+# See the file src/smf/README for more configuration options.
# Uncomment the next line if you want to run through valgrind
#export TOOL="valgrind --leak-check=full --log-file=/tmp/log.valgrind"
--
2.34.1
The information in this email is confidential and may be legally privileged. It
is intended solely for the addressee. Any opinions expressed are mine and do
not necessarily represent the opinions of the Company. Emails are susceptible
to interference. If you are not the intended recipient, any disclosure,
copying, distribution or any action taken or omitted to be taken in reliance on
it, is strictly prohibited and may be unlawful. If you have received this
message in error, do not open any attachments but please notify the Endava
Service Desk on (+44 (0)870 423 0187), and delete this message from your
system. The sender accepts no responsibility for information, errors or
omissions in this email, or for its use or misuse, or for any act committed or
omitted in connection with this communication. If in doubt, please verify the
authenticity of the contents with the sender. Please rely on your own virus
checkers as no responsibility is taken by the sender for any damage rising out
of any bug or virus infection.
Endava plc is a company registered in England under company number 5722669
whose registered office is at 125 Old Broad Street, London, EC2N 1AR, United
Kingdom. Endava plc is the Endava group holding company and does not provide
any services to clients. Each of Endava plc and its subsidiaries is a separate
legal entity and has no liability for another such entity's acts or omissions.
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
