summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2022-11-02 14:28:51 -0500
committerGitHub <noreply@github.com>2022-11-02 14:28:51 -0500
commitf11b76ec56f9a94c4cfb435081c7b9a5986c060c (patch)
tree643871c3f5585f3c2437caeb7eb7beaf3b5a3390 /src
parentf2ec92a78c4ee2a35e7d071387460fc6ce360740 (diff)
parentdb0791238c9cccaf73aac61844a6c0293c513a54 (diff)
downloadvyos-1x-f11b76ec56f9a94c4cfb435081c7b9a5986c060c.tar.gz
vyos-1x-f11b76ec56f9a94c4cfb435081c7b9a5986c060c.zip
Merge pull request #1636 from jestabro/standardize-op-mode-output
op-mode: T4791: consistent normalization of 'raw' output of op-mode scripts for CLI and API
Diffstat (limited to 'src')
-rw-r--r--src/services/api/graphql/libs/op_mode.py6
-rw-r--r--src/services/api/graphql/session/session.py3
2 files changed, 9 insertions, 0 deletions
diff --git a/src/services/api/graphql/libs/op_mode.py b/src/services/api/graphql/libs/op_mode.py
index da2bcdb5b..97a26520e 100644
--- a/src/services/api/graphql/libs/op_mode.py
+++ b/src/services/api/graphql/libs/op_mode.py
@@ -17,8 +17,11 @@ import os
import re
import typing
import importlib.util
+from typing import Union
+from humps import decamelize
from vyos.defaults import directories
+from vyos.opmode import _normalize_field_names
def load_as_module(name: str, path: str):
spec = importlib.util.spec_from_file_location(name, path)
@@ -98,3 +101,6 @@ def map_type_name(type_name: type, optional: bool = False) -> str:
# scalar 'Generic' is defined in schema.graphql
return 'Generic'
+
+def normalize_output(result: Union[dict, list]) -> Union[dict, list]:
+ return _normalize_field_names(decamelize(result))
diff --git a/src/services/api/graphql/session/session.py b/src/services/api/graphql/session/session.py
index c2c1db1df..0b77b1433 100644
--- a/src/services/api/graphql/session/session.py
+++ b/src/services/api/graphql/session/session.py
@@ -25,6 +25,7 @@ from vyos.template import render
from vyos.opmode import Error as OpModeError
from api.graphql.libs.op_mode import load_op_mode_as_module, split_compound_op_mode_name
+from api.graphql.libs.op_mode import normalize_output
op_mode_include_file = os.path.join(directories['data'], 'op-mode-standardized.json')
@@ -149,6 +150,8 @@ class Session:
except OpModeError as e:
raise e
+ res = normalize_output(res)
+
return res
def gen_op_mutation(self):