vyos: Make vyos related yaml file passing yamllint (#65449)

pull/65467/head
Yanis Guenane 5 years ago committed by Paul Belanger
parent ae4363f6d1
commit c19949706f

@ -10,4 +10,4 @@
set interfaces ethernet eth1
set interfaces ethernet eth2
delete interfaces loopback lo
ignore_errors: yes
ignore_errors: true

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -9,7 +9,7 @@
wait_for:
- result[0] is 'VyOS'
register: result
ignore_errors: yes
ignore_errors: true
- assert:
that:

@ -17,7 +17,7 @@
cli_command:
command: 'show foo'
register: result
ignore_errors: yes
ignore_errors: true
- assert:
that:
@ -30,7 +30,7 @@
cli_command:
command: show version
register: result
ignore_errors: yes
ignore_errors: true
- assert:
that:

@ -5,9 +5,9 @@
vyos_command:
commands: show foo
register: result
ignore_errors: yes
ignore_errors: true
- assert: { that: result.failed }
- assert: {that: result.failed}
- name: run commands that include invalid command
vyos_command:
@ -15,8 +15,8 @@
- show version
- show foo
register: result
ignore_errors: yes
ignore_errors: true
- assert: { that: result.failed }
- assert: {that: result.failed}
- debug: msg="END cli/invalid.yaml on connection={{ ansible_connection }}"

@ -8,7 +8,7 @@
wait_for:
- result[0] contains bad_value_string
register: result
ignore_errors: yes
ignore_errors: true
- assert:
that:

@ -1,3 +1,3 @@
---
- { include: cli.yaml, tags: ['cli'] }
- { include: cli_config.yaml, tags: ['cli_config'] }
- {include: cli.yaml, tags: ['cli']}
- {include: cli_config.yaml, tags: ['cli_config']}

@ -16,7 +16,7 @@
- name: take configure backup
vyos_config:
backup: yes
backup: true
register: result
- assert:
@ -44,11 +44,11 @@
- name: take configuration backup in custom filename and directory path
vyos_config:
backup: yes
backup: true
backup_options:
filename: backup.cfg
dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
become: yes
become: true
register: result
- assert:
@ -67,10 +67,10 @@
- name: take configuration backup in custom filename
vyos_config:
backup: yes
backup: true
backup_options:
filename: backup.cfg
become: yes
become: true
register: result
- assert:
@ -89,10 +89,10 @@
- name: take configuration backup in custom path and default filename
vyos_config:
backup: yes
backup: true
backup_options:
dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
become: yes
become: true
register: result
- assert:

@ -1,3 +1,4 @@
---
- debug: msg="END cli_config/backup.yaml on connection={{ ansible_connection }}"
- name: delete configurable backup file path
@ -23,8 +24,8 @@
- name: take config backup
cli_config:
backup: yes
become: yes
backup: true
become: true
register: result
- assert:
@ -44,11 +45,11 @@
- name: take configuration backup in custom filename and directory path
cli_config:
backup: yes
backup: true
backup_options:
filename: backup.cfg
dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
become: yes
become: true
register: result
- assert:
@ -67,10 +68,10 @@
- name: take configuration backup in custom filename
cli_config:
backup: yes
backup: true
backup_options:
filename: backup.cfg
become: yes
become: true
register: result
- assert:
@ -89,10 +90,10 @@
- name: take configuration backup in custom path and default filename
cli_config:
backup: yes
backup: true
backup_options:
dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
become: yes
become: true
register: result
- assert:

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -1,3 +1,4 @@
---
- name: get host name
vyos_command:
commands:

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -84,7 +84,7 @@
- name: Disable interface
vyos_interface:
name: eth1
enabled: False
enabled: false
register: result
- assert:
@ -95,7 +95,7 @@
- name: Enable interface
vyos_interface:
name: eth1
enabled: True
enabled: true
register: result
- assert:
@ -133,8 +133,8 @@
- name: Set interface on aggregate
vyos_interface:
aggregate:
- { name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512}
- { name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256}
- {name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512}
- {name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256}
register: result
when: "'virtio_net' not in lsmod_out.stdout[0]"
@ -154,8 +154,8 @@
- name: Set interface on aggregate (idempotent)
vyos_interface:
aggregate:
- { name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512}
- { name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256}
- {name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512}
- {name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256}
register: result
when: "'virtio_net' not in lsmod_out.stdout[0]"
@ -170,7 +170,7 @@
- name: eth1
- name: eth2
description: test-interface
enabled: False
enabled: false
register: result
- assert:
@ -184,7 +184,7 @@
aggregate:
- name: eth1
- name: eth2
enabled: True
enabled: true
register: result
- assert:

@ -1,5 +1,5 @@
---
- debug: msg="START cli/intent.yaml on connection={{ ansible_connection }}" #"
- debug: msg="START cli/intent.yaml on connection={{ ansible_connection }}"
# To be able to run the lldp test we need to have a neighbor configured to talk to
# In DCI & Zuul we (currently) only spin up a single network VM, so we can't configure a neighbor
@ -30,7 +30,7 @@
- name: Setup (interface is up)
vyos_interface:
name: eth1
enabled: True
enabled: true
state: present
register: result
@ -61,7 +61,7 @@
vyos_interface:
name: eth1
state: down
ignore_errors: yes
ignore_errors: true
register: result
- assert:
@ -75,7 +75,7 @@
neighbors:
- port: dummy_port
host: dummy_host
ignore_errors: yes
ignore_errors: true
when: run_lldp_tests
register: result
@ -89,7 +89,7 @@
- name: Config + intent
vyos_interface:
name: eth1
enabled: False
enabled: false
state: down
register: result
@ -100,9 +100,9 @@
- name: Config + intent (fail)
vyos_interface:
name: eth1
enabled: False
enabled: false
state: up
ignore_errors: yes
ignore_errors: true
register: result
- assert:
@ -114,9 +114,9 @@
vyos_interface:
aggregate:
- name: eth1
enabled: True
enabled: true
state: up
ignore_errors: yes
ignore_errors: true
register: result
- assert:
@ -145,7 +145,7 @@
- port: eth0
- port: dummy_port
host: dummy_host
ignore_errors: yes
ignore_errors: true
when: run_lldp_tests
register: result

@ -1,2 +1,3 @@
---
dependencies:
- prepare_vyos_tests

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -7,7 +7,7 @@
config:
state: merged
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:
@ -18,7 +18,7 @@
config:
state: replaced
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:
@ -29,7 +29,7 @@
config:
state: overridden
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -147,9 +147,9 @@
- name: Set IP addresses on aggregate
vyos_l3_interface:
aggregate:
- { name: eth1, ipv4: 192.168.2.10/24 }
- { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
- { name: eth2, ipv4: 192.168.4.10/24 }
- {name: eth1, ipv4: 192.168.2.10/24}
- {name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64"}
- {name: eth2, ipv4: 192.168.4.10/24}
register: result
- assert:
@ -163,9 +163,9 @@
- name: Set IP addresses on aggregate (idempotent)
vyos_l3_interface:
aggregate:
- { name: eth1, ipv4: 192.168.2.10/24 }
- { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
- { name: eth2, ipv4: 192.168.4.10/24 }
- {name: eth1, ipv4: 192.168.2.10/24}
- {name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64"}
- {name: eth2, ipv4: 192.168.4.10/24}
register: result
- assert:
@ -175,9 +175,9 @@
- name: Remove IP addresses on aggregate
vyos_l3_interface:
aggregate:
- { name: eth1, ipv4: 192.168.2.10/24 }
- { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
- { name: eth2, ipv4: 192.168.4.10/24 }
- {name: eth1, ipv4: 192.168.2.10/24}
- {name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64"}
- {name: eth2, ipv4: 192.168.4.10/24}
state: absent
register: result
@ -192,9 +192,9 @@
- name: Remove IP addresses on aggregate (idempotent)
vyos_l3_interface:
aggregate:
- { name: eth1, ipv4: 192.168.2.10/24 }
- { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
- { name: eth2, ipv4: 192.168.4.10/24 }
- {name: eth1, ipv4: 192.168.2.10/24}
- {name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64"}
- {name: eth2, ipv4: 192.168.4.10/24}
state: absent
register: result

@ -1,2 +1,3 @@
---
dependencies:
- prepare_vyos_tests

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -7,7 +7,7 @@
config:
state: merged
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:
@ -18,7 +18,7 @@
config:
state: replaced
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:
@ -29,7 +29,7 @@
config:
state: overridden
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:

@ -1,2 +1,3 @@
---
dependencies:
- prepare_vyos_tests

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -7,7 +7,7 @@
config:
state: merged
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:
@ -18,7 +18,7 @@
config:
state: replaced
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:
@ -29,7 +29,7 @@
config:
state: overridden
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -130,8 +130,8 @@
- name: Create collection of linkagg definitions
vyos_linkagg:
aggregate:
- { name: bond0, members: [eth1] }
- { name: bond1, members: [eth2] }
- {name: bond0, members: [eth1]}
- {name: bond1, members: [eth2]}
state: present
register: result
@ -146,8 +146,8 @@
- name: Create collection of linkagg definitions again (idempotent)
vyos_linkagg:
aggregate:
- { name: bond0, members: [eth1] }
- { name: bond1, members: [eth2] }
- {name: bond0, members: [eth1]}
- {name: bond1, members: [eth2]}
state: present
register: result

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -7,7 +7,7 @@
config:
state: merged
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:
@ -18,7 +18,7 @@
config:
state: replaced
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -119,7 +119,7 @@
vyos_lldp_interface:
aggregate:
- name: eth1
- { name: eth2, state: disabled }
- {name: eth2, state: disabled}
state: present
register: result
@ -132,7 +132,7 @@
vyos_lldp_interface:
aggregate:
- name: eth1
- { name: eth2, state: disabled }
- {name: eth2, state: disabled}
state: present
register: result

@ -1,2 +1,3 @@
---
dependencies:
- prepare_vyos_tests

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -7,7 +7,7 @@
config:
state: merged
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:
@ -18,7 +18,7 @@
config:
state: replaced
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:
@ -29,7 +29,7 @@
config:
state: overridden
register: result
ignore_errors: True
ignore_errors: true
- assert:
that:

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -83,8 +83,8 @@
- name: Add logging collections
vyos_logging:
aggregate:
- { dest: file, name: test1, facility: all, level: info }
- { dest: file, name: test2, facility: news, level: debug }
- {dest: file, name: test1, facility: all, level: info}
- {dest: file, name: test2, facility: news, level: debug}
state: present
register: result
@ -97,9 +97,9 @@
- name: Add and remove logging collections with overrides
vyos_logging:
aggregate:
- { dest: console, facility: all, level: info }
- { dest: file, name: test1, facility: all, level: info, state: absent }
- { dest: console, facility: daemon, level: warning }
- {dest: console, facility: all, level: info}
- {dest: file, name: test1, facility: all, level: info, state: absent}
- {dest: console, facility: daemon, level: warning}
state: present
register: result
@ -112,9 +112,9 @@
- name: Remove logging collections
vyos_logging:
aggregate:
- { dest: console, facility: all, level: info }
- { dest: console, facility: daemon, level: warning }
- { dest: file, name: test2, facility: news, level: debug }
- {dest: console, facility: all, level: info}
- {dest: console, facility: daemon, level: warning}
- {dest: file, name: test2, facility: news, level: debug}
state: absent
register: result

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -1,3 +1,4 @@
---
# vyos.py in plugins and module_utils/network covered by these as well
# hit NetworkConfig
- name: configure simple config command

@ -1,3 +1,4 @@
---
# vyos.py in plugins and module_utils/network covered by these as well
# remove_default_spec() hit by multiple plays
@ -20,7 +21,7 @@
- name: enable eth1
vyos_interface:
name: eth1
enabled: True
enabled: true
state: present
register: result
@ -34,7 +35,7 @@
vyos_interface:
name: eth1
state: down
ignore_errors: yes
ignore_errors: true
register: result
- assert:
@ -45,5 +46,5 @@
- name: Config + intent
vyos_interface:
name: eth1
enabled: False
enabled: false
state: down

@ -1,8 +1,9 @@
---
# hit check conditional in module_utils.network.vyos -> load_config()
- name: configure simple config command
vyos_config:
lines: set system host-name check-test
check_mode: yes
check_mode: true
- name: get host name
vyos_command:

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -79,8 +79,8 @@
- name: Add static route collections
vyos_static_route:
aggregate:
- { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
- { prefix: 172.24.2.0, mask: 24, next_hop: 192.168.42.64 }
- {prefix: 172.24.1.0/24, next_hop: 192.168.42.64}
- {prefix: 172.24.2.0, mask: 24, next_hop: 192.168.42.64}
state: present
register: result
@ -93,9 +93,9 @@
- name: Add and remove static route collections with overrides
vyos_static_route:
aggregate:
- { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
- { prefix: 172.24.2.0/24, next_hop: 192.168.42.64, state: absent }
- { prefix: 172.24.3.0/24, next_hop: 192.168.42.64 }
- {prefix: 172.24.1.0/24, next_hop: 192.168.42.64}
- {prefix: 172.24.2.0/24, next_hop: 192.168.42.64, state: absent}
- {prefix: 172.24.3.0/24, next_hop: 192.168.42.64}
state: present
register: result
@ -108,8 +108,8 @@
- name: Remove static route collections
vyos_static_route:
aggregate:
- { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
- { prefix: 172.24.3.0/24, next_hop: 192.168.42.64 }
- {prefix: 172.24.1.0/24, next_hop: 192.168.42.64}
- {prefix: 172.24.3.0/24, next_hop: 192.168.42.64}
state: absent
register: result

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -18,7 +18,7 @@
command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_port | default(22) }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '/opt/vyatta/sbin/vyatta-cfg-cmd-wrapper show version'"
responses:
(?i)password: "badpass"
ignore_errors: yes
ignore_errors: true
register: results
- name: check that attempt failed

@ -1,2 +1,2 @@
---
- { include: cli.yaml, tags: ['cli'] }
- {include: cli.yaml, tags: ['cli']}

@ -73,8 +73,8 @@
- name: Create VLANs using aggregate
vyos_vlan: &agg_vlan
aggregate:
- { vlan_id: 101, name: voice, interfaces: "eth0" }
- { vlan_id: 201, name: mgm, interfaces: "eth1" }
- {vlan_id: 101, name: voice, interfaces: "eth0"}
- {vlan_id: 201, name: mgm, interfaces: "eth1"}
state: present
register: result

@ -50,7 +50,7 @@
- eth3
- eth4
register: result
ignore_errors: yes
ignore_errors: true
- assert:
that:

Loading…
Cancel
Save