diff options
author | Kerim Gokarslan <kgokarsl@cisco.com> | 2017-09-26 12:15:30 -0700 |
---|---|---|
committer | Kerim Gokarslan <kgokarsl@cisco.com> | 2017-09-27 10:51:44 -0700 |
commit | c5c27a690fe8ce01f047330327e5bff3afb048bd (patch) | |
tree | ffa4abe020fead5794a82fa006dba02640e9396e /nfvbench | |
parent | 666f8c435109569e9ea643d4a59cb3b4c2f09e0b (diff) |
NFVBENCH-34 Pass configuration file to entrypoint script
Change-Id: If44d5d9fb2db58b3e1a3ebd1c8d94c1452f84409
Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
Diffstat (limited to 'nfvbench')
-rw-r--r-- | nfvbench/nfvbenchd.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nfvbench/nfvbenchd.py b/nfvbench/nfvbenchd.py index 3ab30de..4657504 100644 --- a/nfvbench/nfvbenchd.py +++ b/nfvbench/nfvbenchd.py @@ -137,7 +137,6 @@ def setup_flask(root_path): app.root_path = root_path socketio = SocketIO(app, async_mode='threading') busy_json = result_json(STATUS_ERROR, 'there is already an NFVbench request running') - config_is_null_json = result_json(STATUS_ERROR, 'configuration is missing') not_busy_json = result_json(STATUS_ERROR, 'no pending NFVbench run') not_found_msg = 'results not found' pending_msg = 'NFVbench run still pending' @@ -169,15 +168,13 @@ def setup_flask(root_path): @app.route('/start_run', methods=['POST']) def start_run(): config = load_json(request.json) - if config: - if Ctx.is_busy(): - return jsonify(busy_json) - else: - request_id = get_uuid() - Ctx.enqueue(config, request_id) - return jsonify(result_json(STATUS_PENDING, pending_msg, request_id)) - else: - return jsonify(config_is_null_json) + if not config: + config = {} + if Ctx.is_busy(): + return jsonify(busy_json) + request_id = get_uuid() + Ctx.enqueue(config, request_id) + return jsonify(result_json(STATUS_PENDING, pending_msg, request_id)) @app.route('/status', defaults={'request_id': None}, methods=['GET']) @app.route('/status/<request_id>', methods=['GET']) |