External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 19:30:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

update zoneinfo endpoint to be a list of dicts

Browse Source
This commit is contained in:
Ryan Petrello 2018-02-08 09:11:50 -05:00
parent e982f6ed06
commit c866d85b8c
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/api/views.py
View File

@ -700,7 +700,10 @@ class ScheduleZoneInfo(APIView):
def get(self, request):
from dateutil.zoneinfo import get_zonefile_instance
return Response(sorted(get_zonefile_instance().zones.keys()))
return Response([
{'name': zone}
for zone in sorted(get_zonefile_instance().zones)
])
class LaunchConfigCredentialsBase(SubListAttachDetachAPIView):

7
awx/main/tests/functional/api/test_schedules.py
View File

@ -280,3 +280,10 @@ def test_dst_rollback_duplicates(post, admin_user):
'2030-11-03 02:30:00-05:00',
'2030-11-03 03:30:00-05:00',
]
@pytest.mark.django_db
def test_zoneinfo(get, admin_user):
url = reverse('api:schedule_zoneinfo')
r = get(url, admin_user, expect=200)
assert {'name': 'America/New_York'} in r.data

6
docs/schedules.md
View File

@ -41,9 +41,9 @@ A list of _valid_ zone identifiers (which can vary by system) can be found at:
HTTP GET /api/v2/schedules/zoneinfo/
[
"Africa/Abidjan",
"Africa/Accra",
"Africa/Addis_Ababa",
{"name": "Africa/Abidjan"},
{"name": "Africa/Accra"},
{"name": "Africa/Addis_Ababa"},
...
]