Merge pull request #3590 from talmakion/feature/T6045

T6045: Recreate show lldp detail views & improve remote port selection
vyos · Jun 13, 2024 · c4269a9 · c4269a9
2 parents 31f8e5e + 83a51a0
commit c4269a9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/op-mode-definitions/lldp.xml.in b/op-mode-definitions/lldp.xml.in
@@ -13,6 +13,12 @@
             </properties>
             <command>${vyos_op_scripts_dir}/lldp.py show_neighbors</command>
             <children>
+              <node name="detail">
+                <properties>
+                  <help>Show extended detail for LLDP neighbors</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/lldp.py show_neighbors --detail</command>
+              </node>
               <tagNode name="interface">
                 <properties>
                   <help>Show LLDP for specified interface</help>
@@ -21,6 +27,17 @@
                   </completionHelp>
                 </properties>
                 <command>${vyos_op_scripts_dir}/lldp.py show_neighbors --interface $5</command>
+                <children>
+                  <node name="detail">
+                    <properties>
+                      <help>Show detailed LLDP for specified interface</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces</script>
+                      </completionHelp>
+                    </properties>
+                    <command>${vyos_op_scripts_dir}/lldp.py show_neighbors --interface $5 --detail</command>
+                  </node>
+                </children>
               </tagNode>
             </children>
           </node>

diff --git a/src/op_mode/lldp.py b/src/op_mode/lldp.py
@@ -120,7 +120,12 @@ def _get_formatted_output(raw_data):
                 tmp.append('')
 
             # Remote interface
-            interface = jmespath.search('port.descr', values)
+            interface = None
+            if jmespath.search('port.id.type', values) == 'ifname':
+                # Remote peer has explicitly returned the interface name as the PortID
+                interface = jmespath.search('port.id.value', values)
+            if not interface:
+                interface = jmespath.search('port.descr', values)
             if not interface:
                 interface = jmespath.search('port.id.value', values)
             if not interface:
@@ -136,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: