From 934675eca7fccbb0982fe08d595d3aaccace0adf Mon Sep 17 00:00:00 2001 From: TommyLike Date: Tue, 30 Jan 2018 16:46:32 +0800 Subject: [PATCH] Update document for worker cleanup API Update API document for API 'workers/cleanup', also remove 'until' from allowed clean keys as its value is always assigned in code. Change-Id: Iea940d7c7e52718b8e5e8dcf706aa5d1126860ef --- api-ref/source/v3/samples/worker-cleanup-request.json | 1 + api-ref/source/v3/worker-cleanup.inc | 3 ++- cinder/api/v3/workers.py | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api-ref/source/v3/samples/worker-cleanup-request.json b/api-ref/source/v3/samples/worker-cleanup-request.json index e8bfde5db18..0c6d7e0b380 100644 --- a/api-ref/source/v3/samples/worker-cleanup-request.json +++ b/api-ref/source/v3/samples/worker-cleanup-request.json @@ -2,6 +2,7 @@ "cluster": "test", "disabled": "True", "host": "127.0.0.1", + "service_id": "1", "is_up": "True", "binary": "cinder-volume", "resource_id": "b122f668-d15a-40f8-af21-38d218796ab8", diff --git a/api-ref/source/v3/worker-cleanup.inc b/api-ref/source/v3/worker-cleanup.inc index 758357baf37..1d1a0a776af 100644 --- a/api-ref/source/v3/worker-cleanup.inc +++ b/api-ref/source/v3/worker-cleanup.inc @@ -23,7 +23,8 @@ Request .. rest_parameters:: parameters.yaml - project_id: project_id_path - - cluster: cluster_mutex + - cluster_name: cluster_mutex + - service_id: service_id - host: host_service - binary: binary - is-up: is_up diff --git a/cinder/api/v3/workers.py b/cinder/api/v3/workers.py index 061ce0e446d..dbce6c7933a 100644 --- a/cinder/api/v3/workers.py +++ b/cinder/api/v3/workers.py @@ -32,8 +32,7 @@ from cinder import utils class WorkerController(wsgi.Controller): allowed_clean_keys = {'service_id', 'cluster_name', 'host', 'binary', - 'is_up', 'disabled', 'resource_id', 'resource_type', - 'until'} + 'is_up', 'disabled', 'resource_id', 'resource_type'} def __init__(self, *args, **kwargs): self.sch_api = sch_rpc.SchedulerAPI()