Merge pull request #171 from napalm-automation/develop

Release 0.10.2

Author: mirceaulinic

napalm_junos/junos.py

@@ -180,7 +180,7 @@ def _detect_config_format(self, config):
         ]
         if config.strip().startswith('<'):
             return 'xml'
-        elif config.split(' ')[0] in set_action_matches:
+        elif config.strip().split(' ')[0] in set_action_matches:
             return 'set'
         elif self._is_json_format(config):
             return 'json'
@@ -616,15 +616,17 @@ def get_lldp_neighbors_detail(self, interface=''):
             return {}
         interfaces = lldp_table.get().keys()
 
-        old_junos = napalm_base.helpers.convert(
-            int, self.device.facts.get('version', '0.0').split('.')[0], 0) < 13
-
+        # get lldp neighbor by interface rpc for EX Series, QFX Series, J Series
+        # and SRX Series is get-lldp-interface-neighbors-information,
+        # and rpc for M, MX, and T Series is get-lldp-interface-neighbors
+        # ref1: https://apps.juniper.net/xmlapi/operTags.jsp  (Junos 13.1 and later)
+        # ref2: https://www.juniper.net/documentation/en_US/junos12.3/information-products/topic-collections/junos-xml-ref-oper/index.html  (Junos 12.3) # noqa
         lldp_table.GET_RPC = 'get-lldp-interface-neighbors'
-        if old_junos:
+        if self.device.facts.get('personality') not in ('MX', 'M', 'T'):
             lldp_table.GET_RPC = 'get-lldp-interface-neighbors-information'
 
         for interface in interfaces:
-            if old_junos:
+            if self.device.facts.get('personality') not in ('MX', 'M', 'T'):
                 lldp_table.get(interface_name=interface)
             else:
                 lldp_table.get(interface_device=interface)

setup.py

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

test/unit/mocked_data/test_get_lldp_neighbors_detail/facts.yml

@@ -0,0 +1 @@
+personality: SWITCH

…hbors_detail/normal/expected_result.json …il/normal_ex_fx_srx/expected_result.jsontest/unit/mocked_data/test_get_lldp_neighbors_detail/normal/expected_result.json renamed to test/unit/mocked_data/test_get_lldp_neighbors_detail/normal_ex_fx_srx/expected_result.json test/unit/mocked_data/test_get_lldp_neighbors_detail/normal/expected_result.json renamed to test/unit/mocked_data/test_get_lldp_neighbors_detail/normal_ex_fx_srx/expected_result.json

@@ -0,0 +1 @@
+{"me0.0": [{"remote_port_description": "Po1:sw21.tpe01:xe-0/1/0", "remote_port": "Ethernet3/2/1", "remote_system_description": "Arista Networks EOS version 4.14.8M running on an Arista Networks DCS-7504", "remote_chassis_id": "00:1C:73:EE:C0:46", "remote_system_name": "core05.tpe01", "parent_interface": "ae0.0", "remote_system_capab": "Bridge Router", "remote_system_enable_capab": "Bridge"}], "xe-4/3/6": [{"remote_port_description": "Po1:sw21.tpe01:xe-0/1/0", "remote_port": "Ethernet3/2/1", "remote_system_description": "Arista Networks EOS version 4.14.8M running on an Arista Networks DCS-7504", "remote_chassis_id": "00:1C:73:EE:C0:46", "remote_system_name": "core05.tpe01", "parent_interface": "ae0.0", "remote_system_capab": "Bridge Router", "remote_system_enable_capab": "Bridge"}], "xe-0/1/0.0": [{"remote_port_description": "Po1:sw21.tpe01:xe-0/1/0", "remote_port": "Ethernet3/2/1", "remote_system_description": "Arista Networks EOS version 4.14.8M running on an Arista Networks DCS-7504", "remote_chassis_id": "00:1C:73:EE:C0:46", "remote_system_name": "core05.tpe01", "parent_interface": "ae0.0", "remote_system_capab": "Bridge Router", "remote_system_enable_capab": "Bridge"}], "ge-0/0/0.0": [{"remote_port_description": "Po1:sw21.tpe01:xe-0/1/0", "remote_port": "Ethernet3/2/1", "remote_system_description": "Arista Networks EOS version 4.14.8M running on an Arista Networks DCS-7504", "remote_chassis_id": "00:1C:73:EE:C0:46", "remote_system_name": "core05.tpe01", "parent_interface": "ae0.0", "remote_system_capab": "Bridge Router", "remote_system_enable_capab": "Bridge"}]}

