diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-11-02 14:55:27 +0200 |
|---|---|---|
| committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-11-02 12:59:57 +0000 |
| commit | 46eda54c88ae96ed1f4aaa9ce56c505ed837f3d7 (patch) | |
| tree | 852b802c592919fec3fe66c14dd2f4aaaf8fd7ed /src/services/api/graphql/session | |
| parent | 738641a6c66d22c09b8c028ee3d8a90527d9701f (diff) | |
| parent | f2ec92a78c4ee2a35e7d071387460fc6ce360740 (diff) | |
| download | vyos-1x-46eda54c88ae96ed1f4aaa9ce56c505ed837f3d7.tar.gz vyos-1x-46eda54c88ae96ed1f4aaa9ce56c505ed837f3d7.zip | |
T4758: Fix conflicts op-mode-standardized
Diffstat (limited to 'src/services/api/graphql/session')
| -rwxr-xr-x | src/services/api/graphql/session/composite/system_status.py | 2 | ||||
| -rw-r--r-- | src/services/api/graphql/session/session.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/services/api/graphql/session/composite/system_status.py b/src/services/api/graphql/session/composite/system_status.py index 3c1a3d45b..d809f32e3 100755 --- a/src/services/api/graphql/session/composite/system_status.py +++ b/src/services/api/graphql/session/composite/system_status.py @@ -23,7 +23,7 @@ import importlib.util from vyos.defaults import directories -from api.graphql.utils.util import load_op_mode_as_module +from api.graphql.libs.op_mode import load_op_mode_as_module def get_system_version() -> dict: show_version = load_op_mode_as_module('version.py') diff --git a/src/services/api/graphql/session/session.py b/src/services/api/graphql/session/session.py index f990e63d0..c2c1db1df 100644 --- a/src/services/api/graphql/session/session.py +++ b/src/services/api/graphql/session/session.py @@ -24,7 +24,7 @@ from vyos.defaults import directories from vyos.template import render from vyos.opmode import Error as OpModeError -from api.graphql.utils.util import load_op_mode_as_module, split_compound_op_mode_name +from api.graphql.libs.op_mode import load_op_mode_as_module, split_compound_op_mode_name op_mode_include_file = os.path.join(directories['data'], 'op-mode-standardized.json') |