diff --git a/.github/workflows/integration_source.yml b/.github/workflows/integration_source.yml index e09c5854..4f8f2d88 100644 --- a/.github/workflows/integration_source.yml +++ b/.github/workflows/integration_source.yml @@ -146,20 +146,20 @@ jobs: run: ansible-test integration itsm_api_generic working-directory: ${{ steps.identify.outputs.collection_path }} - - name: Run attachment integration tests - run: ansible-test integration attachment + - name: Run itsm_attachment integration tests + run: ansible-test integration itsm_attachment working-directory: ${{ steps.identify.outputs.collection_path }} - - name: Run attachment_info integration tests - run: ansible-test integration attachment_info + - name: Run itsm_attachment_info integration tests + run: ansible-test integration itsm_attachment_info working-directory: ${{ steps.identify.outputs.collection_path }} - - name: Run attachment_upload integration tests - run: ansible-test integration attachment_upload + - name: Run itsm_attachment_upload integration tests + run: ansible-test integration itsm_attachment_upload working-directory: ${{ steps.identify.outputs.collection_path }} - - name: Run change_request integration tests - run: ansible-test integration change_request + - name: Run itsm_change_request integration tests + run: ansible-test integration itsm_change_request working-directory: ${{ steps.identify.outputs.collection_path }} - name: Run itsm_change_request_task integration tests @@ -170,12 +170,12 @@ jobs: run: ansible-test integration itsm_change_request_with_mapping working-directory: ${{ steps.identify.outputs.collection_path }} - - name: Run configuration_item integration tests - run: ansible-test integration configuration_item + - name: Run itsm_configuration_item integration tests + run: ansible-test integration itsm_configuration_item working-directory: ${{ steps.identify.outputs.collection_path }} - - name: Run configuration_item_batch integration tests - run: ansible-test integration configuration_item_batch + - name: Run itsm_configuration_item_batch integration tests + run: ansible-test integration itsm_configuration_item_batch working-directory: ${{ steps.identify.outputs.collection_path }} - name: Run itsm_configuration_item_relations integration tests @@ -186,6 +186,6 @@ jobs: run: ansible-test integration itsm_service_catalog_info working-directory: ${{ steps.identify.outputs.collection_path }} - - name: Run service_catalog integration tests - run: ansible-test integration service_catalog + - name: Run itsm_service_catalog integration tests + run: ansible-test integration itsm_service_catalog working-directory: ${{ steps.identify.outputs.collection_path }} diff --git a/tests/integration/targets/attachment/res/sample_file1.txt b/tests/integration/targets/itsm_attachment/res/sample_file1.txt similarity index 100% rename from tests/integration/targets/attachment/res/sample_file1.txt rename to tests/integration/targets/itsm_attachment/res/sample_file1.txt diff --git a/tests/integration/targets/attachment/res/sample_file2.txt b/tests/integration/targets/itsm_attachment/res/sample_file2.txt similarity index 100% rename from tests/integration/targets/attachment/res/sample_file2.txt rename to tests/integration/targets/itsm_attachment/res/sample_file2.txt diff --git a/tests/integration/targets/attachment/tasks/main.yml b/tests/integration/targets/itsm_attachment/tasks/main.yml similarity index 96% rename from tests/integration/targets/attachment/tasks/main.yml rename to tests/integration/targets/itsm_attachment/tasks/main.yml index 2d268965..14289572 100644 --- a/tests/integration/targets/attachment/tasks/main.yml +++ b/tests/integration/targets/itsm_attachment/tasks/main.yml @@ -18,7 +18,7 @@ risk: low impact: low attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" check_mode: true register: result @@ -49,9 +49,9 @@ servicenow.itsm.change_request: &cr-update number: "{{ test_result.record.number }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" name: sample_file1.txt - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" name: sample_file2.txt check_mode: true register: result @@ -78,7 +78,7 @@ servicenow.itsm.change_request: number: "{{ test_result.record.number }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file2.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file2.txt" name: sample_file1.txt register: result @@ -130,7 +130,7 @@ install_status: on_order operational_status: non_operational attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" check_mode: true register: ci_result @@ -158,9 +158,9 @@ servicenow.itsm.configuration_item: &ci-update sys_id: "{{ test_result.record.sys_id }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" name: sample_file1.txt - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" name: sample_file2.txt check_mode: true register: result @@ -187,7 +187,7 @@ servicenow.itsm.configuration_item: sys_id: "{{ test_result.record.sys_id }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file2.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file2.txt" name: sample_file1.txt register: result @@ -240,7 +240,7 @@ impact: low urgency: low attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" check_mode: true register: result @@ -268,9 +268,9 @@ servicenow.itsm.incident: &incident-update number: "{{ test_result.record.number }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" name: sample_file1.txt - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" name: sample_file2.txt check_mode: true register: result @@ -297,7 +297,7 @@ servicenow.itsm.incident: number: "{{ test_result.record.number }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file2.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file2.txt" name: sample_file1.txt register: result @@ -346,7 +346,7 @@ short_description: my-problem state: new attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" register: first_problem check_mode: true @@ -370,9 +370,9 @@ servicenow.itsm.problem: &problem-update sys_id: "{{ first_problem.record.sys_id }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" name: sample_file1.txt - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt" name: sample_file2.txt check_mode: true register: result @@ -399,7 +399,7 @@ servicenow.itsm.problem: sys_id: "{{ first_problem.record.sys_id }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file2.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file2.txt" name: sample_file1.txt register: result diff --git a/tests/integration/targets/attachment_info/res/sample_file1.txt b/tests/integration/targets/itsm_attachment_info/res/sample_file1.txt similarity index 100% rename from tests/integration/targets/attachment_info/res/sample_file1.txt rename to tests/integration/targets/itsm_attachment_info/res/sample_file1.txt diff --git a/tests/integration/targets/attachment_info/res/sample_file2.txt b/tests/integration/targets/itsm_attachment_info/res/sample_file2.txt similarity index 100% rename from tests/integration/targets/attachment_info/res/sample_file2.txt rename to tests/integration/targets/itsm_attachment_info/res/sample_file2.txt diff --git a/tests/integration/targets/attachment_info/tasks/main.yml b/tests/integration/targets/itsm_attachment_info/tasks/main.yml similarity index 96% rename from tests/integration/targets/attachment_info/tasks/main.yml rename to tests/integration/targets/itsm_attachment_info/tasks/main.yml index 89024054..d72d7734 100644 --- a/tests/integration/targets/attachment_info/tasks/main.yml +++ b/tests/integration/targets/itsm_attachment_info/tasks/main.yml @@ -16,7 +16,7 @@ impact: low urgency: low attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_info/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_info/res/sample_file1.txt" register: test_incident - ansible.builtin.assert: diff --git a/tests/integration/targets/attachment_upload/res/sample_file1.txt b/tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt similarity index 100% rename from tests/integration/targets/attachment_upload/res/sample_file1.txt rename to tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt diff --git a/tests/integration/targets/attachment_upload/res/sample_file2.txt b/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt similarity index 100% rename from tests/integration/targets/attachment_upload/res/sample_file2.txt rename to tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt diff --git a/tests/integration/targets/attachment_upload/tasks/main.yml b/tests/integration/targets/itsm_attachment_upload/tasks/main.yml similarity index 95% rename from tests/integration/targets/attachment_upload/tasks/main.yml rename to tests/integration/targets/itsm_attachment_upload/tasks/main.yml index e855368e..6d0253f6 100644 --- a/tests/integration/targets/attachment_upload/tasks/main.yml +++ b/tests/integration/targets/itsm_attachment_upload/tasks/main.yml @@ -16,7 +16,7 @@ impact: low urgency: low attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt" register: test_incident - ansible.builtin.assert: @@ -33,7 +33,7 @@ table_name: incident table_sys_id: "{{ test_incident.record.sys_id }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt" name: sample_file1.txt register: result @@ -52,7 +52,7 @@ table_name: incident table_sys_id: "{{ test_incident.record.sys_id }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt" name: sample_file2.txt check_mode: true register: result @@ -92,7 +92,7 @@ table_name: incident table_sys_id: "{{ test_incident.record.sys_id }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt" name: sample_file1.txt register: result @@ -111,9 +111,9 @@ table_name: incident table_sys_id: "{{ test_incident.record.sys_id }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt" name: sample_file1.txt - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt" name: sample_file register: result @@ -132,11 +132,11 @@ table_name: incident table_sys_id: "{{ test_incident.record.sys_id }}" attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file1.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt" name: sample_file1.txt # to be updated - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt" name: sample_file2.txt # no update - - path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt" name: sample_file3.txt # new register: result diff --git a/tests/integration/targets/change_request/res/sample_file.txt b/tests/integration/targets/itsm_change_request/res/sample_file.txt similarity index 100% rename from tests/integration/targets/change_request/res/sample_file.txt rename to tests/integration/targets/itsm_change_request/res/sample_file.txt diff --git a/tests/integration/targets/change_request/tasks/main.yml b/tests/integration/targets/itsm_change_request/tasks/main.yml similarity index 99% rename from tests/integration/targets/change_request/tasks/main.yml rename to tests/integration/targets/itsm_change_request/tasks/main.yml index 34fe861e..1a7c86e0 100644 --- a/tests/integration/targets/change_request/tasks/main.yml +++ b/tests/integration/targets/itsm_change_request/tasks/main.yml @@ -30,7 +30,7 @@ impact: low short_description: some short description attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/change_request/res/sample_file.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_change_request/res/sample_file.txt" check_mode: true register: result diff --git a/tests/integration/targets/configuration_item/res/sample_file.txt b/tests/integration/targets/itsm_configuration_item/res/sample_file.txt similarity index 100% rename from tests/integration/targets/configuration_item/res/sample_file.txt rename to tests/integration/targets/itsm_configuration_item/res/sample_file.txt diff --git a/tests/integration/targets/configuration_item/tasks/main.yml b/tests/integration/targets/itsm_configuration_item/tasks/main.yml similarity index 99% rename from tests/integration/targets/configuration_item/tasks/main.yml rename to tests/integration/targets/itsm_configuration_item/tasks/main.yml index 80c8317f..51c799e9 100644 --- a/tests/integration/targets/configuration_item/tasks/main.yml +++ b/tests/integration/targets/itsm_configuration_item/tasks/main.yml @@ -13,7 +13,7 @@ install_status: on_order operational_status: non_operational attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/configuration_item/res/sample_file.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_configuration_item/res/sample_file.txt" register: base_ci check_mode: true @@ -320,7 +320,7 @@ install_status: on_order operational_status: non_operational attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/configuration_item/res/sample_file.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_configuration_item/res/sample_file.txt" register: base_ci - name: Get info and select only name diff --git a/tests/integration/targets/configuration_item_batch/tasks/main.yml b/tests/integration/targets/itsm_configuration_item_batch/tasks/main.yml similarity index 100% rename from tests/integration/targets/configuration_item_batch/tasks/main.yml rename to tests/integration/targets/itsm_configuration_item_batch/tasks/main.yml diff --git a/tests/integration/targets/incident/res/sample_file.txt b/tests/integration/targets/itsm_incident/res/sample_file.txt similarity index 100% rename from tests/integration/targets/incident/res/sample_file.txt rename to tests/integration/targets/itsm_incident/res/sample_file.txt diff --git a/tests/integration/targets/incident/tasks/main.yml b/tests/integration/targets/itsm_incident/tasks/main.yml similarity index 99% rename from tests/integration/targets/incident/tasks/main.yml rename to tests/integration/targets/itsm_incident/tasks/main.yml index 8821d61f..bdf63a52 100644 --- a/tests/integration/targets/incident/tasks/main.yml +++ b/tests/integration/targets/itsm_incident/tasks/main.yml @@ -12,7 +12,7 @@ impact: low urgency: low attachments: - - path: "{{ collection_base_dir }}/tests/integration/targets/incident/res/sample_file.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_incident/res/sample_file.txt" check_mode: true register: result diff --git a/tests/integration/targets/incident_with_mapping/res/sample_file.txt b/tests/integration/targets/itsm_incident_with_mapping/res/sample_file.txt similarity index 100% rename from tests/integration/targets/incident_with_mapping/res/sample_file.txt rename to tests/integration/targets/itsm_incident_with_mapping/res/sample_file.txt diff --git a/tests/integration/targets/incident_with_mapping/tasks/main.yml b/tests/integration/targets/itsm_incident_with_mapping/tasks/main.yml similarity index 98% rename from tests/integration/targets/incident_with_mapping/tasks/main.yml rename to tests/integration/targets/itsm_incident_with_mapping/tasks/main.yml index fe393d0d..f1ea5402 100644 --- a/tests/integration/targets/incident_with_mapping/tasks/main.yml +++ b/tests/integration/targets/itsm_incident_with_mapping/tasks/main.yml @@ -54,7 +54,7 @@ impact: low urgency: low attachments: - - path: "{{ collection_base_dir }}/targets/incident_with_mapping/res/sample_file.txt" + - path: "{{ collection_base_dir }}/tests/integration/targets/itsm_incident_with_mapping/res/sample_file.txt" check_mode: true register: result diff --git a/tests/integration/targets/service_catalog/tasks/main.yml b/tests/integration/targets/itsm_service_catalog/tasks/main.yml similarity index 100% rename from tests/integration/targets/service_catalog/tasks/main.yml rename to tests/integration/targets/itsm_service_catalog/tasks/main.yml