test/unit/mocked_data/test_get_lldp_neighbors_detail/normal_ex_fx_srx/facts.yml

@@ -0,0 +1 @@
+personality: MX

…lldp-interface-neighbors-information.xml …lldp-interface-neighbors-information.xmltest/unit/mocked_data/test_get_lldp_neighbors_detail/normal/get-lldp-interface-neighbors-information.xml renamed to test/unit/mocked_data/test_get_lldp_neighbors_detail/normal_ex_fx_srx/get-lldp-interface-neighbors-information.xml test/unit/mocked_data/test_get_lldp_neighbors_detail/normal/get-lldp-interface-neighbors-information.xml renamed to test/unit/mocked_data/test_get_lldp_neighbors_detail/normal_ex_fx_srx/get-lldp-interface-neighbors-information.xml

@@ -0,0 +1,41 @@
+<lldp-neighbors-information style="detail">
+    <lldp-neighbor-information>
+        <lldp-index>23</lldp-index>
+        <lldp-ttl>120</lldp-ttl>
+        <lldp-timemark>Mon Apr 18 10:04:06 2016</lldp-timemark>
+        <lldp-age>29</lldp-age>
+        <lldp-local-interface>xe-0/1/0.0</lldp-local-interface>
+        <lldp-local-parent-interface-name>ae0.0</lldp-local-parent-interface-name>
+        <lldp-local-port-id>600</lldp-local-port-id>
+        <lldp-local-port-ageout-count>0</lldp-local-port-ageout-count>
+        <lldp-remote-chassis-id-subtype>Mac address</lldp-remote-chassis-id-subtype>
+        <lldp-remote-chassis-id>00:1c:73:ee:c0:46</lldp-remote-chassis-id>
+        <lldp-remote-port-id-subtype>Interface name</lldp-remote-port-id-subtype>
+        <lldp-remote-port-id>Ethernet3/2/1</lldp-remote-port-id>
+        <lldp-remote-port-description>Po1:sw21.tpe01:xe-0/1/0</lldp-remote-port-description>
+        <lldp-remote-system-name>core05.tpe01</lldp-remote-system-name>
+        <lldp-system-description>
+            <lldp-remote-system-description>Arista Networks EOS version 4.14.8M running on an Arista Networks DCS-7504</lldp-remote-system-description>
+        </lldp-system-description>
+        <lldp-remote-system-capabilities-supported>Bridge Router </lldp-remote-system-capabilities-supported>
+        <lldp-remote-system-capabilities-enabled>Bridge </lldp-remote-system-capabilities-enabled>
+        <lldp-remote-management-address-type>IPv4</lldp-remote-management-address-type>
+        <lldp-remote-management-address>199.27.130.35</lldp-remote-management-address>
+        <lldp-remote-management-address-port-id>2000900</lldp-remote-management-address-port-id>
+        <lldp-remote-management-address-sub-type>1</lldp-remote-management-address-sub-type>
+        <lldp-remote-management-address-interface-subtype>ifIndex(2)</lldp-remote-management-address-interface-subtype>
+        <lldp-remote-management-addr-oid>1.3.6.1.2.1.31.1.1.1.1.2000900</lldp-remote-management-addr-oid>
+        <lldp-remote-org-def-info-oui>0.80.c2</lldp-remote-org-def-info-oui>
+        <lldp-remote-org-def-info-subtype>1</lldp-remote-org-def-info-subtype>
+        <lldp-remote-org-def-info-index>1</lldp-remote-org-def-info-index>
+        <lldp-remote-org-def-info>0001 </lldp-remote-org-def-info>
+        <lldp-remote-org-def-info-oui>0.12.f</lldp-remote-org-def-info-oui>
+        <lldp-remote-org-def-info-subtype>3</lldp-remote-org-def-info-subtype>
+        <lldp-remote-org-def-info-index>2</lldp-remote-org-def-info-index>
+        <lldp-remote-org-def-info>03000F4241 </lldp-remote-org-def-info>
+        <lldp-remote-org-def-info-oui>0.12.f</lldp-remote-org-def-info-oui>
+        <lldp-remote-org-def-info-subtype>4</lldp-remote-org-def-info-subtype>
+        <lldp-remote-org-def-info-index>3</lldp-remote-org-def-info-index>
+        <lldp-remote-org-def-info>2414 </lldp-remote-org-def-info>
+    </lldp-neighbor-information>
+</lldp-neighbors-information>