From 565c825ccd3a0f716cd197717b1aca99dd3c2ce5 Mon Sep 17 00:00:00 2001 From: Kirk Byers Date: Fri, 13 Jan 2023 11:27:03 -0800 Subject: [PATCH] Updates for Hillstone StoneOS driver --- netmiko/cisco_base_connection.py | 6 +----- netmiko/hillstone/__init__.py | 4 ++-- netmiko/hillstone/hillstone.py | 9 ++------- netmiko/ssh_dispatcher.py | 4 ++-- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/netmiko/cisco_base_connection.py b/netmiko/cisco_base_connection.py index d62dc4f3c..9a2fee6ef 100644 --- a/netmiko/cisco_base_connection.py +++ b/netmiko/cisco_base_connection.py @@ -33,11 +33,7 @@ def exit_enable_mode(self, exit_command: str = "disable") -> str: def check_config_mode( self, check_string: str = ")#", pattern: str = "", force_regex: bool = False ) -> bool: - """ - Checks if the device is in configuration mode or not. - - Cisco IOS devices abbreviate the prompt at 20 chars in config mode - """ + """Checks if the device is in configuration mode or not.""" return super().check_config_mode( check_string=check_string, pattern=pattern, force_regex=force_regex ) diff --git a/netmiko/hillstone/__init__.py b/netmiko/hillstone/__init__.py index 082a85aae..5dfdec9e7 100644 --- a/netmiko/hillstone/__init__.py +++ b/netmiko/hillstone/__init__.py @@ -1,3 +1,3 @@ -from netmiko.hillstone.hillstone import hillstoneSSH +from netmiko.hillstone.hillstone import HillstoneStoneosSSH -__all__ = ["hillstoneSSH"] \ No newline at end of file +__all__ = ["HillstoneStoneosSSH"] diff --git a/netmiko/hillstone/hillstone.py b/netmiko/hillstone/hillstone.py index 3dcd70659..d99dd1dea 100644 --- a/netmiko/hillstone/hillstone.py +++ b/netmiko/hillstone/hillstone.py @@ -1,18 +1,13 @@ -import time from netmiko.no_enable import NoEnable from netmiko.cisco_base_connection import CiscoBaseConnection -class hillstoneBase(NoEnable,CiscoBaseConnection): +class HillstoneStoneosBase(NoEnable, CiscoBaseConnection): def session_preparation(self) -> None: """Prepare the session after the connection has been established.""" self._test_channel_read(pattern=r"#") self.set_base_prompt() - # self.enable() self.disable_paging(command="terminal length 0") - # Clear the read buffer - time.sleep(0.3 * self.global_delay_factor) - self.clear_buffer() def config_mode( self, @@ -42,5 +37,5 @@ def save_config( ) -class hillstoneSSH(hillstoneBase): +class HillstoneStoneosSSH(HillstoneStoneosBase): pass diff --git a/netmiko/ssh_dispatcher.py b/netmiko/ssh_dispatcher.py index e0eb7db70..249e4e1b0 100755 --- a/netmiko/ssh_dispatcher.py +++ b/netmiko/ssh_dispatcher.py @@ -124,7 +124,7 @@ from netmiko.supermicro import SmciSwitchSmisSSH from netmiko.supermicro import SmciSwitchSmisTelnet from netmiko.zyxel import ZyxelSSH -from netmiko.hillstone import hillstoneSSH +from netmiko.hillstone import HillstoneStoneosSSH if TYPE_CHECKING: from netmiko.base_connection import BaseConnection @@ -256,7 +256,7 @@ "zte_zxros": ZteZxrosSSH, "yamaha": YamahaSSH, "zyxel_os": ZyxelSSH, - "hillstone": hillstoneSSH, + "hillstone_stoneos": HillstoneStoneosSSH, } FILE_TRANSFER_MAP = {