forcloud/app-autotest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.46: fix _finish_op signature — add op_name, svc_op_id params

Browse Source
This commit is contained in:
naeel
2026-07-27 08:03:27 +04:00
parent 8d9bf338fc
commit ffa7d408c6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site/app.py
+1 -1
View File
@@ -6,7 +6,7 @@ from routes.main import bp as main_bp
from routes.api import bp as api_bp from routes.api import bp as api_bp
from routes.api_test import bp as api_test_bp from routes.api_test import bp as api_test_bp
VERSION = "1.0.45" VERSION = "1.0.46"
app = Flask(__name__, template_folder="templates", static_folder="static") app = Flask(__name__, template_folder="templates", static_folder="static")
app.config["NUBES_API_ENDPOINT"] = os.getenv("NUBES_API_ENDPOINT", "https://lk-api-gateway-dev.ngcloud.ru/api/v1/svc") app.config["NUBES_API_ENDPOINT"] = os.getenv("NUBES_API_ENDPOINT", "https://lk-api-gateway-dev.ngcloud.ru/api/v1/svc")
site/routes/api_test.py
+3 -3
View File
@@ -112,7 +112,7 @@ def api_test():
client.post(f"/instanceOperations/{op_uid}/run") client.post(f"/instanceOperations/{op_uid}/run")
# фоном ждать завершения # фоном ждать завершения
threading.Thread(target=_finish_op, args=(client, op_uid, instance_uid, svc_id, display_name, True), daemon=True).start() threading.Thread(target=_finish_op, args=(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, True), daemon=True).start()
return jsonify({"status": "RUNNING", "opUid": op_uid, "instanceUid": instance_uid}) return jsonify({"status": "RUNNING", "opUid": op_uid, "instanceUid": instance_uid})
else: else:
@@ -139,7 +139,7 @@ def api_test():
# фоном ждать завершения # фоном ждать завершения
is_delete = (op_name == "delete") is_delete = (op_name == "delete")
threading.Thread(target=_finish_op, args=(client, op_uid, instance_uid, svc_id, display_name, False, is_delete), daemon=True).start() threading.Thread(target=_finish_op, args=(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, False, is_delete), daemon=True).start()
return jsonify({"status": "RUNNING", "opUid": op_uid, "instanceUid": instance_uid}) return jsonify({"status": "RUNNING", "opUid": op_uid, "instanceUid": instance_uid})
except Exception as e: except Exception as e:
@@ -151,7 +151,7 @@ def api_test():
_op_results = {} _op_results = {}
def _finish_op(client, op_uid, instance_uid, svc_id, display_name, is_create, is_delete=False): def _finish_op(client, op_uid, instance_uid, svc_id, display_name, op_name, svc_op_id, is_create, is_delete=False):
"""Фоном ждать dtFinish и сохранить результат.""" """Фоном ждать dtFinish и сохранить результат."""
import time import time
t0 = time.time() t0 = time.time()