Merge pull request #2148 from n-rodriguez/wip/fixes

Small fixes for nxos_ssh

Author: bewing

napalm/nxos_ssh/nxos_ssh.py

@@ -168,8 +168,7 @@ def parse_intf_section(interface):
         mtu = int(speed_data["mtu"])
         speed_unit = speed_data["speed_unit"]
         speed_unit = speed_unit.rstrip(",")
-        # This was alway in Kbit (in the data I saw)
-        if speed_unit != "Kbit":
+        if speed_unit not in ["Kbit", "Kbit/sec"]:
             msg = "Unexpected speed unit in show interfaces parsing:\n\n{}".format(
                 interface
             )
@@ -484,7 +483,7 @@ def parse_uptime(uptime_str):
         Return the uptime in seconds as an integer
         """
         # Initialize to zero
-        (years, weeks, days, hours, minutes) = (0, 0, 0, 0, 0)
+        (years, weeks, days, hours, minutes, seconds) = (0, 0, 0, 0, 0, 0)
 
         uptime_str = uptime_str.strip()
         time_list = uptime_str.split(",")

test/nxos_ssh/test_static_methods.py

@@ -0,0 +1,20 @@
+"""Tests for uptime utils"""
+
+from napalm.nxos_ssh import NXOSSSHDriver
+
+
+def test_parse_uptime():
+    """
+    Test uptime parsing
+    """
+    assert (
+        NXOSSSHDriver.parse_uptime("0 day(s), 0 hour(s), 0 minute(s), 1 second(s)") == 1
+    )
+    assert (
+        NXOSSSHDriver.parse_uptime("1 day(s), 0 hour(s), 0 minute(s), 0 second(s)")
+        == 86400
+    )
+    assert (
+        NXOSSSHDriver.parse_uptime("4 day(s), 15 hour(s), 48 minute(s), 52 second(s)")
+        == 402532
+    )