Ack Thanks Lennart
> -----Original Message----- > From: Vu Minh Nguyen [mailto:[email protected]] > Sent: den 30 september 2015 11:08 > To: [email protected]; Lennart Lund; Giang Do T > Cc: [email protected] > Subject: [PATCH 1 of 1] logsv: fix cannot set saLogStreamSeverityFilter value > back to default one (127) [#1395] > > osaf/services/saf/logsv/lgs/lgs_imm.c | 4 ++-- > tests/logsv/tet_LogOiOps.c | 24 ++++++++++++------------ > 2 files changed, 14 insertions(+), 14 deletions(-) > > > logsv did validate the value incorrectly (>= 127) instead of (> 127). > > diff --git a/osaf/services/saf/logsv/lgs/lgs_imm.c > b/osaf/services/saf/logsv/lgs/lgs_imm.c > --- a/osaf/services/saf/logsv/lgs/lgs_imm.c > +++ b/osaf/services/saf/logsv/lgs/lgs_imm.c > @@ -1558,11 +1558,11 @@ static SaAisErrorT check_attr_validity(S > } > > /* saLogStreamSeverityFilter > - * < 0x7f > + * <= 0x7f > */ > if (i_severityFilter_mod) { > TRACE("Checking > saLogStreamSeverityFilter"); > - if (i_severityFilter >= 0x7f) { > + if (i_severityFilter > 0x7f) { > > report_oi_error(immOiHandle, opdata->ccbId, > > "Invalid severity: %x", i_severityFilter); > rc = > SA_AIS_ERR_BAD_OPERATION; > diff --git a/tests/logsv/tet_LogOiOps.c b/tests/logsv/tet_LogOiOps.c > --- a/tests/logsv/tet_LogOiOps.c > +++ b/tests/logsv/tet_LogOiOps.c > @@ -1259,7 +1259,7 @@ void saLogOi_64(void) > * ***************************/ > > /** > - * Create: saLogStreamSeverityFilter < 0x7f, Ok > + * Create: saLogStreamSeverityFilter <= 0x7f, Ok > */ > void saLogOi_65(void) > { > @@ -1269,7 +1269,7 @@ void saLogOi_65(void) > sprintf(command, "immcfg -c SaLogStreamConfig " > "safLgStrCfg=str6,safApp=safLogService -a > saLogStreamSeverityFilter=%d" > " -a saLogStreamFileName=str6file -a > saLogStreamPathName=.", > - 0x7e); > + 0x7f); > rc = system(command); > > sprintf(command,"immcfg -d > safLgStrCfg=str6,safApp=safLogService"); > @@ -1279,7 +1279,7 @@ void saLogOi_65(void) > } > > /** > - * Create: saLogStreamSeverityFilter >= 0x7f, ERR > + * Create: saLogStreamSeverityFilter > 0x7f, ERR > */ > void saLogOi_66(void) > { > @@ -1289,7 +1289,7 @@ void saLogOi_66(void) > sprintf(command, "immcfg -c SaLogStreamConfig " > "safLgStrCfg=str6,safApp=safLogService -a > saLogStreamSeverityFilter=%d" > " -a saLogStreamFileName=str6file -a > saLogStreamPathName=. 2> /dev/null", > - 0x7f); > + 0x7f + 1); > rc = system(command); > rc_validate(WEXITSTATUS(rc), 1); > } > @@ -1565,7 +1565,7 @@ void saLogOi_78(void) > * ***************************/ > > /** > - * Modify: saLogStreamSeverityFilter < 0x7f, Ok > + * Modify: saLogStreamSeverityFilter <= 0x7f, Ok > */ > void saLogOi_100(void) > { > @@ -1582,7 +1582,7 @@ void saLogOi_100(void) > /* Test modify */ > sprintf(command, "immcfg -a saLogStreamSeverityFilter=%d " > "safLgStrCfg=str6,safApp=safLogService", > - 0x7e); > + 0x7f); > rc = system(command); > /* Delete */ > sprintf(command,"immcfg -d > safLgStrCfg=str6,safApp=safLogService"); > @@ -1593,7 +1593,7 @@ void saLogOi_100(void) > } > > /** > - * Modify: saLogStreamSeverityFilter >= 0x7f, ERR > + * Modify: saLogStreamSeverityFilter > 0x7f, ERR > */ > void saLogOi_101(void) > { > @@ -1611,7 +1611,7 @@ void saLogOi_101(void) > sprintf(command, "immcfg -a saLogStreamSeverityFilter=%d" > " safLgStrCfg=str6,safApp=safLogService" > " 2> /dev/null", > - 0x7f); > + 0x7f + 1); > rc = system(command); > /* Delete */ > sprintf(command,"immcfg -d > safLgStrCfg=str6,safApp=safLogService"); > @@ -3368,8 +3368,8 @@ void verCCBWithInvalidValues(void) > /* Stream configuration object */ > /* Tests for create */ > test_suite_add(6, "LOG OI tests, Stream configuration object > attribute validation"); > - test_case_add(6, saLogOi_65, "Create: > saLogStreamSeverityFilter < 0x7f, Ok"); > - test_case_add(6, saLogOi_66, "Create: > saLogStreamSeverityFilter >= 0x7f, ERR"); > + test_case_add(6, saLogOi_65, "Create: > saLogStreamSeverityFilter <= 0x7f, Ok"); > + test_case_add(6, saLogOi_66, "Create: > saLogStreamSeverityFilter > 0x7f, ERR"); > test_case_add(6, saLogOi_67, "Create: saLogStreamPathName > \"../Test/\" (Outside root path), ERR"); > test_case_add(6, saLogOi_68, "Create: saLogStreamFileName, > Name and path already used by an existing stream, ERR"); > test_case_add(6, saLogOi_69, "Create: > saLogStreamMaxLogFileSize > logMaxLogrecsize, Ok"); > @@ -3385,8 +3385,8 @@ void verCCBWithInvalidValues(void) > test_case_add(6, verMaxFilesRotated, "Create: > saLogStreamMaxFilesRotated = 0, ERR"); > > /* Tests for modify */ > - test_case_add(6, saLogOi_100, "Modify: > saLogStreamSeverityFilter < 0x7f, Ok"); > - test_case_add(6, saLogOi_101, "Modify: > saLogStreamSeverityFilter >= 0x7f, ERR"); > + test_case_add(6, saLogOi_100, "Modify: > saLogStreamSeverityFilter <= 0x7f, Ok"); > + test_case_add(6, saLogOi_101, "Modify: > saLogStreamSeverityFilter > 0x7f, ERR"); > test_case_add(6, saLogOi_102, "Modify: > saLogStreamPathName \"Test/\" (Not possible to modify)"); > test_case_add(6, saLogOi_103, "Modify: > saLogStreamFileName, Name and path already used by an existing stream, > ERR"); > test_case_add(6, saLogOi_104, "Modify: > saLogStreamFileName, Name exist but in other path, Ok"); ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
