openstack/cinder
Code Issues Proposed changes

Update document for worker cleanup API

Browse Source 
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
This commit is contained in:
TommyLike 2018-01-30 16:46:32 +08:00
parent cf56cdd4da
commit 934675eca7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api-ref/source/v3/samples/worker-cleanup-request.json
View File

@ -2,6 +2,7 @@
"cluster": "test", "cluster": "test",
"disabled": "True", "disabled": "True",
"host": "127.0.0.1", "host": "127.0.0.1",
"service_id": "1",
"is_up": "True", "is_up": "True",
"binary": "cinder-volume", "binary": "cinder-volume",
"resource_id": "b122f668-d15a-40f8-af21-38d218796ab8", "resource_id": "b122f668-d15a-40f8-af21-38d218796ab8",

3
api-ref/source/v3/worker-cleanup.inc
View File

@ -23,7 +23,8 @@ Request
.. rest_parameters:: parameters.yaml .. rest_parameters:: parameters.yaml
- project_id: project_id_path - project_id: project_id_path
- cluster: cluster_mutex - cluster_name: cluster_mutex
- service_id: service_id
- host: host_service - host: host_service
- binary: binary - binary: binary
- is-up: is_up - is-up: is_up

3
cinder/api/v3/workers.py
View File

@ -32,8 +32,7 @@ from cinder import utils
class WorkerController(wsgi.Controller): class WorkerController(wsgi.Controller):
allowed_clean_keys = {'service_id', 'cluster_name', 'host', 'binary', allowed_clean_keys = {'service_id', 'cluster_name', 'host', 'binary',
'is_up', 'disabled', 'resource_id', 'resource_type', 'is_up', 'disabled', 'resource_id', 'resource_type'}
'until'}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.sch_api = sch_rpc.SchedulerAPI() self.sch_api = sch_rpc.SchedulerAPI()