Merge branch 'develop' into patch-1

Author: yzgyyang

docs/requirements.txt

@@ -2,7 +2,7 @@ urllib3==2.3.0 # https://github.com/readthedocs/readthedocs.org/issues/10290
 sphinx==7.3.7
 sphinx-rtd-theme==2.0.0
 invoke==2.2.0
-jinja2==3.1.4
+jinja2==3.1.6
 MarkupSafe==3.0.2
-pytest==8.3.4
+pytest==8.3.5
 ansible==11.3.0

napalm/eos/eos.py

@@ -530,7 +530,7 @@ def confirm_commit(self):
                 "configure session {} commit".format(self.config_session),
                 "write memory",
             ]
-            self._run_commands(commands)
+            self._run_commands(commands, encoding="text")
             self.config_session = None
         else:
             raise CommitError("No pending commit-confirm found!")
@@ -1224,6 +1224,8 @@ def get_ntp_servers(self):
                 "key_id": -1,
             }
             tokens = server.split()
+            if tokens[0] != "ntp":
+                continue
             if tokens[2] == "vrf":
                 details["network_instance"] = tokens[3]
                 server_ip = details["address"] = tokens[4]
@@ -1270,6 +1272,8 @@ def get_ntp_servers(self):
                 elif tokens[idx] == "prefer":
                     details["prefer"] = True
                     idx += 1
+                else:  # Shouldn't happen
+                    idx += 1
 
             result[server_ip] = details
 

requirements-dev.txt

@@ -2,16 +2,15 @@ black==24.4.2
 coveralls==4.0.1
 ddt==1.7.2
 flake8-import-order==0.18.2
-pytest==8.3.4
+pytest==8.3.5
 pytest-cov==5.0.0
 pytest-json-report==1.5.0
 pyflakes==3.2.0
 pylama==8.4.1
-mock==5.1.0
 mypy==1.11.1
-types-PyYAML==6.0.12.20240808
+types-PyYAML==6.0.12.20241230
 types-requests==2.32.0.20241016
-types-six==1.16.21.20240513
+types-six==1.17.0.20241205
 types-setuptools==69.5.0.20240522
 ttp==0.9.5
-ttp_templates==0.3.6
+ttp_templates==0.3.7

test/eos/mocked_data/test_get_ntp_servers/extra-output/expected_result.json

@@ -0,0 +1,35 @@
+{
+  "1.2.3.4": {
+    "port": 123,
+    "version": 4,
+    "association_type": "SERVER",
+    "iburst": false,
+    "prefer": false,
+    "network_instance": "default",
+    "source_address": "",
+    "key_id": -1,
+    "address": "1.2.3.4"
+  },
+  "5.6.7.8": {
+    "port": 123,
+    "version": 4,
+    "association_type": "SERVER",
+    "iburst": false,
+    "prefer": false,
+    "network_instance": "default",
+    "source_address": "",
+    "key_id": -1,
+    "address": "5.6.7.8"
+  },
+  "2001:0db8:0a0b:12f0:0000:0000:0000:0001": {
+    "port": 123,
+    "version": 4,
+    "association_type": "SERVER",
+    "iburst": false,
+    "prefer": false,
+    "network_instance": "default",
+    "source_address": "",
+    "key_id": -1,
+    "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0001"
+  }
+}

test/eos/mocked_data/test_get_ntp_servers/extra-output/show_running_config___section_ntp.text

@@ -0,0 +1,7 @@
+ip access-list test-acl
+    10 remark ntp
+    20 permit udp any eq ntp any
+    30 permit udp any any eq ntp
+ntp server 1.2.3.4
+ntp server 5.6.7.8
+ntp server 2001:0db8:0a0b:12f0:0000:0000:0000:0001

test/eos/test_heredoc.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import pytest
 from textwrap import dedent
 

test/nxos/test_getters.py

@@ -1,11 +1,12 @@
 """Tests for getters."""
 
+from unittest.mock import patch
+
 from napalm.base.test.getters import BaseTestGetters, wrap_test_cases
 from napalm.base.test import helpers
 from napalm.base import models
 
 import pytest
-from mock import patch
 
 
 def mock_time():

test/nxos_ssh/test_getters.py

@@ -1,11 +1,12 @@
 """Tests for getters."""
 
+from unittest.mock import patch
+
 from napalm.base.test.getters import BaseTestGetters, wrap_test_cases
 from napalm.base.test import helpers
 from napalm.base import models
 
 import pytest
-from mock import patch
 
 
 def mock_time():