From 7a2d8bdf9e4f781dcb3048289e7fa465913ac7b0 Mon Sep 17 00:00:00 2001 From: pszulczewski Date: Fri, 1 Dec 2023 16:55:02 +0100 Subject: [PATCH] Fix #303 --- pyntc/devices/aireos_device.py | 2 ++ pyntc/devices/asa_device.py | 2 ++ pyntc/devices/ios_device.py | 2 ++ tests/unit/test_devices/test_aireos_device.py | 3 +++ tests/unit/test_devices/test_asa_device.py | 3 +++ tests/unit/test_devices/test_ios_device.py | 3 +++ 6 files changed, 15 insertions(+) diff --git a/pyntc/devices/aireos_device.py b/pyntc/devices/aireos_device.py index e1e76ec0..695d3bd4 100644 --- a/pyntc/devices/aireos_device.py +++ b/pyntc/devices/aireos_device.py @@ -87,6 +87,7 @@ def __init__( # nosec # pylint: disable=too-many-arguments self.native = None self.secret = secret self.port = int(port) if port else 22 + self.delay_factor_compat = kwargs.get("delay_factor_compat", True) self.global_delay_factor = kwargs.get("global_delay_factor", 1) self.delay_factor = kwargs.get("delay_factor", 1) self._connected = False @@ -1096,6 +1097,7 @@ def open(self, confirm_active=True): username=self.username, password=self.password, port=self.port, + delay_factor_compat = self.delay_factor_compat, global_delay_factor=self.global_delay_factor, secret=self.secret, verbose=False, diff --git a/pyntc/devices/asa_device.py b/pyntc/devices/asa_device.py index a7f8c317..8b41c1ba 100644 --- a/pyntc/devices/asa_device.py +++ b/pyntc/devices/asa_device.py @@ -55,6 +55,7 @@ def __init__(self, host: str, username: str, password: str, secret="", port=None self.secret = secret self.port = int(port) if port else 22 self.kwargs = kwargs + self.delay_factor_compat = kwargs.get("delay_factor_compat", True) self.global_delay_factor: int = kwargs.get("global_delay_factor", 1) self.delay_factor: int = kwargs.get("delay_factor", 1) self._connected = False @@ -727,6 +728,7 @@ def open(self): username=self.username, password=self.password, port=self.port, + delay_factor_compat=self.delay_factor_compat, global_delay_factor=self.global_delay_factor, secret=self.secret, verbose=False, diff --git a/pyntc/devices/ios_device.py b/pyntc/devices/ios_device.py index 1b0fa6e4..871608c5 100644 --- a/pyntc/devices/ios_device.py +++ b/pyntc/devices/ios_device.py @@ -63,6 +63,7 @@ def __init__( # nosec self.native = None self.secret = secret self.port = int(port) if port else 22 + self.delay_factor_compat = kwargs.get("delay_factor_compat", True) self.global_delay_factor = kwargs.get("global_delay_factor", 1) self.delay_factor = kwargs.get("delay_factor", 1) self._fast_cli = fast_cli @@ -826,6 +827,7 @@ def open(self, confirm_active=True): username=self.username, password=self.password, port=self.port, + delay_factor_compat=self.delay_factor_compat, global_delay_factor=self.global_delay_factor, secret=self.secret, verbose=False, diff --git a/tests/unit/test_devices/test_aireos_device.py b/tests/unit/test_devices/test_aireos_device.py index 4111f641..b70a0c73 100644 --- a/tests/unit/test_devices/test_aireos_device.py +++ b/tests/unit/test_devices/test_aireos_device.py @@ -1681,3 +1681,6 @@ def test_port(aireos_device): def test_port_none(patch): device = AIREOSDevice("host", "user", "pass", port=None) assert device.port == 22 + +def test_delay_factor_compat(aireos_device): + assert aireos_device.delay_factor_compat is True diff --git a/tests/unit/test_devices/test_asa_device.py b/tests/unit/test_devices/test_asa_device.py index 8537bc70..38a55155 100644 --- a/tests/unit/test_devices/test_asa_device.py +++ b/tests/unit/test_devices/test_asa_device.py @@ -68,6 +68,9 @@ def teardown(self): def test_port(self): assert self.device.port == 22 + def test_delay_factor_compat(self): + assert self.device.delay_factor_compat is True + @mock.patch.object(ASADevice, "_get_file_system", return_value="disk0:") def test_boot_options_dir(self, mock_boot): self.device.native.send_command_timing.side_effect = None diff --git a/tests/unit/test_devices/test_ios_device.py b/tests/unit/test_devices/test_ios_device.py index f57d03fd..b6a75be6 100644 --- a/tests/unit/test_devices/test_ios_device.py +++ b/tests/unit/test_devices/test_ios_device.py @@ -81,6 +81,9 @@ def tearDown(self): def test_port(self): self.assertEqual(self.device.port, 22) + def test_delay_factor_compat(self): + self.assertEqual(self.device.delay_factor_compat, True) + def test_bad_show(self): command = "show microsoft" self.device.native.send_command.return_value = "Error: Microsoft"