Merge pull request #180 from napalm-automation/develop

Release 0.6.1

napalm_eos/eos.py

@@ -535,12 +535,13 @@ def get_lldp_neighbors_detail(self, interface=''):
                 remote_chassis_id = neighbor.get('chassisId', u'')
                 if neighbor.get("chassisIdType", u'') == "macAddress":
                     remote_chassis_id = napalm_base.helpers.mac(remote_chassis_id)
+                neighbor_interface_info = neighbor.get('neighborInterfaceInfo', {})
                 lldp_neighbors_out[interface].append(
                     {
                         'parent_interface': interface,  # no parent interfaces
-                        'remote_port':
-                            neighbor.get('neighborInterfaceInfo', {}).get('interfaceId', u''),
-                        'remote_port_description': u'',
+                        'remote_port': neighbor_interface_info.get('interfaceId', u''),
+                        'remote_port_description':
+                            neighbor_interface_info.get('interfaceDescription', u''),
                         'remote_system_name': neighbor.get('systemName', u''),
                         'remote_system_description': neighbor.get('systemDescription', u''),
                         'remote_chassis_id': remote_chassis_id,
@@ -965,12 +966,8 @@ def get_mac_address_table(self):
 
         commands = ['show mac address-table']
 
-        mac_entries = []
-        try:
-            mac_entries = self.device.run_commands(commands)[0].get(
-                'unicastTable', {}).get('tableEntries', [])
-        except Exception:
-            return {}
+        mac_entries = self.device.run_commands(commands)[0].get(
+            'unicastTable', {}).get('tableEntries', [])
 
         for mac_entry in mac_entries:
             vlan = mac_entry.get('vlanId')

napalm_eos/templates/delete_users.j2

@@ -1,7 +1,8 @@
 {%- for user_name, user_details in users.items() %}
-{%- if user_details %}
+{%- if user_details is not none %}
 {%- if user_details.get('password') %}
 username {{user_name}} nopassword
+{%- endif %}
 {%- if user_details.get('level') %}
 no username {{user_name}} privilege {{user_details.level}}
 {%- endif %}

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="napalm-eos",
-    version="0.6.0",
+    version="0.6.1",
     packages=find_packages(),
     author="David Barroso, Mircea Ulinic",
     author_email="[email protected], [email protected]",