Merge branch 'develop' into aruba_os_file_transfer

Author: ktbyers

netmiko/adtran/adtran.py

@@ -46,11 +46,11 @@ def enable(
 
             # Search for trailing prompt or password pattern
             output += self.read_until_prompt_or_pattern(
-                pattern=pattern, re_flags=re_flags
+                pattern=pattern, re_flags=re_flags, read_entire_line=True
             )
 
             # Send the "secret" in response to password pattern
-            if re.search(pattern, output):
+            if re.search(pattern, output, flags=re_flags):
                 self.write_channel(self.normalize_cmd(self.secret))
 
                 # Handle the fallback to local authentication case

netmiko/base_connection.py

@@ -2051,11 +2051,11 @@ def enable(
 
             # Search for trailing prompt or password pattern
             output += self.read_until_prompt_or_pattern(
-                pattern=pattern, re_flags=re_flags
+                pattern=pattern, re_flags=re_flags, read_entire_line=True
             )
 
             # Send the "secret" in response to password pattern
-            if re.search(pattern, output):
+            if re.search(pattern, output, flags=re_flags):
                 self.write_channel(self.normalize_cmd(self.secret))
                 output += self.read_until_prompt()
 

netmiko/cisco/__init__.py

@@ -7,6 +7,7 @@
 from netmiko.cisco.cisco_ios import CiscoIosFileTransfer
 from netmiko.cisco.cisco_ios import InLineTransfer
 from netmiko.cisco.cisco_asa_ssh import CiscoAsaSSH, CiscoAsaFileTransfer
+from netmiko.cisco.cisco_ap_ssh import CiscoApSSH
 from netmiko.cisco.cisco_ftd_ssh import CiscoFtdSSH
 from netmiko.cisco.cisco_nxos import (
     CiscoNxosSSH,
@@ -27,6 +28,7 @@
     "CiscoIosSSH",
     "CiscoIosTelnet",
     "CiscoAsaSSH",
+    "CiscoApSSH",
     "CiscoFtdSSH",
     "CiscoNxosSSH",
     "CiscoNxosTelnet",

netmiko/cisco/cisco_ap_ssh.py

@@ -0,0 +1,15 @@
+"""Subclass specific to Cisco AP."""
+
+from netmiko.no_config import NoConfig
+from netmiko.cisco_base_connection import CiscoBaseConnection
+
+
+class CiscoApSSH(NoConfig, CiscoBaseConnection):
+    """Subclass specific to Cisco AP."""
+
+    def session_preparation(self) -> None:
+        """Prepare the session after the connection has been established."""
+        cmd = "terminal width 132"
+        self.set_terminal_width(command=cmd, pattern=cmd)
+        self.disable_paging()
+        self.set_base_prompt()

netmiko/optilink/__init__.py

@@ -1,7 +1,9 @@
 from netmiko.optilink.op_eolt9702 import OptilinkEOLT9702Telnet
 from netmiko.optilink.op_eolt11444 import OptilinkEOLT11444Telnet
+from netmiko.optilink.op_golt924 import OptilinkGOLT924Telnet
 
 __all__ = [
+    "OptilinkGOLT924Telnet",
     "OptilinkEOLT11444Telnet",
     "OptilinkEOLT9702Telnet",
 ]

netmiko/optilink/op_golt924.py

@@ -0,0 +1,32 @@
+from netmiko.cisco_base_connection import CiscoBaseConnection
+
+
+class OptilinkGOLT924Base(CiscoBaseConnection):
+    """
+    Optilink GOLT 92408A
+    Optilink GOLT 92408A16A
+    """
+
+    def session_preparation(self) -> None:
+        self._test_channel_read(pattern=r"[>#]")
+        self.set_base_prompt()
+
+    def exit_enable_mode(self, exit_command: str = "exit") -> str:
+        """Exit from enable mode."""
+        output = ""
+        if self.check_enable_mode():
+            self.write_channel(self.normalize_cmd(exit_command))
+            self.read_until_pattern(pattern=exit_command)
+            output += self.read_until_pattern(pattern=r"gpon>")
+            if self.check_enable_mode():
+                raise ValueError("Failed to exit enable mode.")
+        return output
+
+
+class OptilinkGOLT924Telnet(OptilinkGOLT924Base):
+    """
+    Optilink GOLT 92416A telnet driver
+    Optilink GOLT 92408A telnet driver
+    """
+
+    pass

netmiko/ssh_autodetect.py

@@ -101,6 +101,12 @@
         "priority": 99,
         "dispatch": "_autodetect_std",
     },
+    "cisco_ap": {
+        "cmd": "show version",
+        "search_patterns": [r"Cisco AP Software"],
+        "priority": 99,
+        "dispatch": "_autodetect_std",
+    },
     "cisco_asa": {
         "cmd": "show version",
         "search_patterns": [r"Cisco Adaptive Security Appliance", r"Cisco ASA"],

netmiko/ssh_dispatcher.py

@@ -43,7 +43,7 @@
     CienaSaosFileTransfer,
 )
 from netmiko.cisco import CiscoAsaSSH, CiscoAsaFileTransfer
-from netmiko.cisco import CiscoApicSSH
+from netmiko.cisco import CiscoApicSSH, CiscoApSSH
 from netmiko.cisco import CiscoFtdSSH
 from netmiko.cisco import (
     CiscoIosSSH,
@@ -135,6 +135,7 @@
 from netmiko.oneaccess import OneaccessOneOSTelnet, OneaccessOneOSSSH
 from netmiko.optilink import OptilinkEOLT9702Telnet
 from netmiko.optilink import OptilinkEOLT11444Telnet
+from netmiko.optilink import OptilinkGOLT924Telnet
 from netmiko.ovs import OvsLinuxSSH
 from netmiko.paloalto import PaloAltoPanosSSH
 from netmiko.paloalto import PaloAltoPanosTelnet
@@ -216,8 +217,9 @@
     "ciena_saos": CienaSaosSSH,
     "ciena_saos10": CienaSaos10SSH,
     "ciena_waveserver": CienaWaveserverSSH,
-    "cisco_asa": CiscoAsaSSH,
+    "cisco_ap": CiscoApSSH,
     "cisco_apic": CiscoApicSSH,
+    "cisco_asa": CiscoAsaSSH,
     "cisco_ftd": CiscoFtdSSH,
     "cisco_ios": CiscoIosSSH,
     "cisco_nxos": CiscoNxosSSH,
@@ -409,6 +411,7 @@
 CLASS_MAPPER["oneaccess_oneos_telnet"] = OneaccessOneOSTelnet
 CLASS_MAPPER["optilink_eolt9702_telnet"] = OptilinkEOLT9702Telnet
 CLASS_MAPPER["optilink_eolt11444_telnet"] = OptilinkEOLT11444Telnet
+CLASS_MAPPER["optilink_golt924_telnet"] = OptilinkGOLT924Telnet
 CLASS_MAPPER["paloalto_panos_telnet"] = PaloAltoPanosTelnet
 CLASS_MAPPER["rad_etx_telnet"] = RadETXTelnet
 CLASS_MAPPER["raisecom_telnet"] = RaisecomRoapTelnet

netmiko/tplink/tplink_jetstream.py

@@ -74,7 +74,7 @@ def enable(
                     pattern=pattern, re_flags=re_flags, read_entire_line=True
                 )
                 output += new_data
-                if re.search(pattern, new_data):
+                if re.search(pattern, new_data, flags=re_flags):
                     self.write_channel(self.normalize_cmd(self.secret))
                     output += self.read_until_prompt(read_entire_line=True)
             except ReadTimeout:

tests/etc/commands.yml.example

@@ -67,6 +67,12 @@ cisco_asa:
   config_verification: "show run | inc logging buffer"
   config_file: "cisco_asa_commands.txt"
 
+cisco_ap:
+  version: "show version"
+  basic: "show ip interface brief"
+  wide_command: "show configuration wlan myverybiglonglistthatdoesntexistandwherethisexceeds80characterssolinewrappingoccurs"
+  extended_output: "show version" # requires paging to be disabled
+
 arista_eos:
   version: "show version"
   basic: "show ip int brief"