1 files changed, 9 insertions, 40 deletions
diff --git a/src/services/api/graphql/session/session.py b/src/services/api/graphql/session/session.py
index 93e1c328e..0b77b1433 100644
--- a/src/services/api/graphql/session/session.py
+++ b/src/services/api/graphql/session/session.py
@@ -24,7 +24,8 @@ 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
+from api.graphql.libs.op_mode import normalize_output
 
 op_mode_include_file = os.path.join(directories['data'], 'op-mode-standardized.json')
 
@@ -45,40 +46,6 @@ class Session:
         except Exception:
             self._op_mode_list = None
 
-    def configure(self):
-        session = self._session
-        data = self._data
-        func_base_name = self._name
-
-        tmpl_file = f'{func_base_name}.tmpl'
-        cmd_file = f'/tmp/{func_base_name}.cmds'
-        tmpl_dir = directories['api_templates']
-
-        try:
-            render(cmd_file, tmpl_file, data, location=tmpl_dir)
-            commands = []
-            with open(cmd_file) as f:
-                lines = f.readlines()
-            for line in lines:
-                commands.append(line.split())
-            for cmd in commands:
-                if cmd[0] == 'set':
-                    session.set(cmd[1:])
-                elif cmd[0] == 'delete':
-                    session.delete(cmd[1:])
-                else:
-                    raise ValueError('Operation must be "set" or "delete"')
-            session.commit()
-        except Exception as error:
-            raise error
-
-    def delete_path_if_childless(self, path):
-        session = self._session
-        config = Config(session.get_session_env())
-        if not config.list_nodes(path):
-            session.delete(path)
-            session.commit()
-
     def show_config(self):
         session = self._session
         data = self._data
@@ -87,14 +54,14 @@ class Session:
         try:
             out = session.show_config(data['path'])
             if data.get('config_format', '') == 'json':
-                config_tree = vyos.configtree.ConfigTree(out)
+                config_tree = ConfigTree(out)
                 out = json.loads(config_tree.to_json())
         except Exception as error:
             raise error
 
         return out
 
-    def save(self):
+    def save_config_file(self):
         session = self._session
         data = self._data
         if 'file_name' not in data or not data['file_name']:
@@ -105,7 +72,7 @@ class Session:
         except Exception as error:
             raise error
 
-    def load(self):
+    def load_config_file(self):
         session = self._session
         data = self._data
 
@@ -127,7 +94,7 @@ class Session:
 
         return out
 
-    def add(self):
+    def add_system_image(self):
         session = self._session
         data = self._data
 
@@ -138,7 +105,7 @@ class Session:
 
         return res
 
-    def delete(self):
+    def delete_system_image(self):
         session = self._session
         data = self._data
 
@@ -183,6 +150,8 @@ class Session:
         except OpModeError as e:
             raise e
 
+        res = normalize_output(res)
+
         return res
 
     def gen_op_mutation(self):