Fixing merge conflicts

Author: ktbyers

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_ssh import CiscoNxosSSH, CiscoNxosFileTransfer
 from netmiko.cisco.cisco_xr import CiscoXrSSH, CiscoXrTelnet, CiscoXrFileTransfer
@@ -23,6 +24,7 @@
     "CiscoIosSSH",
     "CiscoIosTelnet",
     "CiscoAsaSSH",
+    "CiscoApSSH",
     "CiscoFtdSSH",
     "CiscoNxosSSH",
     "CiscoXrSSH",

netmiko/cisco/cisco_ap_ssh.py

@@ -0,0 +1,14 @@
+"""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/ssh_autodetect.py

@@ -95,6 +95,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

@@ -36,7 +36,7 @@
 from netmiko.checkpoint import CheckPointGaiaSSH
 from netmiko.ciena import CienaSaosSSH, CienaSaosTelnet, 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,
@@ -194,7 +194,11 @@
     "centec_os": CentecOSSSH,
     "ciena_saos": CienaSaosSSH,
     "cisco_asa": CiscoAsaSSH,
+<<<<<<< HEAD
     "cisco_apic": CiscoApicSSH,
+=======
+    "cisco_ap": CiscoApSSH,
+>>>>>>> 57a209a8d1f475a612d9b2190cea75b5cb0891ac
     "cisco_ftd": CiscoFtdSSH,
     "cisco_ios": CiscoIosSSH,
     "cisco_nxos": CiscoNxosSSH,

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"

tests/etc/responses.yml.example

@@ -10,6 +10,14 @@ cisco_ios:
   file_check_cmd: "logging buffered 8880"
   save_config: 'OK'
 
+cisco_ap:
+  base_prompt: ap01-test
+  router_prompt: ap01-test>
+  enable_prompt: ap01-test#
+  interface_ip: 10.10.10.100
+  version_banner: "Cisco AP Software"
+  multiple_line_output: "Cisco AP Software"
+
 juniper:
   base_prompt: pyclass@pynet-jnpr-srx1
   router_prompt: pyclass@pynet-jnpr-srx1>

tests/etc/test_devices.yml.example

@@ -17,6 +17,13 @@ cisco_asa_21:               # the device_name does not have to match the device
   password: cisco123
   secret: cisco123
 
+cisco_ap:
+  device_type: cisco_ap
+  ip: 10.10.10.100
+  username: admin
+  password: cisco123
+  secret: cisco123
+
 arista_eos:
   device_type: arista_eos
   ip: 10.10.10.12