f3bc7d0109
This is a squashed commit of work done by Doug and myself.
Thanks Doug!
Author: Angus Salkeld <asalkeld@redhat.com>
Add a Statistics class
Note this is a bit different to the spec
(http://wiki.openstack.org/Ceilometer/blueprints/APIv2)
As wsme doen't really like different types been returned from
the same method.
I have:
GET /v2/meters/<meter> - raw samples
GET /v2/meters/<meter>/statistics - for the stats
Make the error reporting better for invalid fields
Try and protect from passing in the wrong arguments into the db api
Also get_resources() takes start/stop_timestamp not start/stop.
Fix most of the duration test cases (overlapping ones are still broken)
Add some log messages to warn of unimplemented queries
Fix the start/end timestamp passed into calc_duration()
Make the query op default to 'eq'
Fix v2 event list paths
Remove v2 list projects tests
Re-Add the duration
Implement get_meter_statistics() for sqlalchemy.
Add tests for get_meter_statistics()
Fix the latest pep8 1.4 issues
Author: Doug Hellmann <doug.hellmann@dreamhost.com>
fixme comment
Fix duration calculation
fix event listing tests
remove obsolete list tests
update resource listing tests
remove obsolete list tests
fix max statistics tests for projects
fix max tests for resource queries
fix tests for stats using project filter
Fix sum tests for resource queries
Fix the statistics calculation in the mongo driver to handle getting
no data back from the query.
Update the queries in the test code.
enable logging for wsme in the tests to help with debugging
always include all query fields to keep values aligned
only include the start and end timestamp keywords wanted by the EventFilter
update url used in acl tests
update tests for listing meters
convert prints to logging calls and add a few todo/fixme notes
add some debugging and error checking to _query_to_kwargs
add q argument to get_json() to make it easier to pass queries to the service
do not stub out controller we have deleted
fix whitespace issues to make pep8 happy
Change-Id: I1b9a4c26fb8cc74ae1a002f93b84db05d0b20192
Blueprint: api-aggregate-average
Blueprint: api-server-pecan-wsme
78 lines
1.4 KiB
Bash
Executable File
78 lines
1.4 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
bindir=$(dirname $0)
|
|
|
|
project_name="$1"
|
|
if [ -z "$project_name" ]
|
|
then
|
|
project_name=demo
|
|
fi
|
|
|
|
if [ -z "$OS_USERNAME" ]
|
|
then
|
|
user=demo
|
|
else
|
|
user=$OS_USERNAME
|
|
fi
|
|
|
|
# Convert a possible project name to an id, if we have
|
|
# keystone installed.
|
|
if which keystone >/dev/null
|
|
then
|
|
project=$(keystone tenant-list | grep " $project_name " | cut -f2 -d'|' | cut -f2 -d' ')
|
|
else
|
|
# Assume they gave us the project id as argument.
|
|
project="$project_name"
|
|
fi
|
|
|
|
if [ -z "$project" ]
|
|
then
|
|
echo "Could not determine project id for \"$project_name\"" 1>&2
|
|
exit 1
|
|
fi
|
|
|
|
early1="2012-08-27T07:00:00"
|
|
early2="2012-08-27T17:00:00"
|
|
|
|
start="2012-08-28T00:00:00"
|
|
|
|
middle1="2012-08-28T08:00:00"
|
|
middle2="2012-08-28T18:00:00"
|
|
middle3="2012-08-29T09:00:00"
|
|
middle4="2012-08-29T19:00:00"
|
|
|
|
end="2012-08-31T23:59:00"
|
|
|
|
late1="2012-08-31T10:00:00"
|
|
late2="2012-08-31T20:00:00"
|
|
|
|
mkdata() {
|
|
${bindir}/make_test_data.py --project "$project" \
|
|
--user "$user" --start "$2" --end "$3" \
|
|
"$1" instance:m1.tiny 1
|
|
}
|
|
|
|
dates=(early1 early2 start middle1 middle2 middle3 middle4 end late1 late2)
|
|
|
|
echo $project
|
|
|
|
for i in $(seq 0 $((${#dates[@]} - 2)) )
|
|
do
|
|
|
|
iname=${dates[$i]}
|
|
eval "ivalue=\$$iname"
|
|
|
|
for j in $(seq $((i + 1)) $((${#dates[@]} - 1)) )
|
|
do
|
|
jname=${dates[$j]}
|
|
eval "jvalue=\$$jname"
|
|
|
|
resource_id="${project_name}-$iname-$jname"
|
|
echo "$resource_id"
|
|
|
|
mkdata "$resource_id" "$ivalue" "$jvalue"
|
|
[ $? -eq 0 ] || exit $?
|
|
done
|
|
echo
|
|
done
|