From 966af691276cc7f3eaccae4518d0d8b09dde2a75 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 29 May 2012 10:01:48 -0400 Subject: [PATCH] Use timestamp instead of datetime when creating Counter Change-Id: I444b96196107383840c6c9ac070492ecf34079f2 --- ceilometer/compute/network.py | 2 +- run_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceilometer/compute/network.py b/ceilometer/compute/network.py index 5907084f..4b1a7625 100644 --- a/ceilometer/compute/network.py +++ b/ceilometer/compute/network.py @@ -41,7 +41,7 @@ class FloatingIPPollster(plugin.PollsterBase): user_id=None, project_id=ip.project_id, resource_id=ip.id, - datetime=None, + timestamp=None, duration=None, resource_metadata={ 'address': ip.address, diff --git a/run_tests.sh b/run_tests.sh index c15c227f..58c24ad0 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -2,5 +2,5 @@ # Simple test runner, should be replaced with tox rm -rf cover -nosetests -P -d -v --with-coverage --cover-package=ceilometer --cover-inclusive tests +nosetests -P -d -v --cover-erase --with-coverage --cover-package=ceilometer --cover-inclusive tests tox -e pep8