openstack/python-novaclient
Code Issues Proposed changes

Fix nova availability-zone-list for admin users

Browse Source 
Don't need to convert returned timestamp

Fix bug 1123381

Change-Id: I1dbc82475b44b8d321fffb512083fc7a3b13153d
This commit is contained in:
Joe Gordon
2013-02-12 23:22:34 +00:00
parent 0933c64251
commit c97879a3f2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
novaclient/v1_1/shell.py
View File

@@ -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)

6
tests/v1_1/test_availability_zone.py
View File

@@ -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])