parallelvirtualcluster/pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 114 Wiki Activity

Replace retcodes with 400; implement OSD status

Browse Source
This commit is contained in:
Joshua Boniface
2019-07-26 11:23:19 -04:00
parent 4cf3ade10a
commit 17b463afd4
3 changed files with 84 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client-api/pvc-api.py
View File

@ -622,12 +622,9 @@ def api_ceph_status():
def api_ceph_radosdf():
return pvcapi.ceph_radosdf()
@api.route('/api/v1/storage/ceph/cluster-option', methods=['GET', 'POST'])
@api.route('/api/v1/storage/ceph/cluster-option', methods=['POST'])
@authenticator
def api_ceph_cluster_option():
if flask.request.method == 'GET':
pass
if flask.request.method == 'POST':
# Get action
if 'action' in flask.request.values:
@ -698,7 +695,7 @@ def api_ceph_osd_element(osd):
@authenticator
def api_ceph_osd_state(osd):
if flask.request.method == 'GET':
pass
return pvcapi.ceph_osd_state(osd)
if flask.request.method == 'POST':
if 'state' in flask.request.values:
@ -794,13 +791,17 @@ def api_ceph_volume_root():
return pvcapi.ceph_volume_add(pool, volume, size)
@api.route('/api/v1/storage/ceph/volume/<pool>/<volume>', methods=['GET', 'DELETE'])
@api.route('/api/v1/storage/ceph/volume/<pool>/<volume>', methods=['GET', 'PUT', 'DELETE'])
@authenticator
def api_ceph_volume_element(pool, volume):
if flask.request.method == 'GET':
# Same as specifying /volume?limit=VOLUME
return pvcapi.ceph_volume_list(pool, volume)
if flask.request.method == 'PUT':
# TODO: #44
flask.abort(501)
if flask.request.method == 'DELETE':
return pvcapi.ceph_volume_remove(pool, volume)
@ -850,13 +851,17 @@ def api_ceph_volume_snapshot_root():
return pvcapi.ceph_volume_snapshot_add(pool, volume, snapshot)
@api.route('/api/v1/storage/ceph/volume/snapshot/<pool>/<volume>/<snapshot>', methods=['GET', 'DELETE'])
@api.route('/api/v1/storage/ceph/volume/snapshot/<pool>/<volume>/<snapshot>', methods=['GET', 'PUT', 'DELETE'])
@authenticator
def api_ceph_volume_snapshot_element(pool, volume, snapshot):
if flask.request.method == 'GET':
# Same as specifying /snapshot?limit=VOLUME
return pvcapi.ceph_volume_snapshot_list(pool, volume, snapshot)
if flask.request.method == 'PUT':
# TODO: #44
flask.abort(501)
if flask.request.method == 'DELETE':
return pvcapi.ceph_volume_snapshot_remove(pool, volume, snapshot)