1 files changed, 2 insertions, 12 deletions
diff --git a/src/services/api/graphql/libs/op_mode.py b/src/services/api/graphql/libs/op_mode.py
index 97a26520e..c553bbd67 100644
--- a/src/services/api/graphql/libs/op_mode.py
+++ b/src/services/api/graphql/libs/op_mode.py
@@ -21,24 +21,14 @@ from typing import Union
 from humps import decamelize
 
 from vyos.defaults import directories
+from vyos.util import load_as_module
 from vyos.opmode import _normalize_field_names
 
-def load_as_module(name: str, path: str):
-    spec = importlib.util.spec_from_file_location(name, path)
-    mod = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(mod)
-    return mod
-
 def load_op_mode_as_module(name: str):
     path = os.path.join(directories['op_mode'], name)
     name = os.path.splitext(name)[0].replace('-', '_')
     return load_as_module(name, path)
 
-def is_op_mode_function_name(name):
-    if re.match(r"^(show|clear|reset|restart)", name):
-        return True
-    return False
-
 def is_show_function_name(name):
     if re.match(r"^show", name):
         return True
@@ -89,7 +79,7 @@ def map_type_name(type_name: type, optional: bool = False) -> str:
     if type_name == int:
         return 'Int!' if not optional else 'Int = null'
     if type_name == bool:
-        return 'Boolean!' if not optional else 'Boolean = false'
+        return 'Boolean = false'
     if typing.get_origin(type_name) == list:
         if not optional:
             return f'[{map_type_name(typing.get_args(type_name)[0])}]!'