Merge branch 'develop' into patch-1

ktbyers · Oct 17, 2023 · 10a9590 · 10a9590
2 parents 6370d79 + d0287a3
commit 10a9590
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/netmiko/base_connection.py b/netmiko/base_connection.py
@@ -280,7 +280,7 @@ def __init__(
                 (default: False)
 
         :param encoding: Encoding to be used when writing bytes to the output channel.
-                (default: ascii)
+                (default: "utf-8")
 
         :param sock: An open socket or socket-like object (such as a `.Channel`) to use for
                 communication to the target host (default: None).

diff --git a/netmiko/snmp_autodetect.py b/netmiko/snmp_autodetect.py
@@ -40,6 +40,11 @@
         "expr": re.compile(r".*Arista Networks EOS.*", re.IGNORECASE),
         "priority": 99,
     },
+    "allied_telesis_awplus": {
+        "oid": ".1.3.6.1.2.1.1.1.0",
+        "expr": re.compile(r".*AlliedWare Plus.*", re.IGNORECASE),
+        "priority": 99,
+    },
     "paloalto_panos": {
         "oid": ".1.3.6.1.2.1.1.1.0",
         "expr": re.compile(r".*Palo Alto Networks.*", re.IGNORECASE),

diff --git a/netmiko/ssh_autodetect.py b/netmiko/ssh_autodetect.py
@@ -64,6 +64,12 @@
         "priority": 99,
         "dispatch": "_autodetect_std",
     },
+    "allied_telesis_awplus": {
+        "cmd": "show version",
+        "search_patterns": ["AlliedWare Plus"],
+        "priority": 99,
+        "dispatch": "_autodetect_std",
+    },
     "apresia_aeos": {
         "cmd": "show system",
         "search_patterns": ["Apresia"],