Merge branch 'master' into test_merge

Testing merge resolution to merging develop into master (#614)

* master:
  Release 2.2.0 (#560)

napalm/ios/ios.py

@@ -702,6 +702,18 @@ def get_optics(self):
 
     def get_lldp_neighbors(self):
         """IOS implementation of get_lldp_neighbors."""
+
+        def _device_id_expand(device_id, local_int_brief):
+            """Device id might be abbreviated: try to obtain the full device id."""
+            lldp_tmp = self._lldp_detail_parser(local_int_brief)
+            device_id_new = lldp_tmp[3][0]
+            # Verify abbreviated and full name are consistent
+            if device_id_new[:20] == device_id:
+                return device_id_new
+            else:
+                # Else return the original device_id
+                return device_id
+
         lldp = {}
         neighbors_detail = self.get_lldp_neighbors_detail()
         for intf_name, v in neighbors_detail.items():

test/ios/mocked_data/test_get_lldp_neighbors/hostname_spaces/show_int_Gi1.txt

@@ -0,0 +1,28 @@
+GigabitEthernet1 is up, line protocol is up
+  Hardware is CSR vNIC, address is 0800.27f8.e842 (bia 0800.27f8.e842)
+  Internet address is 10.0.2.15/24
+  MTU 1500 bytes, BW 1000000 Kbit/sec, DLY 10 usec,
+     reliability 255/255, txload 1/255, rxload 1/255
+  Encapsulation ARPA, loopback not set
+  Keepalive set (10 sec)
+  Full Duplex, 1000Mbps, link type is auto, media type is RJ45
+  output flow-control is unsupported, input flow-control is unsupported
+  ARP type: ARPA, ARP Timeout 04:00:00
+  Last input 00:42:01, output 00:00:05, output hang never
+  Last clearing of "show interface" counters never
+  Input queue: 0/375/0/0 (size/max/drops/flushes); Total output drops: 0
+  Queueing strategy: fifo
+  Output queue: 0/40 (size/max)
+  5 minute input rate 1000 bits/sec, 1 packets/sec
+  5 minute output rate 1000 bits/sec, 1 packets/sec
+     14028 packets input, 1766902 bytes, 0 no buffer
+     Received 0 broadcasts (0 IP multicasts)
+     0 runts, 0 giants, 0 throttles
+     0 input errors, 0 CRC, 0 frame, 0 overrun, 0 ignored
+     0 watchdog, 0 multicast, 0 pause input
+     9446 packets output, 1379617 bytes, 0 underruns
+     0 output errors, 0 collisions, 0 interface resets
+     0 unknown protocol drops
+     0 babbles, 0 late collision, 0 deferred
+     0 lost carrier, 0 no carrier, 0 pause output
+     0 output buffer failures, 0 output buffers swapped out

test/ios/mocked_data/test_get_lldp_neighbors_detail/alternate/show_lldp_neighbors_Gi1_detail.txt

@@ -0,0 +1,53 @@
+------------------------------------------------
+Local Intf: Gi1
+Chassis id: 2cc2.603e.363b
+Port id: Management1
+Port Description - not advertised
+System Name: eos-spine1.ntc.com
+
+System Description:
+Arista Networks EOS version 4.15.2F running on an Arista Networks vEOS
+
+Time remaining: 95 seconds
+System Capabilities: B,R
+Enabled Capabilities: B,R
+Management Addresses:
+    Other: 2C FF 60 3E 36 3B 00
+Auto Negotiation - not supported
+Physical media capabilities - not advertised
+Media Attachment Unit type - not advertised
+Vlan ID: - not advertised
+
+------------------------------------------------
+Local Intf: Gi1
+Chassis id: 0005.8671.58c0
+Port id: fxp0
+Port Description: fxp0
+System Name: vmx1
+
+System Description:
+Juniper Networks, Inc. vmx internet router, kernel JUNOS 15.1F4.15, Build date: 2015-12-23 19:22:55 UTC Copyright (c) 1996-2015 Juniper Networks, Inc.
+
+Time remaining: 116 seconds
+System Capabilities: B,R
+Enabled Capabilities: B,R
+Management Addresses:
+    IP: 10.0.0.31
+    OID:
+        0.1.3.6.1.2.1.31.1.1.1.1.1.
+Auto Negotiation - supported, disabled
+Physical media capabilities:
+    1000baseT(FD)
+    1000baseX(FD)
+    1000baseX(HD)
+    Symm, Asym Pause(FD)
+    100base-TX(FD)
+    100base-TX(HD)
+    10base-T(FD)
+    10base-T(HD)
+Media Attachment Unit type - not advertised
+Vlan ID: - not advertised
+
+
+Total entries displayed: 2
+

test/ios/mocked_data/test_get_lldp_neighbors_detail/normal/show_lldp_neighbors_Gi1_detail.txt

@@ -0,0 +1,22 @@
+------------------------------------------------
+Chassis id: 0018.fe1e.b020
+Port id: 17
+Port Description: 17
+System Name: twb-sf-hpsw1
+
+System Description: 
+ProCurve J9019A Switch 2510-24, revision Q.10.01, ROM Q.10.02 (/sw/code/build/harp(harp))
+
+Time remaining: 93 seconds
+System Capabilities: B
+Enabled Capabilities: B
+Management Addresses:
+    IP: 10.220.88.10
+Auto Negotiation - not supported
+Physical media capabilities - not advertised
+Media Attachment Unit type - not advertised
+Vlan ID: - not advertised
+
+
+Total entries displayed: 1
+

test/ios/mocked_data/test_get_lldp_neighbors_detail/normal/show_lldp_neighbors_Gi2_detail.txt

@@ -0,0 +1,22 @@
+------------------------------------------------
+Chassis id: 0018.fe1e.b020
+Port id: 18
+Port Description: 18
+System Name: twb-sf-hpsw2
+
+System Description: 
+ProCurve J9019A Switch 2510-24, revision Q.10.01, ROM Q.10.02 (/sw/code/build/harp(harp))
+
+Time remaining: 93 seconds
+System Capabilities: B
+Enabled Capabilities: B
+Management Addresses:
+    IP: 10.220.88.11
+Auto Negotiation - not supported
+Physical media capabilities - not advertised
+Media Attachment Unit type - not advertised
+Vlan ID: - not advertised
+
+
+Total entries displayed: 1
+