@@ -695,34 +695,38 @@ def expected(interfacename):
695
695
print ("DEVICE_NEIGHBOR_METADATA information is not present." )
696
696
return
697
697
698
- #Swap Key and Value from interface: name to name: interface
699
- device2interface_dict = {}
700
698
for port in natsorted (neighbor_dict .keys ()):
701
699
temp_port = port
702
700
if get_interface_mode () == "alias" :
703
701
port = iface_alias_converter .name_to_alias (port )
704
702
neighbor_dict [port ] = neighbor_dict .pop (temp_port )
705
- device2interface_dict [neighbor_dict [port ]['name' ]] = {'localPort' : port , 'neighborPort' : neighbor_dict [port ]['port' ]}
706
703
707
704
header = ['LocalPort' , 'Neighbor' , 'NeighborPort' , 'NeighborLoopback' , 'NeighborMgmt' , 'NeighborType' ]
708
705
body = []
709
706
if interfacename :
710
- for device in natsorted (neighbor_metadata_dict .keys ()):
711
- if device2interface_dict [device ]['localPort' ] == interfacename :
712
- body .append ([device2interface_dict [device ]['localPort' ],
713
- device ,
714
- device2interface_dict [device ]['neighborPort' ],
715
- neighbor_metadata_dict [device ]['lo_addr' ],
716
- neighbor_metadata_dict [device ]['mgmt_addr' ],
717
- neighbor_metadata_dict [device ]['type' ]])
718
- else :
719
- for device in natsorted (neighbor_metadata_dict .keys ()):
720
- body .append ([device2interface_dict [device ]['localPort' ],
707
+ try :
708
+ device = neighbor_dict [interfacename ]['name' ]
709
+ body .append ([interfacename ,
721
710
device ,
722
- device2interface_dict [ device ]['neighborPort ' ],
711
+ neighbor_dict [ interfacename ]['port ' ],
723
712
neighbor_metadata_dict [device ]['lo_addr' ],
724
713
neighbor_metadata_dict [device ]['mgmt_addr' ],
725
714
neighbor_metadata_dict [device ]['type' ]])
715
+ except KeyError :
716
+ click .echo ("No neighbor information available for interface {}" .format (interfacename ))
717
+ return
718
+ else :
719
+ for port in natsorted (neighbor_dict .keys ()):
720
+ try :
721
+ device = neighbor_dict [port ]['name' ]
722
+ body .append ([port ,
723
+ device ,
724
+ neighbor_dict [port ]['port' ],
725
+ neighbor_metadata_dict [device ]['lo_addr' ],
726
+ neighbor_metadata_dict [device ]['mgmt_addr' ],
727
+ neighbor_metadata_dict [device ]['type' ]])
728
+ except KeyError :
729
+ pass
726
730
727
731
click .echo (tabulate (body , header ))
728
732
0 commit comments