Update routeros.py (#138) (#9)

* Update routeros.py Adjust the terminal detection line to support forward slashes in device hostnames (connections fail without clear reason otherwise) * Add changelog fragment. Co-authored-by: Felix Fontein <[email protected]> (cherry picked from commit 3f3e0d0) Fore-ported from ansible-collections/community.network#138.
ansible-collections · Nov 9, 2020 · 49ca4c0 · 49ca4c0
1 parent 70208c0
commit 49ca4c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelogs/fragments/community.network-138-routeros-allow-slash.yml b/changelogs/fragments/community.network-138-routeros-allow-slash.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- "routeros terminal plugin - allow slashes in hostnames for terminal detection. Without this, slashes in hostnames will result in connection timeouts (https://github.com/ansible-collections/community.network/pull/138)."
diff --git a/plugins/terminal/routeros.py b/plugins/terminal/routeros.py
@@ -47,7 +47,7 @@ class TerminalModule(TerminalBase):
 
     terminal_stdout_re = [
         re.compile(br"\x1b<"),
-        re.compile(br"\[[\w\.]+\@[\w\s\-\.]+\] ?> ?$"),
+        re.compile(br"\[[\w\.]+\@[\w\s\-\.\/]+\] ?> ?$"),
         re.compile(br"Please press \"Enter\" to continue!"),
         re.compile(br"Do you want to see the software license\? \[Y\/n\]: ?"),
     ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- "routeros terminal plugin - allow slashes in hostnames for terminal detection. Without this, slashes in hostnames will result in connection timeouts (https://github.com/ansible-collections/community.network/pull/138)."