T6045: Recreate show lldp detail views & improve remote port selection

Resolving problems found in review: * Wrapping lldpcli inside op_mode/lldp.py for plain detail view, retaining existing raw detail-mode * details => detail for non-specific view
vyos · Jun 6, 2024 · 2e5f033 · 2e5f033
1 parent 97a767c
commit 2e5f033
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/op-mode-definitions/lldp.xml.in b/op-mode-definitions/lldp.xml.in
@@ -13,11 +13,11 @@
             </properties>
             <command>${vyos_op_scripts_dir}/lldp.py show_neighbors</command>
             <children>
-              <node name="details">
+              <node name="detail">
                 <properties>
                   <help>Show extended detail for LLDP neighbors</help>
                 </properties>
-                <command>/usr/sbin/lldpcli show neighbors detail</command>
+                <command>${vyos_op_scripts_dir}/lldp.py show_neighbors --detail</command>
               </node>
               <tagNode name="interface">
                 <properties>
@@ -35,7 +35,7 @@
                         <script>${vyos_completion_dir}/list_interfaces</script>
                       </completionHelp>
                     </properties>
-                    <command>/usr/sbin/lldpcli show neighbors ports $5 detail</command>
+                    <command>${vyos_op_scripts_dir}/lldp.py show_neighbors --interface $5 --detail</command>
                   </node>
                 </children>
               </tagNode>

diff --git a/src/op_mode/lldp.py b/src/op_mode/lldp.py
@@ -141,11 +141,17 @@ def _get_formatted_output(raw_data):
 
 @_verify
 def show_neighbors(raw: bool, interface: typing.Optional[str], detail: typing.Optional[bool]):
-    lldp_data = _get_raw_data(interface=interface, detail=detail)
-    if raw:
-        return lldp_data
-    else:
-        return _get_formatted_output(lldp_data)
+    if raw or not detail:
+        lldp_data = _get_raw_data(interface=interface, detail=detail)
+        if raw:
+            return lldp_data
+        else:
+            return _get_formatted_output(lldp_data)
+    else: # non-raw, detail 
+        tmp = 'lldpcli -f text show neighbors details'
+        if interface:
+            tmp += f' ports {interface}'
+        return cmd(tmp)
 
 if __name__ == "__main__":
     try: