diff options
| author | kakurpiel <kakurpiel@users.noreply.github.com> | 2019-11-09 03:33:01 -0600 |
|---|---|---|
| committer | Sumit Jaiswal <sjaiswal@redhat.com> | 2019-11-09 15:03:01 +0530 |
| commit | 4a995f26a3904c5f2fb4805b37c0ca5891a8c5cc (patch) | |
| tree | d9957f0338d21c96f12319bc522bac77f570e5db /lib/ansible/plugins | |
| parent | 5d30180f6bb6f45ae0793ae4aba7926d85d1b661 (diff) | |
| download | ansible-4a995f26a3904c5f2fb4805b37c0ca5891a8c5cc.tar.gz | |
Update aruba modules to handle prompt and syntax changes (#54261)
* Update prompt matching to handle changes introduced in arubaos 8.x
* Update aruba modules to support command changes on arubaos 8.x
Diffstat (limited to 'lib/ansible/plugins')
| -rw-r--r-- | lib/ansible/plugins/cliconf/aruba.py | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/terminal/aruba.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/plugins/cliconf/aruba.py b/lib/ansible/plugins/cliconf/aruba.py index 8dd146575d..27583793ef 100644 --- a/lib/ansible/plugins/cliconf/aruba.py +++ b/lib/ansible/plugins/cliconf/aruba.py @@ -72,7 +72,7 @@ class Cliconf(CliconfBase): if source == 'running': cmd = 'show running-config all' else: - cmd = 'show startup-config' + cmd = 'show configuration' return self.send_command(cmd) @enable_mode diff --git a/lib/ansible/plugins/terminal/aruba.py b/lib/ansible/plugins/terminal/aruba.py index 2ab91779c9..79bce7a2e1 100644 --- a/lib/ansible/plugins/terminal/aruba.py +++ b/lib/ansible/plugins/terminal/aruba.py @@ -37,7 +37,7 @@ class TerminalModule(TerminalBase): ] terminal_stdout_re = [ - re.compile(br"[\r\n]?[\w]*\(.+\) ?#(?:\s*)$"), + re.compile(br"[\r\n]?[\w]*\(.+\)\s*[\^\*]?(?:\[.+\])? ?#(?:\s*)$"), re.compile(br"[pP]assword:$"), re.compile(br"(?<=\s)[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?\s*#\s*$"), re.compile(br"[\r\n]?[\w\+\-\.:\/\[\]]+(?:\([^\)]+\)){0,3}(?:[>#]) ?$"), |