1 files changed, 10 insertions, 4 deletions
diff --git a/src/op_mode/lldp_op.py b/src/op_mode/lldp_op.py
index 4d8fdbc99..5d48e3210 100755
--- a/src/op_mode/lldp_op.py
+++ b/src/op_mode/lldp_op.py
@@ -20,9 +20,11 @@ import jinja2
 
 from xml.dom import minidom
 from sys import exit
-from subprocess import Popen, PIPE, STDOUT
 from tabulate import tabulate
 
+from vyos.util import popen
+from vyos.config import Config
+
 parser = argparse.ArgumentParser()
 parser.add_argument("-a", "--all", action="store_true", help="Show LLDP neighbors on all interfaces")
 parser.add_argument("-i", "--interface", action="store", help="Show LLDP neighbors on specific interface")
@@ -40,9 +42,8 @@ Device ID                 Local     Proto  Cap   Platform             Port ID
 
 def _get_neighbors():
     command = '/usr/sbin/lldpcli -f xml show neighbors'
-    p = Popen(command, stdout=PIPE, stderr=STDOUT, shell=True)
-    tmp = p.communicate()[0].strip()
-    return tmp.decode()
+    out,_ = popen(command)
+    return out
 
 def extract_neighbor(neighbor):
     """
@@ -141,6 +142,11 @@ if __name__ == '__main__':
     args = parser.parse_args()
     tmp = { 'neighbors' : [] }
 
+    c = Config()
+    if not c.exists_effective(['service', 'lldp']):
+        print('Service LLDP is not configured')
+        exit(0)
+
     if args.all:
        neighbors = minidom.parseString(_get_neighbors())
        for neighbor in neighbors.getElementsByTagName('interface'):