Skip to content

Commit 95ba612

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Revert "Event list can not display "timestamp""
2 parents 157b7c6 + ae57ace commit 95ba612

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎openstack/cluster/v1/event.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Event(resource.Resource):
3131

3232
# Properties
3333
#: Timestamp string (in ISO8601 format) when the event was generated.
34-
timestamp = resource.Body('timestamp')
34+
generated_at = resource.Body('timestamp')
3535
#: The UUID of the object related to this event.
3636
obj_id = resource.Body('oid')
3737
#: The name of the object related to this event.

‎openstack/tests/unit/cluster/v1/test_event.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ def test_instantiate(self):
5757
self.assertEqual(FAKE['project'], sot.project_id)
5858
self.assertEqual(FAKE['status'], sot.status)
5959
self.assertEqual(FAKE['status_reason'], sot.status_reason)
60-
self.assertEqual(FAKE['timestamp'], sot.timestamp)
60+
self.assertEqual(FAKE['timestamp'], sot.generated_at)
6161
self.assertEqual(FAKE['user'], sot.user_id)

0 commit comments

Comments
 (0)