diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/defaults/main.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/defaults/main.yml index f1217a95e46..8130abc59f7 100644 --- a/tests/integration/targets/rds_cluster/roles/rds_cluster/defaults/main.yml +++ b/tests/integration/targets/rds_cluster/roles/rds_cluster/defaults/main.yml @@ -4,7 +4,7 @@ cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ tiny_prefix}} username: testrdsusername password: test-rds_password -engine: aurora +engine: aurora-mysql port: 3306 tags_create: Name: ansible-test-cluster-{{ tiny_prefix }} diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/main.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/main.yml index 55f8a551e02..5a5a237a2c9 100644 --- a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/main.yml +++ b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/main.yml @@ -7,4 +7,4 @@ security_token: '{{ security_token | default(omit) }}' block: - - include: ./test_{{ inventory_hostname }}.yml + - include_tasks: ./test_{{ inventory_hostname }}.yml diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create.yml index 54b3143ffd4..8d49d9f5fa1 100644 --- a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create.yml +++ b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create.yml @@ -62,7 +62,7 @@ - "'engine' in _result_create_db_cluster" - _result_create_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_create_db_cluster" - - _result_create_db_cluster.engine_mode == "serverless" + - _result_create_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_create_db_cluster" - "'master_username' in _result_create_db_cluster" - _result_create_db_cluster.master_username == "{{ username }}" @@ -70,7 +70,7 @@ - _result_create_db_cluster.port == {{ port }} - "'status' in _result_create_db_cluster" - _result_create_db_cluster.status == 'available' - - _result_create_db_cluster.storage_encrypted == true + - _result_create_db_cluster.storage_encrypted == false - "'tags' in _result_create_db_cluster" - _result_create_db_cluster.tags | length == 2 - _result_create_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]}}" diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create_sgs.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create_sgs.yml index 99362ee07af..7f3ac5d3ea4 100644 --- a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create_sgs.yml +++ b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create_sgs.yml @@ -71,7 +71,7 @@ - "'engine' in _result_create_db_cluster" - _result_create_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_create_db_cluster" - - _result_create_db_cluster.engine_mode == "serverless" + - _result_create_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_create_db_cluster" - "'master_username' in _result_create_db_cluster" - _result_create_db_cluster.master_username == "{{ username }}" @@ -79,7 +79,7 @@ - _result_create_db_cluster.port == {{ port }} - "'status' in _result_create_db_cluster" - _result_create_db_cluster.status == 'available' - - _result_create_db_cluster.storage_encrypted == true + - _result_create_db_cluster.storage_encrypted == false - "'tags' in _result_create_db_cluster" - "'vpc_security_groups' in _result_create_db_cluster" - _result_create_db_cluster.vpc_security_groups | selectattr('status', 'in', @@ -126,7 +126,7 @@ - "'engine' in _result_create_db_cluster" - _result_create_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_create_db_cluster" - - _result_create_db_cluster.engine_mode == "serverless" + - _result_create_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_create_db_cluster" - "'master_username' in _result_create_db_cluster" - _result_create_db_cluster.master_username == "{{ username }}" @@ -134,7 +134,7 @@ - _result_create_db_cluster.port == {{ port }} - "'status' in _result_create_db_cluster" - _result_create_db_cluster.status == 'available' - - _result_create_db_cluster.storage_encrypted == true + - _result_create_db_cluster.storage_encrypted == false - "'tags' in _result_create_db_cluster" - "'vpc_security_groups' in _result_create_db_cluster" - _result_create_db_cluster.vpc_security_groups | selectattr('status', 'in', diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_promote.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_promote.yml index 8443063add8..f43f41fad18 100644 --- a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_promote.yml +++ b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_promote.yml @@ -47,7 +47,7 @@ - "'engine' in _result_create_src_db_cluster" - _result_create_src_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_create_src_db_cluster" - - _result_create_src_db_cluster.engine_mode == "serverless" + - _result_create_src_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_create_src_db_cluster" - "'master_username' in _result_create_src_db_cluster" - _result_create_src_db_cluster.master_username == "{{ username }}" @@ -103,7 +103,7 @@ - "'engine' in _result_create_replica_db_cluster" - _result_create_replica_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_create_replica_db_cluster" - - _result_create_replica_db_cluster.engine_mode == "serverless" + - _result_create_replica_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_create_replica_db_cluster" - "'master_username' in _result_create_replica_db_cluster" - _result_create_replica_db_cluster.master_username == "{{ username }}" diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_restore.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_restore.yml index b991a457baf..8240cda579d 100644 --- a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_restore.yml +++ b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_restore.yml @@ -41,7 +41,7 @@ - "'engine' in _result_create_source_db_cluster" - _result_create_source_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_create_source_db_cluster" - - _result_create_source_db_cluster.engine_mode == "serverless" + - _result_create_source_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_create_source_db_cluster" - "'master_username' in _result_create_source_db_cluster" - _result_create_source_db_cluster.master_username == "{{ username }}" @@ -49,7 +49,7 @@ - _result_create_source_db_cluster.port == {{ port }} - "'status' in _result_create_source_db_cluster" - _result_create_source_db_cluster.status == 'available' - - _result_create_source_db_cluster.storage_encrypted == true + - _result_create_source_db_cluster.storage_encrypted == false - "'tags' in _result_create_source_db_cluster" - "'vpc_security_groups' in _result_create_source_db_cluster" @@ -83,7 +83,7 @@ - "'engine' in _result_restored_db_cluster" - _result_restored_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_restored_db_cluster" - - _result_restored_db_cluster.engine_mode == "serverless" + - _result_restored_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_restored_db_cluster" - "'master_username' in _result_restored_db_cluster" - _result_restored_db_cluster.master_username == "{{ username }}" @@ -152,7 +152,7 @@ - "'engine' in _result_restored_db_cluster" - _result_restored_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_restored_db_cluster" - - _result_restored_db_cluster.engine_mode == "serverless" + - _result_restored_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_restored_db_cluster" - "'master_username' in _result_restored_db_cluster" - _result_restored_db_cluster.master_username == "{{ username }}" diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_tag.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_tag.yml index be0fa3ee385..e2130fa891e 100644 --- a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_tag.yml +++ b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_tag.yml @@ -39,7 +39,7 @@ - "'engine' in _result_create_db_cluster" - _result_create_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_create_db_cluster" - - _result_create_db_cluster.engine_mode == "serverless" + - _result_create_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_create_db_cluster" - "'master_username' in _result_create_db_cluster" - _result_create_db_cluster.master_username == "{{ username }}" @@ -47,7 +47,7 @@ - _result_create_db_cluster.port == {{ port }} - "'status' in _result_create_db_cluster" - _result_create_db_cluster.status == 'available' - - _result_create_db_cluster.storage_encrypted == true + - _result_create_db_cluster.storage_encrypted == false - "'tags' in _result_create_db_cluster" - _result_create_db_cluster.tags | length == 2 - _result_create_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"] @@ -81,7 +81,7 @@ - "'engine' in _result_tag_db_cluster" - _result_tag_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_tag_db_cluster" - - _result_tag_db_cluster.engine_mode == "serverless" + - _result_tag_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_tag_db_cluster" - "'master_username' in _result_tag_db_cluster" - _result_tag_db_cluster.master_username == "{{ username }}" @@ -89,7 +89,7 @@ - _result_tag_db_cluster.port == {{ port }} - "'status' in _result_tag_db_cluster" - _result_tag_db_cluster.status == 'available' - - _result_tag_db_cluster.storage_encrypted == true + - _result_tag_db_cluster.storage_encrypted == false - "'tags' in _result_tag_db_cluster" - _result_tag_db_cluster.tags | length == 2 - _result_tag_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"] @@ -120,7 +120,7 @@ - "'engine' in _result_tag_db_cluster" - _result_tag_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_tag_db_cluster" - - _result_tag_db_cluster.engine_mode == "serverless" + - _result_tag_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_tag_db_cluster" - "'master_username' in _result_tag_db_cluster" - _result_tag_db_cluster.master_username == "{{ username }}" @@ -128,7 +128,7 @@ - _result_tag_db_cluster.port == {{ port }} - "'status' in _result_tag_db_cluster" - _result_tag_db_cluster.status == 'available' - - _result_tag_db_cluster.storage_encrypted == true + - _result_tag_db_cluster.storage_encrypted == false - "'tags' in _result_tag_db_cluster" - _result_tag_db_cluster.tags | length == 2 - _result_tag_db_cluster.tags["Name"] == "{{ tags_patch['Name'] }}" @@ -175,7 +175,7 @@ - "'engine' in _result_tag_db_cluster" - _result_tag_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_tag_db_cluster" - - _result_tag_db_cluster.engine_mode == "serverless" + - _result_tag_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_tag_db_cluster" - "'master_username' in _result_tag_db_cluster" - _result_tag_db_cluster.master_username == "{{ username }}" @@ -183,7 +183,7 @@ - _result_tag_db_cluster.port == {{ port }} - "'status' in _result_tag_db_cluster" - _result_tag_db_cluster.status == 'available' - - _result_tag_db_cluster.storage_encrypted == true + - _result_tag_db_cluster.storage_encrypted == false - "'tags' in _result_tag_db_cluster" - _result_tag_db_cluster.tags | length == 1 - _result_tag_db_cluster.tags["Created_By"] == "Ansible_rds_cluster_integration_test" @@ -230,7 +230,7 @@ - "'engine' in _result_tag_db_cluster" - _result_tag_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_tag_db_cluster" - - _result_tag_db_cluster.engine_mode == "serverless" + - _result_tag_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_tag_db_cluster" - "'master_username' in _result_tag_db_cluster" - _result_tag_db_cluster.master_username == "{{ username }}" @@ -238,7 +238,7 @@ - _result_tag_db_cluster.port == {{ port }} - "'status' in _result_tag_db_cluster" - _result_tag_db_cluster.status == 'available' - - _result_tag_db_cluster.storage_encrypted == true + - _result_tag_db_cluster.storage_encrypted == false - "'tags' in _result_tag_db_cluster" - _result_tag_db_cluster.tags | length == 2 - _result_tag_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]}}" @@ -269,7 +269,7 @@ - "'engine' in _result_tag_db_cluster" - _result_tag_db_cluster.engine == "{{ engine }}" - "'engine_mode' in _result_tag_db_cluster" - - _result_tag_db_cluster.engine_mode == "serverless" + - _result_tag_db_cluster.engine_mode == "provisioned" - "'engine_version' in _result_tag_db_cluster" - "'master_username' in _result_tag_db_cluster" - _result_tag_db_cluster.master_username == "{{ username }}" @@ -277,7 +277,7 @@ - _result_tag_db_cluster.port == {{ port }} - "'status' in _result_tag_db_cluster" - _result_tag_db_cluster.status == 'available' - - _result_tag_db_cluster.storage_encrypted == true + - _result_tag_db_cluster.storage_encrypted == false - "'tags' in _result_tag_db_cluster" - _result_tag_db_cluster.tags | length == 0 - "'vpc_security_groups' in _result_tag_db_cluster"