Release 3.1.0

README.md

@@ -1,4 +1,5 @@
 [![PyPI](https://img.shields.io/pypi/v/napalm.svg)](https://pypi.python.org/pypi/napalm)
+[![PyPI versions](https://img.shields.io/pypi/pyversions/napalm.svg)](https://pypi.python.org/pypi/napalm)
 [![Build Status](https://travis-ci.org/napalm-automation/napalm.svg?branch=master)](https://travis-ci.org/napalm-automation/napalm)
 [![Coverage Status](https://coveralls.io/repos/github/napalm-automation/napalm/badge.svg)](https://coveralls.io/github/napalm-automation/napalm)
 [![Code Style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
@@ -31,6 +32,9 @@ Install
 pip install napalm
 ```
 
+*Note*: Beginning with release 3.0.0 and later, NAPALM offers support for
+Python 3.6+ only.
+
 
 Upgrading
 =========

docs/installation/index.rst

@@ -1,17 +1,21 @@
 Installation
 ============
 
-
 Full installation
 -----------------
 
 You can install napalm with pip:
 
 .. code-block:: bash
-    
+
     pip install napalm
 
-That will install all the drivers currently available.
+That will install all the core drivers currently available.
+
+.. note::
+
+    Beginning with release 3.0.0 and later, NAPALM offers support for Python
+    3.6+ only.
 
 
 OS Package Managers

napalm/base/helpers.py

@@ -248,7 +248,7 @@ def textfsm_extractor(cls, template_name, raw_text):
 def find_txt(xml_tree, path, default="", namespaces=None):
     """
     Extracts the text value from an XML tree, using XPath.
-    In case of error, will return a default value.
+    In case of error or text element unavailability, will return a default value.
 
     :param xml_tree:   the XML Tree object. Assumed is <type 'lxml.etree._Element'>.
     :param path:       XPath to be applied, in order to extract the desired data.
@@ -265,7 +265,10 @@ def find_txt(xml_tree, path, default="", namespaces=None):
         if xpath_length and xpath_applied[0] is not None:
             xpath_result = xpath_applied[0]
             if isinstance(xpath_result, type(xml_tree)):
-                value = xpath_result.text.strip()
+                if xpath_result.text:
+                    value = xpath_result.text.strip()
+                else:
+                    value = default
             else:
                 value = xpath_result
         else:

napalm/ios/ios.py

@@ -799,13 +799,21 @@ def get_optics(self):
         for optics_entry in split_output.splitlines():
             # Example, Te1/0/1      34.6       3.29      -2.0      -3.5
             try:
+                optics_entry = optics_entry.strip("-")
                 split_list = optics_entry.split()
             except ValueError:
                 return {}
 
-            int_brief = split_list[0]
-            output_power = split_list[3]
-            input_power = split_list[4]
+            current = 0
+            if len(split_list) == 5:
+                int_brief = split_list[0]
+                output_power = split_list[3]
+                input_power = split_list[4]
+            elif len(split_list) >= 6:
+                int_brief = split_list[0]
+                current = split_list[3]
+                output_power = split_list[4]
+                input_power = split_list[5]
 
             port = canonical_interface_name(int_brief)
 
@@ -841,7 +849,7 @@ def get_optics(self):
                         "max": -100.0,
                     },
                     "laser_bias_current": {
-                        "instant": 0.0,
+                        "instant": (float(current) if "current" else -100.0),
                         "avg": 0.0,
                         "min": 0.0,
                         "max": 0.0,

napalm/junos/junos.py

@@ -429,6 +429,9 @@ def get_environment(self):
                 structured_object_data["class"] = current_class
 
             if structured_object_data["class"] == "Power":
+                # Make sure naming is consistent
+                sensor_object = sensor_object.replace("PEM", "Power Supply")
+
                 # Create a dict for the 'power' key
                 try:
                     environment_data["power"][sensor_object] = {}

napalm/nxos/nxos.py

@@ -43,6 +43,7 @@
 from napalm.base.exceptions import CommandErrorException
 from napalm.base.exceptions import ReplaceConfigException
 from napalm.base.helpers import generate_regex_or
+from napalm.base.helpers import as_number
 from napalm.base.netmiko_helpers import netmiko_args
 import napalm.base.constants as c
 
@@ -962,17 +963,15 @@ def get_bgp_neighbors(self):
 
                 for neighbor_dict in neighbors_list:
                     neighborid = napalm.base.helpers.ip(neighbor_dict["neighborid"])
-                    remoteas = napalm.base.helpers.as_number(
-                        neighbor_dict["neighboras"]
-                    )
+                    remoteas = as_number(neighbor_dict["neighboras"])
                     state = str(neighbor_dict["state"])
 
                     bgp_state = bgp_state_dict[state]
                     afid_dict = af_name_dict[int(af_dict["af-id"])]
                     safi_name = afid_dict[int(saf_dict["safi"])]
 
                     result_peer_dict = {
-                        "local_as": int(vrf_dict["vrf-local-as"]),
+                        "local_as": as_number(vrf_dict["vrf-local-as"]),
                         "remote_as": remoteas,
                         "remote_id": neighborid,
                         "is_enabled": bgp_state["is_enabled"],

requirements-dev.txt

@@ -1,11 +1,11 @@
 black==19.10b0
-coveralls==2.0.0
+coveralls==2.1.0
 ddt==1.4.1
 flake8-import-order==0.18.1
-pytest==5.4.2
-pytest-cov==2.8.1
+pytest==5.4.3
+pytest-cov==2.10.0
 pytest-json==0.4.0
 pytest-pythonpath==0.7.3
 pylama==7.7.1
 mock==4.0.2
-tox==3.15.0
+tox==3.16.1