From 53feebac4e3a705c18989d5521727647b1b849fa Mon Sep 17 00:00:00 2001 From: "meriem.zouari" Date: Fri, 18 Oct 2024 14:45:46 +0200 Subject: [PATCH] Update LBU and VMs types --- ...i_access_rule_datasource_attributes_ok.ref | 8 +- ..._access_rules_datasource_attributes_ok.ref | 42 +-- .../step1.cas_datasource_attributes_ok.ref | 16 +- ...ient_gateways_datasource_attributes_ok.ref | 24 +- ...ient_gateways_datasource_attributes_ok.ref | 58 +-- ...e_gpu_catalog_datasource_attributes_ok.ref | 46 +-- .../step1.image_datasource_attributes_ok.ref | 12 +- .../step1.image_datasource_attributes_ok.tf | 7 +- ...unch_permission_resource_attributes_ok.ref | 2 +- .../step1.images_datasource_attributes_ok.ref | 6 +- .../step1.images_datasource_attributes_ok.tf | 3 +- .../step2.images_datasource_attributes_ok.ref | 6 +- .../step2.images_datasource_attributes_ok.tf | 3 +- ...rnet_services_datasource_attributes_ok.ref | 20 +- ...tep1.keypairs_datasource_attributes_ok.ref | 4 +- ...c_load_balancer_resource_attributes_ok.ref | 2 +- ...ic_load_balancer_resource_attributes_ok.tf | 2 +- ...ancer_resource_add_tag_and_listener_ok.ref | 2 +- ...lancer_resource_add_tag_and_listener_ok.tf | 2 +- ...er_resource_remove_tag_and_listener_ok.ref | 2 +- ...cer_resource_remove_tag_and_listener_ok.tf | 2 +- ...d_balancer_resource_update_listener_ok.ref | 4 +- ...ad_balancer_resource_update_listener_ok.tf | 4 +- ...cer_attributes_resource_access_logs_ok.ref | 4 +- ...ncer_attributes_resource_access_logs_ok.tf | 2 +- ...er_attributes_resource_health_check_ok.ref | 4 +- ...cer_attributes_resource_health_check_ok.tf | 2 +- ...er_attributes_resource_health_check_ok.ref | 4 +- ...cer_attributes_resource_health_check_ok.tf | 2 +- ...tes_resource_update_listener_policy_ok.ref | 16 +- ...utes_resource_update_listener_policy_ok.tf | 6 +- ...ource_update_listener_policy_detach_ok.ref | 16 +- ...source_update_listener_policy_detach_ok.tf | 4 +- ...rce_update_listener_policy_reattach_ok.ref | 18 +- ...urce_update_listener_policy_reattach_ok.tf | 6 +- ...urce_update_listener_ssl_certificate_ok.tf | 2 +- ...listener_rule_datasource_attributes_ok.ref | 16 +- ..._listener_rule_datasource_attributes_ok.tf | 8 +- ...r_listener_rule_resource_attributes_ok.ref | 22 +- ...er_listener_rule_resource_attributes_ok.tf | 12 +- ...r_listener_rule_resource_attributes_ok.ref | 18 +- ...er_listener_rule_resource_attributes_ok.tf | 8 +- ...istener_rules_datasource_attributes_ok.ref | 18 +- ...listener_rules_datasource_attributes_ok.tf | 8 +- ...balancer_policy_resource_attributes_ok.ref | 10 +- ..._balancer_policy_resource_attributes_ok.tf | 2 +- ...balancer_tags_datasource_attributes_ok.ref | 19 +- ..._balancer_tags_datasource_attributes_ok.tf | 4 +- ...cer_vm_health_datasource_attributes_ok.ref | 10 +- ...ncer_vm_health_datasource_attributes_ok.tf | 2 +- ...ad_balancer_vms_resource_attributes_ok.ref | 16 +- ...oad_balancer_vms_resource_attributes_ok.tf | 2 +- ...oad_balancer_vms_resource_remove_vm_ok.ref | 8 +- ...load_balancer_vms_resource_remove_vm_ok.tf | 2 +- ...butes_resource_update_dhcp_options_set.ref | 2 +- .../step3.net_attributes_resource_refresh.ref | 2 +- ....net_peerings_datasource_attributes_ok.ref | 50 +-- .../step1.nets_datasource_attributes_ok.ref | 28 +- .../step2.nets_datasource_attributes_ok.ref | 36 +- .../step1.nic_datasource_attributes_ok.ref | 26 +- .../step1.nic_resource_attributes_ok.ref | 10 +- .../step1.nic_resource_attributes_ok.tf | 2 +- .../step2.nic_resource_attributes_update.ref | 12 +- .../step2.nic_resource_attributes_update.tf | 2 +- .../step1.nic_link_resource_attributes_ok.ref | 18 +- .../step1.nic_link_resource_attributes_ok.tf | 2 +- ....nic_private_ip_resource_attributes_ok.ref | 4 +- .../step1.nics_datasource_attributes_ok.ref | 350 +++++++++--------- .../step1.nics_datasource_attributes_ok.tf | 4 +- ....route_table_datasource_attributes_ok2.ref | 2 +- ...ultiple_subnets_resource_attributes_ok.ref | 4 +- ...oute_table_link_resource_attributes_ok.ref | 2 +- .../step1.subnet_datasource_attributes_ok.ref | 18 +- .../step1.subnet_resource_attributes_ok.ref | 2 +- ...step1.subnets_datasource_attributes_ok.ref | 22 +- ...rtual_gateway_datasource_attributes_ok.ref | 8 +- ...rtual_gateway_datasource_attributes_ok.ref | 32 +- .../step1.vm_resource_centos_ok.ref | 47 +-- .../step1.vm_resource_centos_ok.tf | 22 +- ...resource_private_with_multiple_NICs_ok.ref | 8 +- ...et_access_point_resource_attributes_ok.ref | 2 +- ..._point_resource_attributes_update_tags.ref | 2 +- ...s_point_resource_with_RT_attributes_ok.ref | 10 +- ...t_access_point_resource_with_RT_add_RT.ref | 10 +- ...ccess_point_resource_with_RT_remove_RT.ref | 2 +- ...e_load_balancer_update_security_groups.ref | 6 +- ...te_load_balancer_update_security_groups.tf | 2 +- ...vate_load_balancer_Add_security_groups.ref | 16 +- ...ivate_load_balancer_Add_security_groups.tf | 2 +- ...step3.private_load_balancer_Remove_LBU.ref | 2 +- .../step1.test_destroy_igw.ref | 94 ++--- .../step1.test_destroy_igw.tf | 14 +- ...l_load_balancer_resource_attributes_ok.ref | 6 +- ...al_load_balancer_resource_attributes_ok.tf | 2 +- ...g_load_balancer_resource_attributes_ok.ref | 20 +- ...ng_load_balancer_resource_attributes_ok.tf | 6 +- ...load_balancer_datasource_attributes_ok.ref | 10 +- ....load_balancer_datasource_attributes_ok.tf | 2 +- ...p2.load_balancer_datasource_remove_lbu.ref | 2 +- ...oad_balancers_datasource_attributes_ok.ref | 112 +++--- ...load_balancers_datasource_attributes_ok.tf | 4 +- ...ancers_datasource_attributes_removeLBU.ref | 6 +- ...lancers_datasource_attributes_removeLBU.tf | 2 +- ...1.nat_service_datasource_attributes_ok.ref | 50 +-- ...ep1.nat_service_resource_attributes_ok.ref | 2 +- ....nat_services_datasource_attributes_ok.ref | 90 ++--- ....public_ip_link_resource_attributes_ok.ref | 6 +- ...1.public_ip_link_resource_attributes_ok.tf | 2 +- ...p1.public_ips_datasource_attributes_ok.ref | 28 +- ...p2.public_ips_datasource_attributes_ok.ref | 34 +- .../step1.quota_datasource_attributes_ok.ref | 4 +- .../step1.quota_datasource_attributes_ok.tf | 4 +- .../step1.quotas_datasource_attributes_ok.ref | 4 +- .../step1.quotas_datasource_attributes_ok.tf | 4 +- ...quotas_datasource_attributes_ok_global.ref | 2 +- ....quotas_datasource_attributes_ok_global.tf | 2 +- ...ale_subregions_attributes_ok_no_filter.ref | 4 +- ...e_subregions_attributes_ok_with_filter.ref | 2 +- ...e_subregions_attributes_ok_with_filter.ref | 4 +- ...tual_gateways_datasource_attributes_ok.ref | 24 +- .../step1.vm_datasource_centos_ok.ref | 12 +- .../step2.vm_datasource_centos_ok.ref | 16 +- ...m_resource_public_with_multiple_BDM_ok.ref | 2 +- ...m_resource_public_with_multiple_BDM_ok.ref | 2 +- .../step1.vm_resource_with_user_data_ok.ref | 2 +- ...ep1.vm_resource_with_user_data_ok_2.tf.swp | Bin 0 -> 12288 bytes .../step1.vm_resource_with_user_data_ok_2.ref | 2 +- ...step1.vm_resource_update_attributes_ok.ref | 30 +- .../step1.vm_resource_update_attributes_ok.tf | 20 +- .../step2.vm_resource_update_keypair_ok.ref | 30 +- .../step2.vm_resource_update_keypair_ok.tf | 20 +- ...3.vm_resource_update_security_group_ok.ref | 42 +-- ...p3.vm_resource_update_security_group_ok.tf | 22 +- ...resource_update_deletion_protection_ok.ref | 40 +- ..._resource_update_deletion_protection_ok.tf | 20 +- .../step5.vm_resource_update_bdm_ok.ref | 38 +- .../step5.vm_resource_update_bdm_ok.tf | 18 +- ...tep6.vm_resource_update_performance_ok.ref | 38 +- ...step6.vm_resource_update_performance_ok.tf | 18 +- .../step7.vm_resource_update_vm_type_ok.ref | 40 +- .../step7.vm_resource_update_vm_type_ok.tf | 20 +- .../step8.vm_resource_update_user_data_ok.ref | 38 +- .../step8.vm_resource_update_user_data_ok.tf | 18 +- ...m_resource_update_shtdown_behaviour_ok.ref | 64 ++-- ...vm_resource_update_shtdown_behaviour_ok.tf | 20 +- ..._state_datasource_centos_attributes_ok.ref | 2 +- ...states_datasource_centos_attributes_ok.ref | 4 +- .../step1.vms_datasource_attributes_ok.ref | 26 +- .../step2.vms_datasource_attributes_ok.ref | 32 +- ...tep1.volumes_datasource_attributes_ok3.ref | 16 +- ...tep1.volumes_datasource_attributes_ok4.ref | 66 ++-- ...tep2.volumes_datasource_attributes_ok4.ref | 72 ++-- ...p1.volumes_link_resource_attributes_ok.ref | 2 +- ...n_connection_datasources_attributes_ok.ref | 56 +-- tests/qa_provider_oapi/resources.auto.tfvars | 12 +- tests/qa_provider_oapi/test_provider_oapi.py | 11 +- tests/qa_provider_oapi/variables.tf | 6 +- 157 files changed, 1379 insertions(+), 1361 deletions(-) create mode 100644 tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/.step1.vm_resource_with_user_data_ok_2.tf.swp diff --git a/tests/qa_provider_oapi/data/api_access_rule/TF-200_api_access_rule_datasource_attributes_ok/step1.api_access_rule_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/api_access_rule/TF-200_api_access_rule_datasource_attributes_ok/step1.api_access_rule_datasource_attributes_ok.ref index c3792cce9..9e8d05f52 100644 --- a/tests/qa_provider_oapi/data/api_access_rule/TF-200_api_access_rule_datasource_attributes_ok/step1.api_access_rule_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/api_access_rule/TF-200_api_access_rule_datasource_attributes_ok/step1.api_access_rule_datasource_attributes_ok.ref @@ -193,10 +193,10 @@ "schema_version": 0, "attributes": { "ca_fingerprint": "########", - "ca_id": "##id-1##", + "ca_id": "##id-2##", "ca_pem": "########", "description": "", - "id": "##id-1##", + "id": "##id-2##", "request_id": "########" }, "sensitive_attributes": [], @@ -214,10 +214,10 @@ "schema_version": 0, "attributes": { "ca_fingerprint": "########", - "ca_id": "##id-2##", + "ca_id": "##id-1##", "ca_pem": "########", "description": "", - "id": "##id-2##", + "id": "##id-1##", "request_id": "########" }, "sensitive_attributes": [], diff --git a/tests/qa_provider_oapi/data/api_access_rules/TF-202_api_access_rules_datasource_ok/step1.api_access_rules_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/api_access_rules/TF-202_api_access_rules_datasource_ok/step1.api_access_rules_datasource_attributes_ok.ref index e0113bf49..fed11107a 100644 --- a/tests/qa_provider_oapi/data/api_access_rules/TF-202_api_access_rules_datasource_ok/step1.api_access_rules_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/api_access_rules/TF-202_api_access_rules_datasource_ok/step1.api_access_rules_datasource_attributes_ok.ref @@ -22,10 +22,11 @@ "##id-2##" ], "cns": [ + "test-TF202-2", "test-TF202", "outscale-1" ], - "description": "AAR-TF-202-1", + "description": "API Access rules-TF-202-1", "ip_ranges": "########" }, { @@ -35,11 +36,10 @@ "##id-2##" ], "cns": [ - "test-TF202-2", "test-TF202", "outscale-1" ], - "description": "API Access rules-TF-202-1", + "description": "AAR-TF-202-1", "ip_ranges": "########" } ], @@ -68,10 +68,11 @@ "##id-2##" ], "cns": [ + "test-TF202-2", "test-TF202", "outscale-1" ], - "description": "AAR-TF-202-1", + "description": "API Access rules-TF-202-1", "ip_ranges": "########" }, { @@ -81,11 +82,10 @@ "##id-2##" ], "cns": [ - "test-TF202-2", "test-TF202", "outscale-1" ], - "description": "API Access rules-TF-202-1", + "description": "AAR-TF-202-1", "ip_ranges": "########" } ], @@ -114,10 +114,11 @@ "##id-2##" ], "cns": [ + "test-TF202-2", "test-TF202", "outscale-1" ], - "description": "AAR-TF-202-1", + "description": "API Access rules-TF-202-1", "ip_ranges": "########" }, { @@ -127,11 +128,10 @@ "##id-2##" ], "cns": [ - "test-TF202-2", "test-TF202", "outscale-1" ], - "description": "API Access rules-TF-202-1", + "description": "AAR-TF-202-1", "ip_ranges": "########" } ], @@ -160,10 +160,11 @@ "##id-2##" ], "cns": [ + "test-TF202-2", "test-TF202", "outscale-1" ], - "description": "AAR-TF-202-1", + "description": "API Access rules-TF-202-1", "ip_ranges": "########" }, { @@ -173,11 +174,10 @@ "##id-2##" ], "cns": [ - "test-TF202-2", "test-TF202", "outscale-1" ], - "description": "API Access rules-TF-202-1", + "description": "AAR-TF-202-1", "ip_ranges": "########" } ], @@ -200,7 +200,7 @@ "attributes": { "api_access_rules": [ { - "api_access_rule_id": "##id-0##", + "api_access_rule_id": "##id-3##", "ca_ids": [ "##id-1##", "##id-2##" @@ -230,7 +230,7 @@ { "schema_version": 0, "attributes": { - "api_access_rule_id": "##id-3##", + "api_access_rule_id": "##id-0##", "ca_ids": [ "##id-1##", "##id-2##" @@ -241,7 +241,7 @@ "test-TF202-2" ], "description": "API Access rules-TF-202-1", - "id": "##id-3##", + "id": "##id-0##", "ip_ranges": "########", "request_id": "########" }, @@ -263,7 +263,7 @@ { "schema_version": 0, "attributes": { - "api_access_rule_id": "##id-0##", + "api_access_rule_id": "##id-3##", "ca_ids": [ "##id-1##", "##id-2##" @@ -273,7 +273,7 @@ "test-TF202" ], "description": "AAR-TF-202-1", - "id": "##id-0##", + "id": "##id-3##", "ip_ranges": "########", "request_id": "########" }, @@ -296,10 +296,10 @@ "schema_version": 0, "attributes": { "ca_fingerprint": "########", - "ca_id": "##id-1##", + "ca_id": "##id-2##", "ca_pem": "########", "description": "", - "id": "##id-1##", + "id": "##id-2##", "request_id": "########" }, "sensitive_attributes": [], @@ -317,10 +317,10 @@ "schema_version": 0, "attributes": { "ca_fingerprint": "########", - "ca_id": "##id-2##", + "ca_id": "##id-1##", "ca_pem": "########", "description": "", - "id": "##id-2##", + "id": "##id-1##", "request_id": "########" }, "sensitive_attributes": [], diff --git a/tests/qa_provider_oapi/data/cas/TF-199_cas_datasource_attributes_ok/step1.cas_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/cas/TF-199_cas_datasource_attributes_ok/step1.cas_datasource_attributes_ok.ref index ce9cf73eb..ee9159130 100644 --- a/tests/qa_provider_oapi/data/cas/TF-199_cas_datasource_attributes_ok/step1.cas_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/cas/TF-199_cas_datasource_attributes_ok/step1.cas_datasource_attributes_ok.ref @@ -18,12 +18,12 @@ { "ca_fingerprint": "########", "ca_id": "##id-0##", - "description": "test-TF199-2" + "description": "test-TF199" }, { "ca_fingerprint": "########", "ca_id": "##id-1##", - "description": "test-TF199" + "description": "test-TF199-2" } ], "filter": "########", @@ -47,12 +47,12 @@ { "ca_fingerprint": "########", "ca_id": "##id-0##", - "description": "test-TF199-2" + "description": "test-TF199" }, { "ca_fingerprint": "########", "ca_id": "##id-1##", - "description": "test-TF199" + "description": "test-TF199-2" } ], "filter": "########", @@ -73,10 +73,10 @@ "schema_version": 0, "attributes": { "ca_fingerprint": "########", - "ca_id": "##id-1##", + "ca_id": "##id-0##", "ca_pem": "########", "description": "test-TF199", - "id": "##id-1##", + "id": "##id-0##", "request_id": "########" }, "sensitive_attributes": [], @@ -94,10 +94,10 @@ "schema_version": 0, "attributes": { "ca_fingerprint": "########", - "ca_id": "##id-0##", + "ca_id": "##id-1##", "ca_pem": "########", "description": "test-TF199-2", - "id": "##id-0##", + "id": "##id-1##", "request_id": "########" }, "sensitive_attributes": [], diff --git a/tests/qa_provider_oapi/data/client_gateways/TF-60_client_gateways_datasource_attributes_ok/step1.client_gateways_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/client_gateways/TF-60_client_gateways_datasource_attributes_ok/step1.client_gateways_datasource_attributes_ok.ref index 0df139d03..14957a768 100644 --- a/tests/qa_provider_oapi/data/client_gateways/TF-60_client_gateways_datasource_attributes_ok/step1.client_gateways_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/client_gateways/TF-60_client_gateways_datasource_attributes_ok/step1.client_gateways_datasource_attributes_ok.ref @@ -17,7 +17,7 @@ "client_gateway_ids": null, "client_gateways": [ { - "bgp_asn": 571, + "bgp_asn": 575, "client_gateway_id": "##id-0##", "connection_type": "ipsec.1", "public_ip": "########", @@ -25,16 +25,12 @@ "tags": [ { "key": "name-mzi", - "value": "CGW_1_mzi" - }, - { - "key": "project", - "value": "terraform" + "value": "CGW_2_mzi" } ] }, { - "bgp_asn": 575, + "bgp_asn": 571, "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "public_ip": "########", @@ -42,7 +38,11 @@ "tags": [ { "key": "name-mzi", - "value": "CGW_2_mzi" + "value": "CGW_1_mzi" + }, + { + "key": "project", + "value": "terraform" } ] } @@ -65,9 +65,9 @@ "schema_version": 0, "attributes": { "bgp_asn": 571, - "client_gateway_id": "##id-0##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", - "id": "##id-0##", + "id": "##id-1##", "public_ip": "########", "request_id": "########", "state": "available", @@ -97,9 +97,9 @@ "schema_version": 0, "attributes": { "bgp_asn": 575, - "client_gateway_id": "##id-1##", + "client_gateway_id": "##id-0##", "connection_type": "ipsec.1", - "id": "##id-1##", + "id": "##id-0##", "public_ip": "########", "request_id": "########", "state": "available", diff --git a/tests/qa_provider_oapi/data/client_gateways/TF-60_client_gateways_datasource_attributes_ok/step2.client_gateways_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/client_gateways/TF-60_client_gateways_datasource_attributes_ok/step2.client_gateways_datasource_attributes_ok.ref index 2a1d05de9..17e2f7f2b 100644 --- a/tests/qa_provider_oapi/data/client_gateways/TF-60_client_gateways_datasource_attributes_ok/step2.client_gateways_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/client_gateways/TF-60_client_gateways_datasource_attributes_ok/step2.client_gateways_datasource_attributes_ok.ref @@ -17,7 +17,7 @@ "client_gateway_ids": null, "client_gateways": [ { - "bgp_asn": 571, + "bgp_asn": 575, "client_gateway_id": "##id-0##", "connection_type": "ipsec.1", "public_ip": "########", @@ -25,16 +25,12 @@ "tags": [ { "key": "name-terraform", - "value": "CGW_1_terraform" - }, - { - "key": "project", - "value": "terraform" + "value": "CGW_2_terraform" } ] }, { - "bgp_asn": 575, + "bgp_asn": 571, "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "public_ip": "########", @@ -42,7 +38,11 @@ "tags": [ { "key": "name-terraform", - "value": "CGW_2_terraform" + "value": "CGW_1_terraform" + }, + { + "key": "project", + "value": "terraform" } ] } @@ -68,7 +68,7 @@ "client_gateways": [ { "bgp_asn": 571, - "client_gateway_id": "##id-0##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "public_ip": "########", "state": "available", @@ -104,7 +104,7 @@ "client_gateway_ids": null, "client_gateways": [ { - "bgp_asn": 571, + "bgp_asn": 575, "client_gateway_id": "##id-0##", "connection_type": "ipsec.1", "public_ip": "########", @@ -112,16 +112,12 @@ "tags": [ { "key": "name-terraform", - "value": "CGW_1_terraform" - }, - { - "key": "project", - "value": "terraform" + "value": "CGW_2_terraform" } ] }, { - "bgp_asn": 575, + "bgp_asn": 571, "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "public_ip": "########", @@ -129,7 +125,11 @@ "tags": [ { "key": "name-terraform", - "value": "CGW_2_terraform" + "value": "CGW_1_terraform" + }, + { + "key": "project", + "value": "terraform" } ] } @@ -154,7 +154,7 @@ "client_gateway_ids": null, "client_gateways": [ { - "bgp_asn": 571, + "bgp_asn": 575, "client_gateway_id": "##id-0##", "connection_type": "ipsec.1", "public_ip": "########", @@ -162,16 +162,12 @@ "tags": [ { "key": "name-terraform", - "value": "CGW_1_terraform" - }, - { - "key": "project", - "value": "terraform" + "value": "CGW_2_terraform" } ] }, { - "bgp_asn": 575, + "bgp_asn": 571, "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "public_ip": "########", @@ -179,7 +175,11 @@ "tags": [ { "key": "name-terraform", - "value": "CGW_2_terraform" + "value": "CGW_1_terraform" + }, + { + "key": "project", + "value": "terraform" } ] } @@ -202,9 +202,9 @@ "schema_version": 0, "attributes": { "bgp_asn": 571, - "client_gateway_id": "##id-0##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", - "id": "##id-0##", + "id": "##id-1##", "public_ip": "########", "request_id": "########", "state": "available", @@ -234,9 +234,9 @@ "schema_version": 0, "attributes": { "bgp_asn": 575, - "client_gateway_id": "##id-1##", + "client_gateway_id": "##id-0##", "connection_type": "ipsec.1", - "id": "##id-1##", + "id": "##id-0##", "public_ip": "########", "request_id": "########", "state": "available", diff --git a/tests/qa_provider_oapi/data/flexible_gpu_catalog/TF-176_flexible_gpu_catalog_datasource_attributes_ok/step1.flexible_gpu_catalog_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/flexible_gpu_catalog/TF-176_flexible_gpu_catalog_datasource_attributes_ok/step1.flexible_gpu_catalog_datasource_attributes_ok.ref index 8894c337c..2cb869184 100644 --- a/tests/qa_provider_oapi/data/flexible_gpu_catalog/TF-176_flexible_gpu_catalog_datasource_attributes_ok/step1.flexible_gpu_catalog_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/flexible_gpu_catalog/TF-176_flexible_gpu_catalog_datasource_attributes_ok/step1.flexible_gpu_catalog_datasource_attributes_ok.ref @@ -36,22 +36,11 @@ }, { "generations": [ - "v3", - "v4" - ], - "max_cpu": 80, - "max_ram": 512, - "model_name": "nvidia-k2", - "v_ram": 4096 - }, - { - "generations": [ - "v3", - "v4" + "v5" ], "max_cpu": 80, "max_ram": 512, - "model_name": "nvidia-m60", + "model_name": "nvidia-p6", "v_ram": 16000 }, { @@ -66,21 +55,31 @@ }, { "generations": [ - "v5", - "v6" + "v3", + "v4" + ], + "max_cpu": 80, + "max_ram": 512, + "model_name": "nvidia-k2", + "v_ram": 4096 + }, + { + "generations": [ + "v7" ], "max_cpu": 35, "max_ram": 250, - "model_name": "nvidia-a100", - "v_ram": 40000 + "model_name": "nvidia-l40", + "v_ram": 48000 }, { "generations": [ - "v5" + "v3", + "v4" ], "max_cpu": 80, "max_ram": 512, - "model_name": "nvidia-p100", + "model_name": "nvidia-m60", "v_ram": 16000 }, { @@ -89,7 +88,7 @@ ], "max_cpu": 80, "max_ram": 512, - "model_name": "nvidia-p6", + "model_name": "nvidia-p100", "v_ram": 16000 }, { @@ -103,12 +102,13 @@ }, { "generations": [ - "v7" + "v5", + "v6" ], "max_cpu": 35, "max_ram": 250, - "model_name": "nvidia-l40", - "v_ram": 48000 + "model_name": "nvidia-a100", + "v_ram": 40000 } ], "id": "##id-0##", diff --git a/tests/qa_provider_oapi/data/image/TF-66_image_datasource_attributes_ok/step1.image_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/image/TF-66_image_datasource_attributes_ok/step1.image_datasource_attributes_ok.ref index eadd12877..f0e2d4dbb 100644 --- a/tests/qa_provider_oapi/data/image/TF-66_image_datasource_attributes_ok/step1.image_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/image/TF-66_image_datasource_attributes_ok/step1.image_datasource_attributes_ok.ref @@ -540,7 +540,7 @@ "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoyNDAwMDAwMDAwMDAwLCJkZWxldGUiOjI0MDAwMDAwMDAwMDAsInVwZGF0ZSI6MjQwMDAwMDAwMDAwMH19", "dependencies": [ - "outscale_security_group.my_sgImg", + "outscale_security_group.My-SGTF66", "outscale_vm.my-vm" ] } @@ -549,7 +549,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "my_sgImg", + "name": "My-SGTF66", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -564,7 +564,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "SG-inteImg", + "security_group_name": "SG-TF66", "tag": null, "tags": [] }, @@ -637,7 +637,7 @@ "security_groups": [ { "security_group_id": "##id-4##", - "security_group_name": "SG-inteImg" + "security_group_name": "SG-TF66" } ], "state": "running", @@ -648,12 +648,12 @@ "user_data": "", "vm_id": "##id-3##", "vm_initiated_shutdown_behavior": "stop", - "vm_type": "t2.small" + "vm_type": "###vm_type###" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_security_group.my_sgImg" + "outscale_security_group.My-SGTF66" ] } ] diff --git a/tests/qa_provider_oapi/data/image/TF-66_image_datasource_attributes_ok/step1.image_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/image/TF-66_image_datasource_attributes_ok/step1.image_datasource_attributes_ok.tf index 75927af50..088561cfa 100644 --- a/tests/qa_provider_oapi/data/image/TF-66_image_datasource_attributes_ok/step1.image_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/image/TF-66_image_datasource_attributes_ok/step1.image_datasource_attributes_ok.tf @@ -1,11 +1,12 @@ -resource "outscale_security_group" "my_sgImg" { +resource "outscale_security_group" "My-SGTF66" { description = "test security group" - security_group_name = "SG-inteImg" + security_group_name = "SG-TF66" } resource "outscale_vm" "my-vm" { + vm_type = var.vm_type image_id = var.image_id - security_group_ids = [outscale_security_group.my_sgImg.security_group_id] + security_group_ids = [outscale_security_group.My-SGTF66.security_group_id] } resource "outscale_image" "outscale_image" { diff --git a/tests/qa_provider_oapi/data/image_launch_permission/TF-68_image_launch_permission_resource_attributes_ok/step1.image_launch_permission_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/image_launch_permission/TF-68_image_launch_permission_resource_attributes_ok/step1.image_launch_permission_resource_attributes_ok.ref index 31c45c0a5..268abd567 100644 --- a/tests/qa_provider_oapi/data/image_launch_permission/TF-68_image_launch_permission_resource_attributes_ok/step1.image_launch_permission_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/image_launch_permission/TF-68_image_launch_permission_resource_attributes_ok/step1.image_launch_permission_resource_attributes_ok.ref @@ -208,7 +208,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step1.images_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step1.images_datasource_attributes_ok.ref index 87afe1309..52d740d07 100644 --- a/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step1.images_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step1.images_datasource_attributes_ok.ref @@ -102,7 +102,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "SG-inteImgs", + "security_group_name": "SG-TF69", "tag": null, "tags": [] }, @@ -175,7 +175,7 @@ "security_groups": [ { "security_group_id": "##id-4##", - "security_group_name": "SG-inteImgs" + "security_group_name": "SG-TF69" } ], "state": "running", @@ -186,7 +186,7 @@ "user_data": "", "vm_id": "##id-3##", "vm_initiated_shutdown_behavior": "stop", - "vm_type": "t2.small" + "vm_type": "###vm_type###" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", diff --git a/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step1.images_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step1.images_datasource_attributes_ok.tf index eb816c9fd..6d829c3a8 100644 --- a/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step1.images_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step1.images_datasource_attributes_ok.tf @@ -1,10 +1,11 @@ resource "outscale_security_group" "my_sgImgs" { description = "test sg-group" - security_group_name = "SG-inteImgs" + security_group_name = "SG-TF69" } resource "outscale_vm" "outscale_vm" { image_id = var.image_id + vm_type = var.vm_type security_group_ids = [outscale_security_group.my_sgImgs.security_group_id] } diff --git a/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step2.images_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step2.images_datasource_attributes_ok.ref index 4c0642097..bc599437d 100644 --- a/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step2.images_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step2.images_datasource_attributes_ok.ref @@ -732,7 +732,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-11##", - "security_group_name": "SG-inteImgs", + "security_group_name": "SG-TF69", "tag": null, "tags": [] }, @@ -805,7 +805,7 @@ "security_groups": [ { "security_group_id": "##id-11##", - "security_group_name": "SG-inteImgs" + "security_group_name": "SG-TF69" } ], "state": "running", @@ -816,7 +816,7 @@ "user_data": "", "vm_id": "##id-10##", "vm_initiated_shutdown_behavior": "stop", - "vm_type": "t2.small" + "vm_type": "###vm_type###" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", diff --git a/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step2.images_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step2.images_datasource_attributes_ok.tf index 52b08137f..1905d9a2c 100644 --- a/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step2.images_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/images/TF-69_images_datasource_attributes_ok/step2.images_datasource_attributes_ok.tf @@ -1,10 +1,11 @@ resource "outscale_security_group" "my_sgImgs" { description = "test sg-group" - security_group_name = "SG-inteImgs" + security_group_name = "SG-TF69" } resource "outscale_vm" "outscale_vm" { image_id = var.image_id + vm_type = var.vm_type security_group_ids = [outscale_security_group.my_sgImgs.security_group_id] } diff --git a/tests/qa_provider_oapi/data/internet_services/TF-74_internet_services_datasource_attributes_ok/step1.internet_services_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/internet_services/TF-74_internet_services_datasource_attributes_ok/step1.internet_services_datasource_attributes_ok.ref index b7270fe6d..cca12c23b 100644 --- a/tests/qa_provider_oapi/data/internet_services/TF-74_internet_services_datasource_attributes_ok/step1.internet_services_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/internet_services/TF-74_internet_services_datasource_attributes_ok/step1.internet_services_datasource_attributes_ok.ref @@ -23,13 +23,9 @@ "net_id": "", "state": "", "tags": [ - { - "key": "Key", - "value": "value-tags" - }, { "key": "name", - "value": "Internet-service-1" + "value": "Internet-service-2" } ] }, @@ -38,9 +34,13 @@ "net_id": "", "state": "", "tags": [ + { + "key": "Key", + "value": "value-tags" + }, { "key": "name", - "value": "Internet-service-2" + "value": "Internet-service-1" } ] } @@ -60,8 +60,8 @@ { "schema_version": 0, "attributes": { - "id": "##id-1##", - "internet_service_id": "##id-1##", + "id": "##id-2##", + "internet_service_id": "##id-2##", "net_id": "", "request_id": "########", "state": "", @@ -90,8 +90,8 @@ { "schema_version": 0, "attributes": { - "id": "##id-2##", - "internet_service_id": "##id-2##", + "id": "##id-1##", + "internet_service_id": "##id-1##", "net_id": "", "request_id": "########", "state": "", diff --git a/tests/qa_provider_oapi/data/keypairs/TF-78_keypairs_datasource_attributes_ok/step1.keypairs_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/keypairs/TF-78_keypairs_datasource_attributes_ok/step1.keypairs_datasource_attributes_ok.ref index c9228620a..ef557917a 100644 --- a/tests/qa_provider_oapi/data/keypairs/TF-78_keypairs_datasource_attributes_ok/step1.keypairs_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/keypairs/TF-78_keypairs_datasource_attributes_ok/step1.keypairs_datasource_attributes_ok.ref @@ -20,11 +20,11 @@ "keypairs": [ { "keypair_fingerprint": "########", - "keypair_name": "keyname_test_2" + "keypair_name": "keyname_test_" }, { "keypair_fingerprint": "########", - "keypair_name": "keyname_test_" + "keypair_name": "keyname_test_2" } ], "request_id": "########" diff --git a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step1.public_load_balancer_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step1.public_load_balancer_resource_attributes_ok.ref index d92d5527b..a4c8fe469 100644 --- a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step1.public_load_balancer_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step1.public_load_balancer_resource_attributes_ok.ref @@ -55,7 +55,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-79", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", diff --git a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step1.public_load_balancer_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step1.public_load_balancer_resource_attributes_ok.tf index 12bb6602f..fcc529c42 100644 --- a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step1.public_load_balancer_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step1.public_load_balancer_resource_attributes_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name = "lbu-TF-79" + load_balancer_name = "lbu-TF-79-1" subregion_names = ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step2.public_load_balancer_resource_add_tag_and_listener_ok.ref b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step2.public_load_balancer_resource_add_tag_and_listener_ok.ref index c2d14115b..2905ddc4c 100644 --- a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step2.public_load_balancer_resource_add_tag_and_listener_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step2.public_load_balancer_resource_add_tag_and_listener_ok.ref @@ -63,7 +63,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-79", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", diff --git a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step2.public_load_balancer_resource_add_tag_and_listener_ok.tf b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step2.public_load_balancer_resource_add_tag_and_listener_ok.tf index 22dd3ca34..df06eff20 100644 --- a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step2.public_load_balancer_resource_add_tag_and_listener_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step2.public_load_balancer_resource_add_tag_and_listener_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-79" + load_balancer_name ="lbu-TF-79-1" subregion_names= ["${var.region}a"] listeners { backend_port = 1024 diff --git a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step3.public_load_balancer_resource_remove_tag_and_listener_ok.ref b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step3.public_load_balancer_resource_remove_tag_and_listener_ok.ref index a26d27184..478dd6e69 100644 --- a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step3.public_load_balancer_resource_remove_tag_and_listener_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step3.public_load_balancer_resource_remove_tag_and_listener_ok.ref @@ -47,7 +47,7 @@ "server_certificate_id": null } ], - "load_balancer_name": "lbu-TF-79", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", diff --git a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step3.public_load_balancer_resource_remove_tag_and_listener_ok.tf b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step3.public_load_balancer_resource_remove_tag_and_listener_ok.tf index 2e4f1fb6a..89fe40f38 100644 --- a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step3.public_load_balancer_resource_remove_tag_and_listener_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step3.public_load_balancer_resource_remove_tag_and_listener_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-79" + load_balancer_name ="lbu-TF-79-1" subregion_names= ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.ref b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.ref index b9f326372..70f9d8d92 100644 --- a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.ref @@ -47,7 +47,7 @@ "server_certificate_id": "##id-1##" } ], - "load_balancer_name": "lbu-TF-79", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -89,7 +89,7 @@ "dry_run": null, "expiration_date": "", "id": "##id-3##", - "name": "Certificate-TF-79", + "name": "Certificate-TF-79-1", "orn": "########", "path": "/", "private_key": "########", diff --git a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.tf b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.tf index af7611353..cb20acb47 100644 --- a/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer/TF-79_public_load_balancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.tf @@ -1,11 +1,11 @@ resource "outscale_server_certificate" "my_server_certificate" { - name = "Certificate-TF-79" + name = "Certificate-TF-79-1" body = file("data/cert_example/certificate.pem") private_key = file("data/cert_example/certificate.key") } resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-79" + load_balancer_name ="lbu-TF-79-1" subregion_names= ["${var.region}a"] listeners { backend_port = 8080 diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-83_update_load_balancer_access_logs_ok/step1.load_balancer_attributes_resource_access_logs_ok.ref b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-83_update_load_balancer_access_logs_ok/step1.load_balancer_attributes_resource_access_logs_ok.ref index 785b040d5..87016fd94 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-83_update_load_balancer_access_logs_ok/step1.load_balancer_attributes_resource_access_logs_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-83_update_load_balancer_access_logs_ok/step1.load_balancer_attributes_resource_access_logs_ok.ref @@ -55,7 +55,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-83", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -139,7 +139,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-83", + "load_balancer_name": "########", "load_balancer_port": null, "load_balancer_sticky_cookie_policies": [], "load_balancer_type": null, diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-83_update_load_balancer_access_logs_ok/step1.load_balancer_attributes_resource_access_logs_ok.tf b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-83_update_load_balancer_access_logs_ok/step1.load_balancer_attributes_resource_access_logs_ok.tf index 00c2c9791..8037417ed 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-83_update_load_balancer_access_logs_ok/step1.load_balancer_attributes_resource_access_logs_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-83_update_load_balancer_access_logs_ok/step1.load_balancer_attributes_resource_access_logs_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-83" + load_balancer_name ="lbu-TF-83-${var.suffixe_lbu_name}" subregion_names= ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step1.load_balancer_attributes_resource_health_check_ok.ref b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step1.load_balancer_attributes_resource_health_check_ok.ref index 82f28ddd7..a63291374 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step1.load_balancer_attributes_resource_health_check_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step1.load_balancer_attributes_resource_health_check_ok.ref @@ -55,7 +55,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-84", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -139,7 +139,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-84", + "load_balancer_name": "########", "load_balancer_port": null, "load_balancer_sticky_cookie_policies": [], "load_balancer_type": null, diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step1.load_balancer_attributes_resource_health_check_ok.tf b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step1.load_balancer_attributes_resource_health_check_ok.tf index f291a774e..cdbaf94d1 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step1.load_balancer_attributes_resource_health_check_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step1.load_balancer_attributes_resource_health_check_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-84" + load_balancer_name ="lbu-TF-84-1" subregion_names= ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step2.load_balancer_attributes_resource_health_check_ok.ref b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step2.load_balancer_attributes_resource_health_check_ok.ref index 9dbb74a87..82e28919f 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step2.load_balancer_attributes_resource_health_check_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step2.load_balancer_attributes_resource_health_check_ok.ref @@ -55,7 +55,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-84", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -139,7 +139,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-84", + "load_balancer_name": "########", "load_balancer_port": null, "load_balancer_sticky_cookie_policies": [], "load_balancer_type": null, diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step2.load_balancer_attributes_resource_health_check_ok.tf b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step2.load_balancer_attributes_resource_health_check_ok.tf index b133fc820..36c86623a 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step2.load_balancer_attributes_resource_health_check_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-84_update_load_balancer_health_check_ok/step2.load_balancer_attributes_resource_health_check_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-84" + load_balancer_name ="lbu-TF-84-1" subregion_names= ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step1.load_balancer_attributes_resource_update_listener_policy_ok.ref b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step1.load_balancer_attributes_resource_update_listener_policy_ok.ref index c86baa3d7..7635228d0 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step1.load_balancer_attributes_resource_update_listener_policy_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step1.load_balancer_attributes_resource_update_listener_policy_ok.ref @@ -55,7 +55,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-85", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -128,7 +128,7 @@ "load_balancer_port": 80, "load_balancer_protocol": "HTTP", "policy_names": [ - "policy-lbu-terraform-2" + "policy-lbu-terraform-TF85" ], "server_certificate_id": "" }, @@ -141,16 +141,16 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-85", + "load_balancer_name": "########", "load_balancer_port": 80, "load_balancer_sticky_cookie_policies": [ { - "policy_name": "policy-lbu-terraform-2" + "policy_name": "policy-lbu-terraform-TF85" } ], "load_balancer_type": null, "policy_names": [ - "policy-lbu-terraform-2" + "policy-lbu-terraform-TF85" ], "request_id": "########", "security_groups": [], @@ -237,15 +237,15 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-85", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [ { - "policy_name": "policy-lbu-terraform-2" + "policy_name": "policy-lbu-terraform-TF85" } ], "load_balancer_type": "internet-facing", "net_id": "", - "policy_name": "policy-lbu-terraform-2", + "policy_name": "policy-lbu-terraform-TF85", "policy_type": "load_balancer", "public_ip": "########", "request_id": "########", diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step1.load_balancer_attributes_resource_update_listener_policy_ok.tf b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step1.load_balancer_attributes_resource_update_listener_policy_ok.tf index 39e5003b2..537d43ed6 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step1.load_balancer_attributes_resource_update_listener_policy_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step1.load_balancer_attributes_resource_update_listener_policy_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-85" + load_balancer_name ="lbu-TF-85-1" subregion_names= ["${var.region}a"] listeners { backend_port = 80 @@ -25,7 +25,7 @@ resource "outscale_load_balancer" "public_lbu1" { resource "outscale_load_balancer_policy" "policy-1" { load_balancer_name = outscale_load_balancer.public_lbu1.load_balancer_name - policy_name = "policy-lbu-terraform-2" + policy_name = "policy-lbu-terraform-TF85" policy_type = "load_balancer" } @@ -33,7 +33,7 @@ resource "outscale_load_balancer_policy" "policy-1" { resource "outscale_load_balancer_attributes" "attributes-policy" { load_balancer_name = outscale_load_balancer.public_lbu1.id load_balancer_port = 80 - policy_names = ["policy-lbu-terraform-2" ] + policy_names = ["policy-lbu-terraform-TF85" ] depends_on =[outscale_load_balancer_policy.policy-1] } diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step2.load_balancer_attributes_resource_update_listener_policy_detach_ok.ref b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step2.load_balancer_attributes_resource_update_listener_policy_detach_ok.ref index b3008a0d0..236efa5c0 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step2.load_balancer_attributes_resource_update_listener_policy_detach_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step2.load_balancer_attributes_resource_update_listener_policy_detach_ok.ref @@ -52,15 +52,15 @@ "load_balancer_port": 80, "load_balancer_protocol": "HTTP", "policy_names": [ - "policy-lbu-terraform-2" + "policy-lbu-terraform-TF85" ], "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-85", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [ { - "policy_name": "policy-lbu-terraform-2" + "policy_name": "policy-lbu-terraform-TF85" } ], "load_balancer_type": "internet-facing", @@ -145,11 +145,11 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-85", + "load_balancer_name": "########", "load_balancer_port": 80, "load_balancer_sticky_cookie_policies": [ { - "policy_name": "policy-lbu-terraform-2" + "policy_name": "policy-lbu-terraform-TF85" } ], "load_balancer_type": null, @@ -238,15 +238,15 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-85", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [ { - "policy_name": "policy-lbu-terraform-2" + "policy_name": "policy-lbu-terraform-TF85" } ], "load_balancer_type": "internet-facing", "net_id": "", - "policy_name": "policy-lbu-terraform-2", + "policy_name": "policy-lbu-terraform-TF85", "policy_type": "load_balancer", "public_ip": "########", "request_id": "########", diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step2.load_balancer_attributes_resource_update_listener_policy_detach_ok.tf b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step2.load_balancer_attributes_resource_update_listener_policy_detach_ok.tf index d2a78ed18..c5c9687b4 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step2.load_balancer_attributes_resource_update_listener_policy_detach_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step2.load_balancer_attributes_resource_update_listener_policy_detach_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-85" + load_balancer_name ="lbu-TF-85-1" subregion_names= ["${var.region}a"] listeners { backend_port = 80 @@ -25,7 +25,7 @@ resource "outscale_load_balancer" "public_lbu1" { resource "outscale_load_balancer_policy" "policy-1" { load_balancer_name = outscale_load_balancer.public_lbu1.load_balancer_name - policy_name = "policy-lbu-terraform-2" + policy_name = "policy-lbu-terraform-TF85" policy_type = "load_balancer" } diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step3.load_balancer_attributes_resource_update_listener_policy_reattach_ok.ref b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step3.load_balancer_attributes_resource_update_listener_policy_reattach_ok.ref index e070f0120..39299d1d8 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step3.load_balancer_attributes_resource_update_listener_policy_reattach_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step3.load_balancer_attributes_resource_update_listener_policy_reattach_ok.ref @@ -55,10 +55,10 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-85", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [ { - "policy_name": "policy-lbu-terraform-2" + "policy_name": "policy-lbu-terraform-TF85" } ], "load_balancer_type": "internet-facing", @@ -132,7 +132,7 @@ "load_balancer_port": 80, "load_balancer_protocol": "HTTP", "policy_names": [ - "policy-lbu-terraform-2" + "policy-lbu-terraform-TF85" ], "server_certificate_id": "" }, @@ -145,16 +145,16 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-85", + "load_balancer_name": "########", "load_balancer_port": 80, "load_balancer_sticky_cookie_policies": [ { - "policy_name": "policy-lbu-terraform-2" + "policy_name": "policy-lbu-terraform-TF85" } ], "load_balancer_type": null, "policy_names": [ - "policy-lbu-terraform-2" + "policy-lbu-terraform-TF85" ], "request_id": "########", "security_groups": [], @@ -241,15 +241,15 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-85", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [ { - "policy_name": "policy-lbu-terraform-2" + "policy_name": "policy-lbu-terraform-TF85" } ], "load_balancer_type": "internet-facing", "net_id": "", - "policy_name": "policy-lbu-terraform-2", + "policy_name": "policy-lbu-terraform-TF85", "policy_type": "load_balancer", "public_ip": "########", "request_id": "########", diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step3.load_balancer_attributes_resource_update_listener_policy_reattach_ok.tf b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step3.load_balancer_attributes_resource_update_listener_policy_reattach_ok.tf index 39e5003b2..537d43ed6 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step3.load_balancer_attributes_resource_update_listener_policy_reattach_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-85_update_load_balancer_listener_policy_ok/step3.load_balancer_attributes_resource_update_listener_policy_reattach_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-85" + load_balancer_name ="lbu-TF-85-1" subregion_names= ["${var.region}a"] listeners { backend_port = 80 @@ -25,7 +25,7 @@ resource "outscale_load_balancer" "public_lbu1" { resource "outscale_load_balancer_policy" "policy-1" { load_balancer_name = outscale_load_balancer.public_lbu1.load_balancer_name - policy_name = "policy-lbu-terraform-2" + policy_name = "policy-lbu-terraform-TF85" policy_type = "load_balancer" } @@ -33,7 +33,7 @@ resource "outscale_load_balancer_policy" "policy-1" { resource "outscale_load_balancer_attributes" "attributes-policy" { load_balancer_name = outscale_load_balancer.public_lbu1.id load_balancer_port = 80 - policy_names = ["policy-lbu-terraform-2" ] + policy_names = ["policy-lbu-terraform-TF85" ] depends_on =[outscale_load_balancer_policy.policy-1] } diff --git a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-86_update_load_balancer_listener_ssl_certificate_ok/step1.load_balancer_attributes_resource_update_listener_ssl_certificate_ok.tf b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-86_update_load_balancer_listener_ssl_certificate_ok/step1.load_balancer_attributes_resource_update_listener_ssl_certificate_ok.tf index a27562a2e..30c0a5219 100644 --- a/tests/qa_provider_oapi/data/load_balancer_attributes/TF-86_update_load_balancer_listener_ssl_certificate_ok/step1.load_balancer_attributes_resource_update_listener_ssl_certificate_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_attributes/TF-86_update_load_balancer_listener_ssl_certificate_ok/step1.load_balancer_attributes_resource_update_listener_ssl_certificate_ok.tf @@ -12,7 +12,7 @@ resource "outscale_server_certificate" "my_server_certificate_TF-86_2" { resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-86" + load_balancer_name ="lbu-TF-86-${var.suffixe_lbu_name}" subregion_names= ["${var.region}a"] listeners { backend_port = 8080 diff --git a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-87_load_balancer_listener_rule_datasource_attributes_ok/step1.load_balancer_listener_rule_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-87_load_balancer_listener_rule_datasource_attributes_ok/step1.load_balancer_listener_rule_datasource_attributes_ok.ref index 3ccaccbce..5b301fc06 100644 --- a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-87_load_balancer_listener_rule_datasource_attributes_ok/step1.load_balancer_listener_rule_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-87_load_balancer_listener_rule_datasource_attributes_ok/step1.load_balancer_listener_rule_datasource_attributes_ok.ref @@ -20,7 +20,7 @@ "id": "##id-0##", "listener_id": "##id-1##", "listener_rule_id": "##id-2##", - "listener_rule_name": "listener-rule-2", + "listener_rule_name": "########", "path_pattern": "", "priority": 1, "request_id": "########", @@ -96,7 +96,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-87", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -138,7 +138,7 @@ "id": "##id-7##", "listener": [ { - "load_balancer_name": "lbu-TF-87", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -148,7 +148,7 @@ "host_name_pattern": "", "listener_id": "##id-1##", "listener_rule_id": "##id-8##", - "listener_rule_name": "listener-rule-1", + "listener_rule_name": "########", "path_pattern": "*.abc.*.abc.*.com", "priority": 10 } @@ -181,7 +181,7 @@ "id": "##id-9##", "listener": [ { - "load_balancer_name": "lbu-TF-87", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -191,7 +191,7 @@ "host_name_pattern": "*.abc.-.abc.*.com", "listener_id": "##id-1##", "listener_rule_id": "##id-2##", - "listener_rule_name": "listener-rule-2", + "listener_rule_name": "########", "path_pattern": "", "priority": 1 } @@ -225,7 +225,7 @@ "##id-3##" ], "id": "##id-10##", - "load_balancer_name": "lbu-TF-87", + "load_balancer_name": "########", "request_id": "########" }, "sensitive_attributes": [], @@ -307,7 +307,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-87_load_balancer_listener_rule_datasource_attributes_ok/step1.load_balancer_listener_rule_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-87_load_balancer_listener_rule_datasource_attributes_ok/step1.load_balancer_listener_rule_datasource_attributes_ok.tf index df145ab8a..f7146ed18 100644 --- a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-87_load_balancer_listener_rule_datasource_attributes_ok/step1.load_balancer_listener_rule_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-87_load_balancer_listener_rule_datasource_attributes_ok/step1.load_balancer_listener_rule_datasource_attributes_ok.tf @@ -15,7 +15,7 @@ resource "outscale_vm" "public_vm_1" { } resource "outscale_load_balancer" "public_lbu2" { - load_balancer_name ="lbu-TF-87" + load_balancer_name ="lbu-TF-87-${var.suffixe_lbu_name}" subregion_names= ["${var.region}a"] listeners { backend_port = 80 @@ -43,7 +43,7 @@ resource "outscale_load_balancer_listener_rule" "rule-1" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-1" + listener_rule_name = "listener-rule-1-${var.suffixe_lbu_name}" path_pattern = "*.abc.*.abc.*.com" priority = 10 } @@ -58,7 +58,7 @@ resource "outscale_load_balancer_listener_rule" "rule-2" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-2" + listener_rule_name = "listener-rule-2-${var.suffixe_lbu_name}" host_name_pattern = "*.abc.-.abc.*.com" priority = 1 } @@ -68,7 +68,7 @@ resource "outscale_load_balancer_listener_rule" "rule-2" { data "outscale_load_balancer_listener_rule" "outscale_load_balancer_listener_rule" { filter { name = "listener_rule_names" - values = ["listener-rule-2"] + values = ["listener-rule-2-${var.suffixe_lbu_name}"] } depends_on =[outscale_load_balancer_listener_rule.rule-2] } diff --git a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step1.load_balancer_listener_rule_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step1.load_balancer_listener_rule_resource_attributes_ok.ref index 16057a3ee..42a7eb619 100644 --- a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step1.load_balancer_listener_rule_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step1.load_balancer_listener_rule_resource_attributes_ok.ref @@ -69,7 +69,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -89,8 +89,8 @@ ], "tags": [ { - "key": "name", - "value": "listener-rule" + "key": "tag", + "value": "test-listener-rule" } ] }, @@ -111,7 +111,7 @@ "id": "##id-3##", "listener": [ { - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -121,7 +121,7 @@ "host_name_pattern": "", "listener_id": "##id-4##", "listener_rule_id": "##id-5##", - "listener_rule_name": "listener-rule-1", + "listener_rule_name": "listener-rule-11", "path_pattern": "*.abc.*.abc.*.com", "priority": 10 } @@ -154,7 +154,7 @@ "id": "##id-7##", "listener": [ { - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -164,7 +164,7 @@ "host_name_pattern": "*.abc.-.abc.*.com", "listener_id": "##id-4##", "listener_rule_id": "##id-8##", - "listener_rule_name": "listener-rule-2", + "listener_rule_name": "listener-rule-12", "path_pattern": "", "priority": 1 } @@ -197,7 +197,7 @@ "id": "##id-9##", "listener": [ { - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -207,7 +207,7 @@ "host_name_pattern": "", "listener_id": "##id-4##", "listener_rule_id": "##id-10##", - "listener_rule_name": "listener-rule-3", + "listener_rule_name": "listener-rule-13", "path_pattern": "*.abc.*.abc.*.com", "priority": 12 } @@ -241,7 +241,7 @@ "##id-6##" ], "id": "##id-11##", - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "request_id": "########" }, "sensitive_attributes": [], @@ -323,7 +323,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step1.load_balancer_listener_rule_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step1.load_balancer_listener_rule_resource_attributes_ok.tf index c801c1cc6..076eeec6a 100644 --- a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step1.load_balancer_listener_rule_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step1.load_balancer_listener_rule_resource_attributes_ok.tf @@ -15,7 +15,7 @@ resource "outscale_vm" "public_vm_1" { } resource "outscale_load_balancer" "public_lbu2" { - load_balancer_name ="lbu-TF-88" + load_balancer_name ="lbu-TF-88-11" subregion_names= ["${var.region}a"] listeners { backend_port = 80 @@ -24,8 +24,8 @@ resource "outscale_load_balancer" "public_lbu2" { load_balancer_port = 80 } tags { - key = "name" - value = "listener-rule" + key = "tag" + value = "test-listener-rule" } } @@ -43,7 +43,7 @@ resource "outscale_load_balancer_listener_rule" "rule-1" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-1" + listener_rule_name = "listener-rule-11" path_pattern = "*.abc.*.abc.*.com" priority = 10 } @@ -58,7 +58,7 @@ resource "outscale_load_balancer_listener_rule" "rule-2" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-2" + listener_rule_name = "listener-rule-12" host_name_pattern = "*.abc.-.abc.*.com" priority = 1 } @@ -73,7 +73,7 @@ resource "outscale_load_balancer_listener_rule" "rule-3" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-3" + listener_rule_name = "listener-rule-13" path_pattern = "*.abc.*.abc.*.com" priority = 12 } diff --git a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step2.load_balancer_listener_rule_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step2.load_balancer_listener_rule_resource_attributes_ok.ref index 307245103..2dbab2c7b 100644 --- a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step2.load_balancer_listener_rule_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step2.load_balancer_listener_rule_resource_attributes_ok.ref @@ -71,7 +71,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -113,7 +113,7 @@ "id": "##id-4##", "listener": [ { - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -123,7 +123,7 @@ "host_name_pattern": "*.abc.*.abc.*.com", "listener_id": "##id-5##", "listener_rule_id": "##id-6##", - "listener_rule_name": "listener-rule-1", + "listener_rule_name": "listener-rule-11", "path_pattern": "*.abc.*.abc.*.com", "priority": 10 } @@ -156,7 +156,7 @@ "id": "##id-7##", "listener": [ { - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -166,7 +166,7 @@ "host_name_pattern": "*.abc.-.abc.*.com", "listener_id": "##id-5##", "listener_rule_id": "##id-8##", - "listener_rule_name": "listener-rule-2", + "listener_rule_name": "listener-rule-12", "path_pattern": "*.abc.-.abc.*.com", "priority": 1 } @@ -199,7 +199,7 @@ "id": "##id-9##", "listener": [ { - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -209,7 +209,7 @@ "host_name_pattern": "*.abc.-.abc.*.com", "listener_id": "##id-5##", "listener_rule_id": "##id-10##", - "listener_rule_name": "listener-rule-3", + "listener_rule_name": "listener-rule-13", "path_pattern": "*.abc.*.abc.*.com", "priority": 12 } @@ -243,7 +243,7 @@ "##id-1##" ], "id": "##id-11##", - "load_balancer_name": "lbu-TF-88", + "load_balancer_name": "########", "request_id": "########" }, "sensitive_attributes": [], @@ -325,7 +325,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step2.load_balancer_listener_rule_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step2.load_balancer_listener_rule_resource_attributes_ok.tf index 37d87f85b..1f1866d52 100644 --- a/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step2.load_balancer_listener_rule_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_listener_rule/TF-88_load_balancer_listener_rule_resource_attributes_ok/step2.load_balancer_listener_rule_resource_attributes_ok.tf @@ -15,7 +15,7 @@ resource "outscale_vm" "public_vm_1" { } resource "outscale_load_balancer" "public_lbu2" { - load_balancer_name ="lbu-TF-88" + load_balancer_name ="lbu-TF-88-11" subregion_names= ["${var.region}a"] listeners { backend_port = 80 @@ -43,7 +43,7 @@ resource "outscale_load_balancer_listener_rule" "rule-1" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-1" + listener_rule_name = "listener-rule-11" host_name_pattern = "*.abc.*.abc.*.com" priority = 10 } @@ -58,7 +58,7 @@ resource "outscale_load_balancer_listener_rule" "rule-2" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-2" + listener_rule_name = "listener-rule-12" path_pattern = "*.abc.-.abc.*.com" priority = 1 } @@ -73,7 +73,7 @@ resource "outscale_load_balancer_listener_rule" "rule-3" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-3" + listener_rule_name = "listener-rule-13" path_pattern = "*.abc.*.abc.*.com" host_name_pattern = "*.abc.-.abc.*.com" priority = 12 diff --git a/tests/qa_provider_oapi/data/load_balancer_listener_rules/TF-89_load_balancer_listener_rules_datasource_attributes_ok/step1.load_balancer_listener_rules_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_listener_rules/TF-89_load_balancer_listener_rules_datasource_attributes_ok/step1.load_balancer_listener_rules_datasource_attributes_ok.ref index f981839d0..6e1455378 100644 --- a/tests/qa_provider_oapi/data/load_balancer_listener_rules/TF-89_load_balancer_listener_rules_datasource_attributes_ok/step1.load_balancer_listener_rules_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_listener_rules/TF-89_load_balancer_listener_rules_datasource_attributes_ok/step1.load_balancer_listener_rules_datasource_attributes_ok.ref @@ -22,7 +22,7 @@ "host_name_pattern": "", "listener_id": "##id-1##", "listener_rule_id": "##id-2##", - "listener_rule_name": "listener-rule-1", + "listener_rule_name": "########", "path_pattern": "*.abc.*.abc.*.com", "priority": 10, "vm_ids": [ @@ -34,7 +34,7 @@ "host_name_pattern": "*.abc.-.abc.*.com", "listener_id": "##id-1##", "listener_rule_id": "##id-4##", - "listener_rule_name": "listener-rule-2", + "listener_rule_name": "########", "path_pattern": "", "priority": 1, "vm_ids": [ @@ -112,7 +112,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-89", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -154,7 +154,7 @@ "id": "##id-8##", "listener": [ { - "load_balancer_name": "lbu-TF-89", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -164,7 +164,7 @@ "host_name_pattern": "", "listener_id": "##id-1##", "listener_rule_id": "##id-2##", - "listener_rule_name": "listener-rule-1", + "listener_rule_name": "########", "path_pattern": "*.abc.*.abc.*.com", "priority": 10 } @@ -197,7 +197,7 @@ "id": "##id-9##", "listener": [ { - "load_balancer_name": "lbu-TF-89", + "load_balancer_name": "########", "load_balancer_port": 80 } ], @@ -207,7 +207,7 @@ "host_name_pattern": "*.abc.-.abc.*.com", "listener_id": "##id-1##", "listener_rule_id": "##id-4##", - "listener_rule_name": "listener-rule-2", + "listener_rule_name": "########", "path_pattern": "", "priority": 1 } @@ -241,7 +241,7 @@ "##id-3##" ], "id": "##id-10##", - "load_balancer_name": "lbu-TF-89", + "load_balancer_name": "########", "request_id": "########" }, "sensitive_attributes": [], @@ -323,7 +323,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/load_balancer_listener_rules/TF-89_load_balancer_listener_rules_datasource_attributes_ok/step1.load_balancer_listener_rules_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/load_balancer_listener_rules/TF-89_load_balancer_listener_rules_datasource_attributes_ok/step1.load_balancer_listener_rules_datasource_attributes_ok.tf index b8d5f6fb8..ecc9a82fd 100644 --- a/tests/qa_provider_oapi/data/load_balancer_listener_rules/TF-89_load_balancer_listener_rules_datasource_attributes_ok/step1.load_balancer_listener_rules_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_listener_rules/TF-89_load_balancer_listener_rules_datasource_attributes_ok/step1.load_balancer_listener_rules_datasource_attributes_ok.tf @@ -15,7 +15,7 @@ resource "outscale_vm" "public_vm_1" { } resource "outscale_load_balancer" "public_lbu2" { - load_balancer_name ="lbu-TF-89" + load_balancer_name ="lbu-TF-89-${var.suffixe_lbu_name}" subregion_names= ["${var.region}a"] listeners { backend_port = 80 @@ -43,7 +43,7 @@ resource "outscale_load_balancer_listener_rule" "rule-1" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-1" + listener_rule_name = "listener-rule-1-${var.suffixe_lbu_name}" path_pattern = "*.abc.*.abc.*.com" priority = 10 } @@ -58,7 +58,7 @@ resource "outscale_load_balancer_listener_rule" "rule-2" { listener_rule { action = "forward" - listener_rule_name = "listener-rule-2" + listener_rule_name = "listener-rule-2-${var.suffixe_lbu_name}" host_name_pattern = "*.abc.-.abc.*.com" priority = 1 } @@ -68,7 +68,7 @@ resource "outscale_load_balancer_listener_rule" "rule-2" { data "outscale_load_balancer_listener_rules" "outscale_load_balancer_listener_rules" { filter { name = "listener_rule_names" - values = ["listener-rule-2","listener-rule-1"] + values = ["listener-rule-2-${var.suffixe_lbu_name}","listener-rule-1-${var.suffixe_lbu_name}"] } depends_on =[outscale_load_balancer_listener_rule.rule-2,outscale_load_balancer_listener_rule.rule-1] } diff --git a/tests/qa_provider_oapi/data/load_balancer_policy/TF-90_load_balancer_policy_resource_attributes_ok/step1.load_balancer_policy_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_policy/TF-90_load_balancer_policy_resource_attributes_ok/step1.load_balancer_policy_resource_attributes_ok.ref index dbfb49347..014c510a4 100644 --- a/tests/qa_provider_oapi/data/load_balancer_policy/TF-90_load_balancer_policy_resource_attributes_ok/step1.load_balancer_policy_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_policy/TF-90_load_balancer_policy_resource_attributes_ok/step1.load_balancer_policy_resource_attributes_ok.ref @@ -47,7 +47,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-90", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -121,7 +121,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-90", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [ { "policy_name": "policy-lbu-terraform-1" @@ -209,7 +209,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-90", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [ { "policy_name": "policy-lbu-terraform-1" @@ -298,7 +298,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-90", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [ { "policy_name": "policy-lbu-terraform-1" @@ -395,7 +395,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-90", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [ { "policy_name": "policy-lbu-terraform-1" diff --git a/tests/qa_provider_oapi/data/load_balancer_policy/TF-90_load_balancer_policy_resource_attributes_ok/step1.load_balancer_policy_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/load_balancer_policy/TF-90_load_balancer_policy_resource_attributes_ok/step1.load_balancer_policy_resource_attributes_ok.tf index d85d822a2..7899aca0e 100644 --- a/tests/qa_provider_oapi/data/load_balancer_policy/TF-90_load_balancer_policy_resource_attributes_ok/step1.load_balancer_policy_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_policy/TF-90_load_balancer_policy_resource_attributes_ok/step1.load_balancer_policy_resource_attributes_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name = "lbu-TF-90" + load_balancer_name = "lbu-TF-90-${var.suffixe_lbu_name}" subregion_names = ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/load_balancer_tags/TF-91_load_balancer_tags_datasource_attributes_ok/step1.load_balancer_tags_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_tags/TF-91_load_balancer_tags_datasource_attributes_ok/step1.load_balancer_tags_datasource_attributes_ok.ref index e5e7516ea..0b81bb912 100644 --- a/tests/qa_provider_oapi/data/load_balancer_tags/TF-91_load_balancer_tags_datasource_attributes_ok/step1.load_balancer_tags_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_tags/TF-91_load_balancer_tags_datasource_attributes_ok/step1.load_balancer_tags_datasource_attributes_ok.ref @@ -16,35 +16,32 @@ "attributes": { "filter": "########", "id": "##id-0##", - "load_balancer_names": [ - "lbu-TF-91", - "lbu-TF-91-2" - ], + "load_balancer_names": "########", "request_id": "########", "tags": [ { "key": "name", - "load_balancer_name": "lbu-TF-91", + "load_balancer_name": "########", "value": "public_lbu1" }, { "key": "User", - "load_balancer_name": "lbu-TF-91", + "load_balancer_name": "########", "value": "mzi" }, { "key": "Platfotm", - "load_balancer_name": "lbu-TF-91", + "load_balancer_name": "########", "value": "terraform" }, { "key": "name", - "load_balancer_name": "lbu-TF-91-2", + "load_balancer_name": "########", "value": "public_lbu2" }, { "key": "Platfotm", - "load_balancer_name": "lbu-TF-91-2", + "load_balancer_name": "########", "value": "terraform" } ] @@ -95,7 +92,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-91", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -175,7 +172,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-91-2", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", diff --git a/tests/qa_provider_oapi/data/load_balancer_tags/TF-91_load_balancer_tags_datasource_attributes_ok/step1.load_balancer_tags_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/load_balancer_tags/TF-91_load_balancer_tags_datasource_attributes_ok/step1.load_balancer_tags_datasource_attributes_ok.tf index efc3e043e..52f94178c 100644 --- a/tests/qa_provider_oapi/data/load_balancer_tags/TF-91_load_balancer_tags_datasource_attributes_ok/step1.load_balancer_tags_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_tags/TF-91_load_balancer_tags_datasource_attributes_ok/step1.load_balancer_tags_datasource_attributes_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name = "lbu-TF-91" + load_balancer_name = "lbu-TF-91-${var.suffixe_lbu_name}" subregion_names = ["${var.region}a"] listeners { backend_port = 80 @@ -22,7 +22,7 @@ resource "outscale_load_balancer" "public_lbu1" { } resource "outscale_load_balancer" "public_lbu2" { - load_balancer_name ="lbu-TF-91-2" + load_balancer_name ="lbu-TF-91-2-${var.suffixe_lbu_name}" subregion_names= ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.ref index 881c08c03..556b9a0bd 100644 --- a/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.ref @@ -27,7 +27,7 @@ ], "filter": "########", "id": "##id-1##", - "load_balancer_name": "lbu-TF-92", + "load_balancer_name": "########", "request_id": "########" }, "sensitive_attributes": [] @@ -98,7 +98,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-92", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -170,7 +170,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-92", + "load_balancer_name": "########", "load_balancer_port": null, "load_balancer_sticky_cookie_policies": [], "load_balancer_type": null, @@ -216,7 +216,7 @@ "##id-0##" ], "id": "##id-5##", - "load_balancer_name": "lbu-TF-92", + "load_balancer_name": "########", "request_id": "########" }, "sensitive_attributes": [], @@ -329,7 +329,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.tf index df4689312..548f7ab92 100644 --- a/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.tf @@ -31,7 +31,7 @@ resource "outscale_vm" "outscale_vm-1" { } resource "outscale_load_balancer" "public_lbu2" { - load_balancer_name = "lbu-TF-92" + load_balancer_name = "lbu-TF-92-${var.suffixe_lbu_name}" subregion_names = ["${var.region}a"] listeners { backend_port = 8080 diff --git a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.ref index ea1901162..f9b1a68ae 100644 --- a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.ref @@ -77,7 +77,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-93", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -121,7 +121,7 @@ "##id-4##" ], "id": "##id-5##", - "load_balancer_name": "lbu-TF-93", + "load_balancer_name": "########", "request_id": "########" }, "sensitive_attributes": [], @@ -195,7 +195,7 @@ "deletion_protection": false, "get_admin_password": null, "hypervisor": "xen", - "id": "##id-3##", + "id": "##id-4##", "image_id": "##id-9##", "is_source_dest_checked": false, "keypair_name": "KP-TF93", @@ -204,7 +204,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -241,7 +241,7 @@ ], "timeouts": null, "user_data": "ICAgICAjIS9iaW4vYmFzaAogICAgcHVzaGQgL2hvbWUKICAgIG5vaHVwIHB5dGhvbiAtbSBTaW1wbGVIVFRQU2VydmVyIDgwODAK", - "vm_id": "##id-3##", + "vm_id": "##id-4##", "vm_initiated_shutdown_behavior": "stop", "vm_type": "###vm_type###" }, @@ -279,7 +279,7 @@ "deletion_protection": false, "get_admin_password": null, "hypervisor": "xen", - "id": "##id-4##", + "id": "##id-3##", "image_id": "##id-9##", "is_source_dest_checked": false, "keypair_name": "KP-TF93", @@ -288,7 +288,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -325,7 +325,7 @@ ], "timeouts": null, "user_data": "ICAgICAjIS9iaW4vYmFzaAogICAgcHVzaGQgL2hvbWUKICAgIG5vaHVwIHB5dGhvbiAtbSBTaW1wbGVIVFRQU2VydmVyIDgwODAK", - "vm_id": "##id-4##", + "vm_id": "##id-3##", "vm_initiated_shutdown_behavior": "stop", "vm_type": "###vm_type###" }, diff --git a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.tf index a0f25e0c6..c998c053a 100644 --- a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.tf @@ -2,7 +2,7 @@ resource "outscale_keypair" "my_keypair" { keypair_name = "KP-TF93" } resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name = "lbu-TF-93" + load_balancer_name = "lbu-TF-93-11" subregion_names = ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.ref b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.ref index 2e5ba1be5..b7a5a8578 100644 --- a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.ref +++ b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.ref @@ -80,7 +80,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-93", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -123,7 +123,7 @@ "##id-2##" ], "id": "##id-5##", - "load_balancer_name": "lbu-TF-93", + "load_balancer_name": "########", "request_id": "########" }, "sensitive_attributes": [], @@ -206,7 +206,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -290,7 +290,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.tf b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.tf index 6b4721e6d..3aeb0c0cd 100644 --- a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.tf +++ b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.tf @@ -2,7 +2,7 @@ resource "outscale_keypair" "my_keypair" { keypair_name = "KP-TF93" } resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name = "lbu-TF-93" + load_balancer_name = "lbu-TF-93-11" subregion_names = ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/nets/TF-103_net_attributes_change_dhcp_options_ok/step2.net_attributes_resource_update_dhcp_options_set.ref b/tests/qa_provider_oapi/data/nets/TF-103_net_attributes_change_dhcp_options_ok/step2.net_attributes_resource_update_dhcp_options_set.ref index 37f7887e0..1699e5cec 100644 --- a/tests/qa_provider_oapi/data/nets/TF-103_net_attributes_change_dhcp_options_ok/step2.net_attributes_resource_update_dhcp_options_set.ref +++ b/tests/qa_provider_oapi/data/nets/TF-103_net_attributes_change_dhcp_options_ok/step2.net_attributes_resource_update_dhcp_options_set.ref @@ -16,7 +16,7 @@ "attributes": { "default": false, "dhcp_options_set_id": "##id-0##", - "domain_name": "us-east-2.compute.internal", + "domain_name": "eu-west-2.compute.internal", "domain_name_servers": [ "192.168.12.12", "192.168.12.132" diff --git a/tests/qa_provider_oapi/data/nets/TF-103_net_attributes_change_dhcp_options_ok/step3.net_attributes_resource_refresh.ref b/tests/qa_provider_oapi/data/nets/TF-103_net_attributes_change_dhcp_options_ok/step3.net_attributes_resource_refresh.ref index 8f51c1fa8..917b6c41c 100644 --- a/tests/qa_provider_oapi/data/nets/TF-103_net_attributes_change_dhcp_options_ok/step3.net_attributes_resource_refresh.ref +++ b/tests/qa_provider_oapi/data/nets/TF-103_net_attributes_change_dhcp_options_ok/step3.net_attributes_resource_refresh.ref @@ -16,7 +16,7 @@ "attributes": { "default": false, "dhcp_options_set_id": "##id-0##", - "domain_name": "us-east-2.compute.internal", + "domain_name": "eu-west-2.compute.internal", "domain_name_servers": [ "192.168.12.12", "192.168.12.132" diff --git a/tests/qa_provider_oapi/data/nets/TF-107_net_peerings_datasource_attributes_ok/step1.net_peerings_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-107_net_peerings_datasource_attributes_ok/step1.net_peerings_datasource_attributes_ok.ref index 62a4729cf..4a32d5f8a 100644 --- a/tests/qa_provider_oapi/data/nets/TF-107_net_peerings_datasource_attributes_ok/step1.net_peerings_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-107_net_peerings_datasource_attributes_ok/step1.net_peerings_datasource_attributes_ok.ref @@ -29,7 +29,7 @@ "source_net": [ { "account_id": "##id-1##", - "ip_range": "10.31.0.0/16", + "ip_range": "10.20.0.0/16", "net_id": "##id-4##" } ], @@ -39,16 +39,7 @@ "name": "pending-acceptance" } ], - "tags": [ - { - "key": "Key", - "value": "value-tags" - }, - { - "key": "Key-2", - "value": "value-tags-2" - } - ] + "tags": [] }, { "accepter_net": [ @@ -62,7 +53,7 @@ "source_net": [ { "account_id": "##id-1##", - "ip_range": "10.20.0.0/16", + "ip_range": "10.31.0.0/16", "net_id": "##id-6##" } ], @@ -72,7 +63,16 @@ "name": "pending-acceptance" } ], - "tags": [] + "tags": [ + { + "key": "Key", + "value": "value-tags" + }, + { + "key": "Key-2", + "value": "value-tags-2" + } + ] } ], "request_id": "########" @@ -120,9 +120,9 @@ "schema_version": 0, "attributes": { "dhcp_options_set_id": "##id-7##", - "id": "##id-4##", + "id": "##id-6##", "ip_range": "10.31.0.0/16", - "net_id": "##id-4##", + "net_id": "##id-6##", "request_id": "########", "state": "available", "tags": [ @@ -148,9 +148,9 @@ "schema_version": 0, "attributes": { "dhcp_options_set_id": "##id-7##", - "id": "##id-6##", + "id": "##id-4##", "ip_range": "10.20.0.0/16", - "net_id": "##id-6##", + "net_id": "##id-4##", "request_id": "########", "state": "available", "tags": [ @@ -183,18 +183,18 @@ } ], "accepter_net_id": "##id-2##", - "id": "##id-3##", - "net_peering_id": "##id-3##", + "id": "##id-5##", + "net_peering_id": "##id-5##", "request_id": "########", "source_net": [ { "account_id": "##id-1##", "ip_range": "10.31.0.0/16", - "net_id": "##id-4##" + "net_id": "##id-6##" } ], "source_net_account_id": null, - "source_net_id": "##id-4##", + "source_net_id": "##id-6##", "state": [ { "message": "########", @@ -238,18 +238,18 @@ } ], "accepter_net_id": "##id-2##", - "id": "##id-5##", - "net_peering_id": "##id-5##", + "id": "##id-3##", + "net_peering_id": "##id-3##", "request_id": "########", "source_net": [ { "account_id": "##id-1##", "ip_range": "10.20.0.0/16", - "net_id": "##id-6##" + "net_id": "##id-4##" } ], "source_net_account_id": null, - "source_net_id": "##id-6##", + "source_net_id": "##id-4##", "state": [ { "message": "########", diff --git a/tests/qa_provider_oapi/data/nets/TF-108_nets_datasource_attributes_ok/step1.nets_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-108_nets_datasource_attributes_ok/step1.nets_datasource_attributes_ok.ref index a9df68138..25278e263 100644 --- a/tests/qa_provider_oapi/data/nets/TF-108_nets_datasource_attributes_ok/step1.nets_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-108_nets_datasource_attributes_ok/step1.nets_datasource_attributes_ok.ref @@ -20,30 +20,30 @@ "nets": [ { "dhcp_options_set_id": "##id-1##", - "ip_range": "10.0.0.0/17", + "ip_range": "10.2.0.0/17", "net_id": "##id-2##", "state": "available", "tags": [ { - "key": "Key", - "value": "value-tags" - }, - { - "key": "Name", - "value": "outscale_net_resource" + "key": "Name-net-2", + "value": "outscale_net_resource2" } ], "tenancy": "default" }, { "dhcp_options_set_id": "##id-1##", - "ip_range": "10.2.0.0/17", + "ip_range": "10.0.0.0/17", "net_id": "##id-3##", "state": "available", "tags": [ { - "key": "Name-net-2", - "value": "outscale_net_resource2" + "key": "Key", + "value": "value-tags" + }, + { + "key": "Name", + "value": "outscale_net_resource" } ], "tenancy": "default" @@ -65,9 +65,9 @@ "schema_version": 0, "attributes": { "dhcp_options_set_id": "##id-1##", - "id": "##id-2##", + "id": "##id-3##", "ip_range": "10.0.0.0/17", - "net_id": "##id-2##", + "net_id": "##id-3##", "request_id": "########", "state": "available", "tags": [ @@ -97,9 +97,9 @@ "schema_version": 0, "attributes": { "dhcp_options_set_id": "##id-1##", - "id": "##id-3##", + "id": "##id-2##", "ip_range": "10.2.0.0/17", - "net_id": "##id-3##", + "net_id": "##id-2##", "request_id": "########", "state": "available", "tags": [ diff --git a/tests/qa_provider_oapi/data/nets/TF-108_nets_datasource_attributes_ok/step2.nets_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-108_nets_datasource_attributes_ok/step2.nets_datasource_attributes_ok.ref index 8e0653957..cc87f1b3c 100644 --- a/tests/qa_provider_oapi/data/nets/TF-108_nets_datasource_attributes_ok/step2.nets_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-108_nets_datasource_attributes_ok/step2.nets_datasource_attributes_ok.ref @@ -20,30 +20,30 @@ "nets": [ { "dhcp_options_set_id": "##id-1##", - "ip_range": "10.0.0.0/17", + "ip_range": "10.2.0.0/17", "net_id": "##id-2##", "state": "available", "tags": [ { - "key": "Key", - "value": "value-tags" - }, - { - "key": "Name", - "value": "outscale_net_resource" + "key": "Name-net-2", + "value": "outscale_net_resource2" } ], "tenancy": "default" }, { "dhcp_options_set_id": "##id-1##", - "ip_range": "10.2.0.0/17", + "ip_range": "10.0.0.0/17", "net_id": "##id-3##", "state": "available", "tags": [ { - "key": "Name-net-2", - "value": "outscale_net_resource2" + "key": "Key", + "value": "value-tags" + }, + { + "key": "Name", + "value": "outscale_net_resource" } ], "tenancy": "default" @@ -71,7 +71,7 @@ { "dhcp_options_set_id": "##id-1##", "ip_range": "10.2.0.0/17", - "net_id": "##id-3##", + "net_id": "##id-2##", "state": "available", "tags": [ { @@ -104,7 +104,7 @@ { "dhcp_options_set_id": "##id-1##", "ip_range": "10.2.0.0/17", - "net_id": "##id-3##", + "net_id": "##id-2##", "state": "available", "tags": [ { @@ -137,7 +137,7 @@ { "dhcp_options_set_id": "##id-1##", "ip_range": "10.2.0.0/17", - "net_id": "##id-3##", + "net_id": "##id-2##", "state": "available", "tags": [ { @@ -170,7 +170,7 @@ { "dhcp_options_set_id": "##id-1##", "ip_range": "10.2.0.0/17", - "net_id": "##id-3##", + "net_id": "##id-2##", "state": "available", "tags": [ { @@ -197,9 +197,9 @@ "schema_version": 0, "attributes": { "dhcp_options_set_id": "##id-1##", - "id": "##id-2##", + "id": "##id-3##", "ip_range": "10.0.0.0/17", - "net_id": "##id-2##", + "net_id": "##id-3##", "request_id": "########", "state": "available", "tags": [ @@ -229,9 +229,9 @@ "schema_version": 0, "attributes": { "dhcp_options_set_id": "##id-1##", - "id": "##id-3##", + "id": "##id-2##", "ip_range": "10.2.0.0/17", - "net_id": "##id-3##", + "net_id": "##id-2##", "request_id": "########", "state": "available", "tags": [ diff --git a/tests/qa_provider_oapi/data/nets/TF-109_nic_datasource_attributes_ok/step1.nic_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-109_nic_datasource_attributes_ok/step1.nic_datasource_attributes_ok.ref index be883ba3b..1563598e8 100644 --- a/tests/qa_provider_oapi/data/nets/TF-109_nic_datasource_attributes_ok/step1.nic_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-109_nic_datasource_attributes_ok/step1.nic_datasource_attributes_ok.ref @@ -51,7 +51,7 @@ ], "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key:", @@ -113,7 +113,7 @@ ], "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key:", @@ -178,7 +178,7 @@ ], "state": "in-use", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [] }, "sensitive_attributes": [] @@ -231,7 +231,7 @@ ], "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", @@ -289,7 +289,7 @@ ], "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key:", @@ -345,7 +345,7 @@ ], "state": "available", "subnet_id": "##id-11##", - "subregion_name": "us-east-2b", + "subregion_name": "eu-west-2b", "tags": [ { "key": "Key:", @@ -431,7 +431,7 @@ ], "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key-2", @@ -501,7 +501,7 @@ ], "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", @@ -561,7 +561,7 @@ ], "state": "available", "subnet_id": "##id-11##", - "subregion_name": "us-east-2b", + "subregion_name": "eu-west-2b", "tags": [ { "key": "Key-2", @@ -701,7 +701,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -730,7 +730,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-11##", - "subregion_name": "us-east-2b", + "subregion_name": "eu-west-2b", "tags": [], "timeouts": null }, @@ -824,8 +824,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { diff --git a/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step1.nic_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step1.nic_resource_attributes_ok.ref index 1b6470e33..efe9cc073 100644 --- a/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step1.nic_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step1.nic_resource_attributes_ok.ref @@ -69,7 +69,7 @@ ], "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -124,12 +124,12 @@ "security_groups": [ { "security_group_id": "##id-7##", - "security_group_name": "terraform-sg" + "security_group_name": "terraform-sg-TF110" } ], "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -169,7 +169,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-7##", - "security_group_name": "terraform-sg", + "security_group_name": "terraform-sg-TF110", "tag": null, "tags": [] }, @@ -198,7 +198,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step1.nic_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step1.nic_resource_attributes_ok.tf index 294762fb9..657c23cf9 100644 --- a/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step1.nic_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step1.nic_resource_attributes_ok.tf @@ -19,7 +19,7 @@ resource "outscale_nic" "outscale_nic" { resource "outscale_security_group" "outscale_sg" { description = "sg for terraform tests" - security_group_name = "terraform-sg" + security_group_name = "terraform-sg-TF110" net_id = outscale_net.outscale_net.net_id } diff --git a/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.ref b/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.ref index 236b83d11..2d0401d8c 100644 --- a/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.ref +++ b/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.ref @@ -64,12 +64,12 @@ "security_groups": [ { "security_group_id": "##id-4##", - "security_group_name": "terraform-sg" + "security_group_name": "terraform-sg-TF110" } ], "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -125,12 +125,12 @@ "security_groups": [ { "security_group_id": "##id-4##", - "security_group_name": "terraform-sg" + "security_group_name": "terraform-sg-TF110" } ], "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -170,7 +170,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg", + "security_group_name": "terraform-sg-TF110", "tag": null, "tags": [] }, @@ -199,7 +199,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.tf b/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.tf index 071f1f338..bbc9ef455 100644 --- a/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.tf +++ b/tests/qa_provider_oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.tf @@ -22,7 +22,7 @@ resource "outscale_nic" "outscale_nic" { resource "outscale_security_group" "outscale_sg" { description = "sg for terraform tests" - security_group_name = "terraform-sg" + security_group_name = "terraform-sg-TF110" net_id = outscale_net.outscale_net.net_id } diff --git a/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.ref index 9ae73ae1b..26acea273 100644 --- a/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.ref @@ -86,12 +86,12 @@ "security_groups": [ { "security_group_id": "##id-5##", - "security_group_name": "sg1-test-group_test" + "security_group_name": "sg1-test-group_TF111" } ], "state": "available", "subnet_id": "##id-6##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -163,7 +163,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-5##", - "security_group_name": "sg1-test-group_test", + "security_group_name": "sg1-test-group_TF111", "tag": null, "tags": [] }, @@ -192,7 +192,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-6##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -278,7 +278,7 @@ "security_groups": [ { "security_group_id": "##id-5##", - "security_group_name": "sg1-test-group_test" + "security_group_name": "sg1-test-group_TF111" } ], "state": "in-use", @@ -286,8 +286,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { @@ -324,7 +324,7 @@ "security_groups": [ { "security_group_id": "##id-5##", - "security_group_name": "sg1-test-group_test" + "security_group_name": "sg1-test-group_TF111" } ], "state": "in-use", @@ -350,7 +350,7 @@ "security_groups": [ { "security_group_id": "##id-5##", - "security_group_name": "sg1-test-group_test" + "security_group_name": "sg1-test-group_TF111" } ], "state": "running", diff --git a/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.tf index b564413de..2a76c102b 100644 --- a/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.tf @@ -16,7 +16,7 @@ resource "outscale_net" "outscale_net" { resource "outscale_security_group" "outscale_security_group" { description = "test group" - security_group_name = "sg1-test-group_test" + security_group_name = "sg1-test-group_TF111" net_id = outscale_net.outscale_net.net_id } diff --git a/tests/qa_provider_oapi/data/nets/TF-112_nic_private_ip_resource_attributes_ok/step1.nic_private_ip_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-112_nic_private_ip_resource_attributes_ok/step1.nic_private_ip_resource_attributes_ok.ref index eb07b6c64..fb5cab6a0 100644 --- a/tests/qa_provider_oapi/data/nets/TF-112_nic_private_ip_resource_attributes_ok/step1.nic_private_ip_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-112_nic_private_ip_resource_attributes_ok/step1.nic_private_ip_resource_attributes_ok.ref @@ -69,7 +69,7 @@ ], "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -128,7 +128,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref index 1b23272de..bbba284d3 100644 --- a/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref @@ -19,7 +19,7 @@ "nics": [ { "account_id": "##id-1##", - "description": "TF-109", + "description": "TF-113", "is_source_dest_checked": true, "link_nic": [ { @@ -53,12 +53,12 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "in-use", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key:", @@ -119,12 +119,12 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "in-use", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [] } ], @@ -150,20 +150,11 @@ "account_id": "##id-1##", "description": "", "is_source_dest_checked": true, - "link_nic": [ - { - "delete_on_vm_deletion": false, - "device_number": 2, - "link_nic_id": "##id-12##", - "state": "attached", - "vm_account_id": "##id-1##", - "vm_id": "##id-3##" - } - ], + "link_nic": [], "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-13##", + "nic_id": "##id-12##", "private_dns_name": "########", "private_ips": [ { @@ -171,27 +162,25 @@ "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" - }, - { - "is_primary": false, - "link_public_ip": [], - "private_dns_name": "########", - "private_ip": "########" } ], "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], - "state": "in-use", - "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "state": "available", + "subnet_id": "##id-13##", + "subregion_name": "eu-west-2b", "tags": [ { - "key": "Name", - "value": "Nic-2" + "key": "Key:", + "value": ":value-tags" + }, + { + "key": "Key-2", + "value": "value-tags-2" } ] }, @@ -199,11 +188,20 @@ "account_id": "##id-1##", "description": "", "is_source_dest_checked": true, - "link_nic": [], + "link_nic": [ + { + "delete_on_vm_deletion": false, + "device_number": 2, + "link_nic_id": "##id-14##", + "state": "attached", + "vm_account_id": "##id-1##", + "vm_id": "##id-3##" + } + ], "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-14##", + "nic_id": "##id-15##", "private_dns_name": "########", "private_ips": [ { @@ -211,25 +209,27 @@ "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" + }, + { + "is_primary": false, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" } ], "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], - "state": "available", - "subnet_id": "##id-15##", - "subregion_name": "us-east-2b", + "state": "in-use", + "subnet_id": "##id-7##", + "subregion_name": "eu-west-2a", "tags": [ { - "key": "Key:", - "value": ":value-tags" - }, - { - "key": "Key-2", - "value": "value-tags-2" + "key": "Name", + "value": "Nic-2" } ] } @@ -254,7 +254,7 @@ "nics": [ { "account_id": "##id-1##", - "description": "TF-109", + "description": "TF-113", "is_source_dest_checked": true, "link_nic": [ { @@ -288,20 +288,20 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "in-use", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ - { - "key": "Key-2", - "value": "value-tags-2" - }, { "key": "Key:", "value": ":value-tags" + }, + { + "key": "Key-2", + "value": "value-tags-2" } ] }, @@ -309,20 +309,11 @@ "account_id": "##id-1##", "description": "", "is_source_dest_checked": true, - "link_nic": [ - { - "delete_on_vm_deletion": false, - "device_number": 2, - "link_nic_id": "##id-12##", - "state": "attached", - "vm_account_id": "##id-1##", - "vm_id": "##id-3##" - } - ], + "link_nic": [], "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-13##", + "nic_id": "##id-12##", "private_dns_name": "########", "private_ips": [ { @@ -330,39 +321,46 @@ "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" - }, - { - "is_primary": false, - "link_public_ip": [], - "private_dns_name": "########", - "private_ip": "########" } ], "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], - "state": "in-use", - "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "state": "available", + "subnet_id": "##id-13##", + "subregion_name": "eu-west-2b", "tags": [ { - "key": "Name", - "value": "Nic-2" + "key": "Key:", + "value": ":value-tags" + }, + { + "key": "Key-2", + "value": "value-tags-2" } ] }, { "account_id": "##id-1##", - "description": "", + "description": "Primary network interface", "is_source_dest_checked": true, - "link_nic": [], + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": 0, + "link_nic_id": "##id-9##", + "state": "attached", + "vm_account_id": "##id-1##", + "vm_id": "##id-3##" + } + ], "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-14##", + "nic_id": "##id-10##", "private_dns_name": "########", "private_ips": [ { @@ -375,32 +373,23 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], - "state": "available", - "subnet_id": "##id-15##", - "subregion_name": "us-east-2b", - "tags": [ - { - "key": "Key:", - "value": ":value-tags" - }, - { - "key": "Key-2", - "value": "value-tags-2" - } - ] + "state": "in-use", + "subnet_id": "##id-7##", + "subregion_name": "eu-west-2a", + "tags": [] }, { "account_id": "##id-1##", - "description": "Primary network interface", + "description": "", "is_source_dest_checked": true, "link_nic": [ { - "delete_on_vm_deletion": true, - "device_number": 0, - "link_nic_id": "##id-9##", + "delete_on_vm_deletion": false, + "device_number": 2, + "link_nic_id": "##id-14##", "state": "attached", "vm_account_id": "##id-1##", "vm_id": "##id-3##" @@ -409,7 +398,7 @@ "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-10##", + "nic_id": "##id-15##", "private_dns_name": "########", "private_ips": [ { @@ -417,18 +406,29 @@ "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" + }, + { + "is_primary": false, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" } ], "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "in-use", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", - "tags": [] + "subregion_name": "eu-west-2a", + "tags": [ + { + "key": "Name", + "value": "Nic-2" + } + ] } ], "request_id": "########" @@ -451,7 +451,7 @@ "nics": [ { "account_id": "##id-1##", - "description": "TF-109", + "description": "TF-113", "is_source_dest_checked": true, "link_nic": [ { @@ -485,12 +485,12 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "in-use", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key:", @@ -506,20 +506,11 @@ "account_id": "##id-1##", "description": "", "is_source_dest_checked": true, - "link_nic": [ - { - "delete_on_vm_deletion": false, - "device_number": 2, - "link_nic_id": "##id-12##", - "state": "attached", - "vm_account_id": "##id-1##", - "vm_id": "##id-3##" - } - ], + "link_nic": [], "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-13##", + "nic_id": "##id-12##", "private_dns_name": "########", "private_ips": [ { @@ -527,39 +518,46 @@ "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" - }, - { - "is_primary": false, - "link_public_ip": [], - "private_dns_name": "########", - "private_ip": "########" } ], "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], - "state": "in-use", - "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "state": "available", + "subnet_id": "##id-13##", + "subregion_name": "eu-west-2b", "tags": [ { - "key": "Name", - "value": "Nic-2" + "key": "Key:", + "value": ":value-tags" + }, + { + "key": "Key-2", + "value": "value-tags-2" } ] }, { "account_id": "##id-1##", - "description": "", + "description": "Primary network interface", "is_source_dest_checked": true, - "link_nic": [], + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": 0, + "link_nic_id": "##id-9##", + "state": "attached", + "vm_account_id": "##id-1##", + "vm_id": "##id-3##" + } + ], "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-14##", + "nic_id": "##id-10##", "private_dns_name": "########", "private_ips": [ { @@ -572,32 +570,23 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], - "state": "available", - "subnet_id": "##id-15##", - "subregion_name": "us-east-2b", - "tags": [ - { - "key": "Key:", - "value": ":value-tags" - }, - { - "key": "Key-2", - "value": "value-tags-2" - } - ] + "state": "in-use", + "subnet_id": "##id-7##", + "subregion_name": "eu-west-2a", + "tags": [] }, { "account_id": "##id-1##", - "description": "Primary network interface", + "description": "", "is_source_dest_checked": true, "link_nic": [ { - "delete_on_vm_deletion": true, - "device_number": 0, - "link_nic_id": "##id-9##", + "delete_on_vm_deletion": false, + "device_number": 2, + "link_nic_id": "##id-14##", "state": "attached", "vm_account_id": "##id-1##", "vm_id": "##id-3##" @@ -606,7 +595,7 @@ "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-10##", + "nic_id": "##id-15##", "private_dns_name": "########", "private_ips": [ { @@ -614,18 +603,29 @@ "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" + }, + { + "is_primary": false, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" } ], "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "in-use", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", - "tags": [] + "subregion_name": "eu-west-2a", + "tags": [ + { + "key": "Name", + "value": "Nic-2" + } + ] } ], "request_id": "########" @@ -654,7 +654,7 @@ "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-14##", + "nic_id": "##id-12##", "private_dns_name": "########", "private_ips": [ { @@ -667,12 +667,12 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "available", - "subnet_id": "##id-15##", - "subregion_name": "us-east-2b", + "subnet_id": "##id-13##", + "subregion_name": "eu-west-2b", "tags": [ { "key": "Key:", @@ -724,7 +724,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-1##", - "description": "TF-109", + "description": "TF-113", "id": "##id-5##", "is_source_dest_checked": true, "link_nic": [], @@ -756,12 +756,12 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "available", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key-2", @@ -795,13 +795,13 @@ "attributes": { "account_id": "##id-1##", "description": "", - "id": "##id-13##", + "id": "##id-15##", "is_source_dest_checked": true, "link_nic": [], "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-13##", + "nic_id": "##id-15##", "private_dns_name": "########", "private_ip": "########", "private_ips": [ @@ -826,12 +826,12 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "available", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", @@ -861,13 +861,13 @@ "attributes": { "account_id": "##id-1##", "description": "", - "id": "##id-14##", + "id": "##id-12##", "is_source_dest_checked": true, "link_nic": [], "link_public_ip": [], "mac_address": "########", "net_id": "##id-4##", - "nic_id": "##id-14##", + "nic_id": "##id-12##", "private_dns_name": "########", "private_ip": "########", "private_ips": [ @@ -886,12 +886,12 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "available", - "subnet_id": "##id-15##", - "subregion_name": "us-east-2b", + "subnet_id": "##id-13##", + "subregion_name": "eu-west-2b", "tags": [ { "key": "Key-2", @@ -956,9 +956,9 @@ "attributes": { "delete_on_vm_deletion": false, "device_number": 2, - "id": "##id-12##", - "link_nic_id": "##id-12##", - "nic_id": "##id-13##", + "id": "##id-14##", + "link_nic_id": "##id-14##", + "nic_id": "##id-15##", "request_id": "########", "state": null, "vm_account_id": null, @@ -1002,7 +1002,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG", + "security_group_name": "Terraform-SG-TF113", "tag": null, "tags": [] }, @@ -1031,7 +1031,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -1053,14 +1053,14 @@ "schema_version": 0, "attributes": { "available_ips_count": "########", - "id": "##id-15##", + "id": "##id-13##", "ip_range": "10.5.2.0/24", "map_public_ip_on_launch": false, "net_id": "##id-4##", "request_id": "########", "state": "available", - "subnet_id": "##id-15##", - "subregion_name": "us-east-2b", + "subnet_id": "##id-13##", + "subregion_name": "eu-west-2b", "tags": [], "timeouts": null }, @@ -1146,7 +1146,7 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "in-use", @@ -1154,8 +1154,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { @@ -1192,7 +1192,7 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "in-use", @@ -1218,7 +1218,7 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_name": "Terraform-SG-TF113" } ], "state": "running", diff --git a/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.tf index 7bf83fa06..86fdab7bf 100644 --- a/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.tf @@ -16,7 +16,7 @@ resource "outscale_subnet" "subnet02" { resource "outscale_security_group" "security_group01" { description = "Terraform security group test" - security_group_name = "Terraform-SG" + security_group_name = "Terraform-SG-TF113" net_id = outscale_net.outscale_net.net_id } @@ -30,7 +30,7 @@ resource "outscale_vm" "vm01" { resource "outscale_nic" "outscale_nic" { subnet_id = outscale_subnet.subnet01.subnet_id - description = "TF-109" + description = "TF-113" security_group_ids = [outscale_security_group.security_group01.security_group_id] private_ips { is_primary = true diff --git a/tests/qa_provider_oapi/data/nets/TF-120_route_table_datasource_attributes_ok2/step1.route_table_datasource_attributes_ok2.ref b/tests/qa_provider_oapi/data/nets/TF-120_route_table_datasource_attributes_ok2/step1.route_table_datasource_attributes_ok2.ref index 98267ecc2..4a7db05f5 100644 --- a/tests/qa_provider_oapi/data/nets/TF-120_route_table_datasource_attributes_ok2/step1.route_table_datasource_attributes_ok2.ref +++ b/tests/qa_provider_oapi/data/nets/TF-120_route_table_datasource_attributes_ok2/step1.route_table_datasource_attributes_ok2.ref @@ -261,7 +261,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-2##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", diff --git a/tests/qa_provider_oapi/data/nets/TF-122_route_table_link_multiple_subnets_resource_attributes_ok/step1.route_table_link_multiple_subnets_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-122_route_table_link_multiple_subnets_resource_attributes_ok/step1.route_table_link_multiple_subnets_resource_attributes_ok.ref index 199af6663..855b81b1c 100644 --- a/tests/qa_provider_oapi/data/nets/TF-122_route_table_link_multiple_subnets_resource_attributes_ok/step1.route_table_link_multiple_subnets_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-122_route_table_link_multiple_subnets_resource_attributes_ok/step1.route_table_link_multiple_subnets_resource_attributes_ok.ref @@ -142,7 +142,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -171,7 +171,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/nets/TF-123_route_table_link_resource_attributes_ok/step1.route_table_link_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-123_route_table_link_resource_attributes_ok/step1.route_table_link_resource_attributes_ok.ref index fc56af282..7c5534fd7 100644 --- a/tests/qa_provider_oapi/data/nets/TF-123_route_table_link_resource_attributes_ok/step1.route_table_link_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-123_route_table_link_resource_attributes_ok/step1.route_table_link_resource_attributes_ok.ref @@ -116,7 +116,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/nets/TF-135_subnet_datasource_attributes_ok/step1.subnet_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-135_subnet_datasource_attributes_ok/step1.subnet_datasource_attributes_ok.ref index da933e822..811fc8e10 100644 --- a/tests/qa_provider_oapi/data/nets/TF-135_subnet_datasource_attributes_ok/step1.subnet_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-135_subnet_datasource_attributes_ok/step1.subnet_datasource_attributes_ok.ref @@ -23,7 +23,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-0##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", @@ -57,7 +57,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-2##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [] }, "sensitive_attributes": [] @@ -82,7 +82,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-0##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", @@ -116,7 +116,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-0##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", @@ -150,7 +150,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-0##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", @@ -184,7 +184,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-0##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", @@ -218,7 +218,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-0##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", @@ -274,7 +274,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-0##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", @@ -312,7 +312,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-2##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/nets/TF-136_subnet_resource_attributes_ok/step1.subnet_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-136_subnet_resource_attributes_ok/step1.subnet_resource_attributes_ok.ref index 27498d4f2..0f4691bc2 100644 --- a/tests/qa_provider_oapi/data/nets/TF-136_subnet_resource_attributes_ok/step1.subnet_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-136_subnet_resource_attributes_ok/step1.subnet_resource_attributes_ok.ref @@ -50,7 +50,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-0##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", diff --git a/tests/qa_provider_oapi/data/nets/TF-137_subnets_datasource_attributes_ok/step1.subnets_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-137_subnets_datasource_attributes_ok/step1.subnets_datasource_attributes_ok.ref index 4a8500cf8..a16adb862 100644 --- a/tests/qa_provider_oapi/data/nets/TF-137_subnets_datasource_attributes_ok/step1.subnets_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-137_subnets_datasource_attributes_ok/step1.subnets_datasource_attributes_ok.ref @@ -26,7 +26,7 @@ "net_id": "##id-1##", "state": "available", "subnet_id": "##id-2##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key", @@ -45,7 +45,7 @@ "net_id": "##id-1##", "state": "available", "subnet_id": "##id-3##", - "subregion_name": "us-east-2b", + "subregion_name": "eu-west-2b", "tags": [ { "key": "Key", @@ -84,7 +84,7 @@ "net_id": "##id-1##", "state": "available", "subnet_id": "##id-3##", - "subregion_name": "us-east-2b", + "subregion_name": "eu-west-2b", "tags": [ { "key": "name-tf137", @@ -123,7 +123,7 @@ "net_id": "##id-1##", "state": "available", "subnet_id": "##id-2##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key", @@ -162,7 +162,7 @@ "net_id": "##id-1##", "state": "available", "subnet_id": "##id-2##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key", @@ -201,7 +201,7 @@ "net_id": "##id-1##", "state": "available", "subnet_id": "##id-2##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key", @@ -220,7 +220,7 @@ "net_id": "##id-1##", "state": "available", "subnet_id": "##id-3##", - "subregion_name": "us-east-2b", + "subregion_name": "eu-west-2b", "tags": [ { "key": "Key", @@ -259,7 +259,7 @@ "net_id": "##id-1##", "state": "available", "subnet_id": "##id-3##", - "subregion_name": "us-east-2b", + "subregion_name": "eu-west-2b", "tags": [ { "key": "Key", @@ -298,7 +298,7 @@ "net_id": "##id-1##", "state": "available", "subnet_id": "##id-2##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key", @@ -356,7 +356,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-2##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Key", @@ -394,7 +394,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-3##", - "subregion_name": "us-east-2b", + "subregion_name": "eu-west-2b", "tags": [ { "key": "Key", diff --git a/tests/qa_provider_oapi/data/nets/TF-138_virtual_gateway_datasource_attributes_ok/step1.virtual_gateway_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-138_virtual_gateway_datasource_attributes_ok/step1.virtual_gateway_datasource_attributes_ok.ref index 98a37186c..830abca22 100644 --- a/tests/qa_provider_oapi/data/nets/TF-138_virtual_gateway_datasource_attributes_ok/step1.virtual_gateway_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-138_virtual_gateway_datasource_attributes_ok/step1.virtual_gateway_datasource_attributes_ok.ref @@ -26,13 +26,13 @@ "request_id": "########", "state": "available", "tags": [ - { - "key": "Project-Datasource", - "value": "Terraform-Datasource" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "Project-Datasource", + "value": "Terraform-Datasource" } ], "virtual_gateway_id": null diff --git a/tests/qa_provider_oapi/data/nets/TF-138_virtual_gateway_datasource_attributes_ok/step2.virtual_gateway_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-138_virtual_gateway_datasource_attributes_ok/step2.virtual_gateway_datasource_attributes_ok.ref index 25095ed59..8d049e449 100644 --- a/tests/qa_provider_oapi/data/nets/TF-138_virtual_gateway_datasource_attributes_ok/step2.virtual_gateway_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-138_virtual_gateway_datasource_attributes_ok/step2.virtual_gateway_datasource_attributes_ok.ref @@ -62,13 +62,13 @@ "request_id": "########", "state": "available", "tags": [ - { - "key": "Project-Datasource", - "value": "Terraform-Datasource" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "Project-Datasource", + "value": "Terraform-Datasource" } ], "virtual_gateway_id": null @@ -98,13 +98,13 @@ "request_id": "########", "state": "available", "tags": [ - { - "key": "Project-Datasource", - "value": "Terraform-Datasource" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "Project-Datasource", + "value": "Terraform-Datasource" } ], "virtual_gateway_id": null @@ -134,13 +134,13 @@ "request_id": "########", "state": "available", "tags": [ - { - "key": "Project-Datasource", - "value": "Terraform-Datasource" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "Project-Datasource", + "value": "Terraform-Datasource" } ], "virtual_gateway_id": null @@ -170,13 +170,13 @@ "request_id": "########", "state": "available", "tags": [ - { - "key": "Project-Datasource", - "value": "Terraform-Datasource" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "Project-Datasource", + "value": "Terraform-Datasource" } ], "virtual_gateway_id": null diff --git a/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref b/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref index 129564914..375f3932c 100644 --- a/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref @@ -22,7 +22,7 @@ "tags": [ { "key": "name", - "value": "outscale_internet_service" + "value": "outscale_internet_service_TF144" } ] }, @@ -51,7 +51,7 @@ "tags": [ { "key": "name", - "value": "outscale_internet_service" + "value": "outscale_internet_service_TF144" } ] }, @@ -104,7 +104,7 @@ "tags": [ { "key": "name", - "value": "Terraform_net" + "value": "Terraform_net_TF144" } ], "tenancy": "default" @@ -134,7 +134,7 @@ "tags": [ { "key": "name", - "value": "outscale_public_ip" + "value": "outscale_public_ip_TF144" } ], "timeouts": null, @@ -166,7 +166,7 @@ "tags": [ { "key": "name", - "value": "outscale_public_ip" + "value": "outscale_public_ip_TF144" } ], "timeouts": null, @@ -253,7 +253,7 @@ "tags": [ { "key": "name", - "value": "Terraform_RT" + "value": "Terraform_RT_TF144" } ] }, @@ -317,7 +317,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-14##", - "security_group_name": "terraform-sg", + "security_group_name": "terraform-sg-TF144", "tag": null, "tags": [ { @@ -378,11 +378,11 @@ "request_id": "########", "state": "available", "subnet_id": "##id-13##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", - "value": "Terraform_subnet" + "value": "Terraform_subnet_TF144" } ], "timeouts": null @@ -436,8 +436,8 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], "private_dns_name": "########", @@ -468,7 +468,7 @@ "tags": [ { "key": "name", - "value": "outscale_vm" + "value": "outscale_vm_TF144" } ], "timeouts": null, @@ -527,8 +527,8 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], "private_dns_name": "########", @@ -561,7 +561,7 @@ "tags": [ { "key": "name", - "value": "outscale_vm2" + "value": "outscale_vm_TF144_2" } ], "timeouts": null, @@ -653,7 +653,7 @@ "security_groups": [ { "security_group_id": "##id-14##", - "security_group_name": "terraform-sg" + "security_group_name": "terraform-sg-TF144" } ], "state": "in-use", @@ -662,7 +662,7 @@ ], "os_family": "", "performance": "medium", - "placement_subregion_name": "us-east-2a", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { @@ -699,7 +699,7 @@ "security_groups": [ { "security_group_id": "##id-14##", - "security_group_name": "terraform-sg" + "security_group_name": "terraform-sg-TF144" } ], "state": "in-use", @@ -725,18 +725,23 @@ "security_groups": [ { "security_group_id": "##id-14##", - "security_group_name": "terraform-sg" + "security_group_name": "terraform-sg-TF144" } ], "state": "running", "state_reason": "", "subnet_id": "##id-13##", - "tags": [], + "tags": [ + { + "key": "name", + "value": "outscale_vm_net_TF144" + } + ], "timeouts": null, "user_data": "", "vm_id": "##id-8##", "vm_initiated_shutdown_behavior": "stop", - "vm_type": "t2.nano" + "vm_type": "###vm_type###" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", diff --git a/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.tf b/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.tf index 94c51b084..d6845e2bd 100644 --- a/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.tf @@ -15,7 +15,7 @@ resource "outscale_vm" "outscale_vm" { placement_tenancy = "default" tags { key = "name" - value = "outscale_vm" + value = "outscale_vm_TF144" } } @@ -28,7 +28,7 @@ resource "outscale_vm" "outscale_vm2" { placement_tenancy = "default" tags { key = "name" - value = "outscale_vm2" + value = "outscale_vm_TF144_2" } } @@ -39,7 +39,7 @@ resource "outscale_net" "outscale_net" { tags { key = "name" - value = "Terraform_net" + value = "Terraform_net_TF144" } } @@ -50,13 +50,13 @@ resource "outscale_subnet" "outscale_subnet" { tags { key = "name" - value = "Terraform_subnet" + value = "Terraform_subnet_TF144" } } resource "outscale_security_group" "outscale_sg" { description = "sg for terraform tests" - security_group_name = "terraform-sg" + security_group_name = "terraform-sg-TF144" net_id = outscale_net.outscale_net.net_id tags { key = "name" @@ -67,7 +67,7 @@ resource "outscale_security_group" "outscale_sg" { resource "outscale_internet_service" "outscale_internet_service" { tags { key = "name" - value = "outscale_internet_service" + value = "outscale_internet_service_TF144" } depends_on = [outscale_net.outscale_net] } @@ -77,7 +77,7 @@ resource "outscale_route_table" "outscale_route_table" { tags { key = "name" - value = "Terraform_RT" + value = "Terraform_RT_TF144" } } @@ -99,16 +99,20 @@ resource "outscale_route" "outscale_route" { resource "outscale_vm" "outscale_vmnet" { image_id = var.image_id - vm_type = "t2.nano" + vm_type = var.vm_type keypair_name = outscale_keypair.my_keypair.keypair_name security_group_ids = [outscale_security_group.outscale_sg.security_group_id] subnet_id = outscale_subnet.outscale_subnet.subnet_id + tags { + key = "name" + value = "outscale_vm_net_TF144" + } } resource "outscale_public_ip" "outscale_public_ip" { tags { key = "name" - value = "outscale_public_ip" + value = "outscale_public_ip_TF144" } } diff --git a/tests/qa_provider_oapi/data/nets/TF-145_vm_resource_private_with_multiple_NICs_attributes_ok/step1.vm_resource_private_with_multiple_NICs_ok.ref b/tests/qa_provider_oapi/data/nets/TF-145_vm_resource_private_with_multiple_NICs_attributes_ok/step1.vm_resource_private_with_multiple_NICs_ok.ref index 833fc0b73..b35bfd42b 100644 --- a/tests/qa_provider_oapi/data/nets/TF-145_vm_resource_private_with_multiple_NICs_attributes_ok/step1.vm_resource_private_with_multiple_NICs_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-145_vm_resource_private_with_multiple_NICs_attributes_ok/step1.vm_resource_private_with_multiple_NICs_ok.ref @@ -91,7 +91,7 @@ ], "state": "available", "subnet_id": "##id-6##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -197,7 +197,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-6##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -331,8 +331,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { diff --git a/tests/qa_provider_oapi/data/nets/TF-163_net_access_point_resource_attributes_ok/step1.net_access_point_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-163_net_access_point_resource_attributes_ok/step1.net_access_point_resource_attributes_ok.ref index 0e19526b0..60cdc0a27 100644 --- a/tests/qa_provider_oapi/data/nets/TF-163_net_access_point_resource_attributes_ok/step1.net_access_point_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-163_net_access_point_resource_attributes_ok/step1.net_access_point_resource_attributes_ok.ref @@ -42,7 +42,7 @@ "net_id": "##id-1##", "request_id": "########", "route_table_ids": null, - "service_name": "com.outscale.us-east-2.api", + "service_name": "com.outscale.eu-west-2.api", "state": "available", "tags": [ { diff --git a/tests/qa_provider_oapi/data/nets/TF-163_net_access_point_resource_attributes_ok/step2.net_access_point_resource_attributes_update_tags.ref b/tests/qa_provider_oapi/data/nets/TF-163_net_access_point_resource_attributes_ok/step2.net_access_point_resource_attributes_update_tags.ref index b3bbf4e87..b2057558b 100644 --- a/tests/qa_provider_oapi/data/nets/TF-163_net_access_point_resource_attributes_ok/step2.net_access_point_resource_attributes_update_tags.ref +++ b/tests/qa_provider_oapi/data/nets/TF-163_net_access_point_resource_attributes_ok/step2.net_access_point_resource_attributes_update_tags.ref @@ -42,7 +42,7 @@ "net_id": "##id-1##", "request_id": "########", "route_table_ids": [], - "service_name": "com.outscale.us-east-2.api", + "service_name": "com.outscale.eu-west-2.api", "state": "available", "tags": [ { diff --git a/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step1.net_access_point_resource_with_RT_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step1.net_access_point_resource_with_RT_attributes_ok.ref index f209970b2..d217292c7 100644 --- a/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step1.net_access_point_resource_with_RT_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step1.net_access_point_resource_with_RT_attributes_ok.ref @@ -45,7 +45,7 @@ "##id-3##", "##id-4##" ], - "service_name": "com.outscale.us-east-2.api", + "service_name": "com.outscale.eu-west-2.api", "state": "available", "tags": [] }, @@ -68,12 +68,12 @@ "index_key": 0, "schema_version": 0, "attributes": { - "id": "##id-4##", + "id": "##id-3##", "link_route_tables": [], "net_id": "##id-1##", "request_id": "########", "route_propagating_virtual_gateways": [], - "route_table_id": "##id-4##", + "route_table_id": "##id-3##", "routes": [ { "creation_method": "CreateRouteTable", @@ -101,12 +101,12 @@ "index_key": 1, "schema_version": 0, "attributes": { - "id": "##id-3##", + "id": "##id-4##", "link_route_tables": [], "net_id": "##id-1##", "request_id": "########", "route_propagating_virtual_gateways": [], - "route_table_id": "##id-3##", + "route_table_id": "##id-4##", "routes": [ { "creation_method": "CreateRouteTable", diff --git a/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step2.net_access_point_resource_with_RT_add_RT.ref b/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step2.net_access_point_resource_with_RT_add_RT.ref index 74a2fca6a..0136fab72 100644 --- a/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step2.net_access_point_resource_with_RT_add_RT.ref +++ b/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step2.net_access_point_resource_with_RT_add_RT.ref @@ -46,7 +46,7 @@ "##id-4##", "##id-5##" ], - "service_name": "com.outscale.us-east-2.api", + "service_name": "com.outscale.eu-west-2.api", "state": "available", "tags": [] }, @@ -70,12 +70,12 @@ "index_key": 0, "schema_version": 0, "attributes": { - "id": "##id-4##", + "id": "##id-3##", "link_route_tables": [], "net_id": "##id-1##", "request_id": "########", "route_propagating_virtual_gateways": [], - "route_table_id": "##id-4##", + "route_table_id": "##id-3##", "routes": [ { "creation_method": "CreateRouteTable", @@ -116,12 +116,12 @@ "index_key": 1, "schema_version": 0, "attributes": { - "id": "##id-3##", + "id": "##id-4##", "link_route_tables": [], "net_id": "##id-1##", "request_id": "########", "route_propagating_virtual_gateways": [], - "route_table_id": "##id-3##", + "route_table_id": "##id-4##", "routes": [ { "creation_method": "CreateRouteTable", diff --git a/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step3.net_access_point_resource_with_RT_remove_RT.ref b/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step3.net_access_point_resource_with_RT_remove_RT.ref index fc61e8fa4..9f4ff68d5 100644 --- a/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step3.net_access_point_resource_with_RT_remove_RT.ref +++ b/tests/qa_provider_oapi/data/nets/TF-164_net_access_point_resource_with_RT_attributes_ok/step3.net_access_point_resource_with_RT_remove_RT.ref @@ -44,7 +44,7 @@ "route_table_ids": [ "##id-3##" ], - "service_name": "com.outscale.us-east-2.api", + "service_name": "com.outscale.eu-west-2.api", "state": "available", "tags": [] }, diff --git a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step1.private_load_balancer_update_security_groups.ref b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step1.private_load_balancer_update_security_groups.ref index d4c03b498..9972dfd5a 100644 --- a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step1.private_load_balancer_update_security_groups.ref +++ b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step1.private_load_balancer_update_security_groups.ref @@ -47,7 +47,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-181", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internal", "net_id": "##id-1##", @@ -67,7 +67,7 @@ "##id-4##" ], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { @@ -201,7 +201,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step1.private_load_balancer_update_security_groups.tf b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step1.private_load_balancer_update_security_groups.tf index 140838285..bcc61f3f8 100644 --- a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step1.private_load_balancer_update_security_groups.tf +++ b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step1.private_load_balancer_update_security_groups.tf @@ -19,7 +19,7 @@ resource "outscale_subnet" "subnet-1" { ip_range = "10.0.0.0/24" } resource "outscale_load_balancer" "private_lbu" { - load_balancer_name ="lbu-TF-181" + load_balancer_name ="lbu-TF-181-${var.suffixe_lbu_name}" listeners { backend_port = 80 backend_protocol= "HTTP" diff --git a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.ref b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.ref index 11b77f089..0eec5898a 100644 --- a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.ref +++ b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.ref @@ -47,7 +47,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-181", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internal", "net_id": "##id-1##", @@ -61,14 +61,14 @@ "source_security_group": [ { "security_group_account_id": "##id-4##", - "security_group_name": "terraform-sg-lbu-TF181-2" + "security_group_name": "terraform-sg-lbu-TF181-1" } ], "subnets": [ "##id-5##" ], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { @@ -122,7 +122,7 @@ "attributes": { "account_id": "##id-4##", "description": "test lbu-TF181", - "id": "##id-2##", + "id": "##id-3##", "inbound_rules": [], "net_id": "##id-1##", "outbound_rules": [ @@ -136,7 +136,7 @@ ], "remove_default_outbound_rule": false, "request_id": "########", - "security_group_id": "##id-2##", + "security_group_id": "##id-3##", "security_group_name": "terraform-sg-lbu-TF181-1", "tag": null, "tags": [] @@ -160,7 +160,7 @@ "attributes": { "account_id": "##id-4##", "description": "test lbu-2", - "id": "##id-3##", + "id": "##id-2##", "inbound_rules": [], "net_id": "##id-1##", "outbound_rules": [ @@ -174,7 +174,7 @@ ], "remove_default_outbound_rule": false, "request_id": "########", - "security_group_id": "##id-3##", + "security_group_id": "##id-2##", "security_group_name": "terraform-sg-lbu-TF181-2", "tag": null, "tags": [] @@ -204,7 +204,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.tf b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.tf index b2e8861ed..ef50fc3b6 100644 --- a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.tf +++ b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.tf @@ -19,7 +19,7 @@ resource "outscale_subnet" "subnet-1" { ip_range = "10.0.0.0/24" } resource "outscale_load_balancer" "private_lbu" { - load_balancer_name ="lbu-TF-181" + load_balancer_name ="lbu-TF-181-${var.suffixe_lbu_name}" listeners { backend_port = 80 backend_protocol= "HTTP" diff --git a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step3.private_load_balancer_Remove_LBU.ref b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step3.private_load_balancer_Remove_LBU.ref index 0f88c1ee7..b37773ebc 100644 --- a/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step3.private_load_balancer_Remove_LBU.ref +++ b/tests/qa_provider_oapi/data/nets/TF-181_private_load_balancer_update_security_groups/step3.private_load_balancer_Remove_LBU.ref @@ -121,7 +121,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.ref b/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.ref index cf4a420bf..1478906e0 100644 --- a/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.ref +++ b/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.ref @@ -107,7 +107,7 @@ "tags": [ { "key": "name", - "value": "nomad-network" + "value": "TF65-network" } ], "tenancy": "default" @@ -137,7 +137,7 @@ "tags": [ { "key": "name", - "value": "EIP" + "value": "EIP-TF65" } ], "timeouts": null, @@ -168,7 +168,7 @@ "tags": [ { "key": "name", - "value": "EIP2" + "value": "EIP-TF65-2" } ], "timeouts": null, @@ -231,7 +231,7 @@ "tags": [ { "key": "name", - "value": "EIP" + "value": "EIP-TF65" } ], "timeouts": null, @@ -270,7 +270,7 @@ "tags": [ { "key": "name", - "value": "EIP2" + "value": "EIP-TF65-2" } ], "timeouts": null, @@ -521,7 +521,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12", + "security_group_name": "TF65-sg-1", "tag": null, "tags": [] }, @@ -559,7 +559,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22", + "security_group_name": "TF65-sg-2", "tag": null, "tags": [] }, @@ -590,7 +590,7 @@ "rules": [], "security_group_account_id_to_link": null, "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12", + "security_group_name": "TF65-sg-1", "security_group_name_to_link": null, "to_port_range": 0 }, @@ -622,7 +622,7 @@ "rules": [], "security_group_account_id_to_link": null, "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22", + "security_group_name": "TF65-sg-2", "security_group_name_to_link": null, "to_port_range": 0 }, @@ -654,7 +654,7 @@ "rules": [], "security_group_account_id_to_link": null, "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12", + "security_group_name": "TF65-sg-1", "security_group_name_to_link": null, "to_port_range": 22 }, @@ -687,7 +687,7 @@ "rules": [], "security_group_account_id_to_link": null, "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22", + "security_group_name": "TF65-sg-2", "security_group_name_to_link": null, "to_port_range": 80 }, @@ -720,7 +720,7 @@ "rules": [], "security_group_account_id_to_link": null, "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12", + "security_group_name": "TF65-sg-1", "security_group_name_to_link": null, "to_port_range": 1024 }, @@ -754,7 +754,7 @@ "rules": [], "security_group_account_id_to_link": null, "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22", + "security_group_name": "TF65-sg-2", "security_group_name_to_link": null, "to_port_range": 1024 }, @@ -786,11 +786,11 @@ "request_id": "########", "state": "available", "subnet_id": "##id-22##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", - "value": "nomad-adm" + "value": "TF65-adm" } ], "timeouts": null @@ -820,11 +820,11 @@ "request_id": "########", "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", - "value": "nomad-bastion" + "value": "TF65-bastion" } ], "timeouts": null @@ -912,7 +912,7 @@ "security_groups": [ { "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22" + "security_group_name": "TF65-sg-2" } ], "state": "in-use", @@ -920,8 +920,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { @@ -958,7 +958,7 @@ "security_groups": [ { "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22" + "security_group_name": "TF65-sg-2" } ], "state": "in-use", @@ -984,7 +984,7 @@ "security_groups": [ { "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22" + "security_group_name": "TF65-sg-2" } ], "state": "running", @@ -1079,7 +1079,7 @@ "security_groups": [ { "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22" + "security_group_name": "TF65-sg-2" } ], "state": "in-use", @@ -1087,8 +1087,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { @@ -1125,7 +1125,7 @@ "security_groups": [ { "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22" + "security_group_name": "TF65-sg-2" } ], "state": "in-use", @@ -1151,7 +1151,7 @@ "security_groups": [ { "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22" + "security_group_name": "TF65-sg-2" } ], "state": "running", @@ -1246,7 +1246,7 @@ "security_groups": [ { "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22" + "security_group_name": "TF65-sg-2" } ], "state": "in-use", @@ -1254,8 +1254,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { @@ -1292,7 +1292,7 @@ "security_groups": [ { "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22" + "security_group_name": "TF65-sg-2" } ], "state": "in-use", @@ -1318,7 +1318,7 @@ "security_groups": [ { "security_group_id": "##id-24##", - "security_group_name": "terraform-sg-22" + "security_group_name": "TF65-sg-2" } ], "state": "running", @@ -1421,7 +1421,7 @@ "security_groups": [ { "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12" + "security_group_name": "TF65-sg-1" } ], "state": "in-use", @@ -1429,8 +1429,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { @@ -1467,7 +1467,7 @@ "security_groups": [ { "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12" + "security_group_name": "TF65-sg-1" } ], "state": "in-use", @@ -1493,7 +1493,7 @@ "security_groups": [ { "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12" + "security_group_name": "TF65-sg-1" } ], "state": "running", @@ -1588,7 +1588,7 @@ "security_groups": [ { "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12" + "security_group_name": "TF65-sg-1" } ], "state": "in-use", @@ -1596,8 +1596,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { @@ -1634,7 +1634,7 @@ "security_groups": [ { "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12" + "security_group_name": "TF65-sg-1" } ], "state": "in-use", @@ -1660,7 +1660,7 @@ "security_groups": [ { "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12" + "security_group_name": "TF65-sg-1" } ], "state": "running", @@ -1755,7 +1755,7 @@ "security_groups": [ { "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12" + "security_group_name": "TF65-sg-1" } ], "state": "in-use", @@ -1763,8 +1763,8 @@ } ], "os_family": "", - "performance": "high", - "placement_subregion_name": "us-east-2a", + "performance": "medium", + "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ { @@ -1801,7 +1801,7 @@ "security_groups": [ { "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12" + "security_group_name": "TF65-sg-1" } ], "state": "in-use", @@ -1827,7 +1827,7 @@ "security_groups": [ { "security_group_id": "##id-23##", - "security_group_name": "terraform-sg-12" + "security_group_name": "TF65-sg-1" } ], "state": "running", diff --git a/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.tf b/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.tf index feed6d505..31845d79a 100644 --- a/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.tf +++ b/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.tf @@ -5,7 +5,7 @@ resource "outscale_net" "nomad" { ip_range = "10.0.0.0/16" tags { key = "name" - value = "nomad-network" + value = "TF65-network" } } resource "outscale_internet_service_link" "nomad" { @@ -18,7 +18,7 @@ resource "outscale_subnet" "bastion" { net_id = outscale_net.nomad.net_id tags { key = "name" - value = "nomad-bastion" + value = "TF65-bastion" } } resource "outscale_subnet" "adm" { @@ -27,7 +27,7 @@ resource "outscale_subnet" "adm" { net_id = outscale_net.nomad.net_id tags { key = "name" - value = "nomad-adm" + value = "TF65-adm" } } resource "outscale_public_ip" "nat" { @@ -91,12 +91,12 @@ resource "outscale_vm" "vm2" { } resource "outscale_security_group" "nomad-sg1" { description = "sg for terraform tests" - security_group_name = "terraform-sg-12" + security_group_name = "TF65-sg-1" net_id = outscale_net.nomad.net_id } resource "outscale_security_group" "nomad-sg2" { description = "sg for terraform tests" - security_group_name = "terraform-sg-22" + security_group_name = "TF65-sg-2" net_id = outscale_net.nomad.net_id } @@ -162,7 +162,7 @@ depends_on =[outscale_security_group_rule.rule2-sg2] resource "outscale_public_ip" "EIP" { tags { key = "name" - value = "EIP" + value = "EIP-TF65" } } resource "outscale_public_ip_link" "eip_link" { @@ -173,7 +173,7 @@ resource "outscale_public_ip_link" "eip_link" { resource "outscale_public_ip" "EIP2" { tags { key = "name" - value = "EIP2" + value = "EIP-TF65-2" } } resource "outscale_public_ip_link" "eip_link2" { diff --git a/tests/qa_provider_oapi/data/nets/TF-80_private_internal_load_balancer_resource_attributes_ok/step1.private_internal_load_balancer_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-80_private_internal_load_balancer_resource_attributes_ok/step1.private_internal_load_balancer_resource_attributes_ok.ref index 5b44bfdc9..5dfec3a14 100644 --- a/tests/qa_provider_oapi/data/nets/TF-80_private_internal_load_balancer_resource_attributes_ok/step1.private_internal_load_balancer_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-80_private_internal_load_balancer_resource_attributes_ok/step1.private_internal_load_balancer_resource_attributes_ok.ref @@ -55,7 +55,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbuTF-80", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internal", "net_id": "##id-1##", @@ -75,7 +75,7 @@ "##id-4##" ], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { @@ -177,7 +177,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", diff --git a/tests/qa_provider_oapi/data/nets/TF-80_private_internal_load_balancer_resource_attributes_ok/step1.private_internal_load_balancer_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/nets/TF-80_private_internal_load_balancer_resource_attributes_ok/step1.private_internal_load_balancer_resource_attributes_ok.tf index 8d0582097..a8c1d9f68 100644 --- a/tests/qa_provider_oapi/data/nets/TF-80_private_internal_load_balancer_resource_attributes_ok/step1.private_internal_load_balancer_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-80_private_internal_load_balancer_resource_attributes_ok/step1.private_internal_load_balancer_resource_attributes_ok.tf @@ -22,7 +22,7 @@ resource "outscale_subnet" "subnet-1" { } resource "outscale_load_balancer" "private_lbuTF80_1" { - load_balancer_name ="lbuTF-80" + load_balancer_name ="lbuTF-80-${var.suffixe_lbu_name}" listeners { backend_port = 80 backend_protocol= "TCP" diff --git a/tests/qa_provider_oapi/data/nets/TF-81_private_internet_facing_load_balancer_resource_attributes_ok/step1.private_internet_facing_load_balancer_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-81_private_internet_facing_load_balancer_resource_attributes_ok/step1.private_internet_facing_load_balancer_resource_attributes_ok.ref index 7adf0d1a6..db411e0fc 100644 --- a/tests/qa_provider_oapi/data/nets/TF-81_private_internet_facing_load_balancer_resource_attributes_ok/step1.private_internet_facing_load_balancer_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-81_private_internet_facing_load_balancer_resource_attributes_ok/step1.private_internet_facing_load_balancer_resource_attributes_ok.ref @@ -101,7 +101,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-81", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "##id-1##", @@ -115,14 +115,14 @@ "source_security_group": [ { "security_group_account_id": "##id-5##", - "security_group_name": "terraform-sg-lbu-1" + "security_group_name": "TF81-lbu-2" } ], "subnets": [ "##id-6##" ], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { @@ -286,7 +286,7 @@ "attributes": { "account_id": "##id-5##", "description": "test lbu-2", - "id": "##id-3##", + "id": "##id-4##", "inbound_rules": [], "net_id": "##id-1##", "outbound_rules": [ @@ -300,8 +300,8 @@ ], "remove_default_outbound_rule": false, "request_id": "########", - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-lbu-1", + "security_group_id": "##id-4##", + "security_group_name": "TF81-lbu-1", "tag": null, "tags": [ { @@ -329,7 +329,7 @@ "attributes": { "account_id": "##id-5##", "description": "test lbu-2", - "id": "##id-4##", + "id": "##id-3##", "inbound_rules": [], "net_id": "##id-1##", "outbound_rules": [ @@ -343,8 +343,8 @@ ], "remove_default_outbound_rule": false, "request_id": "########", - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-lbu-2", + "security_group_id": "##id-3##", + "security_group_name": "TF81-lbu-2", "tag": null, "tags": [ { @@ -378,7 +378,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-6##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", diff --git a/tests/qa_provider_oapi/data/nets/TF-81_private_internet_facing_load_balancer_resource_attributes_ok/step1.private_internet_facing_load_balancer_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/nets/TF-81_private_internet_facing_load_balancer_resource_attributes_ok/step1.private_internet_facing_load_balancer_resource_attributes_ok.tf index 73c4a9b05..b3d2b1b39 100644 --- a/tests/qa_provider_oapi/data/nets/TF-81_private_internet_facing_load_balancer_resource_attributes_ok/step1.private_internet_facing_load_balancer_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-81_private_internet_facing_load_balancer_resource_attributes_ok/step1.private_internet_facing_load_balancer_resource_attributes_ok.tf @@ -12,7 +12,7 @@ resource "outscale_route_table" "outscale_route_table" { } resource "outscale_security_group" "outscale_security_group" { description = "test lbu-2" - security_group_name = "terraform-sg-lbu-1" + security_group_name = "TF81-lbu-1" net_id = outscale_net.outscale_net.net_id tags { key = "Name" @@ -22,7 +22,7 @@ resource "outscale_security_group" "outscale_security_group" { resource "outscale_security_group" "outscale_security_group-2" { description = "test lbu-2" - security_group_name = "terraform-sg-lbu-2" + security_group_name = "TF81-lbu-2" net_id = outscale_net.outscale_net.net_id tags { key = "Name" @@ -60,7 +60,7 @@ resource "outscale_route_table_link" "outscale_route_table_link" { resource "outscale_load_balancer" "private_lbu_1" { - load_balancer_name ="lbu-TF-81" + load_balancer_name ="lbu-TF-81-${var.suffixe_lbu_name}" listeners { backend_port = 80 backend_protocol= "TCP" diff --git a/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step1.load_balancer_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step1.load_balancer_datasource_attributes_ok.ref index ef7d023f9..7f25b7dee 100644 --- a/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step1.load_balancer_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step1.load_balancer_datasource_attributes_ok.ref @@ -48,7 +48,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-82", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internal", "net_id": "##id-1##", @@ -68,7 +68,7 @@ "##id-4##" ], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { @@ -127,7 +127,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-82", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internal", "net_id": "##id-1##", @@ -147,7 +147,7 @@ "##id-4##" ], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { @@ -253,7 +253,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", diff --git a/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step1.load_balancer_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step1.load_balancer_datasource_attributes_ok.tf index 4408c0133..d18cc2c3b 100644 --- a/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step1.load_balancer_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step1.load_balancer_datasource_attributes_ok.tf @@ -22,7 +22,7 @@ resource "outscale_subnet" "subnet-1" { } resource "outscale_load_balancer" "private_lbu_1" { - load_balancer_name ="lbu-TF-82" + load_balancer_name ="lbu-TF-82-${var.suffixe_lbu_name}" listeners { backend_port = 80 backend_protocol= "TCP" diff --git a/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step2.load_balancer_datasource_remove_lbu.ref b/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step2.load_balancer_datasource_remove_lbu.ref index 081e593f6..23c2fc97d 100644 --- a/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step2.load_balancer_datasource_remove_lbu.ref +++ b/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step2.load_balancer_datasource_remove_lbu.ref @@ -88,7 +88,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", diff --git a/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step1.load_balancers_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step1.load_balancers_datasource_attributes_ok.ref index 6c893b4f5..05be64cf2 100644 --- a/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step1.load_balancers_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step1.load_balancers_datasource_attributes_ok.ref @@ -34,7 +34,7 @@ "check_interval": 30, "healthy_threshold": 10, "path": "", - "port": 80, + "port": 8080, "protocol": "TCP", "timeout": 5, "unhealthy_threshold": 2 @@ -42,39 +42,39 @@ ], "listeners": [ { - "backend_port": 80, - "backend_protocol": "TCP", - "load_balancer_port": 80, - "load_balancer_protocol": "TCP", + "backend_port": 8080, + "backend_protocol": "HTTP", + "load_balancer_port": 8080, + "load_balancer_protocol": "HTTP", "policy_names": [], "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-94", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], - "load_balancer_type": "internet-facing", - "net_id": "", + "load_balancer_type": "internal", + "net_id": "##id-1##", "public_ip": "########", "secured_cookies": false, - "security_groups": [], + "security_groups": [ + "##id-2##" + ], "source_security_group": [ { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" + "security_group_account_id": "##id-3##", + "security_group_name": "sg1-terraform-lbu-test" } ], - "subnet_id": [], + "subnet_id": [ + "##id-4##" + ], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { "key": "name", - "value": "public_lbu1" - }, - { - "key": "test-1", - "value": "outscale_terraform_lbu" + "value": "lbu-internal" } ] }, @@ -95,7 +95,7 @@ "check_interval": 30, "healthy_threshold": 10, "path": "", - "port": 8080, + "port": 80, "protocol": "TCP", "timeout": 5, "unhealthy_threshold": 2 @@ -103,44 +103,44 @@ ], "listeners": [ { - "backend_port": 8080, - "backend_protocol": "HTTP", - "load_balancer_port": 8080, - "load_balancer_protocol": "HTTP", + "backend_port": 80, + "backend_protocol": "TCP", + "load_balancer_port": 80, + "load_balancer_protocol": "TCP", "policy_names": [], "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-94-2", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], - "load_balancer_type": "internal", - "net_id": "##id-2##", + "load_balancer_type": "internet-facing", + "net_id": "", "public_ip": "########", "secured_cookies": false, - "security_groups": [ - "##id-3##" - ], + "security_groups": [], "source_security_group": [ { - "security_group_account_id": "##id-4##", - "security_group_name": "sg1-terraform-lbu-test" + "security_group_account_id": "##id-5##", + "security_group_name": "outscale-elb-sg" } ], - "subnet_id": [ - "##id-5##" - ], + "subnet_id": [], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { "key": "name", - "value": "lbu-internal" + "value": "public_lbu1" + }, + { + "key": "test-1", + "value": "outscale_terraform_lbu" } ] } ], - "load_balancer_name": null, + "load_balancer_name": "########", "request_id": "########" }, "sensitive_attributes": [] @@ -189,27 +189,27 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-94-2", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internal", - "net_id": "##id-2##", + "net_id": "##id-1##", "public_ip": "########", "request_id": "########", "secured_cookies": false, "security_groups": [ - "##id-3##" + "##id-2##" ], "source_security_group": [ { - "security_group_account_id": "##id-4##", + "security_group_account_id": "##id-3##", "security_group_name": "sg1-terraform-lbu-test" } ], "subnets": [ - "##id-5##" + "##id-4##" ], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { @@ -270,7 +270,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-94", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -280,13 +280,13 @@ "security_groups": [], "source_security_group": [ { - "security_group_account_id": "##id-1##", + "security_group_account_id": "##id-5##", "security_group_name": "outscale-elb-sg" } ], "subnets": [], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { @@ -314,9 +314,9 @@ "schema_version": 0, "attributes": { "dhcp_options_set_id": "##id-8##", - "id": "##id-2##", + "id": "##id-1##", "ip_range": "10.0.0.0/16", - "net_id": "##id-2##", + "net_id": "##id-1##", "request_id": "########", "state": "available", "tags": [], @@ -336,11 +336,11 @@ { "schema_version": 0, "attributes": { - "account_id": "##id-4##", + "account_id": "##id-3##", "description": "test lbu-1", - "id": "##id-3##", + "id": "##id-2##", "inbound_rules": [], - "net_id": "##id-2##", + "net_id": "##id-1##", "outbound_rules": [ { "from_port_range": -1, @@ -352,7 +352,7 @@ ], "remove_default_outbound_rule": false, "request_id": "########", - "security_group_id": "##id-3##", + "security_group_id": "##id-2##", "security_group_name": "sg1-terraform-lbu-test", "tag": null, "tags": [ @@ -380,14 +380,14 @@ "schema_version": 0, "attributes": { "available_ips_count": "########", - "id": "##id-5##", + "id": "##id-4##", "ip_range": "10.0.0.0/24", "map_public_ip_on_launch": false, - "net_id": "##id-2##", + "net_id": "##id-1##", "request_id": "########", "state": "available", - "subnet_id": "##id-5##", - "subregion_name": "us-east-2a", + "subnet_id": "##id-4##", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", diff --git a/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step1.load_balancers_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step1.load_balancers_datasource_attributes_ok.tf index c2b9c9c60..15a0e8b08 100644 --- a/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step1.load_balancers_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step1.load_balancers_datasource_attributes_ok.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-94" + load_balancer_name ="lbu-TF-94-${var.suffixe_lbu_name}" subregion_names= ["${var.region}a"] listeners { backend_port = 80 @@ -41,7 +41,7 @@ resource "outscale_subnet" "subnet-1" { } resource "outscale_load_balancer" "private_lbu_1" { - load_balancer_name ="lbu-TF-94-2" + load_balancer_name ="lbu-TF-94-2-${var.suffixe_lbu_name}" listeners { backend_port = 8080 backend_protocol= "HTTP" diff --git a/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step2.load_balancers_datasource_attributes_removeLBU.ref b/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step2.load_balancers_datasource_attributes_removeLBU.ref index dd1397394..dbfc6c586 100644 --- a/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step2.load_balancers_datasource_attributes_removeLBU.ref +++ b/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step2.load_balancers_datasource_attributes_removeLBU.ref @@ -47,7 +47,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "lbu-TF-94", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", @@ -63,7 +63,7 @@ ], "subnets": [], "subregion_names": [ - "us-east-2a" + "eu-west-2a" ], "tags": [ { @@ -164,7 +164,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-6##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", diff --git a/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step2.load_balancers_datasource_attributes_removeLBU.tf b/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step2.load_balancers_datasource_attributes_removeLBU.tf index 778e585bf..0989ff696 100644 --- a/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step2.load_balancers_datasource_attributes_removeLBU.tf +++ b/tests/qa_provider_oapi/data/nets/TF-94_load_balancers_datasource_attributes_ok/step2.load_balancers_datasource_attributes_removeLBU.tf @@ -1,5 +1,5 @@ resource "outscale_load_balancer" "public_lbu1" { - load_balancer_name ="lbu-TF-94" + load_balancer_name ="lbu-TF-94-${var.suffixe_lbu_name}" subregion_names= ["${var.region}a"] listeners { backend_port = 80 diff --git a/tests/qa_provider_oapi/data/nets/TF-95_nat_service_datasource_attributes_ok/step1.nat_service_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-95_nat_service_datasource_attributes_ok/step1.nat_service_datasource_attributes_ok.ref index 5ed5afbc0..153c55704 100644 --- a/tests/qa_provider_oapi/data/nets/TF-95_nat_service_datasource_attributes_ok/step1.nat_service_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-95_nat_service_datasource_attributes_ok/step1.nat_service_datasource_attributes_ok.ref @@ -28,13 +28,13 @@ "state": "available", "subnet_id": "##id-3##", "tags": [ - { - "key": "name", - "value": "nat" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "name", + "value": "nat" } ] }, @@ -65,13 +65,13 @@ "state": "available", "subnet_id": "##id-3##", "tags": [ - { - "key": "name", - "value": "nat" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "name", + "value": "nat" } ] }, @@ -102,13 +102,13 @@ "state": "available", "subnet_id": "##id-3##", "tags": [ - { - "key": "name", - "value": "nat" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "name", + "value": "nat" } ] }, @@ -139,13 +139,13 @@ "state": "available", "subnet_id": "##id-3##", "tags": [ - { - "key": "name", - "value": "nat" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "name", + "value": "nat" } ] }, @@ -176,13 +176,13 @@ "state": "available", "subnet_id": "##id-3##", "tags": [ - { - "key": "name", - "value": "nat" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "name", + "value": "nat" } ] }, @@ -213,13 +213,13 @@ "state": "available", "subnet_id": "##id-3##", "tags": [ - { - "key": "name", - "value": "nat" - }, { "key": "Key", "value": "value-tags" + }, + { + "key": "name", + "value": "nat" } ] }, @@ -511,7 +511,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-3##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", diff --git a/tests/qa_provider_oapi/data/nets/TF-96_nat_service_resource_attributes_ok/step1.nat_service_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-96_nat_service_resource_attributes_ok/step1.nat_service_resource_attributes_ok.ref index 6b0d6bae9..684453144 100644 --- a/tests/qa_provider_oapi/data/nets/TF-96_nat_service_resource_attributes_ok/step1.nat_service_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-96_nat_service_resource_attributes_ok/step1.nat_service_resource_attributes_ok.ref @@ -285,7 +285,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subregion_name": "eu-west-2a", "tags": [ { "key": "name", diff --git a/tests/qa_provider_oapi/data/nets/TF-97_nat_services_datasource_attributes_ok/step1.nat_services_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-97_nat_services_datasource_attributes_ok/step1.nat_services_datasource_attributes_ok.ref index 9dab2447e..06a2c50dd 100644 --- a/tests/qa_provider_oapi/data/nets/TF-97_nat_services_datasource_attributes_ok/step1.nat_services_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-97_nat_services_datasource_attributes_ok/step1.nat_services_datasource_attributes_ok.ref @@ -31,8 +31,8 @@ "subnet_id": "##id-4##", "tags": [ { - "key": "Key", - "value": "value-tags" + "key": "Key-1", + "value": "value-tags-1" }, { "key": "Key:2", @@ -53,8 +53,8 @@ "subnet_id": "##id-7##", "tags": [ { - "key": "Key-1", - "value": "value-tags-1" + "key": "Key", + "value": "value-tags" }, { "key": "Key:2", @@ -83,16 +83,16 @@ "nat_service_ids": null, "nat_services": [ { - "nat_service_id": "##id-5##", + "nat_service_id": "##id-1##", "net_id": "##id-2##", "public_ips": [ { "public_ip": "########", - "public_ip_id": "##id-6##" + "public_ip_id": "##id-3##" } ], "state": "available", - "subnet_id": "##id-7##", + "subnet_id": "##id-4##", "tags": [ { "key": "Key-1", @@ -137,8 +137,8 @@ "subnet_id": "##id-4##", "tags": [ { - "key": "Key", - "value": "value-tags" + "key": "Key-1", + "value": "value-tags-1" }, { "key": "Key:2", @@ -159,8 +159,8 @@ "subnet_id": "##id-7##", "tags": [ { - "key": "Key-1", - "value": "value-tags-1" + "key": "Key", + "value": "value-tags" }, { "key": "Key:2", @@ -201,8 +201,8 @@ "subnet_id": "##id-4##", "tags": [ { - "key": "Key", - "value": "value-tags" + "key": "Key-1", + "value": "value-tags-1" }, { "key": "Key:2", @@ -223,8 +223,8 @@ "subnet_id": "##id-7##", "tags": [ { - "key": "Key-1", - "value": "value-tags-1" + "key": "Key", + "value": "value-tags" }, { "key": "Key:2", @@ -265,8 +265,8 @@ "subnet_id": "##id-4##", "tags": [ { - "key": "Key", - "value": "value-tags" + "key": "Key-1", + "value": "value-tags-1" }, { "key": "Key:2", @@ -287,8 +287,8 @@ "subnet_id": "##id-7##", "tags": [ { - "key": "Key-1", - "value": "value-tags-1" + "key": "Key", + "value": "value-tags" }, { "key": "Key:2", @@ -329,8 +329,8 @@ "subnet_id": "##id-4##", "tags": [ { - "key": "Key", - "value": "value-tags" + "key": "Key-1", + "value": "value-tags-1" }, { "key": "Key:2", @@ -351,8 +351,8 @@ "subnet_id": "##id-7##", "tags": [ { - "key": "Key-1", - "value": "value-tags-1" + "key": "Key", + "value": "value-tags" }, { "key": "Key:2", @@ -422,19 +422,19 @@ { "schema_version": 0, "attributes": { - "id": "##id-5##", - "nat_service_id": "##id-5##", + "id": "##id-1##", + "nat_service_id": "##id-1##", "net_id": "##id-2##", - "public_ip_id": "##id-6##", + "public_ip_id": "##id-3##", "public_ips": [ { "public_ip": "########", - "public_ip_id": "##id-6##" + "public_ip_id": "##id-3##" } ], "request_id": "########", "state": "available", - "subnet_id": "##id-7##", + "subnet_id": "##id-4##", "tags": [ { "key": "Key-1", @@ -468,19 +468,19 @@ { "schema_version": 0, "attributes": { - "id": "##id-1##", - "nat_service_id": "##id-1##", + "id": "##id-5##", + "nat_service_id": "##id-5##", "net_id": "##id-2##", - "public_ip_id": "##id-3##", + "public_ip_id": "##id-6##", "public_ips": [ { "public_ip": "########", - "public_ip_id": "##id-3##" + "public_ip_id": "##id-6##" } ], "request_id": "########", "state": "available", - "subnet_id": "##id-4##", + "subnet_id": "##id-7##", "tags": [ { "key": "Key", @@ -537,13 +537,13 @@ { "schema_version": 0, "attributes": { - "id": "##id-6##", + "id": "##id-3##", "link_public_ip_id": "", "nic_account_id": "", "nic_id": "", "private_ip": "########", "public_ip": "########", - "public_ip_id": "##id-6##", + "public_ip_id": "##id-3##", "request_id": "########", "tags": [], "timeouts": null, @@ -563,13 +563,13 @@ { "schema_version": 0, "attributes": { - "id": "##id-3##", + "id": "##id-6##", "link_public_ip_id": "", "nic_account_id": "", "nic_id": "", "private_ip": "########", "public_ip": "########", - "public_ip_id": "##id-3##", + "public_ip_id": "##id-6##", "request_id": "########", "tags": [], "timeouts": null, @@ -744,7 +744,7 @@ "main": false, "request_id": "########", "route_table_id": "##id-16##", - "subnet_id": "##id-7##" + "subnet_id": "##id-4##" }, "sensitive_attributes": [], "private": "bnVsbA==", @@ -770,7 +770,7 @@ "main": false, "request_id": "########", "route_table_id": "##id-18##", - "subnet_id": "##id-4##" + "subnet_id": "##id-7##" }, "sensitive_attributes": [], "private": "bnVsbA==", @@ -792,14 +792,14 @@ "schema_version": 0, "attributes": { "available_ips_count": "########", - "id": "##id-7##", + "id": "##id-4##", "ip_range": "10.0.0.0/24", "map_public_ip_on_launch": false, "net_id": "##id-2##", "request_id": "########", "state": "available", - "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "subnet_id": "##id-4##", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, @@ -821,14 +821,14 @@ "schema_version": 0, "attributes": { "available_ips_count": "########", - "id": "##id-4##", + "id": "##id-7##", "ip_range": "10.0.1.0/24", "map_public_ip_on_launch": false, "net_id": "##id-2##", "request_id": "########", "state": "available", - "subnet_id": "##id-4##", - "subregion_name": "us-east-2a", + "subnet_id": "##id-7##", + "subregion_name": "eu-west-2a", "tags": [], "timeouts": null }, diff --git a/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.ref index d0e062615..21afb76b4 100644 --- a/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.ref @@ -114,7 +114,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-6##", - "security_group_name": "terraform-sg_PubIp", + "security_group_name": "terraform-sg_TF116", "tag": null, "tags": [] }, @@ -164,7 +164,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -187,7 +187,7 @@ "security_groups": [ { "security_group_id": "##id-6##", - "security_group_name": "terraform-sg_PubIp" + "security_group_name": "terraform-sg_TF116" } ], "state": "running", diff --git a/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.tf index dd6b3bd3f..7d7d4dd64 100644 --- a/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.tf @@ -10,7 +10,7 @@ resource "outscale_public_ip" "outscale_public_ip" { resource "outscale_security_group" "sgPub" { description = "sg for terraform tests" - security_group_name = "terraform-sg_PubIp" + security_group_name = "terraform-sg_TF116" } diff --git a/tests/qa_provider_oapi/data/public_ips/TF-117_public_ips_datasource_attributes_ok/step1.public_ips_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/public_ips/TF-117_public_ips_datasource_attributes_ok/step1.public_ips_datasource_attributes_ok.ref index 0753a4cb8..50d5fdaa7 100644 --- a/tests/qa_provider_oapi/data/public_ips/TF-117_public_ips_datasource_attributes_ok/step1.public_ips_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/public_ips/TF-117_public_ips_datasource_attributes_ok/step1.public_ips_datasource_attributes_ok.ref @@ -24,16 +24,6 @@ "private_ip": "########", "public_ip": "########", "public_ip_id": "##id-1##", - "tags": [], - "vm_id": "" - }, - { - "link_public_ip_id": "", - "nic_account_id": "", - "nic_id": "", - "private_ip": "########", - "public_ip": "########", - "public_ip_id": "##id-2##", "tags": [ { "key": "Key", @@ -45,6 +35,16 @@ } ], "vm_id": "" + }, + { + "link_public_ip_id": "", + "nic_account_id": "", + "nic_id": "", + "private_ip": "########", + "public_ip": "########", + "public_ip_id": "##id-2##", + "tags": [], + "vm_id": "" } ], "request_id": "########" @@ -62,13 +62,13 @@ { "schema_version": 0, "attributes": { - "id": "##id-2##", + "id": "##id-1##", "link_public_ip_id": "", "nic_account_id": "", "nic_id": "", "private_ip": "########", "public_ip": "########", - "public_ip_id": "##id-2##", + "public_ip_id": "##id-1##", "request_id": "########", "tags": [ { @@ -97,13 +97,13 @@ { "schema_version": 0, "attributes": { - "id": "##id-1##", + "id": "##id-2##", "link_public_ip_id": "", "nic_account_id": "", "nic_id": "", "private_ip": "########", "public_ip": "########", - "public_ip_id": "##id-1##", + "public_ip_id": "##id-2##", "request_id": "########", "tags": [], "timeouts": null, diff --git a/tests/qa_provider_oapi/data/public_ips/TF-117_public_ips_datasource_attributes_ok/step2.public_ips_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/public_ips/TF-117_public_ips_datasource_attributes_ok/step2.public_ips_datasource_attributes_ok.ref index 3b11f2f20..1665dda21 100644 --- a/tests/qa_provider_oapi/data/public_ips/TF-117_public_ips_datasource_attributes_ok/step2.public_ips_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/public_ips/TF-117_public_ips_datasource_attributes_ok/step2.public_ips_datasource_attributes_ok.ref @@ -24,16 +24,6 @@ "private_ip": "########", "public_ip": "########", "public_ip_id": "##id-1##", - "tags": [], - "vm_id": "" - }, - { - "link_public_ip_id": "", - "nic_account_id": "", - "nic_id": "", - "private_ip": "########", - "public_ip": "########", - "public_ip_id": "##id-2##", "tags": [ { "key": "Key", @@ -45,6 +35,16 @@ } ], "vm_id": "" + }, + { + "link_public_ip_id": "", + "nic_account_id": "", + "nic_id": "", + "private_ip": "########", + "public_ip": "########", + "public_ip_id": "##id-2##", + "tags": [], + "vm_id": "" } ], "request_id": "########" @@ -71,7 +71,7 @@ "nic_id": "", "private_ip": "########", "public_ip": "########", - "public_ip_id": "##id-2##", + "public_ip_id": "##id-1##", "tags": [ { "key": "Key", @@ -109,7 +109,7 @@ "nic_id": "", "private_ip": "########", "public_ip": "########", - "public_ip_id": "##id-2##", + "public_ip_id": "##id-1##", "tags": [ { "key": "Key", @@ -147,7 +147,7 @@ "nic_id": "", "private_ip": "########", "public_ip": "########", - "public_ip_id": "##id-2##", + "public_ip_id": "##id-1##", "tags": [ { "key": "Key", @@ -176,13 +176,13 @@ { "schema_version": 0, "attributes": { - "id": "##id-2##", + "id": "##id-1##", "link_public_ip_id": "", "nic_account_id": "", "nic_id": "", "private_ip": "########", "public_ip": "########", - "public_ip_id": "##id-2##", + "public_ip_id": "##id-1##", "request_id": "########", "tags": [ { @@ -211,13 +211,13 @@ { "schema_version": 0, "attributes": { - "id": "##id-1##", + "id": "##id-2##", "link_public_ip_id": "", "nic_account_id": "", "nic_id": "", "private_ip": "########", "public_ip": "########", - "public_ip_id": "##id-1##", + "public_ip_id": "##id-2##", "request_id": "########", "tags": [], "timeouts": null, diff --git a/tests/qa_provider_oapi/data/quota/TF-185_quota_datasource_attributes_ok/step1.quota_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/quota/TF-185_quota_datasource_attributes_ok/step1.quota_datasource_attributes_ok.ref index d3ea5c95d..979dd364c 100644 --- a/tests/qa_provider_oapi/data/quota/TF-185_quota_datasource_attributes_ok/step1.quota_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/quota/TF-185_quota_datasource_attributes_ok/step1.quota_datasource_attributes_ok.ref @@ -23,7 +23,7 @@ "max_value": "########", "name": "lb_listeners_limit", "quota_collection": "LBU", - "quota_type": "terraform-lb-TF185", + "quota_type": "terraform-lb-TF185-11", "short_description": "Load Balancer Listeners Limit", "used_value": 1 } @@ -76,7 +76,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "terraform-lb-TF185", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", diff --git a/tests/qa_provider_oapi/data/quota/TF-185_quota_datasource_attributes_ok/step1.quota_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/quota/TF-185_quota_datasource_attributes_ok/step1.quota_datasource_attributes_ok.tf index 9ff7df223..25b756e0c 100644 --- a/tests/qa_provider_oapi/data/quota/TF-185_quota_datasource_attributes_ok/step1.quota_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/quota/TF-185_quota_datasource_attributes_ok/step1.quota_datasource_attributes_ok.tf @@ -1,7 +1,7 @@ ## Create a Load Balancer### resource "outscale_load_balancer" "load_balancer01" { - load_balancer_name = "terraform-lb-TF185" + load_balancer_name = "terraform-lb-TF185-11" subregion_names = ["${var.region}a"] listeners { backend_port = 8080 @@ -25,7 +25,7 @@ data "outscale_quotas" "lbu-quota" { } filter { name = "quota_types" - values = ["terraform-lb-TF185"] + values = ["terraform-lb-TF185-11"] } filter { name = "short_descriptions" diff --git a/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step1.quotas_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step1.quotas_datasource_attributes_ok.ref index 7abc82034..d6d560da6 100644 --- a/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step1.quotas_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step1.quotas_datasource_attributes_ok.ref @@ -23,7 +23,7 @@ "max_value": "########", "name": "lb_listeners_limit", "quota_collection": "LBU", - "quota_type": "terraform-lb-TF186", + "quota_type": "terraform-lb-TF186-11", "short_description": "Load Balancer Listeners Limit", "used_value": 1 } @@ -76,7 +76,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "terraform-lb-TF186", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", diff --git a/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step1.quotas_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step1.quotas_datasource_attributes_ok.tf index a3535eb73..252b1a8ea 100644 --- a/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step1.quotas_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step1.quotas_datasource_attributes_ok.tf @@ -1,7 +1,7 @@ ## Create a Load Balancer### resource "outscale_load_balancer" "load_balancer01" { - load_balancer_name = "terraform-lb-TF186" + load_balancer_name = "terraform-lb-TF186-11" subregion_names = ["${var.region}a"] listeners { backend_port = 8080 @@ -25,7 +25,7 @@ data "outscale_quotas" "lbu-quota" { } filter { name = "quota_types" - values = ["terraform-lb-TF186"] + values = ["terraform-lb-TF186-11"] } filter { name = "short_descriptions" diff --git a/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step2.quotas_datasource_attributes_ok_global.ref b/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step2.quotas_datasource_attributes_ok_global.ref index c25130f6d..d0f3ee8b9 100644 --- a/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step2.quotas_datasource_attributes_ok_global.ref +++ b/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step2.quotas_datasource_attributes_ok_global.ref @@ -76,7 +76,7 @@ "server_certificate_id": "" } ], - "load_balancer_name": "terraform-lb-TF186", + "load_balancer_name": "########", "load_balancer_sticky_cookie_policies": [], "load_balancer_type": "internet-facing", "net_id": "", diff --git a/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step2.quotas_datasource_attributes_ok_global.tf b/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step2.quotas_datasource_attributes_ok_global.tf index cc3570942..07e1dfe3f 100644 --- a/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step2.quotas_datasource_attributes_ok_global.tf +++ b/tests/qa_provider_oapi/data/quotas/TF-186_quotas_datasource_attributes_ok/step2.quotas_datasource_attributes_ok_global.tf @@ -1,7 +1,7 @@ ## Create a Load Balancer### resource "outscale_load_balancer" "load_balancer01" { - load_balancer_name = "terraform-lb-TF186" + load_balancer_name = "terraform-lb-TF186-11" subregion_names = ["${var.region}a"] listeners { backend_port = 8080 diff --git a/tests/qa_provider_oapi/data/subregions/TF-169_outscale_subregions_attributes_ok_no_filter/step1.outscale_subregions_attributes_ok_no_filter.ref b/tests/qa_provider_oapi/data/subregions/TF-169_outscale_subregions_attributes_ok_no_filter/step1.outscale_subregions_attributes_ok_no_filter.ref index fddf7b9e1..28b07387b 100644 --- a/tests/qa_provider_oapi/data/subregions/TF-169_outscale_subregions_attributes_ok_no_filter/step1.outscale_subregions_attributes_ok_no_filter.ref +++ b/tests/qa_provider_oapi/data/subregions/TF-169_outscale_subregions_attributes_ok_no_filter/step1.outscale_subregions_attributes_ok_no_filter.ref @@ -19,13 +19,13 @@ "request_id": "########", "subregions": [ { - "location_code": "PAR1", + "location_code": "PAR4", "region_name": "eu-west-2", "state": "available", "subregion_name": "eu-west-2a" }, { - "location_code": "PAR4", + "location_code": "PAR1", "region_name": "eu-west-2", "state": "available", "subregion_name": "eu-west-2b" diff --git a/tests/qa_provider_oapi/data/subregions/TF-170_outscale_subregions_attributes_ok_with_filter/step1.outscale_subregions_attributes_ok_with_filter.ref b/tests/qa_provider_oapi/data/subregions/TF-170_outscale_subregions_attributes_ok_with_filter/step1.outscale_subregions_attributes_ok_with_filter.ref index 2452b51bf..172778cb7 100644 --- a/tests/qa_provider_oapi/data/subregions/TF-170_outscale_subregions_attributes_ok_with_filter/step1.outscale_subregions_attributes_ok_with_filter.ref +++ b/tests/qa_provider_oapi/data/subregions/TF-170_outscale_subregions_attributes_ok_with_filter/step1.outscale_subregions_attributes_ok_with_filter.ref @@ -19,7 +19,7 @@ "request_id": "########", "subregions": [ { - "location_code": "PAR1", + "location_code": "PAR4", "region_name": "eu-west-2", "state": "available", "subregion_name": "eu-west-2a" diff --git a/tests/qa_provider_oapi/data/subregions/TF-170_outscale_subregions_attributes_ok_with_filter/step2.outscale_subregions_attributes_ok_with_filter.ref b/tests/qa_provider_oapi/data/subregions/TF-170_outscale_subregions_attributes_ok_with_filter/step2.outscale_subregions_attributes_ok_with_filter.ref index 63329687d..e37b61680 100644 --- a/tests/qa_provider_oapi/data/subregions/TF-170_outscale_subregions_attributes_ok_with_filter/step2.outscale_subregions_attributes_ok_with_filter.ref +++ b/tests/qa_provider_oapi/data/subregions/TF-170_outscale_subregions_attributes_ok_with_filter/step2.outscale_subregions_attributes_ok_with_filter.ref @@ -19,13 +19,13 @@ "request_id": "########", "subregions": [ { - "location_code": "PAR1", + "location_code": "PAR4", "region_name": "eu-west-2", "state": "available", "subregion_name": "eu-west-2a" }, { - "location_code": "PAR4", + "location_code": "PAR1", "region_name": "eu-west-2", "state": "available", "subregion_name": "eu-west-2b" diff --git a/tests/qa_provider_oapi/data/virtual_gateways/TF-142_virtual_gateways_datasource_attributes_ok/step1.virtual_gateways_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/virtual_gateways/TF-142_virtual_gateways_datasource_attributes_ok/step1.virtual_gateways_datasource_attributes_ok.ref index 60fee4c5f..37c0520cb 100644 --- a/tests/qa_provider_oapi/data/virtual_gateways/TF-142_virtual_gateways_datasource_attributes_ok/step1.virtual_gateways_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/virtual_gateways/TF-142_virtual_gateways_datasource_attributes_ok/step1.virtual_gateways_datasource_attributes_ok.ref @@ -25,12 +25,8 @@ "state": "available", "tags": [ { - "key": "name-Datasources", - "value": "VGW-1-Datasources" - }, - { - "key": "Project-Datasources", - "value": "Terraform-Datasources" + "key": "name", + "value": "VGW-2-Datasources" } ], "virtual_gateway_id": "##id-1##" @@ -41,8 +37,12 @@ "state": "available", "tags": [ { - "key": "name", - "value": "VGW-2-Datasources" + "key": "name-Datasources", + "value": "VGW-1-Datasources" + }, + { + "key": "Project-Datasources", + "value": "Terraform-Datasources" } ], "virtual_gateway_id": "##id-2##" @@ -63,7 +63,7 @@ "schema_version": 0, "attributes": { "connection_type": "ipsec.1", - "id": "##id-1##", + "id": "##id-2##", "net_to_virtual_gateway_links": [], "request_id": "########", "state": "available", @@ -77,7 +77,7 @@ "value": "VGW-1-Datasources" } ], - "virtual_gateway_id": "##id-1##" + "virtual_gateway_id": "##id-2##" }, "sensitive_attributes": [], "private": "bnVsbA==" @@ -94,7 +94,7 @@ "schema_version": 0, "attributes": { "connection_type": "ipsec.1", - "id": "##id-2##", + "id": "##id-1##", "net_to_virtual_gateway_links": [], "request_id": "########", "state": "available", @@ -104,7 +104,7 @@ "value": "VGW-2-Datasources" } ], - "virtual_gateway_id": "##id-2##" + "virtual_gateway_id": "##id-1##" }, "sensitive_attributes": [], "private": "bnVsbA==" diff --git a/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step1.vm_datasource_centos_ok.ref b/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step1.vm_datasource_centos_ok.ref index e9020d87f..acf8c0429 100644 --- a/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step1.vm_datasource_centos_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step1.vm_datasource_centos_ok.ref @@ -44,7 +44,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -129,7 +129,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -210,7 +210,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -342,7 +342,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -440,7 +440,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -524,7 +524,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step2.vm_datasource_centos_ok.ref b/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step2.vm_datasource_centos_ok.ref index cd0b11ea2..702e88db6 100644 --- a/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step2.vm_datasource_centos_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step2.vm_datasource_centos_ok.ref @@ -44,7 +44,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -129,7 +129,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -214,7 +214,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -299,7 +299,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -380,7 +380,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -512,7 +512,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -608,7 +608,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -692,7 +692,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step1.vm_resource_public_with_multiple_BDM_ok.ref b/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step1.vm_resource_public_with_multiple_BDM_ok.ref index 2a7c85e01..7911e61a5 100644 --- a/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step1.vm_resource_public_with_multiple_BDM_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step1.vm_resource_public_with_multiple_BDM_ok.ref @@ -200,7 +200,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step2.vm_resource_public_with_multiple_BDM_ok.ref b/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step2.vm_resource_public_with_multiple_BDM_ok.ref index 19b44e134..2844ae68a 100644 --- a/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step2.vm_resource_public_with_multiple_BDM_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step2.vm_resource_public_with_multiple_BDM_ok.ref @@ -200,7 +200,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/vm/TF-147_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok.ref b/tests/qa_provider_oapi/data/vm/TF-147_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok.ref index 23a1eb8ee..611e66834 100644 --- a/tests/qa_provider_oapi/data/vm/TF-147_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-147_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok.ref @@ -136,7 +136,7 @@ } ], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [ diff --git a/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/.step1.vm_resource_with_user_data_ok_2.tf.swp b/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/.step1.vm_resource_with_user_data_ok_2.tf.swp new file mode 100644 index 0000000000000000000000000000000000000000..61114db1dc199f6061154581cb4b7d308e6b2a4d GIT binary patch literal 12288 zcmeI2&2G~`5XYySI8Z3`1P8RZ7dSXh+Ny%mM&hHD5RF=(?FGSVV{g(`8PKheY zoj2eO5EsM&fp`tX6L8@fkdT;loVGzNoT+BzzwFr=&(8iaW&f=RDlM4A8i{Qmgs-e~gvJoqOTT+R~%BmB-=I#);AUMZ&19T;!xNqNPn5W=8i^ zB2B1sXJgTk=(Em7JAw~gT#HOaiEtw7rP2CwSew1cdnq^4>fFSV?<%*&b1Mz^L0mXz zR5QmsTyIC#$*flSOSsfm1?Y9A>6##iu?MTw{}$PX1O;$%bhgM1Tko z0U|&IhyW2F0z`la93kMcF?facnR4!Gc^~`ZUYc|x0z`la5CI}U1c(3;AOb{y2oM1x zKm`6n0wMwUaSq_cI2Mop{||rvf4czi1@#&A3H2H!QFYV;>NaW;_47Qycho!7b5tEw zMO{H%L`|U1qP}AOkEjo*_o%n1H>iEo9;%P>HSD5j5CI}U1c(3;AOb{y2oM1xKm<+| zftSGWVm;BxC0k^{`miIKZ#HVv0lKzj-#fY@l>s=>wrme>z|!h6giOX;ngz{{z$;+& zI*St7i=68}siN2EJlXn8cU!8>Q=Q};Y3E^T@XlZw*g?}ZR@xL+&dthhtP^>CVZj&5tc-J`T%Wg%&NJ@! zVlnjTu-TiB22^Z&!zPu{$>ObN;CW<1nZm>z2Pw+=O4{ec$D^UZu=m^bGf%lEjPC^Z z7BH2Hw&W@)=Z7W?+savRutYBnMyy(ZX952F*l}CLjDhcB4~y;ivt%rhHa04AN_V|k qj4})hw83%9j&i^f2Kmahk8aYh_;4*;U&hw>V^fvEnBx$W-^6d}usZ7i literal 0 HcmV?d00001 diff --git a/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok_2.ref b/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok_2.ref index fcf2c2994..df2c58015 100644 --- a/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok_2.ref +++ b/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok_2.ref @@ -95,7 +95,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step1.vm_resource_update_attributes_ok.ref b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step1.vm_resource_update_attributes_ok.ref index 1bb4fee26..8c98b857a 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step1.vm_resource_update_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step1.vm_resource_update_attributes_ok.ref @@ -8,7 +8,7 @@ { "mode": "managed", "type": "outscale_keypair", - "name": "keypair-TF66", + "name": "keypair-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -17,7 +17,7 @@ "attributes": { "id": "##id-0##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "private_key": "########", "public_key": null, "request_id": "########", @@ -32,7 +32,7 @@ "attributes": { "id": "##id-1##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "private_key": "########", "public_key": null, "request_id": "########", @@ -46,7 +46,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "security_group_TF66", + "name": "security_group_TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -54,7 +54,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-3##", "inbound_rules": [], "net_id": "", @@ -62,7 +62,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0", + "security_group_name": "terraform-sg-TF178-0", "tag": null, "tags": [] }, @@ -74,7 +74,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-4##", "inbound_rules": [], "net_id": "", @@ -82,7 +82,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1", + "security_group_name": "terraform-sg-TF178-1", "tag": null, "tags": [] }, @@ -94,7 +94,7 @@ { "mode": "managed", "type": "outscale_vm", - "name": "outscale_vm-TF66", + "name": "outscale_vm-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -154,7 +154,7 @@ "id": "##id-7##", "image_id": "##id-8##", "is_source_dest_checked": false, - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "launch_number": 0, "nested_virtualization": false, "net_id": "", @@ -183,7 +183,7 @@ "security_groups": [ { "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_name": "terraform-sg-TF178-0" } ], "state": "running", @@ -193,14 +193,14 @@ "timeouts": null, "user_data": "", "vm_id": "##id-7##", - "vm_initiated_shutdown_behavior": "restart", - "vm_type": "tinav4.c2r2p3" + "vm_initiated_shutdown_behavior": "stop", + "vm_type": "tinav5.c2r2" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_keypair.keypair-TF66", - "outscale_security_group.security_group_TF66" + "outscale_keypair.keypair-TF178", + "outscale_security_group.security_group_TF178" ] } ] diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step1.vm_resource_update_attributes_ok.tf b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step1.vm_resource_update_attributes_ok.tf index 0b67c6908..eb2fed757 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step1.vm_resource_update_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step1.vm_resource_update_attributes_ok.tf @@ -1,15 +1,15 @@ -resource "outscale_keypair" "keypair-TF66" { +resource "outscale_keypair" "keypair-TF178" { count = 2 - keypair_name = "keyname_TF66-${count.index}" + keypair_name = "keyname_TF178-${count.index}" } -resource "outscale_security_group" "security_group_TF66" { +resource "outscale_security_group" "security_group_TF178" { count = 2 - description = "test-terraform-TF66" - security_group_name = "terraform-sg-TF66-${count.index}" + description = "test-terraform-TF178" + security_group_name = "terraform-sg-TF178-${count.index}" } -resource "outscale_vm" "outscale_vm-TF66" { +resource "outscale_vm" "outscale_vm-TF178" { block_device_mappings { device_name = "/dev/sdb" bsu { @@ -18,10 +18,10 @@ resource "outscale_vm" "outscale_vm-TF66" { } } image_id = var.image_id - vm_type = "tinav4.c2r2p3" + vm_type = "tinav5.c2r2" performance = "medium" deletion_protection = true - vm_initiated_shutdown_behavior = "restart" - security_group_ids = [outscale_security_group.security_group_TF66[0].security_group_id] - keypair_name = outscale_keypair.keypair-TF66[0].keypair_name + vm_initiated_shutdown_behavior = "stop" + security_group_ids = [outscale_security_group.security_group_TF178[0].security_group_id] + keypair_name = outscale_keypair.keypair-TF178[0].keypair_name } diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step2.vm_resource_update_keypair_ok.ref b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step2.vm_resource_update_keypair_ok.ref index 1a860c90d..9f02276e8 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step2.vm_resource_update_keypair_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step2.vm_resource_update_keypair_ok.ref @@ -8,7 +8,7 @@ { "mode": "managed", "type": "outscale_keypair", - "name": "keypair-TF66", + "name": "keypair-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -17,7 +17,7 @@ "attributes": { "id": "##id-0##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "private_key": "########", "public_key": null, "request_id": "########", @@ -32,7 +32,7 @@ "attributes": { "id": "##id-1##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "private_key": "########", "public_key": null, "request_id": "########", @@ -46,7 +46,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "security_group_TF66", + "name": "security_group_TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -54,7 +54,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-3##", "inbound_rules": [], "net_id": "", @@ -62,7 +62,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0", + "security_group_name": "terraform-sg-TF178-0", "tag": null, "tags": [] }, @@ -74,7 +74,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-4##", "inbound_rules": [], "net_id": "", @@ -82,7 +82,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1", + "security_group_name": "terraform-sg-TF178-1", "tag": null, "tags": [] }, @@ -94,7 +94,7 @@ { "mode": "managed", "type": "outscale_vm", - "name": "outscale_vm-TF66", + "name": "outscale_vm-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -154,7 +154,7 @@ "id": "##id-7##", "image_id": "##id-8##", "is_source_dest_checked": false, - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "launch_number": 0, "nested_virtualization": false, "net_id": "", @@ -183,7 +183,7 @@ "security_groups": [ { "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_name": "terraform-sg-TF178-0" } ], "state": "running", @@ -193,14 +193,14 @@ "timeouts": null, "user_data": "", "vm_id": "##id-7##", - "vm_initiated_shutdown_behavior": "restart", - "vm_type": "tinav4.c2r2p3" + "vm_initiated_shutdown_behavior": "stop", + "vm_type": "tinav5.c2r2" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_keypair.keypair-TF66", - "outscale_security_group.security_group_TF66" + "outscale_keypair.keypair-TF178", + "outscale_security_group.security_group_TF178" ] } ] diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step2.vm_resource_update_keypair_ok.tf b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step2.vm_resource_update_keypair_ok.tf index 17e39ac44..536961dbf 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step2.vm_resource_update_keypair_ok.tf +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step2.vm_resource_update_keypair_ok.tf @@ -1,15 +1,15 @@ -resource "outscale_keypair" "keypair-TF66" { +resource "outscale_keypair" "keypair-TF178" { count = 2 - keypair_name = "keyname_TF66-${count.index}" + keypair_name = "keyname_TF178-${count.index}" } -resource "outscale_security_group" "security_group_TF66" { +resource "outscale_security_group" "security_group_TF178" { count = 2 - description = "test-terraform-TF66" - security_group_name = "terraform-sg-TF66-${count.index}" + description = "test-terraform-TF178" + security_group_name = "terraform-sg-TF178-${count.index}" } -resource "outscale_vm" "outscale_vm-TF66" { +resource "outscale_vm" "outscale_vm-TF178" { block_device_mappings { device_name = "/dev/sdb" bsu { @@ -18,10 +18,10 @@ resource "outscale_vm" "outscale_vm-TF66" { } } image_id = var.image_id - vm_type = "tinav4.c2r2p3" + vm_type = "tinav5.c2r2" performance = "medium" deletion_protection = true - vm_initiated_shutdown_behavior = "restart" - security_group_ids = [outscale_security_group.security_group_TF66[0].security_group_id] - keypair_name = outscale_keypair.keypair-TF66[1].keypair_name + vm_initiated_shutdown_behavior = "stop" + security_group_ids = [outscale_security_group.security_group_TF178[0].security_group_id] + keypair_name = outscale_keypair.keypair-TF178[1].keypair_name } diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step3.vm_resource_update_security_group_ok.ref b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step3.vm_resource_update_security_group_ok.ref index c5145d618..03d2d0b41 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step3.vm_resource_update_security_group_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step3.vm_resource_update_security_group_ok.ref @@ -8,7 +8,7 @@ { "mode": "managed", "type": "outscale_keypair", - "name": "keypair-TF66", + "name": "keypair-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -17,7 +17,7 @@ "attributes": { "id": "##id-0##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "private_key": "########", "public_key": null, "request_id": "########", @@ -32,7 +32,7 @@ "attributes": { "id": "##id-1##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "private_key": "########", "public_key": null, "request_id": "########", @@ -46,7 +46,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "security_group_TF66", + "name": "security_group_TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -54,7 +54,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-3##", "inbound_rules": [], "net_id": "", @@ -62,7 +62,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0", + "security_group_name": "terraform-sg-TF178-0", "tag": null, "tags": [] }, @@ -74,7 +74,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-4##", "inbound_rules": [], "net_id": "", @@ -82,7 +82,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1", + "security_group_name": "terraform-sg-TF178-1", "tag": null, "tags": [] }, @@ -94,7 +94,7 @@ { "mode": "managed", "type": "outscale_vm", - "name": "outscale_vm-TF66", + "name": "outscale_vm-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -148,13 +148,13 @@ "bsu_optimized": false, "client_token": "", "creation_date": "########", - "deletion_protection": false, + "deletion_protection": true, "get_admin_password": null, "hypervisor": "xen", "id": "##id-7##", "image_id": "##id-8##", "is_source_dest_checked": false, - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "launch_number": 0, "nested_virtualization": false, "net_id": "", @@ -177,18 +177,18 @@ "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_group_names": null, "security_groups": [ { - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF178-1" }, { - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1" + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF178-0" } ], "state": "running", @@ -198,14 +198,14 @@ "timeouts": null, "user_data": "", "vm_id": "##id-7##", - "vm_initiated_shutdown_behavior": "restart", - "vm_type": "tinav4.c2r2p3" + "vm_initiated_shutdown_behavior": "stop", + "vm_type": "tinav5.c2r2" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_keypair.keypair-TF66", - "outscale_security_group.security_group_TF66" + "outscale_keypair.keypair-TF178", + "outscale_security_group.security_group_TF178" ] } ] diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step3.vm_resource_update_security_group_ok.tf b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step3.vm_resource_update_security_group_ok.tf index c1200f9b1..9e64e7d2d 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step3.vm_resource_update_security_group_ok.tf +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step3.vm_resource_update_security_group_ok.tf @@ -1,15 +1,15 @@ -resource "outscale_keypair" "keypair-TF66" { +resource "outscale_keypair" "keypair-TF178" { count = 2 - keypair_name = "keyname_TF66-${count.index}" + keypair_name = "keyname_TF178-${count.index}" } -resource "outscale_security_group" "security_group_TF66" { +resource "outscale_security_group" "security_group_TF178" { count = 2 - description = "test-terraform-TF66" - security_group_name = "terraform-sg-TF66-${count.index}" + description = "test-terraform-TF178" + security_group_name = "terraform-sg-TF178-${count.index}" } -resource "outscale_vm" "outscale_vm-TF66" { +resource "outscale_vm" "outscale_vm-TF178" { block_device_mappings { device_name = "/dev/sdb" bsu { @@ -18,10 +18,10 @@ resource "outscale_vm" "outscale_vm-TF66" { } } image_id = var.image_id - vm_type = "tinav4.c2r2p3" + vm_type = "tinav5.c2r2" performance = "medium" - deletion_protection = false - vm_initiated_shutdown_behavior = "restart" - security_group_ids = [outscale_security_group.security_group_TF66[0].security_group_id,outscale_security_group.security_group_TF66[1].security_group_id] - keypair_name = outscale_keypair.keypair-TF66[1].keypair_name + deletion_protection = true + vm_initiated_shutdown_behavior = "stop" + security_group_ids = [outscale_security_group.security_group_TF178[0].security_group_id,outscale_security_group.security_group_TF178[1].security_group_id] + keypair_name = outscale_keypair.keypair-TF178[1].keypair_name } diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step4.vm_resource_update_deletion_protection_ok.ref b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step4.vm_resource_update_deletion_protection_ok.ref index c5145d618..4f9f3dfcc 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step4.vm_resource_update_deletion_protection_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step4.vm_resource_update_deletion_protection_ok.ref @@ -8,7 +8,7 @@ { "mode": "managed", "type": "outscale_keypair", - "name": "keypair-TF66", + "name": "keypair-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -17,7 +17,7 @@ "attributes": { "id": "##id-0##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "private_key": "########", "public_key": null, "request_id": "########", @@ -32,7 +32,7 @@ "attributes": { "id": "##id-1##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "private_key": "########", "public_key": null, "request_id": "########", @@ -46,7 +46,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "security_group_TF66", + "name": "security_group_TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -54,7 +54,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-3##", "inbound_rules": [], "net_id": "", @@ -62,7 +62,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0", + "security_group_name": "terraform-sg-TF178-0", "tag": null, "tags": [] }, @@ -74,7 +74,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-4##", "inbound_rules": [], "net_id": "", @@ -82,7 +82,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1", + "security_group_name": "terraform-sg-TF178-1", "tag": null, "tags": [] }, @@ -94,7 +94,7 @@ { "mode": "managed", "type": "outscale_vm", - "name": "outscale_vm-TF66", + "name": "outscale_vm-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -154,7 +154,7 @@ "id": "##id-7##", "image_id": "##id-8##", "is_source_dest_checked": false, - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "launch_number": 0, "nested_virtualization": false, "net_id": "", @@ -177,18 +177,18 @@ "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_group_names": null, "security_groups": [ { - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF178-1" }, { - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1" + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF178-0" } ], "state": "running", @@ -198,14 +198,14 @@ "timeouts": null, "user_data": "", "vm_id": "##id-7##", - "vm_initiated_shutdown_behavior": "restart", - "vm_type": "tinav4.c2r2p3" + "vm_initiated_shutdown_behavior": "stop", + "vm_type": "tinav5.c2r2" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_keypair.keypair-TF66", - "outscale_security_group.security_group_TF66" + "outscale_keypair.keypair-TF178", + "outscale_security_group.security_group_TF178" ] } ] diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step4.vm_resource_update_deletion_protection_ok.tf b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step4.vm_resource_update_deletion_protection_ok.tf index c1200f9b1..2d38367df 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step4.vm_resource_update_deletion_protection_ok.tf +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step4.vm_resource_update_deletion_protection_ok.tf @@ -1,15 +1,15 @@ -resource "outscale_keypair" "keypair-TF66" { +resource "outscale_keypair" "keypair-TF178" { count = 2 - keypair_name = "keyname_TF66-${count.index}" + keypair_name = "keyname_TF178-${count.index}" } -resource "outscale_security_group" "security_group_TF66" { +resource "outscale_security_group" "security_group_TF178" { count = 2 - description = "test-terraform-TF66" - security_group_name = "terraform-sg-TF66-${count.index}" + description = "test-terraform-TF178" + security_group_name = "terraform-sg-TF178-${count.index}" } -resource "outscale_vm" "outscale_vm-TF66" { +resource "outscale_vm" "outscale_vm-TF178" { block_device_mappings { device_name = "/dev/sdb" bsu { @@ -18,10 +18,10 @@ resource "outscale_vm" "outscale_vm-TF66" { } } image_id = var.image_id - vm_type = "tinav4.c2r2p3" + vm_type = "tinav5.c2r2" performance = "medium" deletion_protection = false - vm_initiated_shutdown_behavior = "restart" - security_group_ids = [outscale_security_group.security_group_TF66[0].security_group_id,outscale_security_group.security_group_TF66[1].security_group_id] - keypair_name = outscale_keypair.keypair-TF66[1].keypair_name + vm_initiated_shutdown_behavior = "stop" + security_group_ids = [outscale_security_group.security_group_TF178[0].security_group_id,outscale_security_group.security_group_TF178[1].security_group_id] + keypair_name = outscale_keypair.keypair-TF178[1].keypair_name } diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step5.vm_resource_update_bdm_ok.ref b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step5.vm_resource_update_bdm_ok.ref index cb687dfff..372e80170 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step5.vm_resource_update_bdm_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step5.vm_resource_update_bdm_ok.ref @@ -8,7 +8,7 @@ { "mode": "managed", "type": "outscale_keypair", - "name": "keypair-TF66", + "name": "keypair-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -17,7 +17,7 @@ "attributes": { "id": "##id-0##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "private_key": "########", "public_key": null, "request_id": "########", @@ -32,7 +32,7 @@ "attributes": { "id": "##id-1##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "private_key": "########", "public_key": null, "request_id": "########", @@ -46,7 +46,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "security_group_TF66", + "name": "security_group_TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -54,7 +54,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-3##", "inbound_rules": [], "net_id": "", @@ -62,7 +62,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0", + "security_group_name": "terraform-sg-TF178-0", "tag": null, "tags": [] }, @@ -74,7 +74,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-4##", "inbound_rules": [], "net_id": "", @@ -82,7 +82,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1", + "security_group_name": "terraform-sg-TF178-1", "tag": null, "tags": [] }, @@ -94,7 +94,7 @@ { "mode": "managed", "type": "outscale_vm", - "name": "outscale_vm-TF66", + "name": "outscale_vm-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -154,7 +154,7 @@ "id": "##id-7##", "image_id": "##id-8##", "is_source_dest_checked": false, - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "launch_number": 0, "nested_virtualization": false, "net_id": "", @@ -177,18 +177,18 @@ "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_group_names": null, "security_groups": [ { - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF178-1" }, { - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1" + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF178-0" } ], "state": "running", @@ -199,13 +199,13 @@ "user_data": "", "vm_id": "##id-7##", "vm_initiated_shutdown_behavior": "stop", - "vm_type": "tinav4.c2r2p3" + "vm_type": "tinav5.c2r2" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_keypair.keypair-TF66", - "outscale_security_group.security_group_TF66" + "outscale_keypair.keypair-TF178", + "outscale_security_group.security_group_TF178" ] } ] diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step5.vm_resource_update_bdm_ok.tf b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step5.vm_resource_update_bdm_ok.tf index fc96f16dd..beb9331a4 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step5.vm_resource_update_bdm_ok.tf +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step5.vm_resource_update_bdm_ok.tf @@ -1,15 +1,15 @@ -resource "outscale_keypair" "keypair-TF66" { +resource "outscale_keypair" "keypair-TF178" { count = 2 - keypair_name = "keyname_TF66-${count.index}" + keypair_name = "keyname_TF178-${count.index}" } -resource "outscale_security_group" "security_group_TF66" { +resource "outscale_security_group" "security_group_TF178" { count = 2 - description = "test-terraform-TF66" - security_group_name = "terraform-sg-TF66-${count.index}" + description = "test-terraform-TF178" + security_group_name = "terraform-sg-TF178-${count.index}" } -resource "outscale_vm" "outscale_vm-TF66" { +resource "outscale_vm" "outscale_vm-TF178" { block_device_mappings { device_name = "/dev/sdb" bsu { @@ -19,10 +19,10 @@ resource "outscale_vm" "outscale_vm-TF66" { } } image_id = var.image_id - vm_type = "tinav4.c2r2p3" + vm_type = "tinav5.c2r2" performance = "medium" deletion_protection = false vm_initiated_shutdown_behavior = "stop" - security_group_ids = [outscale_security_group.security_group_TF66[0].security_group_id,outscale_security_group.security_group_TF66[1].security_group_id] - keypair_name = outscale_keypair.keypair-TF66[1].keypair_name + security_group_ids = [outscale_security_group.security_group_TF178[0].security_group_id,outscale_security_group.security_group_TF178[1].security_group_id] + keypair_name = outscale_keypair.keypair-TF178[1].keypair_name } diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step6.vm_resource_update_performance_ok.ref b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step6.vm_resource_update_performance_ok.ref index 55742ce7a..a4dae28a6 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step6.vm_resource_update_performance_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step6.vm_resource_update_performance_ok.ref @@ -8,7 +8,7 @@ { "mode": "managed", "type": "outscale_keypair", - "name": "keypair-TF66", + "name": "keypair-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -17,7 +17,7 @@ "attributes": { "id": "##id-0##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "private_key": "########", "public_key": null, "request_id": "########", @@ -32,7 +32,7 @@ "attributes": { "id": "##id-1##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "private_key": "########", "public_key": null, "request_id": "########", @@ -46,7 +46,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "security_group_TF66", + "name": "security_group_TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -54,7 +54,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-3##", "inbound_rules": [], "net_id": "", @@ -62,7 +62,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0", + "security_group_name": "terraform-sg-TF178-0", "tag": null, "tags": [] }, @@ -74,7 +74,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-4##", "inbound_rules": [], "net_id": "", @@ -82,7 +82,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1", + "security_group_name": "terraform-sg-TF178-1", "tag": null, "tags": [] }, @@ -94,7 +94,7 @@ { "mode": "managed", "type": "outscale_vm", - "name": "outscale_vm-TF66", + "name": "outscale_vm-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -154,7 +154,7 @@ "id": "##id-7##", "image_id": "##id-8##", "is_source_dest_checked": false, - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "launch_number": 0, "nested_virtualization": false, "net_id": "", @@ -177,18 +177,18 @@ "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_group_names": null, "security_groups": [ { - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF178-1" }, { - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1" + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF178-0" } ], "state": "running", @@ -199,13 +199,13 @@ "user_data": "", "vm_id": "##id-7##", "vm_initiated_shutdown_behavior": "stop", - "vm_type": "###vm_type###" + "vm_type": "tinav5.c2r2" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_keypair.keypair-TF66", - "outscale_security_group.security_group_TF66" + "outscale_keypair.keypair-TF178", + "outscale_security_group.security_group_TF178" ] } ] diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step6.vm_resource_update_performance_ok.tf b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step6.vm_resource_update_performance_ok.tf index e69f0bfce..18fdc2055 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step6.vm_resource_update_performance_ok.tf +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step6.vm_resource_update_performance_ok.tf @@ -1,15 +1,15 @@ -resource "outscale_keypair" "keypair-TF66" { +resource "outscale_keypair" "keypair-TF178" { count = 2 - keypair_name = "keyname_TF66-${count.index}" + keypair_name = "keyname_TF178-${count.index}" } -resource "outscale_security_group" "security_group_TF66" { +resource "outscale_security_group" "security_group_TF178" { count = 2 - description = "test-terraform-TF66" - security_group_name = "terraform-sg-TF66-${count.index}" + description = "test-terraform-TF178" + security_group_name = "terraform-sg-TF178-${count.index}" } -resource "outscale_vm" "outscale_vm-TF66" { +resource "outscale_vm" "outscale_vm-TF178" { block_device_mappings { device_name = "/dev/sdb" bsu { @@ -19,10 +19,10 @@ resource "outscale_vm" "outscale_vm-TF66" { } } image_id = var.image_id - vm_type = "tinav4.c2r2p2" + vm_type = "tinav5.c2r2" performance = "high" deletion_protection = false vm_initiated_shutdown_behavior = "stop" - security_group_ids = [outscale_security_group.security_group_TF66[0].security_group_id,outscale_security_group.security_group_TF66[1].security_group_id] - keypair_name = outscale_keypair.keypair-TF66[1].keypair_name + security_group_ids = [outscale_security_group.security_group_TF178[0].security_group_id,outscale_security_group.security_group_TF178[1].security_group_id] + keypair_name = outscale_keypair.keypair-TF178[1].keypair_name } diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step7.vm_resource_update_vm_type_ok.ref b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step7.vm_resource_update_vm_type_ok.ref index a3c96425b..0aeb59ddd 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step7.vm_resource_update_vm_type_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step7.vm_resource_update_vm_type_ok.ref @@ -8,7 +8,7 @@ { "mode": "managed", "type": "outscale_keypair", - "name": "keypair-TF66", + "name": "keypair-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -17,7 +17,7 @@ "attributes": { "id": "##id-0##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "private_key": "########", "public_key": null, "request_id": "########", @@ -32,7 +32,7 @@ "attributes": { "id": "##id-1##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "private_key": "########", "public_key": null, "request_id": "########", @@ -46,7 +46,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "security_group_TF66", + "name": "security_group_TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -54,7 +54,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-3##", "inbound_rules": [], "net_id": "", @@ -62,7 +62,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0", + "security_group_name": "terraform-sg-TF178-0", "tag": null, "tags": [] }, @@ -74,7 +74,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-4##", "inbound_rules": [], "net_id": "", @@ -82,7 +82,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1", + "security_group_name": "terraform-sg-TF178-1", "tag": null, "tags": [] }, @@ -94,7 +94,7 @@ { "mode": "managed", "type": "outscale_vm", - "name": "outscale_vm-TF66", + "name": "outscale_vm-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -154,7 +154,7 @@ "id": "##id-7##", "image_id": "##id-8##", "is_source_dest_checked": false, - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "launch_number": 0, "nested_virtualization": false, "net_id": "", @@ -177,18 +177,18 @@ "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_group_names": null, "security_groups": [ { - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF178-1" }, { - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1" + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF178-0" } ], "state": "running", @@ -198,14 +198,14 @@ "timeouts": null, "user_data": "", "vm_id": "##id-7##", - "vm_initiated_shutdown_behavior": "restart", - "vm_type": "tinav4.c3r3p2" + "vm_initiated_shutdown_behavior": "stop", + "vm_type": "tinav5.c3r3" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_keypair.keypair-TF66", - "outscale_security_group.security_group_TF66" + "outscale_keypair.keypair-TF178", + "outscale_security_group.security_group_TF178" ] } ] diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step7.vm_resource_update_vm_type_ok.tf b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step7.vm_resource_update_vm_type_ok.tf index f94e94e85..f6e11d659 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step7.vm_resource_update_vm_type_ok.tf +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step7.vm_resource_update_vm_type_ok.tf @@ -1,15 +1,15 @@ -resource "outscale_keypair" "keypair-TF66" { +resource "outscale_keypair" "keypair-TF178" { count = 2 - keypair_name = "keyname_TF66-${count.index}" + keypair_name = "keyname_TF178-${count.index}" } -resource "outscale_security_group" "security_group_TF66" { +resource "outscale_security_group" "security_group_TF178" { count = 2 - description = "test-terraform-TF66" - security_group_name = "terraform-sg-TF66-${count.index}" + description = "test-terraform-TF178" + security_group_name = "terraform-sg-TF178-${count.index}" } -resource "outscale_vm" "outscale_vm-TF66" { +resource "outscale_vm" "outscale_vm-TF178" { block_device_mappings { device_name = "/dev/sdb" bsu { @@ -19,10 +19,10 @@ resource "outscale_vm" "outscale_vm-TF66" { } } image_id = var.image_id - vm_type = "tinav4.c3r3p2" + vm_type = "tinav5.c3r3" performance = "high" deletion_protection = false - vm_initiated_shutdown_behavior = "restart" - security_group_ids = [outscale_security_group.security_group_TF66[0].security_group_id,outscale_security_group.security_group_TF66[1].security_group_id] - keypair_name = outscale_keypair.keypair-TF66[1].keypair_name + vm_initiated_shutdown_behavior = "stop" + security_group_ids = [outscale_security_group.security_group_TF178[0].security_group_id,outscale_security_group.security_group_TF178[1].security_group_id] + keypair_name = outscale_keypair.keypair-TF178[1].keypair_name } diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step8.vm_resource_update_user_data_ok.ref b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step8.vm_resource_update_user_data_ok.ref index e29bb267a..6a8522a32 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step8.vm_resource_update_user_data_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step8.vm_resource_update_user_data_ok.ref @@ -8,7 +8,7 @@ { "mode": "managed", "type": "outscale_keypair", - "name": "keypair-TF66", + "name": "keypair-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -17,7 +17,7 @@ "attributes": { "id": "##id-0##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "private_key": "########", "public_key": null, "request_id": "########", @@ -32,7 +32,7 @@ "attributes": { "id": "##id-1##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "private_key": "########", "public_key": null, "request_id": "########", @@ -46,7 +46,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "security_group_TF66", + "name": "security_group_TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -54,7 +54,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-3##", "inbound_rules": [], "net_id": "", @@ -62,7 +62,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0", + "security_group_name": "terraform-sg-TF178-0", "tag": null, "tags": [] }, @@ -74,7 +74,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-4##", "inbound_rules": [], "net_id": "", @@ -82,7 +82,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1", + "security_group_name": "terraform-sg-TF178-1", "tag": null, "tags": [] }, @@ -94,7 +94,7 @@ { "mode": "managed", "type": "outscale_vm", - "name": "outscale_vm-TF66", + "name": "outscale_vm-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -154,7 +154,7 @@ "id": "##id-7##", "image_id": "##id-8##", "is_source_dest_checked": false, - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "launch_number": 0, "nested_virtualization": false, "net_id": "##id-9##", @@ -177,18 +177,18 @@ "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_group_names": null, "security_groups": [ { - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF178-1" }, { - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1" + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF178-0" } ], "state": "running", @@ -199,13 +199,13 @@ "user_data": "LS0tLS1CRUdJTiBPVVRTQ0FMRSBTRUNUSU9OLS0tLS0KCnByaXZhdGVfb25seT10cnVlCgotLS0tLUVORCBPVVRTQ0FMRSBTRUNUSU9OLS0tLS0=", "vm_id": "##id-7##", "vm_initiated_shutdown_behavior": "stop", - "vm_type": "tinav4.c3r3p2" + "vm_type": "tinav5.c3r3" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_keypair.keypair-TF66", - "outscale_security_group.security_group_TF66" + "outscale_keypair.keypair-TF178", + "outscale_security_group.security_group_TF178" ] } ] diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step8.vm_resource_update_user_data_ok.tf b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step8.vm_resource_update_user_data_ok.tf index c53d827f4..d601e1eca 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step8.vm_resource_update_user_data_ok.tf +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step8.vm_resource_update_user_data_ok.tf @@ -1,15 +1,15 @@ -resource "outscale_keypair" "keypair-TF66" { +resource "outscale_keypair" "keypair-TF178" { count = 2 - keypair_name = "keyname_TF66-${count.index}" + keypair_name = "keyname_TF178-${count.index}" } -resource "outscale_security_group" "security_group_TF66" { +resource "outscale_security_group" "security_group_TF178" { count = 2 - description = "test-terraform-TF66" - security_group_name = "terraform-sg-TF66-${count.index}" + description = "test-terraform-TF178" + security_group_name = "terraform-sg-TF178-${count.index}" } -resource "outscale_vm" "outscale_vm-TF66" { +resource "outscale_vm" "outscale_vm-TF178" { block_device_mappings { device_name = "/dev/sdb" bsu { @@ -19,11 +19,11 @@ resource "outscale_vm" "outscale_vm-TF66" { } } image_id = var.image_id - vm_type = "tinav4.c3r3p2" + vm_type = "tinav5.c3r3" performance = "high" deletion_protection = false vm_initiated_shutdown_behavior = "stop" - security_group_ids = [outscale_security_group.security_group_TF66[0].security_group_id,outscale_security_group.security_group_TF66[1].security_group_id] - keypair_name = outscale_keypair.keypair-TF66[1].keypair_name + security_group_ids = [outscale_security_group.security_group_TF178[0].security_group_id,outscale_security_group.security_group_TF178[1].security_group_id] + keypair_name = outscale_keypair.keypair-TF178[1].keypair_name user_data = "LS0tLS1CRUdJTiBPVVRTQ0FMRSBTRUNUSU9OLS0tLS0KCnByaXZhdGVfb25seT10cnVlCgotLS0tLUVORCBPVVRTQ0FMRSBTRUNUSU9OLS0tLS0=" } diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step9.vm_resource_update_shtdown_behaviour_ok.ref b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step9.vm_resource_update_shtdown_behaviour_ok.ref index 910937b9b..75da4c94f 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step9.vm_resource_update_shtdown_behaviour_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step9.vm_resource_update_shtdown_behaviour_ok.ref @@ -8,7 +8,7 @@ { "mode": "managed", "type": "outscale_keypair", - "name": "keypair-TF66", + "name": "keypair-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -17,7 +17,7 @@ "attributes": { "id": "##id-0##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-0", + "keypair_name": "keyname_TF178-0", "private_key": "########", "public_key": null, "request_id": "########", @@ -32,7 +32,7 @@ "attributes": { "id": "##id-1##", "keypair_fingerprint": "########", - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "private_key": "########", "public_key": null, "request_id": "########", @@ -46,7 +46,7 @@ { "mode": "managed", "type": "outscale_security_group", - "name": "security_group_TF66", + "name": "security_group_TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -54,7 +54,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-3##", "inbound_rules": [], "net_id": "", @@ -62,7 +62,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0", + "security_group_name": "terraform-sg-TF178-0", "tag": null, "tags": [] }, @@ -74,7 +74,7 @@ "schema_version": 0, "attributes": { "account_id": "##id-2##", - "description": "test-terraform-TF66", + "description": "test-terraform-TF178", "id": "##id-4##", "inbound_rules": [], "net_id": "", @@ -82,7 +82,7 @@ "remove_default_outbound_rule": false, "request_id": "########", "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1", + "security_group_name": "terraform-sg-TF178-1", "tag": null, "tags": [] }, @@ -94,7 +94,7 @@ { "mode": "managed", "type": "outscale_vm", - "name": "outscale_vm-TF66", + "name": "outscale_vm-TF178", "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { @@ -154,7 +154,7 @@ "id": "##id-7##", "image_id": "##id-8##", "is_source_dest_checked": false, - "keypair_name": "keyname_TF66-1", + "keypair_name": "keyname_TF178-1", "launch_number": 0, "nested_virtualization": false, "net_id": "##id-9##", @@ -188,17 +188,17 @@ ], "secondary_private_ip_count": 0, "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_groups": [ { - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF178-1" }, { - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1" + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF178-0" } ], "state": "in-use", @@ -239,17 +239,17 @@ ], "secondary_private_ip_count": 0, "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_groups": [ { - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF178-1" }, { - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1" + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF178-0" } ], "state": "in-use", @@ -269,18 +269,18 @@ "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_group_names": null, "security_groups": [ { - "security_group_id": "##id-3##", - "security_group_name": "terraform-sg-TF66-0" + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF178-1" }, { - "security_group_id": "##id-4##", - "security_group_name": "terraform-sg-TF66-1" + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF178-0" } ], "state": "running", @@ -290,14 +290,14 @@ "timeouts": null, "user_data": "LS0tLS1CRUdJTiBPVVRTQ0FMRSBTRUNUSU9OLS0tLS0KCnByaXZhdGVfb25seT10cnVlCgotLS0tLUVORCBPVVRTQ0FMRSBTRUNUSU9OLS0tLS0=", "vm_id": "##id-7##", - "vm_initiated_shutdown_behavior": "stop", - "vm_type": "tinav4.c3r3p2" + "vm_initiated_shutdown_behavior": "restart", + "vm_type": "tinav5.c3r3" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMDAsInVwZGF0ZSI6MzAwMDAwMDAwMDAwfX0=", "dependencies": [ - "outscale_keypair.keypair-TF66", - "outscale_security_group.security_group_TF66" + "outscale_keypair.keypair-TF178", + "outscale_security_group.security_group_TF178" ] } ] diff --git a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step9.vm_resource_update_shtdown_behaviour_ok.tf b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step9.vm_resource_update_shtdown_behaviour_ok.tf index 9a5197767..7b849b5ae 100644 --- a/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step9.vm_resource_update_shtdown_behaviour_ok.tf +++ b/tests/qa_provider_oapi/data/vm/TF-178_vm_resource_update_attributes_ok/step9.vm_resource_update_shtdown_behaviour_ok.tf @@ -1,15 +1,15 @@ -resource "outscale_keypair" "keypair-TF66" { +resource "outscale_keypair" "keypair-TF178" { count = 2 - keypair_name = "keyname_TF66-${count.index}" + keypair_name = "keyname_TF178-${count.index}" } -resource "outscale_security_group" "security_group_TF66" { +resource "outscale_security_group" "security_group_TF178" { count = 2 - description = "test-terraform-TF66" - security_group_name = "terraform-sg-TF66-${count.index}" + description = "test-terraform-TF178" + security_group_name = "terraform-sg-TF178-${count.index}" } -resource "outscale_vm" "outscale_vm-TF66" { +resource "outscale_vm" "outscale_vm-TF178" { block_device_mappings { device_name = "/dev/sdb" bsu { @@ -19,11 +19,11 @@ resource "outscale_vm" "outscale_vm-TF66" { } } image_id = var.image_id - vm_type = "tinav4.c3r3p2" + vm_type = "tinav5.c3r3" performance = "high" deletion_protection = false - vm_initiated_shutdown_behavior = "stop" - security_group_ids = [outscale_security_group.security_group_TF66[0].security_group_id,outscale_security_group.security_group_TF66[1].security_group_id] - keypair_name = outscale_keypair.keypair-TF66[1].keypair_name + vm_initiated_shutdown_behavior = "restart" + security_group_ids = [outscale_security_group.security_group_TF178[0].security_group_id,outscale_security_group.security_group_TF178[1].security_group_id] + keypair_name = outscale_keypair.keypair-TF178[1].keypair_name user_data = "LS0tLS1CRUdJTiBPVVRTQ0FMRSBTRUNUSU9OLS0tLS0KCnByaXZhdGVfb25seT10cnVlCgotLS0tLUVORCBPVVRTQ0FMRSBTRUNUSU9OLS0tLS0=" } diff --git a/tests/qa_provider_oapi/data/vm_state/TF-149_vm_state_datasource_centos_attributes_ok/step1.vm_state_datasource_centos_attributes_ok.ref b/tests/qa_provider_oapi/data/vm_state/TF-149_vm_state_datasource_centos_attributes_ok/step1.vm_state_datasource_centos_attributes_ok.ref index 5873fad40..55ca93ab9 100644 --- a/tests/qa_provider_oapi/data/vm_state/TF-149_vm_state_datasource_centos_attributes_ok/step1.vm_state_datasource_centos_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/vm_state/TF-149_vm_state_datasource_centos_attributes_ok/step1.vm_state_datasource_centos_attributes_ok.ref @@ -117,7 +117,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/vm_states/TF-150_vm_states_datasource_centos_attributes_ok/step1.vm_states_datasource_centos_attributes_ok.ref b/tests/qa_provider_oapi/data/vm_states/TF-150_vm_states_datasource_centos_attributes_ok/step1.vm_states_datasource_centos_attributes_ok.ref index fbc162a99..5073404fe 100644 --- a/tests/qa_provider_oapi/data/vm_states/TF-150_vm_states_datasource_centos_attributes_ok/step1.vm_states_datasource_centos_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/vm_states/TF-150_vm_states_datasource_centos_attributes_ok/step1.vm_states_datasource_centos_attributes_ok.ref @@ -130,7 +130,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -216,7 +216,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step1.vms_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step1.vms_datasource_attributes_ok.ref index 4b2c553ab..3f3f8e057 100644 --- a/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step1.vms_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step1.vms_datasource_attributes_ok.ref @@ -47,7 +47,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -109,7 +109,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -218,7 +218,7 @@ "link_date": "########", "state": "attached", "tags": [], - "volume_id": "##id-1##" + "volume_id": "##id-6##" } ], "device_name": "/dev/sda1" @@ -230,7 +230,7 @@ "deletion_protection": false, "get_admin_password": null, "hypervisor": "xen", - "id": "##id-5##", + "id": "##id-8##", "image_id": "##id-2##", "is_source_dest_checked": false, "keypair_name": "KP-TF151", @@ -239,7 +239,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -252,7 +252,7 @@ "public_dns_name": "########", "public_ip": "########", "request_id": "########", - "reservation_id": "##id-3##", + "reservation_id": "##id-7##", "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ @@ -271,7 +271,7 @@ "tags": [], "timeouts": null, "user_data": "", - "vm_id": "##id-5##", + "vm_id": "##id-8##", "vm_initiated_shutdown_behavior": "stop", "vm_type": "###vm_type###" }, @@ -297,7 +297,7 @@ "link_date": "########", "state": "attached", "tags": [], - "volume_id": "##id-6##" + "volume_id": "##id-1##" } ], "device_name": "/dev/sda1" @@ -309,7 +309,7 @@ "deletion_protection": false, "get_admin_password": null, "hypervisor": "xen", - "id": "##id-8##", + "id": "##id-5##", "image_id": "##id-2##", "is_source_dest_checked": false, "keypair_name": "KP-TF151", @@ -318,7 +318,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -331,7 +331,7 @@ "public_dns_name": "########", "public_ip": "########", "request_id": "########", - "reservation_id": "##id-7##", + "reservation_id": "##id-3##", "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ @@ -350,7 +350,7 @@ "tags": [], "timeouts": null, "user_data": "", - "vm_id": "##id-8##", + "vm_id": "##id-5##", "vm_initiated_shutdown_behavior": "stop", "vm_type": "###vm_type###" }, @@ -404,7 +404,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step2.vms_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step2.vms_datasource_attributes_ok.ref index 30eca0169..b0663505d 100644 --- a/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step2.vms_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step2.vms_datasource_attributes_ok.ref @@ -47,7 +47,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -109,7 +109,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -190,7 +190,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -280,7 +280,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -370,7 +370,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -488,7 +488,7 @@ "link_date": "########", "state": "attached", "tags": [], - "volume_id": "##id-1##" + "volume_id": "##id-6##" } ], "device_name": "/dev/sda1" @@ -500,7 +500,7 @@ "deletion_protection": false, "get_admin_password": null, "hypervisor": "xen", - "id": "##id-5##", + "id": "##id-8##", "image_id": "##id-2##", "is_source_dest_checked": false, "keypair_name": "KP-TF151", @@ -509,7 +509,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -522,7 +522,7 @@ "public_dns_name": "########", "public_ip": "########", "request_id": "########", - "reservation_id": "##id-3##", + "reservation_id": "##id-7##", "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ @@ -541,7 +541,7 @@ "tags": [], "timeouts": null, "user_data": "", - "vm_id": "##id-5##", + "vm_id": "##id-8##", "vm_initiated_shutdown_behavior": "stop", "vm_type": "###vm_type###" }, @@ -567,7 +567,7 @@ "link_date": "########", "state": "attached", "tags": [], - "volume_id": "##id-6##" + "volume_id": "##id-1##" } ], "device_name": "/dev/sda1" @@ -579,7 +579,7 @@ "deletion_protection": false, "get_admin_password": null, "hypervisor": "xen", - "id": "##id-8##", + "id": "##id-5##", "image_id": "##id-2##", "is_source_dest_checked": false, "keypair_name": "KP-TF151", @@ -588,7 +588,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -601,7 +601,7 @@ "public_dns_name": "########", "public_ip": "########", "request_id": "########", - "reservation_id": "##id-7##", + "reservation_id": "##id-3##", "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ @@ -620,7 +620,7 @@ "tags": [], "timeouts": null, "user_data": "", - "vm_id": "##id-8##", + "vm_id": "##id-5##", "vm_initiated_shutdown_behavior": "stop", "vm_type": "###vm_type###" }, @@ -674,7 +674,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/volumes/TF-158_volumes_datasource_attributes_ok3/step1.volumes_datasource_attributes_ok3.ref b/tests/qa_provider_oapi/data/volumes/TF-158_volumes_datasource_attributes_ok3/step1.volumes_datasource_attributes_ok3.ref index ea0cca0f8..338050b7f 100644 --- a/tests/qa_provider_oapi/data/volumes/TF-158_volumes_datasource_attributes_ok3/step1.volumes_datasource_attributes_ok3.ref +++ b/tests/qa_provider_oapi/data/volumes/TF-158_volumes_datasource_attributes_ok3/step1.volumes_datasource_attributes_ok3.ref @@ -23,14 +23,14 @@ "creation_date": "########", "iops": 150, "linked_volumes": [], - "size": 13, + "size": 15, "snapshot_id": "", "state": "available", "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", - "value": "volume-standard-2" + "value": "volume-standard-1" } ], "volume_id": "##id-1##", @@ -40,14 +40,14 @@ "creation_date": "########", "iops": 150, "linked_volumes": [], - "size": 15, + "size": 13, "snapshot_id": "", "state": "available", "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", - "value": "volume-standard-1" + "value": "volume-standard-2" } ], "volume_id": "##id-2##", @@ -69,7 +69,7 @@ "schema_version": 0, "attributes": { "creation_date": "########", - "id": "##id-2##", + "id": "##id-1##", "iops": 150, "linked_volumes": [], "request_id": "########", @@ -84,7 +84,7 @@ } ], "termination_snapshot_name": null, - "volume_id": "##id-2##", + "volume_id": "##id-1##", "volume_type": "standard" }, "sensitive_attributes": [], @@ -102,7 +102,7 @@ "schema_version": 0, "attributes": { "creation_date": "########", - "id": "##id-1##", + "id": "##id-2##", "iops": 150, "linked_volumes": [], "request_id": "########", @@ -117,7 +117,7 @@ } ], "termination_snapshot_name": null, - "volume_id": "##id-1##", + "volume_id": "##id-2##", "volume_type": "standard" }, "sensitive_attributes": [], diff --git a/tests/qa_provider_oapi/data/volumes/TF-159_volumes_datasource_attributes_ok4/step1.volumes_datasource_attributes_ok4.ref b/tests/qa_provider_oapi/data/volumes/TF-159_volumes_datasource_attributes_ok4/step1.volumes_datasource_attributes_ok4.ref index cda8737fa..a6aa84e0b 100644 --- a/tests/qa_provider_oapi/data/volumes/TF-159_volumes_datasource_attributes_ok4/step1.volumes_datasource_attributes_ok4.ref +++ b/tests/qa_provider_oapi/data/volumes/TF-159_volumes_datasource_attributes_ok4/step1.volumes_datasource_attributes_ok4.ref @@ -19,6 +19,23 @@ "request_id": "########", "volume_id": null, "volumes": [ + { + "creation_date": "########", + "iops": 150, + "linked_volumes": [], + "size": 15, + "snapshot_id": "", + "state": "available", + "subregion_name": "eu-west-2a", + "tags": [ + { + "key": "Name", + "value": "volume-standard-1" + } + ], + "volume_id": "##id-1##", + "volume_type": "standard" + }, { "creation_date": "########", "iops": 150, @@ -33,7 +50,7 @@ "value": "volume-standard-2" } ], - "volume_id": "##id-1##", + "volume_id": "##id-2##", "volume_type": "standard" }, { @@ -44,8 +61,8 @@ "delete_on_vm_deletion": false, "device_name": "/dev/xvdc", "state": "attached", - "vm_id": "##id-2##", - "volume_id": "##id-3##" + "vm_id": "##id-3##", + "volume_id": "##id-4##" } ], "size": 40, @@ -58,25 +75,8 @@ "value": "io1" } ], - "volume_id": "##id-3##", - "volume_type": "io1" - }, - { - "creation_date": "########", - "iops": 150, - "linked_volumes": [], - "size": 15, - "snapshot_id": "", - "state": "available", - "subregion_name": "eu-west-2a", - "tags": [ - { - "key": "Name", - "value": "volume-standard-1" - } - ], "volume_id": "##id-4##", - "volume_type": "standard" + "volume_type": "io1" } ] }, @@ -165,7 +165,7 @@ "deletion_protection": false, "get_admin_password": null, "hypervisor": "xen", - "id": "##id-2##", + "id": "##id-3##", "image_id": "##id-9##", "is_source_dest_checked": false, "keypair_name": "KP-TF159", @@ -174,7 +174,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -206,7 +206,7 @@ "tags": [], "timeouts": null, "user_data": "", - "vm_id": "##id-2##", + "vm_id": "##id-3##", "vm_initiated_shutdown_behavior": "stop", "vm_type": "###vm_type###" }, @@ -229,7 +229,7 @@ "schema_version": 0, "attributes": { "creation_date": "########", - "id": "##id-4##", + "id": "##id-1##", "iops": 150, "linked_volumes": [], "request_id": "########", @@ -244,7 +244,7 @@ } ], "termination_snapshot_name": null, - "volume_id": "##id-4##", + "volume_id": "##id-1##", "volume_type": "standard" }, "sensitive_attributes": [], @@ -262,7 +262,7 @@ "schema_version": 0, "attributes": { "creation_date": "########", - "id": "##id-1##", + "id": "##id-2##", "iops": 150, "linked_volumes": [], "request_id": "########", @@ -277,7 +277,7 @@ } ], "termination_snapshot_name": null, - "volume_id": "##id-1##", + "volume_id": "##id-2##", "volume_type": "standard" }, "sensitive_attributes": [], @@ -295,7 +295,7 @@ "schema_version": 0, "attributes": { "creation_date": "########", - "id": "##id-3##", + "id": "##id-4##", "iops": 100, "linked_volumes": [], "request_id": "########", @@ -310,7 +310,7 @@ } ], "termination_snapshot_name": null, - "volume_id": "##id-3##", + "volume_id": "##id-4##", "volume_type": "io1" }, "sensitive_attributes": [], @@ -330,12 +330,12 @@ "delete_on_vm_termination": false, "device_name": "/dev/xvdc", "force_unlink": null, - "id": "##id-3##", + "id": "##id-4##", "request_id": "########", "state": "attached", "timeouts": null, - "vm_id": "##id-2##", - "volume_id": "##id-3##" + "vm_id": "##id-3##", + "volume_id": "##id-4##" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwfX0=", diff --git a/tests/qa_provider_oapi/data/volumes/TF-159_volumes_datasource_attributes_ok4/step2.volumes_datasource_attributes_ok4.ref b/tests/qa_provider_oapi/data/volumes/TF-159_volumes_datasource_attributes_ok4/step2.volumes_datasource_attributes_ok4.ref index 296c778a1..67a6ea593 100644 --- a/tests/qa_provider_oapi/data/volumes/TF-159_volumes_datasource_attributes_ok4/step2.volumes_datasource_attributes_ok4.ref +++ b/tests/qa_provider_oapi/data/volumes/TF-159_volumes_datasource_attributes_ok4/step2.volumes_datasource_attributes_ok4.ref @@ -19,6 +19,23 @@ "request_id": "########", "volume_id": null, "volumes": [ + { + "creation_date": "########", + "iops": 150, + "linked_volumes": [], + "size": 15, + "snapshot_id": "", + "state": "available", + "subregion_name": "eu-west-2a", + "tags": [ + { + "key": "Name", + "value": "volume-standard-1" + } + ], + "volume_id": "##id-1##", + "volume_type": "standard" + }, { "creation_date": "########", "iops": 150, @@ -33,7 +50,7 @@ "value": "volume-standard-2" } ], - "volume_id": "##id-1##", + "volume_id": "##id-2##", "volume_type": "standard" }, { @@ -44,8 +61,8 @@ "delete_on_vm_deletion": false, "device_name": "/dev/xvdc", "state": "attached", - "vm_id": "##id-2##", - "volume_id": "##id-3##" + "vm_id": "##id-3##", + "volume_id": "##id-4##" } ], "size": 40, @@ -58,25 +75,8 @@ "value": "io1" } ], - "volume_id": "##id-3##", - "volume_type": "io1" - }, - { - "creation_date": "########", - "iops": 150, - "linked_volumes": [], - "size": 15, - "snapshot_id": "", - "state": "available", - "subregion_name": "eu-west-2a", - "tags": [ - { - "key": "Name", - "value": "volume-standard-1" - } - ], "volume_id": "##id-4##", - "volume_type": "standard" + "volume_type": "io1" } ] }, @@ -170,7 +170,7 @@ "value": "io1" } ], - "volume_id": "##id-3##" + "volume_id": "##id-4##" } ], "device_name": "/dev/xvdc" @@ -182,7 +182,7 @@ "deletion_protection": false, "get_admin_password": null, "hypervisor": "xen", - "id": "##id-2##", + "id": "##id-3##", "image_id": "##id-9##", "is_source_dest_checked": false, "keypair_name": "KP-TF159", @@ -191,7 +191,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], @@ -223,7 +223,7 @@ "tags": [], "timeouts": null, "user_data": "", - "vm_id": "##id-2##", + "vm_id": "##id-3##", "vm_initiated_shutdown_behavior": "stop", "vm_type": "###vm_type###" }, @@ -246,7 +246,7 @@ "schema_version": 0, "attributes": { "creation_date": "########", - "id": "##id-4##", + "id": "##id-1##", "iops": 150, "linked_volumes": [], "request_id": "########", @@ -261,7 +261,7 @@ } ], "termination_snapshot_name": null, - "volume_id": "##id-4##", + "volume_id": "##id-1##", "volume_type": "standard" }, "sensitive_attributes": [], @@ -279,7 +279,7 @@ "schema_version": 0, "attributes": { "creation_date": "########", - "id": "##id-1##", + "id": "##id-2##", "iops": 150, "linked_volumes": [], "request_id": "########", @@ -294,7 +294,7 @@ } ], "termination_snapshot_name": null, - "volume_id": "##id-1##", + "volume_id": "##id-2##", "volume_type": "standard" }, "sensitive_attributes": [], @@ -312,15 +312,15 @@ "schema_version": 0, "attributes": { "creation_date": "########", - "id": "##id-3##", + "id": "##id-4##", "iops": 100, "linked_volumes": [ { "delete_on_vm_deletion": false, "device_name": "/dev/xvdc", "state": "attached", - "vm_id": "##id-2##", - "volume_id": "##id-3##" + "vm_id": "##id-3##", + "volume_id": "##id-4##" } ], "request_id": "########", @@ -335,7 +335,7 @@ } ], "termination_snapshot_name": null, - "volume_id": "##id-3##", + "volume_id": "##id-4##", "volume_type": "io1" }, "sensitive_attributes": [], @@ -355,12 +355,12 @@ "delete_on_vm_termination": false, "device_name": "/dev/xvdc", "force_unlink": null, - "id": "##id-3##", + "id": "##id-4##", "request_id": "########", "state": "attached", "timeouts": null, - "vm_id": "##id-2##", - "volume_id": "##id-3##" + "vm_id": "##id-3##", + "volume_id": "##id-4##" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwfX0=", diff --git a/tests/qa_provider_oapi/data/volumes_link/TF-160_volumes_link_resource_attributes_ok/step1.volumes_link_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/volumes_link/TF-160_volumes_link_resource_attributes_ok/step1.volumes_link_resource_attributes_ok.ref index 841a885fa..42f645c2a 100644 --- a/tests/qa_provider_oapi/data/volumes_link/TF-160_volumes_link_resource_attributes_ok/step1.volumes_link_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/volumes_link/TF-160_volumes_link_resource_attributes_ok/step1.volumes_link_resource_attributes_ok.ref @@ -95,7 +95,7 @@ "net_id": "", "nics": [], "os_family": "", - "performance": "high", + "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", "primary_nic": [], diff --git a/tests/qa_provider_oapi/data/vpn_connections/TF-180_vpn_connection_datasources_attributes_ok/step1.vpn_connection_datasources_attributes_ok.ref b/tests/qa_provider_oapi/data/vpn_connections/TF-180_vpn_connection_datasources_attributes_ok/step1.vpn_connection_datasources_attributes_ok.ref index 8164128dd..cadeb8fe7 100644 --- a/tests/qa_provider_oapi/data/vpn_connections/TF-180_vpn_connection_datasources_attributes_ok/step1.vpn_connection_datasources_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/vpn_connections/TF-180_vpn_connection_datasources_attributes_ok/step1.vpn_connection_datasources_attributes_ok.ref @@ -25,11 +25,15 @@ "connection_type": "ipsec.1", "routes": [], "state": "available", - "static_routes_only": true, + "static_routes_only": false, "tags": [ + { + "key": "Test-TF180", + "value": "Terraform" + }, { "key": "Type:TF-180", - "value": "Static-TF:180" + "value": "Dynamic-TF:180" } ], "vgw_telemetries": [ @@ -50,15 +54,11 @@ "connection_type": "ipsec.1", "routes": [], "state": "available", - "static_routes_only": false, + "static_routes_only": true, "tags": [ - { - "key": "Test-TF180", - "value": "Terraform" - }, { "key": "Type:TF-180", - "value": "Dynamic-TF:180" + "value": "Static-TF:180" } ], "vgw_telemetries": [ @@ -95,7 +95,7 @@ "vpn_connections": [ { "client_gateway_configuration": "########", - "client_gateway_id": "##id-4##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "routes": [], "state": "available", @@ -120,7 +120,7 @@ } ], "virtual_gateway_id": "##id-2##", - "vpn_connection_id": "##id-5##" + "vpn_connection_id": "##id-3##" } ] }, @@ -144,7 +144,7 @@ "vpn_connections": [ { "client_gateway_configuration": "########", - "client_gateway_id": "##id-4##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "routes": [], "state": "available", @@ -169,7 +169,7 @@ } ], "virtual_gateway_id": "##id-2##", - "vpn_connection_id": "##id-5##" + "vpn_connection_id": "##id-3##" } ] }, @@ -193,7 +193,7 @@ "vpn_connections": [ { "client_gateway_configuration": "########", - "client_gateway_id": "##id-4##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "routes": [], "state": "available", @@ -218,7 +218,7 @@ } ], "virtual_gateway_id": "##id-2##", - "vpn_connection_id": "##id-5##" + "vpn_connection_id": "##id-3##" } ] }, @@ -242,7 +242,7 @@ "vpn_connections": [ { "client_gateway_configuration": "########", - "client_gateway_id": "##id-4##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "routes": [], "state": "available", @@ -267,7 +267,7 @@ } ], "virtual_gateway_id": "##id-2##", - "vpn_connection_id": "##id-5##" + "vpn_connection_id": "##id-3##" } ] }, @@ -291,7 +291,7 @@ "vpn_connections": [ { "client_gateway_configuration": "########", - "client_gateway_id": "##id-4##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", "routes": [], "state": "available", @@ -316,7 +316,7 @@ } ], "virtual_gateway_id": "##id-2##", - "vpn_connection_id": "##id-5##" + "vpn_connection_id": "##id-3##" } ] }, @@ -334,9 +334,9 @@ "schema_version": 0, "attributes": { "bgp_asn": 65000, - "client_gateway_id": "##id-4##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", - "id": "##id-4##", + "id": "##id-1##", "public_ip": "########", "request_id": "########", "state": "available", @@ -357,9 +357,9 @@ "schema_version": 0, "attributes": { "bgp_asn": 64900, - "client_gateway_id": "##id-1##", + "client_gateway_id": "##id-4##", "connection_type": "ipsec.1", - "id": "##id-1##", + "id": "##id-4##", "public_ip": "########", "request_id": "########", "state": "available", @@ -402,9 +402,9 @@ "schema_version": 0, "attributes": { "client_gateway_configuration": "########", - "client_gateway_id": "##id-4##", + "client_gateway_id": "##id-1##", "connection_type": "ipsec.1", - "id": "##id-5##", + "id": "##id-3##", "request_id": "########", "routes": [], "state": "available", @@ -430,7 +430,7 @@ } ], "virtual_gateway_id": "##id-2##", - "vpn_connection_id": "##id-5##" + "vpn_connection_id": "##id-3##" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19", @@ -451,9 +451,9 @@ "schema_version": 0, "attributes": { "client_gateway_configuration": "########", - "client_gateway_id": "##id-1##", + "client_gateway_id": "##id-4##", "connection_type": "ipsec.1", - "id": "##id-3##", + "id": "##id-5##", "request_id": "########", "routes": [], "state": "available", @@ -475,7 +475,7 @@ } ], "virtual_gateway_id": "##id-2##", - "vpn_connection_id": "##id-3##" + "vpn_connection_id": "##id-5##" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19", diff --git a/tests/qa_provider_oapi/resources.auto.tfvars b/tests/qa_provider_oapi/resources.auto.tfvars index 75cdd17fb..6e56f43e0 100644 --- a/tests/qa_provider_oapi/resources.auto.tfvars +++ b/tests/qa_provider_oapi/resources.auto.tfvars @@ -1,5 +1,7 @@ -#image_id = "ami-0736e5f7" #Copie-CentOS-8-2021.06.17-0 #eu-west-2 -#service_name = "com.outscale.eu-west-2.api" #example #eu-west-2 -account_id = "xxxxxxxxxx" -osu_bucket_name = "bucket-name" -vm_type = "tinav4.c2r2p2" +###PAR1 credentials +image_id = "ami-0736e5f7" #Copie-CentOS-8-2021.06.17-0 #eu-west-2 +account_id = "xxxxxxxxxxxxx" +osu_bucket_name = "terraform-bucket" +service_name = "com.outscale.eu-west-2.api" #example #eu-west-2 +vm_type = "tinav5.c2r2p3" + diff --git a/tests/qa_provider_oapi/test_provider_oapi.py b/tests/qa_provider_oapi/test_provider_oapi.py index 5a3dfb431..c9d89298d 100644 --- a/tests/qa_provider_oapi/test_provider_oapi.py +++ b/tests/qa_provider_oapi/test_provider_oapi.py @@ -49,7 +49,10 @@ 'orn', 'last_state_change_date', 'outside_ip_address', - 'available_ips_count'] + 'available_ips_count', + 'load_balancer_name', + 'load_balancer_names', + 'listener_rule_name'] IGNORE_END_PATHS = [] TINA_ID_PREFIXES = ['i', 'subnet', 'snap', 'img', 'vol', 'eni', 'vpc', 'igw', 'nat', 'vgw', 'pcx', 'sg', 'rtb', 'rtbassoc', 'vpn', 'vpcconn', 'ami', 'dxvif','vpce','fgpu','aar','ca'] VARIABLES_FILE_NAME = ['resources.auto.tfvars'] @@ -426,8 +429,8 @@ def run_cmd(self, cmd, exp_ret_code=0): def exec_test_step(self, tf_file_path, out_file_path): self.logger.debug("Exec step : {}".format(tf_file_path)) self.log += "\nTerraform validate:\n{}".format(self.run_cmd("terraform validate -no-color")[0]) - self.log += "\nTerraform plan:\n{}".format(self.run_cmd("terraform plan -lock=false -no-color")[0]) - self.log += "\nTerraform apply:\n{}".format(self.run_cmd("terraform apply -auto-approve -lock=false -no-color")[0]) + self.log += "\nTerraform plan:\n{}".format(self.run_cmd("export TF_VAR_suffixe_lbu_name=$((RANDOM%10000)) && terraform plan -lock=false -no-color")[0]) + self.log += "\nTerraform apply:\n{}".format(self.run_cmd("export TF_VAR_suffixe_lbu_name=$((RANDOM%10000)) && terraform apply -auto-approve -lock=false -no-color")[0]) self.log += "\nTerraform show:\n{}".format(self.run_cmd("terraform show -no-color")[0]) self.run_cmd("terraform state pull > {}".format(out_file_path)) @@ -483,7 +486,7 @@ def exec_test(self, test_name, test_path): raise error finally: try: - self.run_cmd("terraform destroy -auto-approve -no-color") + self.run_cmd("export TF_VAR_suffixe_lbu_name=$((RANDOM%10000)) && terraform destroy -auto-approve -no-color") finally: self.run_cmd("rm -f test.tf") self.run_cmd("rm -f terraform.tfstate") diff --git a/tests/qa_provider_oapi/variables.tf b/tests/qa_provider_oapi/variables.tf index 0fb6792b7..cfb18df8f 100644 --- a/tests/qa_provider_oapi/variables.tf +++ b/tests/qa_provider_oapi/variables.tf @@ -9,7 +9,7 @@ variable "osu_bucket_name" {} variable "vm_type" { type = string - default = "tinav4.c2r2p2" + default = "tinav5.c2r2p2" } variable "fgpu_gen" { @@ -21,3 +21,7 @@ variable "fgpu_vm_type" { type = string default = "tinav5.c2r2p1" } + +variable "suffixe_lbu_name" { +type = string +}