From c97879a3f24ac51a8b7673590445014eeb046381 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Tue, 12 Feb 2013 23:22:34 +0000 Subject: [PATCH] Fix nova availability-zone-list for admin users Don't need to convert returned timestamp Fix bug 1123381 Change-Id: I1dbc82475b44b8d321fffb512083fc7a3b13153d --- novaclient/v1_1/shell.py | 2 +- tests/v1_1/test_availability_zone.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py index 8dd4dce7b..d5c0469bb 100644 --- a/novaclient/v1_1/shell.py +++ b/novaclient/v1_1/shell.py @@ -2921,7 +2921,7 @@ def _treeizeAvailabilityZone(zone): az.zoneState = '%s %s %s' % ( 'enabled' if state['active'] else 'disabled', ':-)' if state['available'] else 'XXX', - timeutils.strtime(state['updated_at'])) + state['updated_at']) az._info['zoneName'] = az.zoneName az._info['zoneState'] = az.zoneState result.append(az) diff --git a/tests/v1_1/test_availability_zone.py b/tests/v1_1/test_availability_zone.py index b06f21def..f270bec27 100644 --- a/tests/v1_1/test_availability_zone.py +++ b/tests/v1_1/test_availability_zone.py @@ -62,12 +62,12 @@ class AvailabilityZoneTest(utils.TestCase): l0 = [u'zone-1', u'available'] l1 = [u'|- fake_host-1', u''] - l2 = [u'| |- nova-compute', u'enabled :-) 2012-12-26T14:45:25.000000'] + l2 = [u'| |- nova-compute', u'enabled :-) 2012-12-26 14:45:25'] l3 = [u'internal', u'available'] l4 = [u'|- fake_host-1', u''] - l5 = [u'| |- nova-sched', u'enabled :-) 2012-12-26T14:45:25.000000'] + l5 = [u'| |- nova-sched', u'enabled :-) 2012-12-26 14:45:25'] l6 = [u'|- fake_host-2', u''] - l7 = [u'| |- nova-network', u'enabled XXX 2012-12-26T14:45:24.000000'] + l7 = [u'| |- nova-network', u'enabled XXX 2012-12-26 14:45:24'] l8 = [u'zone-2', u'not available'] z0 = shell._treeizeAvailabilityZone(zones[0])