3wordchant/capsul-flask
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

manually merging in the sshkeys to the spoke model/hub model interface

Browse Source
This commit is contained in:
forest
2021-02-15 18:16:15 -06:00
parent 44ee42764c
commit cc164dce01
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
capsulflask/spoke_api.py
View File

@ -41,7 +41,7 @@ def operation_with_id(operation_id: int):
def operation_without_id():
return operation_impl(None)
def operation_impl(operation_id: int):
def operation_impl(operation_id: int|None):
if authorized_as_hub(request.headers):
request_body_json = request.json
request_body = json.loads(request_body_json)
@ -89,9 +89,9 @@ def handle_get(operation_id, request_body):
current_app.logger.error(f"/hosts/operation returned 400: id is required for get")
return abort(400, f"bad request; id is required for get")
vm = current_app.config['SPOKE_MODEL'].get(request_body['id'])
vm = current_app.config['SPOKE_MODEL'].get(request_body['id'], request_body['get_ssh_host_keys'])
return jsonify(dict(assignment_status="assigned", id=vm.id, host=vm.host, ipv4=vm.ipv4, ipv6=vm.ipv6))
return jsonify(dict(assignment_status="assigned", id=vm.id, host=vm.host, ipv4=vm.ipv4, ipv6=vm.ipv6, ssh_host_keys=vm.ssh_host_keys))
def handle_list_ids(operation_id, request_body):
return jsonify(dict(assignment_status="assigned", ids=current_app.config['SPOKE_MODEL'].list_ids()))