diff options
Diffstat (limited to 'tests')
10 files changed, 54 insertions, 68 deletions
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/_parsed_config.cfg b/tests/integration/targets/vyos_interfaces/tests/cli/_parsed_config.cfg index e5c3fc7..088354d 100644 --- a/tests/integration/targets/vyos_interfaces/tests/cli/_parsed_config.cfg +++ b/tests/integration/targets/vyos_interfaces/tests/cli/_parsed_config.cfg @@ -1,12 +1,10 @@ set interfaces ethernet eth1 description 'Configured by Ansible - Interface 1' -set interfaces ethernet eth1 duplex 'auto' set interfaces ethernet eth1 hw-id '08:00:27:da:67:43' set interfaces ethernet eth1 mtu '1500' -set interfaces ethernet eth1 speed 'auto' set interfaces ethernet eth1 vif 100 description 'Eth1 - VIF 100' -set interfaces ethernet eth1 vif 100 mtu '400' +set interfaces ethernet eth1 vif 100 mtu '1404' set interfaces ethernet eth1 vif 101 description 'Eth1 - VIF 101' set interfaces ethernet eth2 description 'Configured by Ansible - Interface 2 (ADMIN DOWN)' -set interfaces ethernet eth2 'disable' +set interfaces ethernet eth2 disable set interfaces ethernet eth2 hw-id '08:00:27:d8:70:b0' -set interfaces ethernet eth2 mtu '600' +set interfaces ethernet eth2 mtu '1406' diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml index cb4e86c..c6cc1a8 100644 --- a/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml +++ b/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml @@ -5,8 +5,6 @@ vars: lines: |- set interfaces ethernet "{{ intf }}" description 'Configured by Ansible' - set interfaces ethernet "{{ intf }}" speed 'auto' - set interfaces ethernet "{{ intf }}" duplex 'auto' set interfaces ethernet "{{ intf }}" mtu '1500' set interfaces ethernet "{{ intf }}" vif 200 set interfaces ethernet "{{ intf }}" vif 200 description 'VIF - 200' diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml index 194d9bc..5c719b3 100644 --- a/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml +++ b/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml @@ -12,19 +12,17 @@ - name: eth1 description: Configured by Ansible - Interface 1 mtu: 1500 - speed: auto - duplex: auto vifs: - vlan_id: 100 description: Eth1 - VIF 100 - mtu: 400 + mtu: 1404 - vlan_id: 101 description: Eth1 - VIF 101 - name: eth2 description: Configured by Ansible - Interface 2 (ADMIN DOWN) - mtu: 600 + mtu: 1406 enabled: false state: merged diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml index f8915d3..7e86d3e 100644 --- a/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml +++ b/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml @@ -15,7 +15,7 @@ - name: eth2 description: Overridden by Ansible - mtu: 1200 + mtu: 1402 state: overridden - name: Assert that before dicts were correctly generated diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml index cd8cdf6..c03347f 100644 --- a/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml +++ b/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml @@ -11,25 +11,21 @@ config: - name: eth0 enabled: true - duplex: auto - speed: auto - name: eth1 description: Configured by Ansible - Interface 1 mtu: 1500 - speed: auto - duplex: auto enabled: true vifs: - vlan_id: 100 description: Eth1 - VIF 100 - mtu: 400 + mtu: 1404 enabled: true - vlan_id: 101 description: Eth1 - VIF 101 enabled: true - name: eth2 description: Configured by Ansible - Interface 2 (ADMIN DOWN) - mtu: 600 + mtu: 1406 enabled: false state: rendered diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml index f6cfda4..6309c59 100644 --- a/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml +++ b/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml @@ -25,11 +25,17 @@ that: - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}" + - debug: + var: populate | symmetric_difference(result['before']) + - name: Assert that before dicts are correctly generated assert: that: - "{{ populate | symmetric_difference(result['before']) |length == 0 }}" + - debug: + var: replaced['after'] | symmetric_difference(result['after']) + - name: Assert that after dict is correctly generated assert: that: diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml index 5073a34..2ec37f0 100644 --- a/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml +++ b/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml @@ -11,8 +11,6 @@ config: - name: eth0 enabled: true - duplex: auto - speed: auto - name: eth1 description: Interface - 1 @@ -20,7 +18,7 @@ vifs: - vlan_id: 100 description: Eth1 - VIF 100 - mtu: 200 + mtu: 1402 - vlan_id: 101 enabled: false @@ -28,7 +26,7 @@ - name: eth2 description: Interface - 2 enabled: true - mtu: 900 + mtu: 1409 state: merged - name: Gather interfaces facts @@ -44,11 +42,11 @@ config: - name: eth1 description: Interface 1 - Description (WILL BE REVERTED) - mtu: 1200 + mtu: 1412 vifs: - vlan_id: 100 description: Eth1 - VIF 100 (WILL BE REVERTED) - mtu: 400 + mtu: 1404 - vlan_id: 101 description: Eth1 - VIF 101 (WILL BE REMOVED) @@ -56,7 +54,7 @@ - name: eth2 description: Interface 2 (ADMIN DOWN) (WILL BE REVERTED) - mtu: 600 + mtu: 1406 enabled: false state: merged diff --git a/tests/integration/targets/vyos_interfaces/tests/redirection/cli/shortname.yaml b/tests/integration/targets/vyos_interfaces/tests/redirection/cli/shortname.yaml index fcab967..305a795 100644 --- a/tests/integration/targets/vyos_interfaces/tests/redirection/cli/shortname.yaml +++ b/tests/integration/targets/vyos_interfaces/tests/redirection/cli/shortname.yaml @@ -12,19 +12,17 @@ - name: eth1 description: Configured by Ansible - Interface 1 mtu: 1500 - speed: auto - duplex: auto vifs: - vlan_id: 100 description: Eth1 - VIF 100 - mtu: 400 + mtu: 1404 - vlan_id: 101 description: Eth1 - VIF 101 - name: eth2 description: Configured by Ansible - Interface 2 (ADMIN DOWN) - mtu: 600 + mtu: 1406 enabled: false state: merged diff --git a/tests/integration/targets/vyos_interfaces/vars/main.yaml b/tests/integration/targets/vyos_interfaces/vars/main.yaml index 7bf9b25..9d93170 100644 --- a/tests/integration/targets/vyos_interfaces/vars/main.yaml +++ b/tests/integration/targets/vyos_interfaces/vars/main.yaml @@ -9,18 +9,20 @@ merged: enabled: true - name: eth2 enabled: true + - name: lo + enabled: true commands: - set interfaces ethernet eth1 description 'Configured by Ansible - Interface 1' - set interfaces ethernet eth1 mtu '1500' - - set interfaces ethernet eth1 duplex 'auto' - - set interfaces ethernet eth1 speed 'auto' - set interfaces ethernet eth1 vif 100 description 'Eth1 - VIF 100' - - set interfaces ethernet eth1 vif 100 mtu '400' + - set interfaces ethernet eth1 vif 100 mtu '1404' - set interfaces ethernet eth1 vif 101 description 'Eth1 - VIF 101' - set interfaces ethernet eth2 description 'Configured by Ansible - Interface 2 (ADMIN DOWN)' - - set interfaces ethernet eth2 mtu '600' + - set interfaces ethernet eth2 mtu '1406' - set interfaces ethernet eth2 disable after: + - name: lo + enabled: true - name: eth0 enabled: true duplex: auto @@ -28,26 +30,24 @@ merged: - name: eth1 description: Configured by Ansible - Interface 1 mtu: 1500 - speed: auto - duplex: auto enabled: true vifs: - vlan_id: 100 description: Eth1 - VIF 100 - mtu: 400 + mtu: 1404 enabled: true - vlan_id: 101 description: Eth1 - VIF 101 enabled: true - name: eth2 description: Configured by Ansible - Interface 2 (ADMIN DOWN) - mtu: 600 + mtu: 1406 enabled: false populate: + - name: lo + enabled: true - name: eth1 enabled: true - speed: auto - duplex: auto description: Configured by Ansible mtu: 1500 vifs: @@ -56,8 +56,6 @@ populate: description: VIF - 200 - name: eth2 enabled: true - speed: auto - duplex: auto description: Configured by Ansible mtu: 1500 vifs: @@ -71,17 +69,15 @@ populate: replaced: commands: - delete interfaces ethernet eth1 mtu - - delete interfaces ethernet eth1 speed - - delete interfaces ethernet eth1 duplex - delete interfaces ethernet eth1 vif 200 description - set interfaces ethernet eth1 description 'Replaced by Ansible' - set interfaces ethernet eth1 vif 100 description 'VIF 100 - Replaced by Ansible' - - delete interfaces ethernet eth2 speed - - delete interfaces ethernet eth2 duplex - delete interfaces ethernet eth2 vif 200 description - set interfaces ethernet eth2 description 'Replaced by Ansible' - set interfaces ethernet eth2 mtu '1400' after: + - name: lo + enabled: true - name: eth1 description: Replaced by Ansible enabled: true @@ -107,34 +103,30 @@ parsed: - name: eth1 description: Configured by Ansible - Interface 1 mtu: 1500 - speed: auto - duplex: auto enabled: true vifs: - vlan_id: 100 description: Eth1 - VIF 100 - mtu: 400 + mtu: 1404 enabled: true - vlan_id: 101 description: Eth1 - VIF 101 enabled: true - name: eth2 description: Configured by Ansible - Interface 2 (ADMIN DOWN) - mtu: 600 + mtu: 1406 enabled: false overridden: commands: - delete interfaces ethernet eth1 description - - delete interfaces ethernet eth1 speed - - delete interfaces ethernet eth1 duplex - delete interfaces ethernet eth1 mtu - delete interfaces ethernet eth1 vif 200 description - - delete interfaces ethernet eth2 speed - - delete interfaces ethernet eth2 duplex - delete interfaces ethernet eth2 vif 200 description - set interfaces ethernet eth2 description 'Overridden by Ansible' - - set interfaces ethernet eth2 mtu '1200' + - set interfaces ethernet eth2 mtu '1402' after: + - name: lo + enabled: true - name: eth0 enabled: true speed: auto @@ -147,37 +139,31 @@ overridden: - name: eth2 enabled: true description: Overridden by Ansible - mtu: 1200 + mtu: 1402 vifs: - vlan_id: 200 enabled: true rendered: commands: - - set interfaces ethernet eth0 duplex 'auto' - - set interfaces ethernet eth0 speed 'auto' - - set interfaces ethernet eth1 duplex 'auto' - - set interfaces ethernet eth1 speed 'auto' - set interfaces ethernet eth1 description 'Configured by Ansible - Interface 1' - set interfaces ethernet eth1 mtu '1500' - set interfaces ethernet eth1 vif 100 description 'Eth1 - VIF 100' - - set interfaces ethernet eth1 vif 100 mtu '400' + - set interfaces ethernet eth1 vif 100 mtu '1404' - set interfaces ethernet eth1 vif 101 description 'Eth1 - VIF 101' - set interfaces ethernet eth2 description 'Configured by Ansible - Interface 2 (ADMIN DOWN)' - - set interfaces ethernet eth2 mtu '600' + - set interfaces ethernet eth2 mtu '1406' deleted: commands: - delete interfaces ethernet eth1 description - - delete interfaces ethernet eth1 speed - - delete interfaces ethernet eth1 duplex - delete interfaces ethernet eth1 mtu - delete interfaces ethernet eth1 vif 200 description - delete interfaces ethernet eth2 description - - delete interfaces ethernet eth2 speed - - delete interfaces ethernet eth2 duplex - delete interfaces ethernet eth2 mtu - delete interfaces ethernet eth2 vif 200 description after: + - name: lo + enabled: true - name: eth0 enabled: true speed: auto @@ -194,6 +180,8 @@ deleted: enabled: true round_trip: after: + - name: lo + enabled: true - name: eth0 enabled: true speed: auto @@ -201,16 +189,16 @@ round_trip: - name: eth1 description: Interface 1 - Description (WILL BE REVERTED) enabled: true - mtu: 1200 + mtu: 1412 vifs: - vlan_id: 100 description: Eth1 - VIF 100 (WILL BE REVERTED) - mtu: 400 + mtu: 1404 enabled: true - vlan_id: 101 description: Eth1 - VIF 101 (WILL BE REMOVED) enabled: true - name: eth2 description: Interface 2 (ADMIN DOWN) (WILL BE REVERTED) - mtu: 600 + mtu: 1406 enabled: false diff --git a/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml b/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml index e9781e6..deec3fa 100644 --- a/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml +++ b/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml @@ -1,6 +1,7 @@ --- merged: before: + - name: lo - name: eth0 ipv4: - address: dhcp @@ -13,6 +14,7 @@ merged: - set interfaces ethernet eth2 vif 101 address '198.51.100.130/25' - set interfaces ethernet eth2 vif 101 address '2001:db8::20/32' after: + - name: lo - name: eth0 ipv4: - address: dhcp @@ -31,6 +33,7 @@ merged: ipv6: - address: 2001:db8::20/32 populate: + - name: lo - name: eth1 ipv4: - address: 192.0.2.14/24 @@ -54,6 +57,7 @@ replaced: - delete interfaces ethernet eth1 address '192.0.2.14/24' - set interfaces ethernet eth1 address '192.0.2.19/24' after: + - name: lo - name: eth2 ipv6: - address: 2001:db8::11/32 @@ -72,6 +76,7 @@ overridden: - delete interfaces ethernet eth2 address '2001:db8::10/32' - delete interfaces ethernet eth2 address '2001:db8::12/32' after: + - name: lo - name: eth0 ipv4: - address: dhcp @@ -111,6 +116,7 @@ deleted: - delete interfaces ethernet eth2 address '2001:db8::10/32' - delete interfaces ethernet eth2 address '2001:db8::12/32' after: + - name: lo - name: eth0 ipv4: - address: dhcp |