Merge "Set correct timestamp on floatingip counter"

This commit is contained in:
Jenkins 2012-10-11 19:02:16 +00:00 committed by Gerrit Code Review
commit f8620ebe5e

View File

@ -19,6 +19,7 @@
from nova import exception from nova import exception
from ceilometer.openstack.common import log from ceilometer.openstack.common import log
from ceilometer.openstack.common import timeutils
from ceilometer import counter from ceilometer import counter
from ceilometer.central import plugin from ceilometer.central import plugin
@ -44,7 +45,7 @@ class FloatingIPPollster(plugin.CentralPollster):
user_id=None, user_id=None,
project_id=ip.project_id, project_id=ip.project_id,
resource_id=ip.id, resource_id=ip.id,
timestamp=None, # FIXME(dhellmann): This needs to be now() timestamp=timeutils.utcnow().isoformat(),
resource_metadata={ resource_metadata={
'address': ip.address, 'address': ip.address,
'fixed_ip_id': ip.fixed_ip_id, 'fixed_ip_id': ip.fixed_ip_id,