src/log/Makefile.am | 4 +-
src/log/apitest/tet_LogOiOps.c | 8 +-
src/log/apitest/tet_cfg_destination.c | 483 ++++++++++++++++++++++++++++++++++
3 files changed, 490 insertions(+), 5 deletions(-)
Major changes:
1) Modify Lennart's test cases because enhancing destination
configuration validation rules.
2) Add test suite #17 to verify alternative destination
diff --git a/src/log/Makefile.am b/src/log/Makefile.am
--- a/src/log/Makefile.am
+++ b/src/log/Makefile.am
@@ -183,7 +183,9 @@ bin_logtest_SOURCES = \
src/log/apitest/tet_Log_recov.c \
src/log/apitest/tet_log_runtime_cfgobj.c \
src/log/apitest/tet_log_longDN.c \
- src/log/apitest/tet_Log_clm.c
+ src/log/apitest/tet_Log_clm.c \
+ src/log/apitest/tet_cfg_destination.c
+
bin_logtest_LDADD = \
lib/libapitest.la \
diff --git a/src/log/apitest/tet_LogOiOps.c b/src/log/apitest/tet_LogOiOps.c
--- a/src/log/apitest/tet_LogOiOps.c
+++ b/src/log/apitest/tet_LogOiOps.c
@@ -1923,7 +1923,7 @@ void check_logRecordDestinationConfigura
do {
// Add values
for (int i = 0; i < num_values; i++) {
- sprintf(set_values[i], "Name%d;Type%d;Setting%d", i, i,
i);
+ sprintf(set_values[i], "Name%d;localsocket;Setting%d",
i, i);
sprintf(command, "immcfg "
"-a logRecordDestinationConfiguration+="
"'%s' "
@@ -1979,7 +1979,7 @@ void check_logRecordDestinationConfigura
do {
// Add values
for (int i = 0; i < num_values; i++) {
- sprintf(set_values[i], "Name%d;Type%d;Setting%d", i, i,
i);
+ sprintf(set_values[i], "Name%d;localsocket;Setting%d",
i, i);
sprintf(command, "immcfg "
"-a logRecordDestinationConfiguration+="
"'%s' "
@@ -2067,7 +2067,7 @@ void check_logRecordDestinationConfigura
do {
// Add values that will be replaced
for (int i = 0; i < num_values; i++) {
- sprintf(set_values[i], "Name%d;Type%d;Setting%d", i, i,
i);
+ sprintf(set_values[i], "Name%d;localsocket;Setting%d",
i, i);
sprintf(command, "immcfg "
"-a logRecordDestinationConfiguration+="
"'%s' "
@@ -2094,7 +2094,7 @@ void check_logRecordDestinationConfigura
int num_new_values = 3;
for (int i = 0; i < num_new_values; i++) {
sprintf(set_values[i],
- "NewName%d;NewType%d;NewSetting%d", i, i, i);
+ "NewName%d;localsocket;NewSetting%d", i, i);
}
sprintf(command, "immcfg "
"-a logRecordDestinationConfiguration='%s' "
diff --git a/src/log/apitest/tet_cfg_destination.c
b/src/log/apitest/tet_cfg_destination.c
new file mode 100644
--- /dev/null
+++ b/src/log/apitest/tet_cfg_destination.c
@@ -0,0 +1,483 @@
+/* -*- OpenSAF -*-
+ *
+ * (C) Copyright 2017 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): Ericsson AB
+ *
+ */
+
+#include "log/apitest/logtest.h"
+
+// These test cases are for testing #2258 - alternative destinations
+
+//==============================================================================
+// Validate `logRecordDestinationConfiguration`
+//==============================================================================
+const char validDest[] = "desta;localsocket;/var/lib/opensaf/mds_log.sock";
+// Multi destinations
+const char multiDest1[] = "desta;localsocket;/var/lib/opensaf/mds_log.sock";
+const char multiDest2[] = "destb;localsocket;/var/lib/opensaf/local.sock";
+// Delete destination
+const char delDest[] = "";
+// NIL destination configution.
+const char nildest[] = "destc;localsocket;";
+
+//>
+// Abnormal cases
+//<
+// Only destination type = "unix" is supported.
+const char invalidTypeDest[] = "test;invalid;/var/lib/opensaf/mds_log.sock";
+// "name" & "type" must have at least.
+const char invalidFmtDest[] = "test";
+// "name" must not contain special characters
+const char invalidNameDest[] = "destA?abc;localsocket;";
+// Same "name" must go with same "dest" and vice versa.
+const char invalidDuplicatedDest[] =
+ "destb;localsocket;/var/lib/opensaf/mds_log.sock";
+const char nilname[] = "destc";
+
+// Configure destination command
+const char cfgObjDn[] = "logConfig=1,safApp=safLogService";
+const char cmd[] = "immcfg -a logRecordDestinationConfiguration";
+
+// Verify it is OK to set an valid destination.
+void cfgOneValidDest(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s", cmd, validDest, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ }
+ rc_validate(WEXITSTATUS(rc), 0);
+}
+
+// Verify it is OK to set multi valid destinations.
+void cfgMultiValidDest(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s", cmd, multiDest1, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // Multiple configuration
+ sprintf(command,"%s+=\"%s\" %s", cmd, multiDest2, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ }
+ rc_validate(WEXITSTATUS(rc), 0);
+}
+
+// Verify it is OK to delete one destination.
+void delOneDest(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s", cmd, multiDest1, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // Add multiple configuration
+ sprintf(command,"%s+=\"%s\" %s", cmd, multiDest2, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // Delete one configuration
+ sprintf(command,"%s-=\"%s\" %s", cmd, multiDest2, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ }
+ rc_validate(WEXITSTATUS(rc), 0);
+}
+
+// Verify it is OK to delete destinations
+void delCfgDest(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s= %s", cmd, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ }
+ rc_validate(WEXITSTATUS(rc), 0);
+}
+
+// Verify it is NOK to set type different from "unix"
+void invalidTypeDestFn(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s 2> /dev/null",
+ cmd, invalidTypeDest, cfgObjDn);
+ rc = system(command);
+ rc_validate(WEXITSTATUS(rc), 1);
+}
+
+// Verify it is NOK to set wrong destination format
+// Note: right format is one that have at least "name" and "type"
+void invalidFmtDestFn(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s 2> /dev/null",
+ cmd, invalidFmtDest, cfgObjDn);
+ rc = system(command);
+ rc_validate(WEXITSTATUS(rc), 1);
+}
+
+// Verify it is NOK to set configuration with name contain special character
+void invalidNameDestFn(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s 2> /dev/null",
+ cmd, invalidNameDest, cfgObjDn);
+ rc = system(command);
+ rc_validate(WEXITSTATUS(rc), 1);
+}
+
+// Verify it is NOK to have destination configuration duplicated.
+// The rule is same "name" must go with same "value", and vice versa.
+void duplicatedDestFn(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s", cmd, multiDest1, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ sprintf(command,"%s+=\"%s\" %s 2> /dev/null",
+ cmd, invalidDuplicatedDest, cfgObjDn);
+ rc = system(command);
+ rc_validate(WEXITSTATUS(rc), 1);
+}
+
+//==============================================================================
+// These test cases are used to test `saLogRecordDestination`
+//==============================================================================
+const char validName[] = "desta";
+const char multiName[] = "test2";
+
+// Invalid name
+const char invalidName[] = "te?st";
+
+// Configure destination name command
+const char systemDN[] = "safLgStrCfg=saLogSystem,safApp=safLogService";
+const char cmdName[] = "immcfg -a saLogRecordDestination";
+
+// Verify it is OK to set an valid destination name
+void cfgOneDestName(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s", cmdName, validName, systemDN);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ }
+ rc_validate(WEXITSTATUS(rc), 0);
+}
+
+// Verify it is OK to set multiple destination names
+void cfgMultiDestName(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s", cmdName, validName, systemDN);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ sprintf(command,"%s+=\"%s\" %s", cmdName, multiName, systemDN);
+ rc = system(command);
+ rc_validate(WEXITSTATUS(rc), 0);
+}
+
+// Verify it is OK to clear destination name
+void delDestName(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s= %s", cmdName, systemDN);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ }
+ rc_validate(WEXITSTATUS(rc), 0);
+}
+
+// Verify it is NOK to set an invalid destination name
+// Rule: invalid means having special characters in its name
+void invalidDestName(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+
+ sprintf(command,"%s=\"%s\" %s 2>/dev/null", cmdName, invalidName,
systemDN);
+ rc = system(command);
+ rc_validate(WEXITSTATUS(rc), 1);
+}
+
+//==============================================================================
+// Send Log record to one configured destination
+//==============================================================================
+//
+// 1) Configure an valid destination to configurable object
+// 2) Configure an valid destination name to system log stream
+// 3) Send an log record to the system log stream
+// 4) Wait a bit for msg come to the end (guess number)
+// 5) Verify if RFC syslog comes to the receiver
+// Note:
+// Use MDS log server as an receiver.
+//
+const char sendMsg[] = "writing a record to destination";
+const char sendCmd[] = "saflogger -y";
+const char mdsLogPath[] = "/var/log/opensaf/mds.log";
+// Verify if the record comes to destination or not
+void writeToDest(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+ bool disable_stdout = true;
+ SaConstStringT s_stdout = "1> /dev/null";
+
+ if (getenv("LOGTEST_ENABLE_STDOUT")) disable_stdout = false;
+
+ // 1) Configure an valid destination
+ sprintf(command,"%s=\"%s\" %s", cmd, validDest, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // 2) Configure an valid destination name
+ sprintf(command,"%s=\"%s\" %s", cmdName, validName, systemDN);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // Avoid getting old msg
+ int r = rand();
+
+ // 3) Send an log record to system log stream
+ sprintf(command,"%s \"%s_%d\"", sendCmd, sendMsg, r);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // 5) Verify if that sent msg comes to the end
+ sprintf(command,"grep \"%s_%d\" %s %s", sendMsg, r, mdsLogPath,
+ disable_stdout ? s_stdout : "");
+
+ int count = 0;
+tryagain:
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ sleep(1); count++;
+ if (count < 20) {
+ goto tryagain;
+ } else {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ }
+ }
+ rc_validate(WEXITSTATUS(rc), 0);
+}
+
+// Verify if the record comes to destination or not
+// if no destination name set
+const char sendMsgNoDest[] = "[No dest name set] writing a record to
destination";
+void writeToNoDestName(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+ bool disable_stdout = true;
+ SaConstStringT s_stdout = "1> /dev/null";
+
+ if (getenv("LOGTEST_ENABLE_STDOUT")) disable_stdout = false;
+
+ // 1) Configure an valid destination
+ sprintf(command,"%s=\"%s\" %s", cmd, validDest, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // 2) Delete Destination name
+ sprintf(command,"%s= %s", cmdName, systemDN);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // Avoid getting old msg
+ int r = rand();
+
+ // 3) Send an log record to system log stream
+ sprintf(command,"%s \"%s_%d\"", sendCmd, sendMsg, r);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // 4) Sleep for a while (5s) as mds log server could busy
+ // handling log comming from other OpenSAF components
+ sleep(2);
+
+ // 5) Verify if that sent msg comes to the end
+ sprintf(command,"grep \"%s_%d\" %s %s", sendMsgNoDest, r, mdsLogPath,
+ disable_stdout ? s_stdout : "");
+ rc = system(command);
+ if (WEXITSTATUS(rc) == 0) {
+ fprintf(stderr, "log record is written to local file\n");
+ }
+ rc_validate(WEXITSTATUS(rc), 1);
+}
+
+// Verify if the record comes to destination or not
+// if destination name is set but no destination configured to that name.
+const char sendMsgNil[] = "[Dest name with nil configuration] writing a record
to destination";
+void writeToNilDestCfg(void)
+{
+ SaAisErrorT rc;
+ char command[1000];
+ bool disable_stdout = true;
+ SaConstStringT s_stdout = "1> /dev/null";
+
+ if (getenv("LOGTEST_ENABLE_STDOUT")) disable_stdout = false;
+
+ // 1) Configure an valid destination
+ sprintf(command,"%s=\"%s\" %s", cmd, validDest, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // 2) Add a nil destination
+ sprintf(command,"%s+=\"%s\" %s", cmd, nildest, cfgObjDn);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // 3) Add destination name with nil destination configuation.
+ sprintf(command,"%s=\"%s\" %s", cmdName, nilname, systemDN);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // Avoid getting old msg
+ int r = rand();
+
+ // 4) Send an log record to system log stream
+ sprintf(command,"%s \"%s_%d\"", sendCmd, sendMsg, r);
+ rc = system(command);
+ if (WEXITSTATUS(rc) != 0) {
+ fprintf(stderr, "Failed to perform cmd %s\n", command);
+ rc_validate(WEXITSTATUS(rc), 0);
+ return;
+ }
+
+ // 4) Sleep for a while (2s) as mds log server could busy
+ // handling log comming from other OpenSAF components
+ sleep(2);
+
+ // 5) Verify if that sent msg comes to the end
+ sprintf(command,"grep \"%s_%d\" %s %s", sendMsgNil, r, mdsLogPath,
+ disable_stdout ? s_stdout : "");
+ rc = system(command);
+ if (WEXITSTATUS(rc) == 0) {
+ fprintf(stderr, "log record is written to local file\n");
+ }
+ rc_validate(WEXITSTATUS(rc), 1);
+}
+
+__attribute__ ((constructor)) static void cfgDest_constructor(void)
+{
+ /* Test suite for testing #2258 */
+ // Normal test cases verify `logRecordDestinationConfiguration`
+ test_suite_add(17, "LOG OI tests, configure alternative destinations");
+ test_case_add(17, cfgOneValidDest, "Configure one valid destination,
OK");
+ test_case_add(17, cfgMultiValidDest, "Configure multi valid
destinations, OK");
+ test_case_add(17, delOneDest, "Delete one destinations, OK");
+ test_case_add(17, delCfgDest, "Delete all configure, OK");
+ // Abnormal test cases
+ test_case_add(17, invalidTypeDestFn, "Set destination with invalid
type, NOK");
+ test_case_add(17, invalidFmtDestFn, "Set destination with invalid
format, NOK");
+ test_case_add(17, invalidNameDestFn, "Set destination with invalid
name, NOK");
+ test_case_add(17, duplicatedDestFn, "Set destination with duplicated
info, NOK");
+ // Normal test cases verify `saLogRecordDestination`
+ test_case_add(17, cfgOneDestName, "Configure one valid destination
name, OK");
+ test_case_add(17, cfgMultiDestName, "Configure multi valid destination
names, OK");
+ test_case_add(17, delDestName, "Delete all destination names, OK");
+ // Abnormal
+ test_case_add(17, invalidDestName, "Configure an invalid destination
name, NOK");
+ // Write log record to destination
+ test_case_add(17, writeToDest, "Write a log record to destination, OK");
+ test_case_add(17, writeToNoDestName, "Write to stream with no
destination name set, OK");
+ test_case_add(17, writeToNilDestCfg, "Write to stream with destination
name set but nil cfg, OK");
+}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
