diff --git a/tests/integration/targets/vyos_firewall_global/tests/cli/deleted.yaml b/tests/integration/targets/vyos_firewall_global/tests/cli/deleted.yaml index 186ed4e4..e285e27f 100644 --- a/tests/integration/targets/vyos_firewall_global/tests/cli/deleted.yaml +++ b/tests/integration/targets/vyos_firewall_global/tests/cli/deleted.yaml @@ -1,48 +1,49 @@ --- - debug: msg: START vyos_firewall_global deleted integration tests ansible_connection={{ ansible_connection }} - include_tasks: _populate.yaml - block: - name: Delete attributes of firewall. register: result vyos.vyos.vyos_firewall_global: &id001 config: state: deleted diff: true - name: Assert that the before dicts were correctly generated assert: that: - "{{ populate == result['before'] }}" - - '''- network "192.0.1.0/24"'' in result.diff.prepared' + - ('- network "192.0.1.0/24"' in result.diff.prepared) or + ("- network 192.0.1.0/24" in result.diff.prepared) - name: Assert that the correct set of commands were generated assert: that: - "{{ deleted['commands'] | symmetric_difference(result['commands']) |length == 0 }}" - name: Assert that the after dicts were correctly generated assert: that: - "{{ deleted['after'] == result['after'] }}" - name: Delete attributes of given interfaces (IDEMPOTENT) register: result vyos.vyos.vyos_firewall_global: *id001 diff: true - name: Assert that the previous task was idempotent assert: that: - result.changed == false - result.commands|length == 0 - result['diff'] is not defined - name: Assert that the before dicts were correctly generated assert: that: - "{{ deleted['after'] == result['before'] }}" always: - include_tasks: _remove_config.yaml diff --git a/tests/integration/targets/vyos_firewall_global/tests/cli/merged.yaml b/tests/integration/targets/vyos_firewall_global/tests/cli/merged.yaml index 667f2b34..2c7c1565 100644 --- a/tests/integration/targets/vyos_firewall_global/tests/cli/merged.yaml +++ b/tests/integration/targets/vyos_firewall_global/tests/cli/merged.yaml @@ -1,59 +1,59 @@ --- - debug: msg: START vyos_firewall_global merged integration tests on connection={{ ansible_connection }} - include_tasks: _get_version.yaml - include_tasks: _remove_config.yaml - block: - name: Merge the provided configuration with the existing running configuration register: result vyos.vyos.vyos_firewall_global: &id001 config: "{{ merged['config'] }}" state: merged - name: Assert that before dicts were correctly generated assert: that: "{{ merged['before'] == result['before'] }}" - name: Assert that correct set of commands were generated assert: that: - "{{ merged['commands'] | symmetric_difference(result['commands']) |length == 0 }}" - name: Assert that after dicts was correctly generated assert: that: - "{{ merged['after'] == result['after'] }}" - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT) register: result vyos.vyos.vyos_firewall_global: *id001 diff: true - name: Assert that the previous task was idempotent assert: that: - result['changed'] == false - result['diff'] is not defined - name: Assert that before dicts were correctly generated assert: that: - "{{ merged['after'] == result['before'] }}" - name: Prepare device configurationsfor diff mode test register: result vyos.vyos.vyos_firewall_global: config: "{{ merged['diff_config'] }}" state: merged diff: true - name: Assert that correct diff of commands were generated assert: that: - - '''+ network "1.1.1.1/32"'' in result.diff.prepared' - + - ('+ network "1.1.1.1/32"' in result.diff.prepared) or + ('+network 1.1.1.1/32' in result.diff.prepared) always: - include_tasks: _remove_config.yaml diff --git a/tests/integration/targets/vyos_firewall_global/tests/cli/replaced.yaml b/tests/integration/targets/vyos_firewall_global/tests/cli/replaced.yaml index 58596623..1859730c 100644 --- a/tests/integration/targets/vyos_firewall_global/tests/cli/replaced.yaml +++ b/tests/integration/targets/vyos_firewall_global/tests/cli/replaced.yaml @@ -1,59 +1,61 @@ --- - debug: msg: START vyos_firewall_global replaced integration tests on connection={{ ansible_connection }} - include_tasks: _populate.yaml - block: - name: Replace device configurations of listed firewall with provided configurations register: result vyos.vyos.vyos_firewall_global: &id001 config: "{{ replaced['config'] }}" state: replaced - name: Assert that correct set of commands were generated assert: that: - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}" - name: Assert that before dicts are correctly generated assert: that: - "{{ populate == result['before'] }}" - name: Assert that after dict is correctly generated assert: that: - "{{ replaced['after'] == result['after'] }}" - name: Replace device configurations of listed firewall with provided configurarions (IDEMPOTENT) register: result vyos.vyos.vyos_firewall_global: *id001 diff: true - name: Assert that task was idempotent assert: that: - result['changed'] == false - result['diff'] is not defined - name: Assert that before dict is correctly generated assert: that: - "{{ replaced['after'] == result['before'] }}" - name: Replace device configurations and test diff mode register: result vyos.vyos.vyos_firewall_global: config: "{{ replaced['diff_config'] }}" state: replaced diff: true - name: Assert that correct diff of commands were generated assert: that: - - '''+ network "1.1.1.1/32"'' in result.diff.prepared' - - '''- network "192.0.1.0/24"'' in result.diff.prepared' + - (('+ network "1.1.1.1/32"' in result.diff.prepared) and + ('- network "192.0.1.0/24"' in result.diff.prepared)) or + (('+network 1.1.1.1/32' in result.diff.prepared) and + ('-network 192.0.1.0/24' in result.diff.prepared)) always: - include_tasks: _remove_config.yaml