Merge "Make all timestamps formats equal"

This commit is contained in:
Jenkins 2017-06-15 10:13:38 +00:00 committed by Gerrit Code Review
commit d68626595e
2 changed files with 11 additions and 2 deletions

View File

@ -235,8 +235,8 @@ def send_instance_update_notification(context, instance, old_vm_state=None,
# add audit fields:
(audit_start, audit_end) = audit_period_bounds(current_period=True)
payload["audit_period_beginning"] = audit_start
payload["audit_period_ending"] = audit_end
payload["audit_period_beginning"] = null_safe_isotime(audit_start)
payload["audit_period_ending"] = null_safe_isotime(audit_end)
# add bw usage info:
bw = bandwidth_usage(instance, audit_start)

View File

@ -21,6 +21,7 @@ import datetime
import mock
from oslo_context import context as o_context
from oslo_context import fixture as o_fixture
from oslo_utils import timeutils
from nova.compute import flavors
from nova.compute import task_states
@ -67,6 +68,9 @@ class NotificationsTestCase(test.TestCase):
self.project_id = 'fake'
self.context = context.RequestContext(self.user_id, self.project_id)
self.fake_time = datetime.datetime(2017, 2, 2, 16, 45, 0)
timeutils.set_time_override(self.fake_time)
self.instance = self._wrapped_create()
self.decorated_function_called = False
@ -340,6 +344,11 @@ class NotificationsTestCase(test.TestCase):
self.assertEqual(payload["display_name"], display_name)
self.assertEqual(payload["hostname"], hostname)
self.assertEqual(payload["node"], node)
self.assertEqual("2017-02-01T00:00:00.000000",
payload["audit_period_beginning"])
self.assertEqual("2017-02-02T16:45:00.000000",
payload["audit_period_ending"])
payload = fake_notifier.VERSIONED_NOTIFICATIONS[0][
'payload']['nova_object.data']
state_update = payload['state_update']['nova_object.data']