diff options
author | Lena Novokshonova <enovokshonova@mirantis.com> | 2014-12-11 17:25:03 +0400 |
---|---|---|
committer | Lena Novokshonova <enovokshonova@mirantis.com> | 2014-12-17 10:15:11 +0000 |
commit | f1c84280069fd8761d29ab7a05f8a4d3211d0299 (patch) | |
tree | a42207d93224c2492bb94c2b94ecaa07f1e5a9ef /tools | |
parent | 61eba5455bebb068868488f14a62e47996341c66 (diff) | |
download | ceilometer-f1c84280069fd8761d29ab7a05f8a4d3211d0299.tar.gz |
Improve tools/make_test_data.sh correctness
This change allows the script tools/make_test_data.sh and
tools/make_test_data.py to work correctly by handing
exceptions appropriately.
Change-Id: Ib054c3e10d617686928bf03f94c5ff868905afde
Closes-bug: 1389684
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/make_test_data.py | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/tools/make_test_data.py b/tools/make_test_data.py index e3fd16d4..8a521dea 100755 --- a/tools/make_test_data.py +++ b/tools/make_test_data.py @@ -111,12 +111,15 @@ def main(): parser.add_argument( '--start', default=31, - help='The number of days in the past to start timestamps.', + help='Number of days to be stepped back from now or date in the past (' + '"YYYY-MM-DDTHH:MM:SS" format) to define timestamps start range.', ) parser.add_argument( '--end', default=2, - help='The number of days into the future to continue timestamps.', + help='Number of days to be stepped forward from now or date in the ' + 'future ("YYYY-MM-DDTHH:MM:SS" format) to define timestamps end ' + 'range.', ) parser.add_argument( '--type', @@ -186,8 +189,25 @@ def main(): break # Compute the correct time span - start = datetime.datetime.utcnow() - datetime.timedelta(days=args.start) - end = datetime.datetime.utcnow() + datetime.timedelta(days=args.end) + format = '%Y-%m-%dT%H:%M:%S' + + try: + start = datetime.datetime.utcnow() - datetime.timedelta( + days=int(args.start)) + except ValueError: + try: + start = datetime.datetime.strptime(args.start, format) + except ValueError: + raise + + try: + end = datetime.datetime.utcnow() + datetime.timedelta( + days=int(args.end)) + except ValueError: + try: + end = datetime.datetime.strptime(args.end, format) + except ValueError: + raise make_test_data(conn=conn, name=args.counter, |