diff --git a/changelogs/fragments/terminal_stderr_delete.yml b/changelogs/fragments/terminal_stderr_delete.yml
new file mode 100644
index 0000000..b886a3d
--- /dev/null
+++ b/changelogs/fragments/terminal_stderr_delete.yml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+ - Add regex for delete failures to terminal_stderr_re
diff --git a/plugins/terminal/vyos.py b/plugins/terminal/vyos.py
index bf9d87b..0b5e74b 100644
--- a/plugins/terminal/vyos.py
+++ b/plugins/terminal/vyos.py
@@ -1,75 +1,76 @@
#
# (c) 2016 Red Hat Inc.
#
# This file is part of Ansible
#
# Ansible is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Ansible is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see .
#
from __future__ import absolute_import, division, print_function
__metaclass__ = type
import os
import re
from ansible.plugins.terminal import TerminalBase
from ansible.errors import AnsibleConnectionFailure
class TerminalModule(TerminalBase):
terminal_stdout_re = [
re.compile(br"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"),
re.compile(br"\@[\w\-\.]+:\S+?[>#\$] ?$"),
]
terminal_stderr_re = [
re.compile(br"\n\s*Invalid command:"),
re.compile(br"\nCommit failed"),
re.compile(br"\n\s+Set failed"),
+ re.compile(br"\n\s+Delete failed"),
]
ansi_re = TerminalBase.ansi_re + [
# Color codes
re.compile(br"\x1b\[(\d+(;\d+)*)?m"),
# Clear line (CSI K)
re.compile(br"\x1b\[K"),
# Xterm change cursor mode (CSI ? 1 [h|l])
re.compile(br"\x1b\[\?1(h|l)"),
# Xterm change keypad (ESC [=|>])
re.compile(br"\x1b(=|>)"),
# Xterm window title string (OSC BEL)
re.compile(br"\x1b]0;[^\x07]*\x07"),
]
terminal_config_prompt = re.compile(r"^.+#$")
try:
terminal_length = os.getenv("ANSIBLE_VYOS_TERMINAL_LENGTH", 10000)
terminal_length = int(terminal_length)
except ValueError:
raise AnsibleConnectionFailure(
"Invalid value set for vyos terminal length '%s', value should be a valid integer string"
% terminal_length
)
def on_open_shell(self):
try:
for cmd in (b"set terminal length 0", b"set terminal width 512"):
self._exec_cli_command(cmd)
self._exec_cli_command(
b"set terminal length %d" % self.terminal_length
)
except AnsibleConnectionFailure:
raise AnsibleConnectionFailure("unable to set terminal parameters")
diff --git a/tests/integration/targets/vyos_system/tests/cli/basic.yaml b/tests/integration/targets/vyos_system/tests/cli/basic.yaml
index 9c3c09f..29309e2 100644
--- a/tests/integration/targets/vyos_system/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_system/tests/cli/basic.yaml
@@ -1,61 +1,63 @@
---
- debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
- name: setup
+ ignore_errors: true
vyos.vyos.vyos_config:
lines:
- delete system name-server 192.0.2.1
- delete system name-server 192.0.2.2
- delete system name-server 192.0.2.3
match: none
- name: configure name servers
register: result
vyos.vyos.vyos_system:
name_servers:
- 192.0.2.1
- 192.0.2.2
- 192.0.2.3
- assert:
that:
- result.changed == true
- result.commands|length == 3
- result.commands[0] is search("set system name-server '192.0.2.1'")
- result.commands[1] is search("set system name-server '192.0.2.2'")
- result.commands[2] is search("set system name-server '192.0.2.3'")
- name: verify name_servers
register: result
vyos.vyos.vyos_system:
name_servers:
- 192.0.2.1
- 192.0.2.2
- 192.0.2.3
- assert:
that:
- result.changed == false
- name: remove one
register: result
vyos.vyos.vyos_system:
name_servers:
- 192.0.2.3
state: absent
- assert:
that:
- result.changed == true
- result.commands|length == 1
- result.commands[0] is search("delete system name-server '192.0.2.3'")
- name: teardown
+ ignore_errors: true
vyos.vyos.vyos_config:
lines:
- delete system name-server name-server 192.0.2.1
- delete system name-server name-server 192.0.2.2
- delete system name-server name-server 192.0.2.3
match: none
- debug: msg="END cli/basic.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_system/tests/cli/net_system.yaml b/tests/integration/targets/vyos_system/tests/cli/net_system.yaml
index 3e68d20..758ba40 100644
--- a/tests/integration/targets/vyos_system/tests/cli/net_system.yaml
+++ b/tests/integration/targets/vyos_system/tests/cli/net_system.yaml
@@ -1,28 +1,30 @@
---
- debug: msg="START vyos cli/net_system.yaml on connection={{ ansible_connection
}}"
- name: setup
+ ignore_errors: true
vyos.vyos.vyos_config:
lines:
- delete system name-server 192.0.2.1
match: none
- name: configure name servers using platform agnostic module
register: result
ansible.netcommon.net_system:
name_servers:
- 192.0.2.1
- assert:
that:
- result.changed == true
- result.commands[0] is search("set system name-server '192.0.2.1'")
- name: setup
+ ignore_errors: true
vyos.vyos.vyos_config:
lines:
- delete system name-server 192.0.2.1
match: none
- debug: msg="END vyos cli/net_system.yaml on connection={{ ansible_connection }}"