diff options
| author | John Estabrook <jestabro@vyos.io> | 2022-09-06 13:58:25 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2022-09-06 15:22:47 -0500 |
| commit | 038ae3c95e060ab3c698e1a2c178762c429eb21d (patch) | |
| tree | ee318e766b29dfd9d9d9b4f05c89e3f213ecdfb0 /src | |
| parent | acd3a42355da185e06670c1a23550589fce0e2f9 (diff) | |
| download | vyos-1x-038ae3c95e060ab3c698e1a2c178762c429eb21d.tar.gz vyos-1x-038ae3c95e060ab3c698e1a2c178762c429eb21d.zip | |
graphql: T4674: print included op-mode error message, if it exists
Diffstat (limited to 'src')
| -rw-r--r-- | src/services/api/graphql/graphql/mutations.py | 3 | ||||
| -rw-r--r-- | src/services/api/graphql/graphql/queries.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/services/api/graphql/graphql/mutations.py b/src/services/api/graphql/graphql/mutations.py index 1b77cff87..5ccc9b0b6 100644 --- a/src/services/api/graphql/graphql/mutations.py +++ b/src/services/api/graphql/graphql/mutations.py @@ -90,11 +90,12 @@ def make_mutation_resolver(mutation_name, class_name, session_func): } except OpModeError as e: typename = type(e).__name__ + msg = str(e) return { "success": False, "errore": ['op_mode_error'], "op_mode_error": {"name": f"{typename}", - "message": op_mode_err_msg.get(typename, "Unknown"), + "message": msg if msg else op_mode_err_msg.get(typename, "Unknown"), "vyos_code": op_mode_err_code.get(typename, 9999)} } except Exception as error: diff --git a/src/services/api/graphql/graphql/queries.py b/src/services/api/graphql/graphql/queries.py index 8ae61b704..b46914dcc 100644 --- a/src/services/api/graphql/graphql/queries.py +++ b/src/services/api/graphql/graphql/queries.py @@ -90,11 +90,12 @@ def make_query_resolver(query_name, class_name, session_func): } except OpModeError as e: typename = type(e).__name__ + msg = str(e) return { "success": False, "errors": ['op_mode_error'], "op_mode_error": {"name": f"{typename}", - "message": op_mode_err_msg.get(typename, "Unknown"), + "message": msg if msg else op_mode_err_msg.get(typename, "Unknown"), "vyos_code": op_mode_err_code.get(typename, 9999)} } except Exception as error: |