1 files changed, 9 insertions, 9 deletions
diff --git a/src/op_mode/neighbor.py b/src/op_mode/neighbor.py
index 264dbdc72..8b3c45c7c 100755
--- a/src/op_mode/neighbor.py
+++ b/src/op_mode/neighbor.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2022 VyOS maintainers and contributors
+# Copyright (C) 2022-2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -31,14 +31,14 @@ import sys
 import typing
 
 import vyos.opmode
+from vyos.utils.network import interface_exists
 
-def interface_exists(interface):
-    import os
-    return os.path.exists(f'/sys/class/net/{interface}')
+ArgFamily = typing.Literal['inet', 'inet6']
+ArgState = typing.Literal['reachable', 'stale', 'failed', 'permanent']
 
 def get_raw_data(family, interface=None, state=None):
     from json import loads
-    from vyos.util import cmd
+    from vyos.utils.process import cmd
 
     if interface:
         if not interface_exists(interface):
@@ -88,7 +88,8 @@ def format_neighbors(neighs, interface=None):
     headers = ["Address", "Interface", "Link layer address",  "State"]
     return tabulate(neighs, headers)
 
-def show(raw: bool, family: str, interface: typing.Optional[str], state: typing.Optional[str]):
+def show(raw: bool, family: ArgFamily, interface: typing.Optional[str],
+         state: typing.Optional[ArgState]):
     """ Display neighbor table contents """
     data = get_raw_data(family, interface, state=state)
 
@@ -97,8 +98,8 @@ def show(raw: bool, family: str, interface: typing.Optional[str], state: typing.
     else:
         return format_neighbors(data, interface)
 
-def reset(family: str, interface: typing.Optional[str], address: typing.Optional[str]):
-    from vyos.util import run
+def reset(family: ArgFamily, interface: typing.Optional[str], address: typing.Optional[str]):
+    from vyos.utils.process import run
 
     if address and interface:
         raise ValueError("interface and address parameters are mutually exclusive")
@@ -110,7 +111,6 @@ def reset(family: str, interface: typing.Optional[str], address: typing.Optional
         # Flush an entire neighbor table
         run(f"""ip --family {family} neighbor flush""")
 
-
 if __name__ == '__main__':
     try:
         res = vyos.opmode.run(sys.modules[__name__])