diff options
Diffstat (limited to 'plugins')
37 files changed, 47 insertions, 11 deletions
diff --git a/plugins/action/banner.py b/plugins/action/banner.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/banner.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/bgp_address_family.py b/plugins/action/bgp_address_family.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/bgp_address_family.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/bgp_global.py b/plugins/action/bgp_global.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/bgp_global.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/command.py b/plugins/action/command.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/command.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/config.py b/plugins/action/config.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/config.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/facts.py b/plugins/action/facts.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/facts.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/firewall_global.py b/plugins/action/firewall_global.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/firewall_global.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/firewall_interfaces.py b/plugins/action/firewall_interfaces.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/firewall_interfaces.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/firewall_rules.py b/plugins/action/firewall_rules.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/firewall_rules.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/hostname.py b/plugins/action/hostname.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/hostname.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/interface.py b/plugins/action/interface.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/interface.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/interfaces.py b/plugins/action/interfaces.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/interfaces.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/l3_interface.py b/plugins/action/l3_interface.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/l3_interface.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/l3_interfaces.py b/plugins/action/l3_interfaces.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/l3_interfaces.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/lag_interfaces.py b/plugins/action/lag_interfaces.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/lag_interfaces.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/linkagg.py b/plugins/action/linkagg.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/linkagg.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/lldp.py b/plugins/action/lldp.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/lldp.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/lldp_global.py b/plugins/action/lldp_global.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/lldp_global.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/lldp_interface.py b/plugins/action/lldp_interface.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/lldp_interface.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/lldp_interfaces.py b/plugins/action/lldp_interfaces.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/lldp_interfaces.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/logging.py b/plugins/action/logging.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/logging.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/logging_global.py b/plugins/action/logging_global.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/logging_global.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/ntp_global.py b/plugins/action/ntp_global.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/ntp_global.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/ospf_interfaces.py b/plugins/action/ospf_interfaces.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/ospf_interfaces.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/ospfv2.py b/plugins/action/ospfv2.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/ospfv2.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/ospfv3.py b/plugins/action/ospfv3.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/ospfv3.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/ping.py b/plugins/action/ping.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/ping.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/prefix_lists.py b/plugins/action/prefix_lists.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/prefix_lists.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/route_maps.py b/plugins/action/route_maps.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/route_maps.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/snmp_server.py b/plugins/action/snmp_server.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/snmp_server.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/static_route.py b/plugins/action/static_route.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/static_route.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/static_routes.py b/plugins/action/static_routes.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/static_routes.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/system.py b/plugins/action/system.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/system.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/user.py b/plugins/action/user.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/user.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/action/vlan.py b/plugins/action/vlan.py new file mode 120000 index 00000000..331a791f --- /dev/null +++ b/plugins/action/vlan.py @@ -0,0 +1 @@ +vyos.py
\ No newline at end of file diff --git a/plugins/cliconf/vyos.py b/plugins/cliconf/vyos.py index b100ce01..b1a55b1c 100644 --- a/plugins/cliconf/vyos.py +++ b/plugins/cliconf/vyos.py @@ -36,6 +36,7 @@ options: to the device is present in this list, the existing cache is invalidated. version_added: 2.0.0 type: list + elements: str default: [] vars: - name: ansible_vyos_config_commands diff --git a/plugins/terminal/vyos.py b/plugins/terminal/vyos.py index 0b5e74b3..850e5283 100644 --- a/plugins/terminal/vyos.py +++ b/plugins/terminal/vyos.py @@ -30,28 +30,28 @@ from ansible.errors import AnsibleConnectionFailure class TerminalModule(TerminalBase): terminal_stdout_re = [ - re.compile(br"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"), - re.compile(br"\@[\w\-\.]+:\S+?[>#\$] ?$"), + re.compile(rb"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"), + re.compile(rb"\@[\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"), + re.compile(rb"\n\s*Invalid command:"), + re.compile(rb"\nCommit failed"), + re.compile(rb"\n\s+Set failed"), + re.compile(rb"\n\s+Delete failed"), ] ansi_re = TerminalBase.ansi_re + [ # Color codes - re.compile(br"\x1b\[(\d+(;\d+)*)?m"), + re.compile(rb"\x1b\[(\d+(;\d+)*)?m"), # Clear line (CSI K) - re.compile(br"\x1b\[K"), + re.compile(rb"\x1b\[K"), # Xterm change cursor mode (CSI ? 1 [h|l]) - re.compile(br"\x1b\[\?1(h|l)"), + re.compile(rb"\x1b\[\?1(h|l)"), # Xterm change keypad (ESC [=|>]) - re.compile(br"\x1b(=|>)"), + re.compile(rb"\x1b(=|>)"), # Xterm window title string (OSC <title string> BEL) - re.compile(br"\x1b]0;[^\x07]*\x07"), + re.compile(rb"\x1b]0;[^\x07]*\x07"), ] terminal_config_prompt = re.compile(r"^.+#$") |