diff --git a/codecov.yml b/codecov.yml index 816cb440..384f7fcb 100644 --- a/codecov.yml +++ b/codecov.yml @@ -7,4 +7,4 @@ coverage: patch: false project: default: - threshold: 0.3% + threshold: "0.3%" diff --git a/galaxy.yml b/galaxy.yml index 4ec64c1b..16b6ab07 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -4,9 +4,7 @@ authors: license_file: LICENSE name: utils namespace: ansible -description: - Ansible Collection with utilities to ease the management, manipulation, - and validation of data within a playbook +description: Ansible Collection with utilities to ease the management, manipulation, and validation of data within a playbook readme: README.md repository: https://github.com/ansible-collections/ansible.utils issues: https://github.com/ansible-collections/ansible.utils/issues diff --git a/tests/integration/targets/utils_cli_parse/tasks/argspec.yaml b/tests/integration/targets/utils_cli_parse/tasks/argspec.yaml index 4e4a8635..6bb52960 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/argspec.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/argspec.yaml @@ -1,5 +1,5 @@ --- -- name: "Validate argspec {{ parser }}" +- name: Validate argspec {{ parser }} ansible.utils.cli_parse: text: "" parser: @@ -9,13 +9,13 @@ register: argfail ignore_errors: true -- name: "Check argspec fail {{ parser }}" +- name: Check argspec fail {{ parser }} ansible.builtin.assert: that: "{{ msg in argfail.errors }}" vars: msg: "parameters are mutually exclusive: command|template_path found in parser" -- name: "Validate argspec {{ parser }}" +- name: Validate argspec {{ parser }} ansible.utils.cli_parse: text: "" command: ls @@ -25,13 +25,13 @@ register: argfail ignore_errors: true -- name: "Check argspec fail {{ parser }}" +- name: Check argspec fail {{ parser }} ansible.builtin.assert: that: "{{ msg in argfail.errors }}" vars: msg: "parameters are mutually exclusive: command|text" -- name: "Validate argspec {{ parser }}" +- name: Validate argspec {{ parser }} ansible.utils.cli_parse: parser: name: ansible.netcommon.json @@ -39,13 +39,13 @@ register: argfail ignore_errors: true -- name: "Check argspec fail {{ parser }}" +- name: Check argspec fail {{ parser }} ansible.builtin.assert: that: "{{ msg in argfail.errors }}" vars: msg: "one of the following is required: command, text" -- name: "Validate argspec {{ parser }}" +- name: Validate argspec {{ parser }} ansible.utils.cli_parse: text: "" parser: @@ -54,8 +54,8 @@ register: argfail ignore_errors: true -- name: "Check arspec fail {{ parser }}" +- name: Check arspec fail {{ parser }} ansible.builtin.assert: that: "{{ msg in argfail.msg }}" vars: - msg: "Parser name should be provided as a full name including collection" + msg: Parser name should be provided as a full name including collection diff --git a/tests/integration/targets/utils_cli_parse/tasks/centos_textfsm.yaml b/tests/integration/targets/utils_cli_parse/tasks/centos_textfsm.yaml index 626acca6..de535838 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/centos_textfsm.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/centos_textfsm.yaml @@ -1,13 +1,13 @@ --- -- name: "Run command and parse with textfsm {{ parser }}" +- name: Run command and parse with textfsm {{ parser }} ansible.utils.cli_parse: - command: "ifconfig" + command: ifconfig parser: name: ansible.utils.textfsm ansible.builtin.set_fact: myfact register: ifconfig_out -- name: "Check parser output {{ parser }}" +- name: Check parser output {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_cli_parse/tasks/centos_ttp.yaml b/tests/integration/targets/utils_cli_parse/tasks/centos_ttp.yaml index 6868d4f4..ba62d360 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/centos_ttp.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/centos_ttp.yaml @@ -1,13 +1,13 @@ --- -- name: "Run command and parse with ttp {{ parser }}" +- name: Run command and parse with ttp {{ parser }} ansible.utils.cli_parse: - command: "df -h" + command: df -h parser: name: ansible.utils.ttp ansible.builtin.set_fact: myfact register: df_h_out -- name: "Check parser output {{ parser }}" +- name: Check parser output {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_cli_parse/tasks/fedora_textfsm.yaml b/tests/integration/targets/utils_cli_parse/tasks/fedora_textfsm.yaml index 626acca6..de535838 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/fedora_textfsm.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/fedora_textfsm.yaml @@ -1,13 +1,13 @@ --- -- name: "Run command and parse with textfsm {{ parser }}" +- name: Run command and parse with textfsm {{ parser }} ansible.utils.cli_parse: - command: "ifconfig" + command: ifconfig parser: name: ansible.utils.textfsm ansible.builtin.set_fact: myfact register: ifconfig_out -- name: "Check parser output {{ parser }}" +- name: Check parser output {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_cli_parse/tasks/fedora_ttp.yaml b/tests/integration/targets/utils_cli_parse/tasks/fedora_ttp.yaml index 6868d4f4..ba62d360 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/fedora_ttp.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/fedora_ttp.yaml @@ -1,13 +1,13 @@ --- -- name: "Run command and parse with ttp {{ parser }}" +- name: Run command and parse with ttp {{ parser }} ansible.utils.cli_parse: - command: "df -h" + command: df -h parser: name: ansible.utils.ttp ansible.builtin.set_fact: myfact register: df_h_out -- name: "Check parser output {{ parser }}" +- name: Check parser output {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_cli_parse/tasks/main.yaml b/tests/integration/targets/utils_cli_parse/tasks/main.yaml index c03ebf40..63c9389d 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/main.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/main.yaml @@ -6,33 +6,33 @@ - name: Include argspec.yaml ansible.builtin.include_tasks: argspec.yaml vars: - parser: "({{ inventory_hostname }}/argspec)" + parser: ({{ inventory_hostname }}/argspec) - name: Include nxos_json.yaml - ansible.builtin.include_tasks: "nxos_json.yaml" + ansible.builtin.include_tasks: nxos_json.yaml vars: - parser: "(nxos/json)" + parser: (nxos/json) tags: - json - name: Include nxos_textfsm.yaml - ansible.builtin.include_tasks: "nxos_textfsm.yaml" + ansible.builtin.include_tasks: nxos_textfsm.yaml vars: - parser: "(nxos/textfsm)" + parser: (nxos/textfsm) tags: - textfsm - name: Include nxos_ttp.yaml - ansible.builtin.include_tasks: "nxos_ttp.yaml" + ansible.builtin.include_tasks: nxos_ttp.yaml vars: - parser: "(nxos/ttp)" + parser: (nxos/ttp) tags: - ttp - name: Include nxos_xml.yaml - ansible.builtin.include_tasks: "nxos_xml.yaml" + ansible.builtin.include_tasks: nxos_xml.yaml vars: - parser: "(nxos/xml)" + parser: (nxos/xml) tags: - xml @@ -41,49 +41,49 @@ msg: "{{ os }}" - name: Include centos_textfsm.yaml - ansible.builtin.include_tasks: "centos_textfsm.yaml" + ansible.builtin.include_tasks: centos_textfsm.yaml vars: - parser: "(centos/textfsm)" + parser: (centos/textfsm) when: os == 'centos' tags: - textfsm - name: Include centos_ttp.yaml - ansible.builtin.include_tasks: "centos_ttp.yaml" + ansible.builtin.include_tasks: centos_ttp.yaml vars: - parser: "(centos/ttp)" + parser: (centos/ttp) when: os == 'centos' tags: - ttp - name: Include fedora_textfsm.yaml - ansible.builtin.include_tasks: "fedora_textfsm.yaml" + ansible.builtin.include_tasks: fedora_textfsm.yaml vars: - parser: "(fedora/textfsm)" + parser: (fedora/textfsm) when: os == 'fedora' tags: - textfsm - name: Include fedora_ttp.yaml - ansible.builtin.include_tasks: "fedora_ttp.yaml" + ansible.builtin.include_tasks: fedora_ttp.yaml vars: - parser: "(fedora/ttp)" + parser: (fedora/ttp) when: os == 'fedora' tags: - ttp - name: Include ubuntu_textfsm.yaml - ansible.builtin.include_tasks: "ubuntu_textfsm.yaml" + ansible.builtin.include_tasks: ubuntu_textfsm.yaml vars: - parser: "(ubuntu/textfsm)" + parser: (ubuntu/textfsm) when: os == 'ubuntu' tags: - textfsm - name: Include ubuntu_ttp.yaml - ansible.builtin.include_tasks: "ubuntu_ttp.yaml" + ansible.builtin.include_tasks: ubuntu_ttp.yaml vars: - parser: "(ubuntu/ttp)" + parser: (ubuntu/ttp) when: os == 'ubuntu' tags: - ttp diff --git a/tests/integration/targets/utils_cli_parse/tasks/nxos_json.yaml b/tests/integration/targets/utils_cli_parse/tasks/nxos_json.yaml index 32e12331..3337d2f5 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/nxos_json.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/nxos_json.yaml @@ -3,14 +3,14 @@ ansible.builtin.set_fact: nxos_json_text_parsed: "{{ lookup('ansible.builtin.file', '{{ role_path }}/output/nxos_show_interface_json_text.txt') }}" -- name: "Run command and parse with json {{ parser }}" +- name: Run command and parse with json {{ parser }} ansible.utils.cli_parse: text: "{{ lookup('ansible.builtin.file', '{{ role_path }}/output/nxos_show_interface_json_text.txt') }}" parser: name: ansible.utils.json register: nxos_json_text -- name: "Confirm response {{ parser }}" +- name: Confirm response {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_cli_parse/tasks/nxos_textfsm.yaml b/tests/integration/targets/utils_cli_parse/tasks/nxos_textfsm.yaml index 8c0ccf27..5c5011d3 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/nxos_textfsm.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/nxos_textfsm.yaml @@ -3,7 +3,7 @@ ansible.builtin.set_fact: nxos_textfsm_text_parsed: "{{ lookup('ansible.builtin.file', '{{ role_path }}/output/nxos_show_version_textfsm_parsed.json') | from_json }}" -- name: "Pass text and command {{ parser }}" +- name: Pass text and command {{ parser }} ansible.utils.cli_parse: text: "{{ lookup('ansible.builtin.file', '{{ role_path }}/files/nxos_show_version.txt') }}" parser: @@ -11,7 +11,7 @@ template_path: "{{ role_path }}/templates/nxos_show_version.textfsm" register: nxos_textfsm_text -- name: "Confirm response {{ parser }}" +- name: Confirm response {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_cli_parse/tasks/nxos_ttp.yaml b/tests/integration/targets/utils_cli_parse/tasks/nxos_ttp.yaml index 06777947..1a8edffb 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/nxos_ttp.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/nxos_ttp.yaml @@ -3,7 +3,7 @@ ansible.builtin.set_fact: nxos_ttp_text_parsed: "{{ lookup('ansible.builtin.file', '{{ role_path }}/output/nxos_show_interface_ttp_parsed.json') | from_json }}" -- name: "Pass text and template_path {{ parser }}" +- name: Pass text and template_path {{ parser }} ansible.utils.cli_parse: text: "{{ lookup('ansible.builtin.file', '{{ role_path }}/files/nxos_show_interface.txt') }}" parser: @@ -12,14 +12,14 @@ set_fact: POpqMQoJWTiDpEW register: nxos_ttp_text -- name: "Confirm response {{ parser }}" +- name: Confirm response {{ parser }} ansible.builtin.assert: that: - "{{ POpqMQoJWTiDpEW is defined }}" - "{{ nxos_ttp_text['parsed'][0][0] | selectattr('interface', 'search', 'mgmt0') | list | length }}" - "{{ nxos_ttp_text['parsed'] == nxos_ttp_text_parsed }}" -- name: "Pass text and custom variable {{ parser }}" +- name: Pass text and custom variable {{ parser }} ansible.utils.cli_parse: text: "{{ lookup('ansible.builtin.file', '{{ role_path }}/files/nxos_show_interface.txt') }}" parser: @@ -30,13 +30,13 @@ extra_var: some_text register: nxos_ttp_vars -- name: "Confirm modified results {{ parser }}" +- name: Confirm modified results {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: - "{{ nxos_ttp_vars['parsed'][0][0][0]['var'] == 'some_text' }}" -- name: "Pass text and ttp_results modified {{ parser }}" +- name: Pass text and ttp_results modified {{ parser }} ansible.utils.cli_parse: text: "{{ lookup('ansible.builtin.file', '{{ role_path }}/files/nxos_show_interface.txt') }}" parser: @@ -47,7 +47,7 @@ format: yaml register: nxos_ttp_results -- name: "Confirm modified results {{ parser }}" +- name: Confirm modified results {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_cli_parse/tasks/nxos_xml.yaml b/tests/integration/targets/utils_cli_parse/tasks/nxos_xml.yaml index a615c57d..4c67ba06 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/nxos_xml.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/nxos_xml.yaml @@ -3,7 +3,7 @@ ansible.builtin.set_fact: nxos_xml_text_parsed: "{{ lookup('ansible.builtin.file', '{{ role_path }}/output/nxos_show_interface_xml_parsed.json') | from_json }}" -- name: "Pass text and parse with xml {{ parser }}" +- name: Pass text and parse with xml {{ parser }} ansible.utils.cli_parse: text: "{{ lookup('ansible.builtin.file', '{{ role_path }}/files/nxos_show_interface.xml') }}" parser: @@ -11,7 +11,7 @@ os: nxos register: nxos_xml_text -- name: "Confirm response {{ parser }}" +- name: Confirm response {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_cli_parse/tasks/ubuntu_textfsm.yaml b/tests/integration/targets/utils_cli_parse/tasks/ubuntu_textfsm.yaml index 626acca6..de535838 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/ubuntu_textfsm.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/ubuntu_textfsm.yaml @@ -1,13 +1,13 @@ --- -- name: "Run command and parse with textfsm {{ parser }}" +- name: Run command and parse with textfsm {{ parser }} ansible.utils.cli_parse: - command: "ifconfig" + command: ifconfig parser: name: ansible.utils.textfsm ansible.builtin.set_fact: myfact register: ifconfig_out -- name: "Check parser output {{ parser }}" +- name: Check parser output {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_cli_parse/tasks/ubuntu_ttp.yaml b/tests/integration/targets/utils_cli_parse/tasks/ubuntu_ttp.yaml index 6868d4f4..ba62d360 100644 --- a/tests/integration/targets/utils_cli_parse/tasks/ubuntu_ttp.yaml +++ b/tests/integration/targets/utils_cli_parse/tasks/ubuntu_ttp.yaml @@ -1,13 +1,13 @@ --- -- name: "Run command and parse with ttp {{ parser }}" +- name: Run command and parse with ttp {{ parser }} ansible.utils.cli_parse: - command: "df -h" + command: df -h parser: name: ansible.utils.ttp ansible.builtin.set_fact: myfact register: df_h_out -- name: "Check parser output {{ parser }}" +- name: Check parser output {{ parser }} ansible.builtin.assert: that: "{{ item }}" with_items: diff --git a/tests/integration/targets/utils_consolidate/tasks/main.yaml b/tests/integration/targets/utils_consolidate/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_consolidate/tasks/main.yaml +++ b/tests/integration/targets/utils_consolidate/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_consolidate/tasks/simple.yaml b/tests/integration/targets/utils_consolidate/tasks/simple.yaml index 365dec5b..2a5a57b8 100644 --- a/tests/integration/targets/utils_consolidate/tasks/simple.yaml +++ b/tests/integration/targets/utils_consolidate/tasks/simple.yaml @@ -2,23 +2,12 @@ - name: Build the data structure ansible.builtin.set_fact: data_sources: - - data: - [{ "name": "GigabitEthernet0/1" }, { "name": "GigabitEthernet0/2" }] + - data: [name: GigabitEthernet0/1, name: GigabitEthernet0/2] match_key: name name: acl_interfaces - data: - [ - { - "description": "This is a user template", - "enabled": true, - "name": "GigabitEthernet0/1", - }, - { - "description": "This is a user template", - "enabled": true, - "name": "GigabitEthernet0/2", - }, - ] + - { description: This is a user template, enabled: true, name: GigabitEthernet0/1 } + - { description: This is a user template, enabled: true, name: GigabitEthernet0/2 } match_key: name name: interfaces diff --git a/tests/integration/targets/utils_fact_diff/tasks/argspec.yaml b/tests/integration/targets/utils_fact_diff/tasks/argspec.yaml index 0f5a2122..6958c1a6 100644 --- a/tests/integration/targets/utils_fact_diff/tasks/argspec.yaml +++ b/tests/integration/targets/utils_fact_diff/tasks/argspec.yaml @@ -13,14 +13,14 @@ - after loop_control: loop_var: string - when: "result.msg | type_debug != 'list'" + when: result.msg | type_debug != 'list' - name: Assert ansible.builtin.assert: that: "{{ msg in result.msg }}" vars: msg: "missing required arguments: after, before" - when: "result.msg | type_debug == 'list'" + when: result.msg | type_debug == 'list' - name: Check argspec validation, skip_lines must be a dict ansible.utils.fact_diff: @@ -36,9 +36,9 @@ - name: Assert ansible.builtin.assert: that: "{{ 'unable to convert to list' in result.msg }}" - when: "result.msg | type_debug != 'list'" + when: result.msg | type_debug != 'list' - name: Assert ansible.builtin.assert: that: "{{ 'unable to convert to list' in result.msg[0] }}" - when: "result.msg | type_debug == 'list'" + when: result.msg | type_debug == 'list' diff --git a/tests/integration/targets/utils_fact_diff/tasks/main.yaml b/tests/integration/targets/utils_fact_diff/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_fact_diff/tasks/main.yaml +++ b/tests/integration/targets/utils_fact_diff/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_fact_diff/tasks/simple.yaml b/tests/integration/targets/utils_fact_diff/tasks/simple.yaml index 4a2ed729..e327a373 100644 --- a/tests/integration/targets/utils_fact_diff/tasks/simple.yaml +++ b/tests/integration/targets/utils_fact_diff/tasks/simple.yaml @@ -6,7 +6,7 @@ plugin: vars: skip_lines: - - "+" + - + ignore_errors: true register: result @@ -14,4 +14,4 @@ ansible.builtin.assert: that: "{{ msg in result.msg }}" vars: - msg: "The regex '+', is not valid" + msg: The regex '+', is not valid diff --git a/tests/integration/targets/utils_from_xml/tasks/main.yaml b/tests/integration/targets/utils_from_xml/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_from_xml/tasks/main.yaml +++ b/tests/integration/targets/utils_from_xml/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_from_xml/tasks/simple.yaml b/tests/integration/targets/utils_from_xml/tasks/simple.yaml index 1b09d0aa..8948842f 100644 --- a/tests/integration/targets/utils_from_xml/tasks/simple.yaml +++ b/tests/integration/targets/utils_from_xml/tasks/simple.yaml @@ -1,17 +1,8 @@ --- - name: Setup xml and expected json ansible.builtin.set_fact: - data: ' - - ' - output: - { - "netconf-state": - { - "@xmlns": "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring", - "schemas": { "schema": null }, - }, - } + data: ' ' + output: { netconf-state: { "@xmlns": urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring, schemas: { schema: !!null "" } } } - name: Debug ansible.builtin.debug: @@ -26,7 +17,7 @@ - name: Setup invalid xml as input to ansible.utils.from_xml. ansible.builtin.set_fact: - data: '' + data: - name: Validate input xml ansible.builtin.set_fact: diff --git a/tests/integration/targets/utils_get_path/tasks/examples_filter.yaml b/tests/integration/targets/utils_get_path/tasks/examples_filter.yaml index 4dc7154b..eab422cf 100644 --- a/tests/integration/targets/utils_get_path/tasks/examples_filter.yaml +++ b/tests/integration/targets/utils_get_path/tasks/examples_filter.yaml @@ -45,7 +45,7 @@ - name: Retrieve the value of each path from vars ansible.builtin.debug: - msg: "The value of path {{ path }} in vars is {{ value }}" + msg: The value of path {{ path }} in vars is {{ value }} loop: "{{ paths.keys()|list }}" loop_control: label: "{{ item }}" diff --git a/tests/integration/targets/utils_get_path/tasks/examples_lookup.yaml b/tests/integration/targets/utils_get_path/tasks/examples_lookup.yaml index c24ed15f..feead35a 100644 --- a/tests/integration/targets/utils_get_path/tasks/examples_lookup.yaml +++ b/tests/integration/targets/utils_get_path/tasks/examples_lookup.yaml @@ -45,7 +45,7 @@ - name: Retrieve the value of each path from vars ansible.builtin.debug: - msg: "The value of path {{ path }} in vars is {{ lookup('ansible.utils.get_path', hostvars[inventory_hostname], path) }}" + msg: The value of path {{ path }} in vars is {{ lookup('ansible.utils.get_path', hostvars[inventory_hostname], path) }} loop: "{{ paths.keys()|list }}" loop_control: loop_var: path diff --git a/tests/integration/targets/utils_get_path/tasks/main.yaml b/tests/integration/targets/utils_get_path/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_get_path/tasks/main.yaml +++ b/tests/integration/targets/utils_get_path/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_get_path/tasks/simple.yaml b/tests/integration/targets/utils_get_path/tasks/simple.yaml index d31a8742..d0131b13 100644 --- a/tests/integration/targets/utils_get_path/tasks/simple.yaml +++ b/tests/integration/targets/utils_get_path/tasks/simple.yaml @@ -24,7 +24,7 @@ expected: "{{ a.b.c.d[0] }}" - result: "{{ a|ansible.utils.get_path('b.c.d[1]') }}" expected: "{{ a.b.c.d[1] }}" - - result: '{{ a|ansible.utils.get_path(''b["c"]'') }}' + - result: "{{ a|ansible.utils.get_path('b[\"c\"]') }}" expected: "{{ a.b.c }}" - result: "{{ lookup('ansible.utils.get_path', vars, 'a') }}" expected: "{{ a }}" @@ -38,7 +38,7 @@ expected: "{{ a.b.c.d[0] }}" - result: "{{ lookup('ansible.utils.get_path', a, 'b.c.d[1]') }}" expected: "{{ a.b.c.d[1] }}" - - result: '{{ lookup(''ansible.utils.get_path'', a, ''b["c"]'') }}' + - result: "{{ lookup('ansible.utils.get_path', a, 'b[\"c\"]') }}" expected: "{{ a.b.c }}" - name: Set fact diff --git a/tests/integration/targets/utils_index_of/tasks/argspec.yaml b/tests/integration/targets/utils_index_of/tasks/argspec.yaml index 890b3c63..5d118071 100644 --- a/tests/integration/targets/utils_index_of/tasks/argspec.yaml +++ b/tests/integration/targets/utils_index_of/tasks/argspec.yaml @@ -22,7 +22,7 @@ ansible.builtin.assert: that: "{{ msg in result.msg }}" vars: - msg: "cannot be converted to a list" + msg: cannot be converted to a list - name: Check argspec validation with filter (missing params) ansible.builtin.set_fact: @@ -46,7 +46,7 @@ ansible.builtin.assert: that: "{{ msg in result.msg }}" vars: - msg: "cannot be converted to a list" + msg: cannot be converted to a list - name: Check argspec validation with lookup (missing params) ansible.builtin.set_fact: diff --git a/tests/integration/targets/utils_index_of/tasks/examples_filter.yaml b/tests/integration/targets/utils_index_of/tasks/examples_filter.yaml index d2d8800f..98dfd33d 100644 --- a/tests/integration/targets/utils_index_of/tasks/examples_filter.yaml +++ b/tests/integration/targets/utils_index_of/tasks/examples_filter.yaml @@ -79,7 +79,7 @@ - name: Find the index of all firewalls, use in a loop ansible.builtin.debug: - msg: "The type of {{ device_type }} at index {{ item }} has name {{ data[item].name }}." + msg: The type of {{ device_type }} at index {{ item }} has name {{ data[item].name }}. loop: "{{ data|ansible.utils.index_of('eq', device_type, 'type') }}" vars: device_type: firewall @@ -92,10 +92,10 @@ - name: Find the index of all devices with a .corp name ansible.builtin.debug: - msg: "The device named {{ data[item].name }} is a {{ data[item].type }}" + msg: The device named {{ data[item].name }} is a {{ data[item].type }} loop: "{{ data|ansible.utils.index_of('regex', expression, 'name') }}" vars: - expression: '\.corp$' + expression: \.corp$ # ends with .corp # TASK [Find the index of all devices with a .corp name] ********************* diff --git a/tests/integration/targets/utils_index_of/tasks/examples_lookup.yaml b/tests/integration/targets/utils_index_of/tasks/examples_lookup.yaml index 885d9d0e..3c76fc65 100644 --- a/tests/integration/targets/utils_index_of/tasks/examples_lookup.yaml +++ b/tests/integration/targets/utils_index_of/tasks/examples_lookup.yaml @@ -95,7 +95,7 @@ - name: Find the index of all firewalls, use in a loop ansible.builtin.debug: - msg: "The type of {{ device_type }} at index {{ item }} has name {{ data[item].name }}." + msg: The type of {{ device_type }} at index {{ item }} has name {{ data[item].name }}. loop: "{{ lookup('ansible.utils.index_of', data, 'eq', device_type, 'type') }}" vars: device_type: firewall @@ -108,10 +108,10 @@ - name: Find the index of all devices with a .corp name ansible.builtin.debug: - msg: "The device named {{ data[item].name }} is a {{ data[item].type }}" + msg: The device named {{ data[item].name }} is a {{ data[item].type }} loop: "{{ lookup('ansible.utils.index_of', data, 'regex', expression, 'name') }}" vars: - expression: '\.corp$' + expression: \.corp$ # ends with .corp # TASK [Find the index of all devices with a .corp name] ********************* @@ -238,7 +238,7 @@ {{ data.interfaces.interface[int_idx|int] .subinterfaces.subinterface[subint_idx|int] .config.description }} - # retrieve the index in each nested list + # retrieve the index in each nested list # TASK [Find the description of loopback111, subinterface index 10] ************ # ok: [sw01] => diff --git a/tests/integration/targets/utils_index_of/tasks/main.yaml b/tests/integration/targets/utils_index_of/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_index_of/tasks/main.yaml +++ b/tests/integration/targets/utils_index_of/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_ipaddr_filter/tasks/ipaddr.yaml b/tests/integration/targets/utils_ipaddr_filter/tasks/ipaddr.yaml index d6abf22b..9ac3aa88 100644 --- a/tests/integration/targets/utils_ipaddr_filter/tasks/ipaddr.yaml +++ b/tests/integration/targets/utils_ipaddr_filter/tasks/ipaddr.yaml @@ -7,7 +7,7 @@ - ::1 - 192.168.32.0/24 - fe80::100/10 - - "42540766412265424405338506004571095040/64" + - 42540766412265424405338506004571095040/64 - true - name: Ipaddr filter with empty string query @@ -60,11 +60,11 @@ - name: Debug ansible.builtin.debug: - msg: "Test int input for ipaddr filter" + msg: Test int input for ipaddr filter - name: Set fact 1 ansible.builtin.set_fact: - ip1: "172.20.0.1" + ip1: 172.20.0.1 - name: Set fact 2 ansible.builtin.set_fact: diff --git a/tests/integration/targets/utils_ipaddr_filter/tasks/ipv4.yaml b/tests/integration/targets/utils_ipaddr_filter/tasks/ipv4.yaml index 0acc9879..dc0b5a53 100644 --- a/tests/integration/targets/utils_ipaddr_filter/tasks/ipv4.yaml +++ b/tests/integration/targets/utils_ipaddr_filter/tasks/ipv4.yaml @@ -7,7 +7,7 @@ - ::1 - 192.168.32.0/24 - fe80::100/10 - - "42540766412265424405338506004571095040/64" + - 42540766412265424405338506004571095040/64 - true - name: Ipv4 filter diff --git a/tests/integration/targets/utils_ipaddr_filter/tasks/ipwrap.yaml b/tests/integration/targets/utils_ipaddr_filter/tasks/ipwrap.yaml index bb548fa1..2f9c3c41 100644 --- a/tests/integration/targets/utils_ipaddr_filter/tasks/ipwrap.yaml +++ b/tests/integration/targets/utils_ipaddr_filter/tasks/ipwrap.yaml @@ -7,7 +7,7 @@ - ::1 - 192.168.32.0/24 - fe80::100/10 - - "42540766412265424405338506004571095040/64" + - 42540766412265424405338506004571095040/64 - true - name: Ipwrap filter diff --git a/tests/integration/targets/utils_ipaddr_filter/tasks/main.yaml b/tests/integration/targets/utils_ipaddr_filter/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_ipaddr_filter/tasks/main.yaml +++ b/tests/integration/targets/utils_ipaddr_filter/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_ipaddr_filter/vars/main.yaml b/tests/integration/targets/utils_ipaddr_filter/vars/main.yaml index 6c28bde1..d27fcd57 100644 --- a/tests/integration/targets/utils_ipaddr_filter/vars/main.yaml +++ b/tests/integration/targets/utils_ipaddr_filter/vars/main.yaml @@ -1,16 +1,16 @@ --- -address: "192.168.144.5" -subnet: "192.168.0.0/16" +address: 192.168.144.5 +subnet: 192.168.0.0/16 result1_val: - - "192.24.2.1" - - "192.168.32.0/24" + - 192.24.2.1 + - 192.168.32.0/24 result2_val: - - "::ffff:192.24.2.1/128" - - "::ffff:192.168.32.0/120" + - ::ffff:192.24.2.1/128 + - ::ffff:192.168.32.0/120 result3_val: - - "192.24.2.1" + - 192.24.2.1 ipaddr_result1: - 192.24.2.1 @@ -33,27 +33,27 @@ ipaddr_result4: - 2001:db8:32c:faad::/64 ipwrap_result1: - - "192.24.2.1" - - "host.fqdn" + - 192.24.2.1 + - host.fqdn - "[::1]" - - "192.168.32.0/24" + - 192.168.32.0/24 - "[fe80::100]/10" - "[2001:db8:32c:faad::]/64" - true ipv6_result1: - - "::ffff:192.168.32.0/120" - - "::ffff:192.24.2.1/128" - - "fe80::100/10" + - ::ffff:192.168.32.0/120 + - ::ffff:192.24.2.1/128 + - fe80::100/10 ipv6_result2: - - "192.168.32.0/24" - - "192.24.2.1/32" + - 192.168.32.0/24 + - 192.24.2.1/32 ipv6_result3: - - "::ffff:192.168.32.0" - - "::ffff:192.24.2.1" - - "fe80::100" + - ::ffff:192.168.32.0 + - ::ffff:192.24.2.1 + - fe80::100 cidr_result1: - 192.168.0.0/16 diff --git a/tests/integration/targets/utils_keep_keys/tasks/main.yaml b/tests/integration/targets/utils_keep_keys/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_keep_keys/tasks/main.yaml +++ b/tests/integration/targets/utils_keep_keys/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_netaddr_test/tasks/main.yaml b/tests/integration/targets/utils_netaddr_test/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_netaddr_test/tasks/main.yaml +++ b/tests/integration/targets/utils_netaddr_test/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_netaddr_test/vars/main.yaml b/tests/integration/targets/utils_netaddr_test/vars/main.yaml index 6505ab23..e2740645 100644 --- a/tests/integration/targets/utils_netaddr_test/vars/main.yaml +++ b/tests/integration/targets/utils_netaddr_test/vars/main.yaml @@ -1,11 +1,11 @@ --- networks: - - "10.0.0.0/8" - - "192.168.1.0/24" - - "172.16.0.0/16" + - 10.0.0.0/8 + - 192.168.1.0/24 + - 172.16.0.0/16 good_name: www.google.com bad_name: foo.google.com -ipv4_localhost: "127.0.0.1" -ipv6_localhost: "::1" +ipv4_localhost: 127.0.0.1 +ipv6_localhost: ::1 diff --git a/tests/integration/targets/utils_param_list_compare/tasks/main.yaml b/tests/integration/targets/utils_param_list_compare/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_param_list_compare/tasks/main.yaml +++ b/tests/integration/targets/utils_param_list_compare/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_param_list_compare/tasks/simple.yaml b/tests/integration/targets/utils_param_list_compare/tasks/simple.yaml index b79e0b38..9b50824d 100644 --- a/tests/integration/targets/utils_param_list_compare/tasks/simple.yaml +++ b/tests/integration/targets/utils_param_list_compare/tasks/simple.yaml @@ -1,48 +1,48 @@ --- - name: Debug ansible.builtin.debug: - msg: "START param_list_compare integration tests on connection={{ ansible_connection }}" + msg: START param_list_compare integration tests on connection={{ ansible_connection }} - name: Setup supported resource module list json ansible.builtin.set_fact: network_resources: modules: - - "acl_interfaces" - - "acls" - - "bgp_address_family" - - "bgp_global" - - "interfaces" - - "l2_interfaces" - - "l3_interfaces" - - "lacp" - - "lacp_interfaces" - - "lag_interfaces" - - "lldp_global" - - "lldp_interfaces" - - "logging_global" - - "ospf_interfaces" - - "ospfv2" - - "ospfv3" - - "prefix_lists" - - "route_maps" - - "static_routes" - - "vlans" + - acl_interfaces + - acls + - bgp_address_family + - bgp_global + - interfaces + - l2_interfaces + - l3_interfaces + - lacp + - lacp_interfaces + - lag_interfaces + - lldp_global + - lldp_interfaces + - logging_global + - ospf_interfaces + - ospfv2 + - ospfv3 + - prefix_lists + - route_maps + - static_routes + - vlans - name: Setup target resources with bangs ansible.builtin.set_fact: provided_resources: - "!all" - "!acl_interfaces" - - "acls" - - "bgp_address_family" - - "bgp_global" + - acls + - bgp_address_family + - bgp_global - name: Setup target resources with bangs ansible.builtin.set_fact: expected_network_resources: - - "acls" - - "bgp_address_family" - - "bgp_global" + - acls + - bgp_address_family + - bgp_global - name: Get the final list of resources ansible.builtin.set_fact: @@ -51,9 +51,8 @@ - name: Assert final network resources ansible.builtin.assert: that: - - "{{ expected_network_resources | symmetric_difference(final_network_resources['actionable']) |length\ - \ == 0 }}" + - "{{ expected_network_resources | symmetric_difference(final_network_resources['actionable']) |length == 0 }}" - name: Debug ansible.builtin.debug: - msg: "END param_list_compare integration tests on connection={{ ansible_connection }}" + msg: END param_list_compare integration tests on connection={{ ansible_connection }} diff --git a/tests/integration/targets/utils_remove_keys/tasks/main.yaml b/tests/integration/targets/utils_remove_keys/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_remove_keys/tasks/main.yaml +++ b/tests/integration/targets/utils_remove_keys/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_replace_keys/tasks/main.yaml b/tests/integration/targets/utils_replace_keys/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_replace_keys/tasks/main.yaml +++ b/tests/integration/targets/utils_replace_keys/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_to_paths/tasks/main.yaml b/tests/integration/targets/utils_to_paths/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_to_paths/tasks/main.yaml +++ b/tests/integration/targets/utils_to_paths/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_to_xml/tasks/main.yaml b/tests/integration/targets/utils_to_xml/tasks/main.yaml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_to_xml/tasks/main.yaml +++ b/tests/integration/targets/utils_to_xml/tasks/main.yaml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_to_xml/tasks/simple.yaml b/tests/integration/targets/utils_to_xml/tasks/simple.yaml index 108ac00a..c3baca31 100644 --- a/tests/integration/targets/utils_to_xml/tasks/simple.yaml +++ b/tests/integration/targets/utils_to_xml/tasks/simple.yaml @@ -2,9 +2,9 @@ - name: Setup xml ansible.builtin.set_fact: data: - "interface-configurations": - "@xmlns": "http://cisco.com/ns/yang/Cisco-IOS-XR-ifmgr-cfg" - "interface-configuration": + interface-configurations: + "@xmlns": http://cisco.com/ns/yang/Cisco-IOS-XR-ifmgr-cfg + interface-configuration: - name: Debug ansible.builtin.debug: @@ -20,8 +20,8 @@ - name: Test for supported engine for to_xml filter ansible.builtin.set_fact: data: - "interface-configurations": - "@xmlns": "http://cisco.com/ns/yang/Cisco-IOS-XR-ifmgr-cfg" + interface-configurations: + "@xmlns": http://cisco.com/ns/yang/Cisco-IOS-XR-ifmgr-cfg - name: Validate input xml ansible.builtin.set_fact: diff --git a/tests/integration/targets/utils_to_xml/vars/main.yaml b/tests/integration/targets/utils_to_xml/vars/main.yaml index 2dfb1674..04c4c5ea 100644 --- a/tests/integration/targets/utils_to_xml/vars/main.yaml +++ b/tests/integration/targets/utils_to_xml/vars/main.yaml @@ -1,3 +1,4 @@ --- -output: "\n\n\t\n" -output1: '' +output: "\n\n\t\n\ + " +output1: diff --git a/tests/integration/targets/utils_update_fact/tasks/main.yaml b/tests/integration/targets/utils_update_fact/tasks/main.yaml index 292c99ed..cc91ff84 100644 --- a/tests/integration/targets/utils_update_fact/tasks/main.yaml +++ b/tests/integration/targets/utils_update_fact/tasks/main.yaml @@ -12,7 +12,7 @@ updates: - path: a.b.c.0 value: 10 - - path: "a['b']['c'][1]" + - path: a['b']['c'][1] value: 20 register: updated @@ -33,7 +33,7 @@ - path: a value: x: - y: + true: z: - 100 - true @@ -46,7 +46,7 @@ expected: a: x: - y: + true: z: - 100 - true @@ -54,7 +54,7 @@ - name: Update the fact ansible.utils.update_fact: updates: - - path: "a.b.c[{{ index }}]" + - path: a.b.c[{{ index }}] value: 20 vars: index: "{{ a.b.c|ansible.utils.index_of('eq', 2) }}" diff --git a/tests/integration/targets/utils_usable_range/tasks/argspec.yml b/tests/integration/targets/utils_usable_range/tasks/argspec.yml index ccc8a2bc..6a2d1cee 100644 --- a/tests/integration/targets/utils_usable_range/tasks/argspec.yml +++ b/tests/integration/targets/utils_usable_range/tasks/argspec.yml @@ -9,7 +9,7 @@ ansible.builtin.assert: that: "{{ msg in result1.msg }}" vars: - msg: "does not appear to be an IPv4 or IPv6 network" + msg: does not appear to be an IPv4 or IPv6 network - name: Check argspec validation with filter (random string arg) ansible.builtin.set_fact: @@ -21,7 +21,7 @@ ansible.builtin.assert: that: "{{ msg in result2.msg }}" vars: - msg: "does not appear to be an IPv4 or IPv6 network" + msg: does not appear to be an IPv4 or IPv6 network - name: Check argspec validation with filter (invalid arg for expansion) ansible.builtin.set_fact: @@ -33,7 +33,7 @@ ansible.builtin.assert: that: "{{ msg in result3.msg }}" vars: - msg: "has host bits set" + msg: has host bits set - name: Check argspec validation with filter (invalid format for arg) ansible.builtin.set_fact: @@ -45,7 +45,7 @@ ansible.builtin.assert: that: "{{ msg in result4.msg }}" vars: - msg: "does not appear to be an IPv4 or IPv6 network" + msg: does not appear to be an IPv4 or IPv6 network - name: Check argspec validation with filter (invalid format for arg) ansible.builtin.set_fact: @@ -57,7 +57,7 @@ ansible.builtin.assert: that: "{{ msg in result5.msg }}" vars: - msg: "does not appear to be an IPv4 or IPv6 network" + msg: does not appear to be an IPv4 or IPv6 network - name: Check argspec validation with filter (invalid netmask) ansible.builtin.set_fact: @@ -69,7 +69,7 @@ ansible.builtin.assert: that: "{{ msg in result6.msg }}" vars: - msg: "does not appear to be an IPv4 or IPv6 network" + msg: does not appear to be an IPv4 or IPv6 network - name: Check argspec validation with filter (invalid netmask) ansible.builtin.set_fact: @@ -81,4 +81,4 @@ ansible.builtin.assert: that: "{{ msg in result7.msg }}" vars: - msg: "does not appear to be an IPv4 or IPv6 network" + msg: does not appear to be an IPv4 or IPv6 network diff --git a/tests/integration/targets/utils_usable_range/tasks/main.yml b/tests/integration/targets/utils_usable_range/tasks/main.yml index 333bee8c..76ee7078 100644 --- a/tests/integration/targets/utils_usable_range/tasks/main.yml +++ b/tests/integration/targets/utils_usable_range/tasks/main.yml @@ -6,7 +6,7 @@ recurse: false use_regex: true patterns: - - "^(?!_|main).+$" + - ^(?!_|main).+$ delegate_to: localhost register: found diff --git a/tests/integration/targets/utils_usable_range/vars/main.yml b/tests/integration/targets/utils_usable_range/vars/main.yml index 800517fd..2c1c7b57 100644 --- a/tests/integration/targets/utils_usable_range/vars/main.yml +++ b/tests/integration/targets/utils_usable_range/vars/main.yml @@ -2,27 +2,27 @@ result1_val: number_of_ips: 1 usable_ips: - - "10.1.1.1" + - 10.1.1.1 result2_val: number_of_ips: 16 usable_ips: - - "10.0.0.0" - - "10.0.0.1" - - "10.0.0.2" - - "10.0.0.3" - - "10.0.0.4" - - "10.0.0.5" - - "10.0.0.6" - - "10.0.0.7" - - "10.0.0.8" - - "10.0.0.9" - - "10.0.0.10" - - "10.0.0.11" - - "10.0.0.12" - - "10.0.0.13" - - "10.0.0.14" - - "10.0.0.15" + - 10.0.0.0 + - 10.0.0.1 + - 10.0.0.2 + - 10.0.0.3 + - 10.0.0.4 + - 10.0.0.5 + - 10.0.0.6 + - 10.0.0.7 + - 10.0.0.8 + - 10.0.0.9 + - 10.0.0.10 + - 10.0.0.11 + - 10.0.0.12 + - 10.0.0.13 + - 10.0.0.14 + - 10.0.0.15 result3_val: number_of_ips: 256 @@ -31,9 +31,9 @@ result4_val: number_of_ips: 4 usable_ips: - "2001:db8:abcd:12::" - - "2001:db8:abcd:12::1" - - "2001:db8:abcd:12::2" - - "2001:db8:abcd:12::3" + - 2001:db8:abcd:12::1 + - 2001:db8:abcd:12::2 + - 2001:db8:abcd:12::3 result5_val: number_of_ips: 1 diff --git a/tests/integration/targets/utils_validate/files/criteria/rules.yaml b/tests/integration/targets/utils_validate/files/criteria/rules.yaml index 1cd28d68..3f09e631 100644 --- a/tests/integration/targets/utils_validate/files/criteria/rules.yaml +++ b/tests/integration/targets/utils_validate/files/criteria/rules.yaml @@ -1,20 +1,20 @@ --- - name: Interface description should not be more than 8 chars - example: "Matches description this-is-a-long-description" - rule: 'description\s(.{9,})' + example: Matches description this-is-a-long-description + rule: description\s(.{9,}) action: warn - name: Ethernet interface names should be in format Ethernet[Slot/chassis number].[sub-intf number (optional)] - example: "Matches interface Eth1/1, interface eth 1/1, interface Ethernet 1/1, interface ethernet 1/1.100" - rule: 'interface\s[eE](?!\w{7}\d/\d(.\d+)?)' + example: Matches interface Eth1/1, interface eth 1/1, interface Ethernet 1/1, interface ethernet 1/1.100 + rule: interface\s[eE](?!\w{7}\d/\d(.\d+)?) action: fail - name: Loopback interface names should be in format loopback[Virtual Interface Number] - example: "Matches interface Lo10, interface loopback 10" - rule: 'interface\s[lL](?!\w{7}\d)' + example: Matches interface Lo10, interface loopback 10 + rule: interface\s[lL](?!\w{7}\d) action: fail - name: Port Channel names should be in format port-channel[Port Channel number].[sub-intf number (optional)] - example: "Matches interface Port-channel 10, interface po10, interface Port-channel 10.1" - rule: 'interface\s[pP](?!\w{3}-\w{7}\d(.\d+)?)' + example: Matches interface Port-channel 10, interface po10, interface Port-channel 10.1 + rule: interface\s[pP](?!\w{3}-\w{7}\d(.\d+)?) action: fail diff --git a/tests/integration/targets/utils_validate/tests/config/filter.yaml b/tests/integration/targets/utils_validate/tests/config/filter.yaml index bfe769bf..92177fa9 100644 --- a/tests/integration/targets/utils_validate/tests/config/filter.yaml +++ b/tests/integration/targets/utils_validate/tests/config/filter.yaml @@ -22,9 +22,9 @@ - ansible.builtin.assert: that: - - "data_criteria_checks[0].found == 'interface Eth1/1'" - - "data_criteria_checks[1].found == 'interface Loopback 10'" - - "data_criteria_checks[2].found == 'interface po2.1'" + - data_criteria_checks[0].found == 'interface Eth1/1' + - data_criteria_checks[1].found == 'interface Loopback 10' + - data_criteria_checks[2].found == 'interface po2.1' - name: validate configuration using config (with warnings) ansible.builtin.set_fact: @@ -32,7 +32,7 @@ - ansible.builtin.assert: that: - - "data_criteria_checks == []" + - data_criteria_checks == [] - name: validate configuration using config (all pass) ansible.builtin.set_fact: @@ -40,7 +40,7 @@ - ansible.builtin.assert: that: - - "data_criteria_checks == []" + - data_criteria_checks == [] - name: invalid rules ansible.builtin.set_fact: @@ -50,7 +50,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - '"is not one of \"warn\" or \"fail\"" in result["msg"]' - '"missing \"action\" key" in result["msg"]' - '"missing \"rule\" key" in result["msg"]' diff --git a/tests/integration/targets/utils_validate/tests/config/lookup.yaml b/tests/integration/targets/utils_validate/tests/config/lookup.yaml index d4f1f16e..945e2306 100644 --- a/tests/integration/targets/utils_validate/tests/config/lookup.yaml +++ b/tests/integration/targets/utils_validate/tests/config/lookup.yaml @@ -22,9 +22,9 @@ - ansible.builtin.assert: that: - - "data_criteria_checks[0].found == 'interface Eth1/1'" - - "data_criteria_checks[1].found == 'interface Loopback 10'" - - "data_criteria_checks[2].found == 'interface po2.1'" + - data_criteria_checks[0].found == 'interface Eth1/1' + - data_criteria_checks[1].found == 'interface Loopback 10' + - data_criteria_checks[2].found == 'interface po2.1' - name: validate configuration using config (with warnings) ansible.builtin.set_fact: @@ -32,7 +32,7 @@ - ansible.builtin.assert: that: - - "data_criteria_checks == []" + - data_criteria_checks == [] - name: validate configuration using config (all pass) ansible.builtin.set_fact: @@ -40,7 +40,7 @@ - ansible.builtin.assert: that: - - "data_criteria_checks == []" + - data_criteria_checks == [] - name: invalid rules ansible.builtin.set_fact: @@ -50,7 +50,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - '"is not one of \"warn\" or \"fail\"" in result["msg"]' - '"missing \"action\" key" in result["msg"]' - '"missing \"rule\" key" in result["msg"]' diff --git a/tests/integration/targets/utils_validate/tests/config/module.yaml b/tests/integration/targets/utils_validate/tests/config/module.yaml index ce54b8f1..a62d7173 100644 --- a/tests/integration/targets/utils_validate/tests/config/module.yaml +++ b/tests/integration/targets/utils_validate/tests/config/module.yaml @@ -27,10 +27,10 @@ - ansible.builtin.assert: that: - "'errors' in result" - - "result['errors'][0].found == 'interface Eth1/1'" - - "result['errors'][1].found == 'interface Loopback 10'" - - "result['errors'][2].found == 'interface po2.1'" - - "result['failed'] == true" + - result['errors'][0].found == 'interface Eth1/1' + - result['errors'][1].found == 'interface Loopback 10' + - result['errors'][2].found == 'interface po2.1' + - result['failed'] == true - "'Validation errors were found' in result.msg" - "'Ethernet interface names should be in format' in result.msg" - "'Loopback interface names should be in format' in result.msg" @@ -50,7 +50,7 @@ - "'errors' not in result" - "'warnings' in result" - "'At line 2: Interface description should not be more than 8 chars' in result['warnings'][0]" - - "result['failed'] == false" + - result['failed'] == false - "'Non-fatal validation errors were found.' in result.msg" - name: validate configuration using config (all passed) @@ -64,7 +64,7 @@ that: - "'errors' not in result" - "'warnings' not in result" - - "result['failed'] == false" + - result['failed'] == false - "'All checks passed' in result.msg" - name: invalid rules @@ -77,7 +77,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - '"is not one of \"warn\" or \"fail\"" in result["msg"]' - '"missing \"action\" key" in result["msg"]' - '"missing \"rule\" key" in result["msg"]' diff --git a/tests/integration/targets/utils_validate/tests/config/test.yaml b/tests/integration/targets/utils_validate/tests/config/test.yaml index 62018ee3..bc46affd 100644 --- a/tests/integration/targets/utils_validate/tests/config/test.yaml +++ b/tests/integration/targets/utils_validate/tests/config/test.yaml @@ -22,7 +22,7 @@ - ansible.builtin.assert: that: - - "is_data_valid == false" + - is_data_valid == false - name: validate configuration using config (with warnings) ansible.builtin.set_fact: @@ -30,7 +30,7 @@ - ansible.builtin.assert: that: - - "is_data_valid == true" + - is_data_valid == true - name: validate configuration using config (all pass) ansible.builtin.set_fact: @@ -38,7 +38,7 @@ - ansible.builtin.assert: that: - - "is_data_valid == true" + - is_data_valid == true - name: invalid rules ansible.builtin.set_fact: @@ -48,7 +48,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - '"is not one of \"warn\" or \"fail\"" in result["msg"]' - '"missing \"action\" key" in result["msg"]' - '"missing \"rule\" key" in result["msg"]' diff --git a/tests/integration/targets/utils_validate/tests/jsonschema/filter.yaml b/tests/integration/targets/utils_validate/tests/jsonschema/filter.yaml index e67522cf..b319c5fe 100644 --- a/tests/integration/targets/utils_validate/tests/jsonschema/filter.yaml +++ b/tests/integration/targets/utils_validate/tests/jsonschema/filter.yaml @@ -5,9 +5,9 @@ - ansible.builtin.assert: that: - - "data_criteria_checks[0].data_path == 'GigabitEthernet0/0/0/0.oper_status'" - - "data_criteria_checks[1].data_path == 'GigabitEthernet0/0/0/1.enabled'" - - "data_criteria_checks[2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors'" + - data_criteria_checks[0].data_path == 'GigabitEthernet0/0/0/0.oper_status' + - data_criteria_checks[1].data_path == 'GigabitEthernet0/0/0/1.enabled' + - data_criteria_checks[2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors' - name: validate data in json format using jsonschema (valid data) ansible.builtin.set_fact: @@ -15,7 +15,7 @@ - ansible.builtin.assert: that: - - "data_criteria_checks == []" + - data_criteria_checks == [] - name: test invalid plugin configuration option, passed within filter plugin ansible.builtin.set_fact: @@ -36,7 +36,7 @@ - ansible.builtin.assert: that: - "'errors' not in result" - - "result['failed'] == true" + - result['failed'] == true - "'For engine \\'ansible.utils.sample\\' error loading the corresponding validate plugin' in result.msg" - name: invalid data value @@ -47,7 +47,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - "'\\'data\\' option value is invalid' in result.msg" - name: invalid criteria value @@ -58,7 +58,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - "'\\'criteria\\' option value is invalid' in result.msg" - name: read data and criteria from file @@ -75,9 +75,9 @@ - ansible.builtin.assert: that: - - "data_criteria_checks[0].data_path == 'GigabitEthernet0/0/0/0.oper_status'" - - "data_criteria_checks[1].data_path == 'GigabitEthernet0/0/0/1.enabled'" - - "data_criteria_checks[2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors'" + - data_criteria_checks[0].data_path == 'GigabitEthernet0/0/0/0.oper_status' + - data_criteria_checks[1].data_path == 'GigabitEthernet0/0/0/1.enabled' + - data_criteria_checks[2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors' - name: validate data using jsonschema engine (valid data read from file) ansible.builtin.set_fact: @@ -85,4 +85,4 @@ - ansible.builtin.assert: that: - - "data_criteria_checks == []" + - data_criteria_checks == [] diff --git a/tests/integration/targets/utils_validate/tests/jsonschema/lookup.yaml b/tests/integration/targets/utils_validate/tests/jsonschema/lookup.yaml index c20f9610..dcba0cc8 100644 --- a/tests/integration/targets/utils_validate/tests/jsonschema/lookup.yaml +++ b/tests/integration/targets/utils_validate/tests/jsonschema/lookup.yaml @@ -7,9 +7,9 @@ - ansible.builtin.assert: that: - - "data_criteria_checks[0].data_path == 'GigabitEthernet0/0/0/0.oper_status'" - - "data_criteria_checks[1].data_path == 'GigabitEthernet0/0/0/1.enabled'" - - "data_criteria_checks[2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors'" + - data_criteria_checks[0].data_path == 'GigabitEthernet0/0/0/0.oper_status' + - data_criteria_checks[1].data_path == 'GigabitEthernet0/0/0/1.enabled' + - data_criteria_checks[2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors' - name: validate data in json format using jsonschema (invalid data) ansible.builtin.set_fact: @@ -19,7 +19,7 @@ - ansible.builtin.assert: that: - - "data_criteria_checks == []" + - data_criteria_checks == [] - name: test invalid plugin configuration option, passed within lookup plugin ansible.builtin.set_fact: @@ -54,7 +54,7 @@ - ansible.builtin.assert: that: - "'errors' not in result" - - "result['failed'] == true" + - result['failed'] == true - "'For engine \\'ansible.utils.sample\\' error loading the corresponding validate plugin' in result.msg" - name: invalid data value @@ -65,7 +65,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - "'\\'data\\' option value is invalid' in result.msg" - name: invalid criteria value @@ -76,7 +76,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - "'\\'criteria\\' option value is invalid' in result.msg" - name: read data and criteria from file @@ -89,13 +89,14 @@ - name: validate data using jsonschema engine (invalid data read from file) ansible.builtin.set_fact: - data_criteria_checks: "{{ lookup('ansible.utils.validate', data, [oper_status_up_criteria, enabled_check_criteria, crc_error_check_criteria], engine='ansible.utils.jsonschema') }}" + data_criteria_checks: "{{ lookup('ansible.utils.validate', data, [oper_status_up_criteria, enabled_check_criteria, crc_error_check_criteria], engine='ansible.utils.jsonschema') + }}" - ansible.builtin.assert: that: - - "data_criteria_checks[0].data_path == 'GigabitEthernet0/0/0/0.oper_status'" - - "data_criteria_checks[1].data_path == 'GigabitEthernet0/0/0/1.enabled'" - - "data_criteria_checks[2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors'" + - data_criteria_checks[0].data_path == 'GigabitEthernet0/0/0/0.oper_status' + - data_criteria_checks[1].data_path == 'GigabitEthernet0/0/0/1.enabled' + - data_criteria_checks[2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors' - name: validate data using jsonschema engine (valid data read from file) ansible.builtin.set_fact: @@ -103,4 +104,4 @@ - ansible.builtin.assert: that: - - "data_criteria_checks == []" + - data_criteria_checks == [] diff --git a/tests/integration/targets/utils_validate/tests/jsonschema/module.yaml b/tests/integration/targets/utils_validate/tests/jsonschema/module.yaml index b26a0ceb..d3a97757 100644 --- a/tests/integration/targets/utils_validate/tests/jsonschema/module.yaml +++ b/tests/integration/targets/utils_validate/tests/jsonschema/module.yaml @@ -15,9 +15,9 @@ - ansible.builtin.assert: that: - "'errors' in result" - - "result['errors'][0].data_path == 'GigabitEthernet0/0/0/0.oper_status'" - - "result['errors'][1].data_path == 'GigabitEthernet0/0/0/1.enabled'" - - "result['errors'][2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors'" + - result['errors'][0].data_path == 'GigabitEthernet0/0/0/0.oper_status' + - result['errors'][1].data_path == 'GigabitEthernet0/0/0/1.enabled' + - result['errors'][2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors' - "'Validation errors were found' in result.msg" - "'patternProperties.^.*.properties.oper_status.pattern' in result.msg" - "'patternProperties.^.*.properties.enabled.enum' in result.msg" @@ -51,7 +51,7 @@ - ansible.builtin.assert: that: - "'errors' not in result" - - "result['failed'] == true" + - result['failed'] == true - "'value of draft must be one of: draft3, draft4, draft6, draft7, 2019-09, 2020-12, got: draft0' in result.msg" - name: invalid engine value @@ -65,12 +65,12 @@ - ansible.builtin.assert: that: - "'errors' not in result" - - "result['failed'] == true" + - result['failed'] == true - "'For engine \\'ansible.utils.sample\\' error loading the corresponding validate plugin' in result.msg" - name: invalid data value ansible.utils.validate: - data: "sample" + data: sample criteria: "{{ in_rate_check }}" engine: ansible.utils.jsonschema ignore_errors: true @@ -78,20 +78,20 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - "'\\'data\\' option value is invalid' in result.msg" - name: invalid criteria value ansible.utils.validate: data: "{{ show_interfaces }}" - criteria: "sample}" + criteria: sample} engine: ansible.utils.jsonschema ignore_errors: true register: result - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - "'\\'criteria\\' option value is invalid' in result.msg" - name: validate data using jsonschema engine (invalid data read from file) @@ -110,9 +110,9 @@ - ansible.builtin.assert: that: - "'errors' in result" - - "result['errors'][0].data_path == 'GigabitEthernet0/0/0/0.oper_status'" - - "result['errors'][1].data_path == 'GigabitEthernet0/0/0/1.enabled'" - - "result['errors'][2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors'" + - result['errors'][0].data_path == 'GigabitEthernet0/0/0/0.oper_status' + - result['errors'][1].data_path == 'GigabitEthernet0/0/0/1.enabled' + - result['errors'][2].data_path == 'GigabitEthernet0/0/0/1.counters.in_crc_errors' - "'Validation errors were found' in result.msg" - "'patternProperties.^.*.properties.oper_status.pattern' in result.msg" - "'patternProperties.^.*.properties.enabled.enum' in result.msg" diff --git a/tests/integration/targets/utils_validate/tests/jsonschema/test.yaml b/tests/integration/targets/utils_validate/tests/jsonschema/test.yaml index 882ab434..595cfeb9 100644 --- a/tests/integration/targets/utils_validate/tests/jsonschema/test.yaml +++ b/tests/integration/targets/utils_validate/tests/jsonschema/test.yaml @@ -1,11 +1,12 @@ --- - name: validate data in json format using jsonschema (invalid data) ansible.builtin.set_fact: - is_data_valid: "{{ show_interfaces is ansible.utils.validate(engine='ansible.utils.jsonschema', criteria=[oper_status, enable_check, crc_error_check], draft='draft7') }}" + is_data_valid: "{{ show_interfaces is ansible.utils.validate(engine='ansible.utils.jsonschema', criteria=[oper_status, enable_check, crc_error_check], draft='draft7') + }}" - ansible.builtin.assert: that: - - "is_data_valid == false" + - is_data_valid == false - name: validate data in json format using jsonschema (valid data) ansible.builtin.set_fact: @@ -13,7 +14,7 @@ - ansible.builtin.assert: that: - - "is_data_valid == true" + - is_data_valid == true - name: test invalid plugin configuration option, passed within filter plugin ansible.builtin.set_fact: @@ -34,7 +35,7 @@ - ansible.builtin.assert: that: - "'errors' not in result" - - "result['failed'] == true" + - result['failed'] == true - "'For engine \\'ansible.utils.sample\\' error loading the corresponding validate plugin' in result.msg" - name: invalid data value @@ -45,7 +46,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - "'\\'data\\' option value is invalid' in result.msg" - name: invalid criteria value @@ -56,7 +57,7 @@ - ansible.builtin.assert: that: - - "result['failed'] == true" + - result['failed'] == true - "'\\'criteria\\' option value is invalid' in result.msg" - name: read data and criteria from file @@ -69,11 +70,12 @@ - name: validate data using jsonschema engine (invalid data read from file) ansible.builtin.set_fact: - is_data_valid: "{{ show_interfaces is ansible.utils.validate(engine='ansible.utils.jsonschema', criteria=[oper_status_up_criteria, enabled_check_criteria, crc_error_check_criteria], draft='draft7') }}" + is_data_valid: "{{ show_interfaces is ansible.utils.validate(engine='ansible.utils.jsonschema', criteria=[oper_status_up_criteria, enabled_check_criteria, crc_error_check_criteria], + draft='draft7') }}" - ansible.builtin.assert: that: - - "is_data_valid == false" + - is_data_valid == false - name: validate data using jsonschema engine (invalid data read from file) ansible.builtin.set_fact: @@ -85,7 +87,7 @@ - ansible.builtin.assert: that: - - "is_data_valid == true" + - is_data_valid == true - name: read data and criteria from file ansible.builtin.set_fact: @@ -98,4 +100,4 @@ - ansible.builtin.assert: that: - - "is_data_valid == true" + - is_data_valid == true