diff --git a/ci/lib.py b/ci/lib.py index 6b7face6379a3e529377dbab0fe03283ad2888e4..c6efd533ff68415b54acd9b03c3c465641ea9830 100644 --- a/ci/lib.py +++ b/ci/lib.py @@ -206,12 +206,12 @@ def assert_entity_ownership(entities, project): -def log_or_assert(args, msg, condition, trace_details=None): +def log_or_assert(args, msg, condition, trace_details=None, msg_guidance=''): """ log, assert, dump state """ if not condition: with open(args.exception_trace_file, "w", encoding="utf-8") as file: file.write(f"{msg}\n{pprint.pformat(trace_details)}\n\n{locals()}\n") - assert condition, msg + assert condition, "\n".join([msg, msg_guidance]) if msg_guidance else msg args.logger.info(msg) diff --git a/ci/olib.py b/ci/olib.py index 4e44343389743e6c283abbaa5a998a6e211e7c99..d365a3a137e59343ba3783160680091affd8fab0 100644 --- a/ci/olib.py +++ b/ci/olib.py @@ -246,10 +246,10 @@ def get_or_create_dst_server_keypair(args, source_keypairs, src_server, dst_osta src_server.key_name, src_server.user_id) log_or_assert(args, - f"F.7 Source OpenStack server keypair found ({src_server.key_name}). " \ - "Current source OpenStack cloud keypair dump is outdated already and does not contain mentioned keypair. " \ - "Re-dump source OpenStack keypairs to ceph migrator server node and retry migration.", - source_server_keypair) + f"F.7 Source OpenStack server keypair found ({src_server.key_name}).", + source_server_keypair, + msg_guidance="Current source OpenStack cloud keypair dump is outdated already and does not contain mentioned keypair." \ + "Re-dump source OpenStack keypairs to ceph migrator server node and retry migration.") destination_server_keypair = None if destination_server_keypairs := [i_keypair for i_keypair in dst_ostack_conn.list_keypairs()