Skip to content

fix: update regex for newer junos prompt #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: update regex for newer junos prompt #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55caa90
fix: update regex for newer junos prompt
yoleri Sep 14, 2020
5a9539f
improved prompt matching for JunOS
yoleri Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Exscript/protocols/drivers/junos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
_re_re = r'(?:' + _mb + r'|' + _ps + r')'
_edit = r'(?:\[edit[^\]\r\n]*\])'
_prefix = r'(?:[\r\n]+' + _re_re + r'?' + _edit + r'?)'
_prompt = r'[\r\n]+[\w\-\.]+@[\-\w+\.:]+[%>#] $'
_prompt = r'[\r\n]+[\w\-\.]+@[\-\w+\.:]+[~]?[\s%>#]+$'
_prompt_re = [re.compile(_prefix + r'?' + _prompt)]
_error_re = [re.compile(r'^(unknown|invalid|error|syntax error)', re.I)]
_junos_re = re.compile(r'\bjunos\b', re.I)
Expand Down
4 changes: 4 additions & 0 deletions tests/Exscript/protocols/banners/junos.4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Password:
Last login: Mon Sep 14 17:57:32 2020 from (x.x.x.x)
--- JUNOS 18.4R3.3 Kernel 64-bit JNPR-11.0-20191211.fa5e90e_buil
root@testhost:~ #