diff --git a/tools/collector/debian-scripts/collect b/tools/collector/debian-scripts/collect index 2330ecee..534d0a66 100644 --- a/tools/collector/debian-scripts/collect +++ b/tools/collector/debian-scripts/collect @@ -759,6 +759,23 @@ while [[ ${#} -gt 0 ]] ; do done +date -d $STARTDATE > /dev/null 2>/dev/null +rc_start_date=${?} +date -d $ENDDATE > /dev/null 2>/dev/null +rc_end_date=${?} + +if [ $rc_start_date != 0 -a "$STARTDATE" != "any" ] ; then + report_error "the start date is invalid" ${FAIL_INVALID_START_DATE} + collect_exit ${FAIL_INVALID_START_DATE} +elif [ $rc_end_date != 0 -a "$ENDDATE" != "any" ] ; then + report_error "the end date is invalid" ${FAIL_INVALID_END_DATE} + collect_exit ${FAIL_INVALID_END_DATE} +elif (( STARTDATE > ENDDATE )) && [ "$STARTDATE" != "any" -a "$ENDDATE" != "any" ] ; then + report_error "the start date is greater than the end date" ${FAIL_INVALID_DATE_RANGE} + collect_exit ${FAIL_INVALID_DATE_RANGE} +fi + + # startup state debug logs dlog "${TOOL_NAME} ver ${TOOL_REV}.${TOOL_REV} (pid:$$)" dlog "USERNAME = ${USER}" diff --git a/tools/collector/debian-scripts/collect_utils b/tools/collector/debian-scripts/collect_utils index 95f634e6..ba9af14d 100755 --- a/tools/collector/debian-scripts/collect_utils +++ b/tools/collector/debian-scripts/collect_utils @@ -54,7 +54,10 @@ FAIL_CONTINUE=51 FAIL_SUBCLOUDNAME=52 FAIL_NO_SUBCLOUDS=53 FAIL_NOT_SYSTEMCONTROLLER=54 - +FAIL_NAME_TOO_LONG=55 +FAIL_INVALID_START_DATE=56 +FAIL_INVALID_END_DATE=57 +FAIL_INVALID_DATE_RANGE=58 # Warnings are above 200 WARN_WARNING=200 diff --git a/tools/collector/scripts/collect b/tools/collector/scripts/collect index 1101135f..1d7b2f77 100755 --- a/tools/collector/scripts/collect +++ b/tools/collector/scripts/collect @@ -768,6 +768,23 @@ while [[ ${#} -gt 0 ]] ; do done +date -d $STARTDATE > /dev/null 2>/dev/null +rc_start_date=${?} +date -d $ENDDATE > /dev/null 2>/dev/null +rc_end_date=${?} + +if [ $rc_start_date != 0 -a "$STARTDATE" != "any" ] ; then + report_error "the start date is invalid" ${FAIL_INVALID_START_DATE} + collect_exit ${FAIL_INVALID_START_DATE} +elif [ $rc_end_date != 0 -a "$ENDDATE" != "any" ] ; then + report_error "the end date is invalid" ${FAIL_INVALID_END_DATE} + collect_exit ${FAIL_INVALID_END_DATE} +elif (( STARTDATE > ENDDATE )) && [ "$STARTDATE" != "any" -a "$ENDDATE" != "any" ] ; then + report_error "the start date is greater than the end date" ${FAIL_INVALID_DATE_RANGE} + collect_exit ${FAIL_INVALID_DATE_RANGE} +fi + + # startup state debug logs dlog "${TOOL_NAME} ver ${TOOL_REV}.${TOOL_REV} (pid:$$)" dlog "USERNAME = ${USER}" diff --git a/tools/collector/scripts/collect_utils b/tools/collector/scripts/collect_utils index 71e867fc..ef3d8d63 100755 --- a/tools/collector/scripts/collect_utils +++ b/tools/collector/scripts/collect_utils @@ -55,6 +55,9 @@ FAIL_SUBCLOUDNAME=52 FAIL_NO_SUBCLOUDS=53 FAIL_NOT_SYSTEMCONTROLLER=54 FAIL_NAME_TOO_LONG=55 +FAIL_INVALID_START_DATE=56 +FAIL_INVALID_END_DATE=57 +FAIL_INVALID_DATE_RANGE=58 # Warnings are above 200