api: Use basename instead of base_name in URL mapping
It turns out base_name was deprecated in 3.9 [1] and was just removed in
3.11 released today.
This is squashed with an integration test fix which adds another error
case handling.
[1]: 7095021db7
Change-Id: Icfbd94e40b9efd7c750cfa72a49bdbf930ad8fc6
This commit is contained in:
parent
1aef90b419
commit
84cb73eae3
|
@ -20,13 +20,13 @@ from rest_framework.routers import DefaultRouter
|
|||
from ara.api import views
|
||||
|
||||
router = DefaultRouter(trailing_slash=False)
|
||||
router.register("labels", views.LabelViewSet, base_name="label")
|
||||
router.register("playbooks", views.PlaybookViewSet, base_name="playbook")
|
||||
router.register("plays", views.PlayViewSet, base_name="play")
|
||||
router.register("tasks", views.TaskViewSet, base_name="task")
|
||||
router.register("hosts", views.HostViewSet, base_name="host")
|
||||
router.register("results", views.ResultViewSet, base_name="result")
|
||||
router.register("files", views.FileViewSet, base_name="file")
|
||||
router.register("records", views.RecordViewSet, base_name="record")
|
||||
router.register("labels", views.LabelViewSet, basename="label")
|
||||
router.register("playbooks", views.PlaybookViewSet, basename="playbook")
|
||||
router.register("plays", views.PlayViewSet, basename="play")
|
||||
router.register("tasks", views.TaskViewSet, basename="task")
|
||||
router.register("hosts", views.HostViewSet, basename="host")
|
||||
router.register("results", views.ResultViewSet, basename="result")
|
||||
router.register("files", views.FileViewSet, basename="file")
|
||||
router.register("records", views.RecordViewSet, basename="record")
|
||||
|
||||
urlpatterns = router.urls
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
{{ _mysql_image_name }}
|
||||
when:
|
||||
- _docker_run is failed
|
||||
- "'Failed to import docker or docker-py' in _docker_run.msg"
|
||||
- "'Failed to import docker or docker-py' in _docker_run.msg or 'Failed to import the required Python library' in _docker_run.msg"
|
||||
tasks:
|
||||
- block:
|
||||
- name: Set up the API with the ara_api role
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
postgres:10
|
||||
when:
|
||||
- _docker_run is failed
|
||||
- "'Failed to import docker or docker-py' in _docker_run.msg"
|
||||
- "'Failed to import docker or docker-py' in _docker_run.msg or 'Failed to import the required Python library' in _docker_run.msg"
|
||||
tasks:
|
||||
- block:
|
||||
- name: Set up the API with the ara_api role
|
||||
|
|
Loading…
Reference in New Issue