Add support to connect to HPE 1920 and 1950 OfficeConnect switches

netmiko/hp/__init__.py

@@ -1,4 +1,7 @@
 from netmiko.hp.hp_procurve import HPProcurveSSH, HPProcurveTelnet
 from netmiko.hp.hp_comware import HPComwareSSH, HPComwareTelnet
+from netmiko.hp.hp_comware1920 import HPComware1920SSH, HPComware1920Telnet
+from netmiko.hp.hp_comware1950 import HPComware1950SSH, HPComware1950Telnet
 
-__all__ = ["HPProcurveSSH", "HPProcurveTelnet", "HPComwareSSH", "HPComwareTelnet"]
+__all__ = ["HPProcurveSSH", "HPProcurveTelnet", "HPComwareSSH", "HPComwareTelnet", "HPComware1920SSH",
+           "HPComware1920Telnet", "HPComware1950SSH", "HPComware1950Telnet"]

netmiko/hp/hp_comware1920.py

@@ -0,0 +1,33 @@
+from typing import Optional, Any
+from netmiko.hp.hp_comware import HPComwareBase
+
+
+class HPComware1920Base(HPComwareBase):
+    """
+    Connection class for OfficeConnect 1920 series switches
+    """
+
+    def set_base_prompt(self, pri_prompt_terminator: str = ">", alt_prompt_terminator: str = "]",
+                        delay_factor: float = 1.0, pattern: Optional[str] = None) -> str:
+        ret =  super().set_base_prompt(pri_prompt_terminator, alt_prompt_terminator, delay_factor, pattern)
+        self.enable_cmd_hpe1920()
+        return ret
+
+    def enable_cmd_hpe1920(self):
+        """
+        Enable terminal cmdline for HPE OfficeConnect 1920
+        """
+        self.send_command('_cmdline-mode on', 'Continue?')
+        self.send_command('y', 'password:')
+        self.send_command('Jinhua1920unauthorized', 'Warning:')
+
+
+class HPComware1920SSH(HPComware1920Base):
+    pass
+
+
+class HPComware1920Telnet(HPComware1920Base):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        default_enter = kwargs.get("default_enter")
+        kwargs["default_enter"] = "\r\n" if default_enter is None else default_enter
+        super().__init__(*args, **kwargs)

netmiko/hp/hp_comware1950.py

@@ -0,0 +1,33 @@
+from typing import Optional, Any
+from netmiko.hp.hp_comware import HPComwareBase
+
+
+class HPComware1950Base(HPComwareBase):
+    """
+    Connection class for OfficeConnect 1950 series switches
+    """
+
+    def set_base_prompt(self, pri_prompt_terminator: str = ">", alt_prompt_terminator: str = "]",
+                        delay_factor: float = 1.0, pattern: Optional[str] = None) -> str:
+        ret =  super().set_base_prompt(pri_prompt_terminator, alt_prompt_terminator, delay_factor, pattern)
+        self.enable_cmd_hpe1950()
+        return ret
+
+    def enable_cmd_hpe1950(self):
+        """
+        Enable terminal cmdline for HPE OfficeConnect 1950
+        """
+        self.send_command('xtd-cli-mode', 'Switch to extended CLI mode?')
+        self.send_command('y', 'Password:')
+        self.send_command('foes-bent-pile-atom-ship', 'Warning:')
+
+
+class HPComware1950SSH(HPComware1950Base):
+    pass
+
+
+class HPComware1950Telnet(HPComware1950Base):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        default_enter = kwargs.get("default_enter")
+        kwargs["default_enter"] = "\r\n" if default_enter is None else default_enter
+        super().__init__(*args, **kwargs)

netmiko/ssh_dispatcher.py

@@ -106,7 +106,16 @@
 from netmiko.garderos import GarderosGrsSSH
 from netmiko.genexis import GenexisSOLT33Telnet
 from netmiko.hillstone import HillstoneStoneosSSH
-from netmiko.hp import HPProcurveSSH, HPProcurveTelnet, HPComwareSSH, HPComwareTelnet
+from netmiko.hp import (
+    HPProcurveSSH,
+    HPProcurveTelnet,
+    HPComwareSSH,
+    HPComwareTelnet,
+    HPComware1920SSH,
+    HPComware1920Telnet,
+    HPComware1950SSH,
+    HPComware1950Telnet
+)
 from netmiko.huawei import HuaweiSSH, HuaweiVrpv8SSH, HuaweiTelnet
 from netmiko.huawei import HuaweiSmartAXSSH, HuaweiSmartAXSSHMMI
 from netmiko.infinera import InfineraPacketSSH, InfineraPacketTelnet
@@ -277,6 +286,8 @@
     "h3c_comware": HPComwareSSH,
     "hillstone_stoneos": HillstoneStoneosSSH,
     "hp_comware": HPComwareSSH,
+    "hp_comware1920": HPComware1920SSH,
+    "hp_comware1950": HPComware1950SSH,
     "hp_procurve": HPProcurveSSH,
     "huawei": HuaweiSSH,
     "huawei_smartaxmmi": HuaweiSmartAXSSHMMI,
@@ -400,6 +411,8 @@
 CLASS_MAPPER["genexis_solt33_telnet"] = GenexisSOLT33Telnet
 CLASS_MAPPER["hp_procurve_telnet"] = HPProcurveTelnet
 CLASS_MAPPER["hp_comware_telnet"] = HPComwareTelnet
+CLASS_MAPPER["hp_comware1920_telnet"] = HPComware1920Telnet
+CLASS_MAPPER["hp_comware1950_telnet"] = HPComware1950Telnet
 CLASS_MAPPER["huawei_telnet"] = HuaweiTelnet
 CLASS_MAPPER["huawei_olt_telnet"] = HuaweiSmartAXSSH
 CLASS_MAPPER["infinera_packet_telnet"] = InfineraPacketTelnet