From e1448b01145e310f989f9c1f132825fb3817a46a Mon Sep 17 00:00:00 2001 From: Thiery Ouattara Date: Fri, 15 Dec 2023 16:22:56 +0000 Subject: [PATCH] Update tests for migration --- ...exible_gpu_link_resource_attributes_ok.ref | 32 +- ...lexible_gpu_link_resource_attributes_ok.tf | 24 +- ...flexible_gpus_datasource_attributes_ok.ref | 28 +- ....flexible_gpus_datasource_attributes_ok.tf | 2 +- .../step1.image_datasource_attributes_ok.ref | 14 +- ...e_no-reboot_resource_std_attributes_ok.ref | 14 +- ...unch_permission_resource_attributes_ok.ref | 14 +- .../step1.images_datasource_attributes_ok.ref | 14 +- .../step2.images_datasource_attributes_ok.ref | 14 +- ...c_load_balancer_resource_attributes_ok.ref | 44 +-- ...ancer_resource_add_tag_and_listener_ok.ref | 44 +-- ...er_resource_remove_tag_and_listener_ok.ref | 44 +-- ...d_balancer_resource_update_listener_ok.ref | 44 +-- ...cer_attributes_resource_access_logs_ok.ref | 66 ++-- ...er_attributes_resource_health_check_ok.ref | 54 +-- ...er_attributes_resource_health_check_ok.ref | 54 +-- ...tes_resource_update_listener_policy_ok.ref | 110 +++--- ...ource_update_listener_policy_detach_ok.ref | 110 +++--- ...rce_update_listener_policy_reattach_ok.ref | 110 +++--- ...rce_update_listener_ssl_certificate_ok.ref | 74 +++-- ...listener_rule_datasource_attributes_ok.ref | 58 ++-- ...r_listener_rule_resource_attributes_ok.ref | 58 ++-- ...r_listener_rule_resource_attributes_ok.ref | 58 ++-- ...istener_rules_datasource_attributes_ok.ref | 58 ++-- ...balancer_policy_resource_attributes_ok.ref | 220 ++++++------ ...balancer_tags_datasource_attributes_ok.ref | 88 ++--- ...1.net_peering_datasource_attributes_ok.ref | 68 ++-- ...ep1.net_peering_resource_attributes_ok.ref | 36 +- ...tep1.net_peering_resource_attributes_ok.tf | 2 +- ...ing_acceptation_resource_attributes_ok.ref | 72 ++-- ...ring_acceptation_resource_attributes_ok.tf | 4 +- .../step1.nic_datasource_attributes_ok.ref | 312 +++--------------- .../step1.nic_resource_attributes_ok.ref | 62 +--- .../step2.nic_resource_attributes_update.ref | 62 +--- .../step1.nic_link_resource_attributes_ok.tf | 4 +- ....nic_private_ip_resource_attributes_ok.ref | 25 +- .../step1.nics_datasource_attributes_ok.tf | 18 +- ...resource_private_with_multiple_NICs_ok.ref | 43 +-- ..._resource_private_with_multiple_NICs_ok.tf | 6 +- ...e_load_balancer_update_security_groups.ref | 44 +-- ...vate_load_balancer_Add_security_groups.ref | 44 +-- .../step1.test_destroy_igw.ref | 86 ++--- ...l_load_balancer_resource_attributes_ok.ref | 48 +-- ...al_load_balancer_resource_attributes_ok.tf | 4 +- ...g_load_balancer_resource_attributes_ok.ref | 52 +-- ...load_balancer_datasource_attributes_ok.ref | 92 +++--- ....load_balancer_datasource_attributes_ok.tf | 4 +- ...p2.load_balancer_datasource_remove_lbu.ref | 4 +- ...ep2.load_balancer_datasource_remove_lbu.tf | 4 +- ...oad_balancers_datasource_attributes_ok.ref | 176 +++++----- ...ancers_datasource_attributes_removeLBU.ref | 44 +-- ....nat_services_datasource_attributes_ok.ref | 4 +- ....public_ip_link_resource_attributes_ok.ref | 14 +- .../step1.quota_datasource_attributes_ok.ref | 44 +-- .../step1.quotas_datasource_attributes_ok.ref | 44 +-- ...quotas_datasource_attributes_ok_global.ref | 44 +-- .../step1.vm_datasource_centos_ok.ref | 84 +++-- .../step2.vm_datasource_centos_ok.ref | 112 ++++--- .../step1.vm_resource_with_user_data_ok.ref | 14 +- ...step1.vm_resource_update_attributes_ok.ref | 28 +- .../step2.vm_resource_update_keypair_ok.ref | 28 +- ...3.vm_resource_update_security_group_ok.ref | 28 +- ...resource_update_deletion_protection_ok.ref | 28 +- .../step5.vm_resource_update_bdm_ok.ref | 30 +- ...tep6.vm_resource_update_performance_ok.ref | 28 +- .../step7.vm_resource_update_vm_type_ok.ref | 28 +- .../step8.vm_resource_update_user_data_ok.ref | 28 +- ...m_resource_update_shtdown_behaviour_ok.ref | 28 +- ..._state_datasource_centos_attributes_ok.ref | 14 +- ...states_datasource_centos_attributes_ok.ref | 28 +- .../step1.vms_datasource_attributes_ok.ref | 70 ++-- .../step2.vms_datasource_attributes_ok.ref | 112 ++++--- ...tep1.volumes_datasource_attributes_ok4.ref | 16 +- ...tep2.volumes_datasource_attributes_ok4.ref | 30 +- 74 files changed, 1898 insertions(+), 1752 deletions(-) diff --git a/tests/qa_provider_oapi/data/flexible_gpu_link/TF-174_flexible_gpu_link_resource_attributes_ok/step1.flexible_gpu_link_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/flexible_gpu_link/TF-174_flexible_gpu_link_resource_attributes_ok/step1.flexible_gpu_link_resource_attributes_ok.ref index 742234c0d..6af6bbcbd 100644 --- a/tests/qa_provider_oapi/data/flexible_gpu_link/TF-174_flexible_gpu_link_resource_attributes_ok/step1.flexible_gpu_link_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/flexible_gpu_link/TF-174_flexible_gpu_link_resource_attributes_ok/step1.flexible_gpu_link_resource_attributes_ok.ref @@ -38,8 +38,10 @@ { "schema_version": 0, "attributes": { - "flexible_gpu_id": "##id-0##", - "id": "##id-0##", + "flexible_gpu_ids": [ + "##id-0##" + ], + "id": "##id-1##", "request_id": "########", "timeouts": null, "vm_id": "##id-1##" @@ -63,7 +65,7 @@ { "schema_version": 0, "attributes": { - "id": "##id-2##", + "id": "##id-3##", "keypair_fingerprint": "########", "keypair_name": "KP-TF174", "private_key": "########", @@ -90,12 +92,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-3##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-4##" + } + ], "device_name": "/dev/sda1" } ], @@ -105,8 +109,8 @@ "deletion_protection": false, "get_admin_password": null, "hypervisor": "xen", - "id": "##id-1##", - "image_id": "##id-4##", + "id": "##id-2##", + "image_id": "##id-5##", "is_source_dest_checked": true, "keypair_name": "KP-TF174", "launch_number": 0, @@ -127,14 +131,14 @@ "public_dns_name": "########", "public_ip": "########", "request_id": "########", - "reservation_id": "##id-5##", + "reservation_id": "##id-6##", "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": null, "security_group_names": null, "security_groups": [ { - "security_group_id": "##id-6##", + "security_group_id": "##id-7##", "security_group_name": "default" } ], @@ -144,7 +148,7 @@ "tags": [], "timeouts": null, "user_data": "", - "vm_id": "##id-1##", + "vm_id": "##id-2##", "vm_initiated_shutdown_behavior": "restart", "vm_type": "tinav5.c2r2p1" }, diff --git a/tests/qa_provider_oapi/data/flexible_gpu_link/TF-174_flexible_gpu_link_resource_attributes_ok/step1.flexible_gpu_link_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/flexible_gpu_link/TF-174_flexible_gpu_link_resource_attributes_ok/step1.flexible_gpu_link_resource_attributes_ok.tf index 54d816ded..a7cc9a715 100644 --- a/tests/qa_provider_oapi/data/flexible_gpu_link/TF-174_flexible_gpu_link_resource_attributes_ok/step1.flexible_gpu_link_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/flexible_gpu_link/TF-174_flexible_gpu_link_resource_attributes_ok/step1.flexible_gpu_link_resource_attributes_ok.tf @@ -1,25 +1,25 @@ resource "outscale_keypair" "my_keypair" { - keypair_name = "KP-TF174" + keypair_name = "KP-TF174" } resource "outscale_vm" "MaVM" { - image_id = var.image_id - vm_type = var.fgpu_vm_type - keypair_name = outscale_keypair.my_keypair.keypair_name - placement_subregion_name = "${var.region}a" - vm_initiated_shutdown_behavior = "restart" + image_id = var.image_id + vm_type = var.fgpu_vm_type + keypair_name = outscale_keypair.my_keypair.keypair_name + placement_subregion_name = "${var.region}a" + vm_initiated_shutdown_behavior = "restart" } resource "outscale_flexible_gpu" "fGPU-1" { - model_name = "nvidia-p6" - generation = var.fgpu_gen - subregion_name = "${var.region}a" - delete_on_vm_deletion = true + model_name = "nvidia-p6" + generation = var.fgpu_gen + subregion_name = "${var.region}a" + delete_on_vm_deletion = true } resource "outscale_flexible_gpu_link" "link_fGPU" { - flexible_gpu_id = outscale_flexible_gpu.fGPU-1.flexible_gpu_id - vm_id = outscale_vm.MaVM.vm_id + flexible_gpu_ids = [outscale_flexible_gpu.fGPU-1.flexible_gpu_id] + vm_id = outscale_vm.MaVM.vm_id } diff --git a/tests/qa_provider_oapi/data/flexible_gpus/TF-175_flexible_gpus_datasource_attributes_ok/step1.flexible_gpus_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/flexible_gpus/TF-175_flexible_gpus_datasource_attributes_ok/step1.flexible_gpus_datasource_attributes_ok.ref index 20d782aac..6d0a850fd 100644 --- a/tests/qa_provider_oapi/data/flexible_gpus/TF-175_flexible_gpus_datasource_attributes_ok/step1.flexible_gpus_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/flexible_gpus/TF-175_flexible_gpus_datasource_attributes_ok/step1.flexible_gpus_datasource_attributes_ok.ref @@ -147,8 +147,10 @@ { "schema_version": 0, "attributes": { - "flexible_gpu_id": "##id-0##", - "id": "##id-0##", + "flexible_gpu_ids": [ + "##id-0##" + ], + "id": "##id-4##", "request_id": "########", "timeouts": null, "vm_id": "##id-1##" @@ -172,7 +174,7 @@ { "schema_version": 0, "attributes": { - "id": "##id-4##", + "id": "##id-5##", "keypair_fingerprint": "########", "keypair_name": "KP-TF1775", "private_key": "########", @@ -199,12 +201,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sda1" } ], @@ -215,7 +219,7 @@ "get_admin_password": null, "hypervisor": "xen", "id": "##id-1##", - "image_id": "##id-6##", + "image_id": "##id-7##", "is_source_dest_checked": true, "keypair_name": "KP-TF1775", "launch_number": 0, @@ -236,14 +240,14 @@ "public_dns_name": "########", "public_ip": "########", "request_id": "########", - "reservation_id": "##id-7##", + "reservation_id": "##id-8##", "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": null, "security_group_names": null, "security_groups": [ { - "security_group_id": "##id-8##", + "security_group_id": "##id-9##", "security_group_name": "default" } ], diff --git a/tests/qa_provider_oapi/data/flexible_gpus/TF-175_flexible_gpus_datasource_attributes_ok/step1.flexible_gpus_datasource_attributes_ok.tf b/tests/qa_provider_oapi/data/flexible_gpus/TF-175_flexible_gpus_datasource_attributes_ok/step1.flexible_gpus_datasource_attributes_ok.tf index de5935605..252560728 100644 --- a/tests/qa_provider_oapi/data/flexible_gpus/TF-175_flexible_gpus_datasource_attributes_ok/step1.flexible_gpus_datasource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/flexible_gpus/TF-175_flexible_gpus_datasource_attributes_ok/step1.flexible_gpus_datasource_attributes_ok.tf @@ -25,7 +25,7 @@ resource "outscale_flexible_gpu" "fGPU-2" { } resource "outscale_flexible_gpu_link" "link_fGPU" { - flexible_gpu_id = outscale_flexible_gpu.fGPU-1.flexible_gpu_id + flexible_gpu_ids = [outscale_flexible_gpu.fGPU-1.flexible_gpu_id] vm_id = outscale_vm.MaVM.vm_id } 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 01f1e30db..df9035bd9 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 @@ -559,12 +559,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-4##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-4##" + } + ], "device_name": "/dev/sda1" } ], diff --git a/tests/qa_provider_oapi/data/image/TF-67_image_resource_attributes_ok/step1.image_no-reboot_resource_std_attributes_ok.ref b/tests/qa_provider_oapi/data/image/TF-67_image_resource_attributes_ok/step1.image_no-reboot_resource_std_attributes_ok.ref index ca9e3a851..da5bb9b02 100644 --- a/tests/qa_provider_oapi/data/image/TF-67_image_resource_attributes_ok/step1.image_no-reboot_resource_std_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/image/TF-67_image_resource_attributes_ok/step1.image_no-reboot_resource_std_attributes_ok.ref @@ -163,12 +163,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-7##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-7##" + } + ], "device_name": "/dev/sda1" } ], 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 c244bde60..df608c1f1 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 @@ -152,12 +152,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" } ], 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 aba37277f..5a544a4f6 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 @@ -97,12 +97,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-4##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-4##" + } + ], "device_name": "/dev/sda1" } ], 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 b2784aad5..4d146329a 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 @@ -726,12 +726,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-11##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-11##" + } + ], "device_name": "/dev/sda1" } ], 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 7683bb966..d92d5527b 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -59,10 +63,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 8d906ef80..c2d14115b 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -67,10 +71,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 46aa28f1f..a26d27184 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -51,10 +55,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 f1071d1ac..2247cf79f 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -51,10 +55,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-2##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-2##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 c5c4289ff..785b040d5 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -59,10 +63,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -103,7 +109,17 @@ "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": null, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -131,10 +147,12 @@ "request_id": "########", "security_groups": [], "server_certificate_id": null, - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 db6995e1f..82f28ddd7 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -59,10 +63,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -141,10 +147,12 @@ "request_id": "########", "security_groups": [], "server_certificate_id": null, - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 3b32e8dc3..9dbb74a87 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "36", - "healthy_threshold": "10", - "path": "/index.html", - "port": "80", - "protocol": "HTTP", - "timeout": "6", - "unhealthy_threshold": "6" - }, + "health_check": [ + { + "check_interval": 36, + "healthy_threshold": 10, + "path": "/index.html", + "port": 80, + "protocol": "HTTP", + "timeout": 6, + "unhealthy_threshold": 6 + } + ], "id": "##id-0##", "listeners": [ { @@ -59,10 +63,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -141,10 +147,12 @@ "request_id": "########", "security_groups": [], "server_certificate_id": null, - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 c755f1547..c86baa3d7 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -59,10 +63,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -103,7 +109,17 @@ "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": null, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -139,10 +155,12 @@ "request_id": "########", "security_groups": [], "server_certificate_id": null, - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -176,26 +194,30 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "cookie_expiration_period": 1, "cookie_name": "########", "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-2##", "listeners": [ { @@ -229,10 +251,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 3b6025854..b3008a0d0 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -65,10 +69,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -109,7 +115,17 @@ "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": [], + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -141,10 +157,12 @@ "request_id": "########", "security_groups": [], "server_certificate_id": null, - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -177,26 +195,30 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "cookie_expiration_period": 1, "cookie_name": "########", "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-2##", "listeners": [ { @@ -230,10 +252,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 f91293870..e070f0120 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -63,10 +67,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -107,7 +113,17 @@ "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": [], + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -143,10 +159,12 @@ "request_id": "########", "security_groups": [], "server_certificate_id": null, - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -180,26 +198,30 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "cookie_expiration_period": 1, "cookie_name": "########", "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-2##", "listeners": [ { @@ -233,10 +255,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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.ref 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.ref index 8aaf4105e..bcd2dc6b1 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.ref +++ 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.ref @@ -9,29 +9,33 @@ "mode": "managed", "type": "outscale_load_balancer", "name": "public_lbu1", - "provider": "provider[\"registry.terraform.io/outscale-dev/outscale\"]", + "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -51,10 +55,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-2##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-2##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "###region###a" @@ -78,7 +84,7 @@ "mode": "managed", "type": "outscale_load_balancer_attributes", "name": "attributes-ssl-certificate", - "provider": "provider[\"registry.terraform.io/outscale-dev/outscale\"]", + "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { "schema_version": 0, @@ -94,7 +100,17 @@ "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": null, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -114,10 +130,12 @@ "request_id": "########", "security_groups": [], "server_certificate_id": "##id-3##", - "source_security_group": { - "security_group_account_id": "##id-2##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-2##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "###region###a" @@ -143,7 +161,7 @@ "mode": "managed", "type": "outscale_server_certificate", "name": "my_server_certificate_TF-86", - "provider": "provider[\"registry.terraform.io/outscale-dev/outscale\"]", + "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { "schema_version": 0, @@ -169,7 +187,7 @@ "mode": "managed", "type": "outscale_server_certificate", "name": "my_server_certificate_TF-86_2", - "provider": "provider[\"registry.terraform.io/outscale-dev/outscale\"]", + "provider": "provider[\"registry.terraform.io/outscale/outscale\"]", "instances": [ { "schema_version": 0, 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 e4788beeb..0374da0f8 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 @@ -63,24 +63,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-5##", "listeners": [ { @@ -100,10 +104,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-6##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-6##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -244,12 +250,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-11##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-11##" + } + ], "device_name": "/dev/sda1" } ], 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 645577f41..f8e4a2f8f 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 @@ -36,24 +36,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-1##", "listeners": [ { @@ -73,10 +77,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-2##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-2##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -259,12 +265,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-12##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-12##" + } + ], "device_name": "/dev/sda1" } ], 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 f9aafb456..6559cbaf2 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 @@ -36,26 +36,30 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [ "##id-1##" ], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-2##", "listeners": [ { @@ -75,10 +79,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-3##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-3##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -261,12 +267,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-12##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-12##" + } + ], "device_name": "/dev/sda1" } ], 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 8ba3ecdb2..de195dd2b 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 @@ -79,24 +79,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-6##", "listeners": [ { @@ -116,10 +120,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-7##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-7##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -260,12 +266,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-11##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-11##" + } + ], "device_name": "/dev/sda1" } ], 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 5b74590fc..dbfb49347 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -51,10 +55,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -80,26 +86,30 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "cookie_expiration_period": 1, "cookie_name": "########", "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-2##", "listeners": [ { @@ -125,10 +135,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -157,12 +169,14 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [ { "cookie_name": "########", @@ -173,15 +187,17 @@ "cookie_expiration_period": null, "cookie_name": "########", "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-3##", "listeners": [ { @@ -207,10 +223,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -240,12 +258,14 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [ { "cookie_name": "########", @@ -256,15 +276,17 @@ "cookie_expiration_period": 1, "cookie_name": "########", "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-4##", "listeners": [ { @@ -293,10 +315,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -327,12 +351,14 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [ { "cookie_name": "########", @@ -347,15 +373,17 @@ "cookie_expiration_period": null, "cookie_name": "########", "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-5##", "listeners": [ { @@ -384,10 +412,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 2f55c652c..e5e7516ea 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 @@ -62,24 +62,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-1##", "listeners": [ { @@ -99,10 +103,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-2##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-2##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" @@ -136,24 +142,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-3##", "listeners": [ { @@ -173,10 +183,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-2##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-2##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" diff --git a/tests/qa_provider_oapi/data/nets/TF-104_net_peering_datasource_attributes_ok/step1.net_peering_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-104_net_peering_datasource_attributes_ok/step1.net_peering_datasource_attributes_ok.ref index ad5f4850b..6aa493ad7 100644 --- a/tests/qa_provider_oapi/data/nets/TF-104_net_peering_datasource_attributes_ok/step1.net_peering_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-104_net_peering_datasource_attributes_ok/step1.net_peering_datasource_attributes_ok.ref @@ -14,24 +14,30 @@ { "schema_version": 0, "attributes": { - "accepter_net": { - "account_id": "##id-0##", - "ip_range": "10.10.0.0/24", - "net_id": "##id-1##" - }, + "accepter_net": [ + { + "account_id": "##id-0##", + "ip_range": "10.10.0.0/24", + "net_id": "##id-1##" + } + ], "filter": "########", "id": "##id-2##", "net_peering_id": "##id-2##", "request_id": "########", - "source_net": { - "account_id": "##id-0##", - "ip_range": "10.31.0.0/16", - "net_id": "##id-3##" - }, - "state": { - "message": "########", - "name": "pending-acceptance" - }, + "source_net": [ + { + "account_id": "##id-0##", + "ip_range": "10.31.0.0/16", + "net_id": "##id-3##" + } + ], + "state": [ + { + "message": "########", + "name": "pending-acceptance" + } + ], "tags": [ { "key": "Key-2", @@ -102,26 +108,32 @@ { "schema_version": 0, "attributes": { - "accepter_net": { - "account_id": "##id-0##", - "ip_range": "10.10.0.0/24", - "net_id": "##id-1##" - }, + "accepter_net": [ + { + "account_id": "##id-0##", + "ip_range": "10.10.0.0/24", + "net_id": "##id-1##" + } + ], "accepter_net_id": "##id-1##", "id": "##id-2##", "net_peering_id": "##id-2##", "request_id": "########", - "source_net": { - "account_id": "##id-0##", - "ip_range": "10.31.0.0/16", - "net_id": "##id-3##" - }, + "source_net": [ + { + "account_id": "##id-0##", + "ip_range": "10.31.0.0/16", + "net_id": "##id-3##" + } + ], "source_net_account_id": null, "source_net_id": "##id-3##", - "state": { - "message": "########", - "name": "pending-acceptance" - }, + "state": [ + { + "message": "########", + "name": "pending-acceptance" + } + ], "tags": [ { "key": "Key-2", diff --git a/tests/qa_provider_oapi/data/nets/TF-105_net_peering_resource_attributes_ok/step1.net_peering_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-105_net_peering_resource_attributes_ok/step1.net_peering_resource_attributes_ok.ref index 042984f52..38cb5cdec 100644 --- a/tests/qa_provider_oapi/data/nets/TF-105_net_peering_resource_attributes_ok/step1.net_peering_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-105_net_peering_resource_attributes_ok/step1.net_peering_resource_attributes_ok.ref @@ -39,7 +39,7 @@ "attributes": { "dhcp_options_set_id": "##id-0##", "id": "##id-2##", - "ip_range": "10.31.0.0/16", + "ip_range": "10.32.0.0/16", "net_id": "##id-2##", "request_id": "########", "state": "available", @@ -60,26 +60,32 @@ { "schema_version": 0, "attributes": { - "accepter_net": { - "account_id": "##id-3##", - "ip_range": "10.10.0.0/24", - "net_id": "##id-1##" - }, + "accepter_net": [ + { + "account_id": "##id-3##", + "ip_range": "10.10.0.0/24", + "net_id": "##id-1##" + } + ], "accepter_net_id": "##id-1##", "id": "##id-4##", "net_peering_id": "##id-4##", "request_id": "########", - "source_net": { - "account_id": "##id-3##", - "ip_range": "10.31.0.0/16", - "net_id": "##id-2##" - }, + "source_net": [ + { + "account_id": "##id-3##", + "ip_range": "10.32.0.0/16", + "net_id": "##id-2##" + } + ], "source_net_account_id": null, "source_net_id": "##id-2##", - "state": { - "message": "########", - "name": "pending-acceptance" - }, + "state": [ + { + "message": "########", + "name": "pending-acceptance" + } + ], "tags": [] }, "sensitive_attributes": [], diff --git a/tests/qa_provider_oapi/data/nets/TF-105_net_peering_resource_attributes_ok/step1.net_peering_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/nets/TF-105_net_peering_resource_attributes_ok/step1.net_peering_resource_attributes_ok.tf index 676d43ebe..894f74dfd 100644 --- a/tests/qa_provider_oapi/data/nets/TF-105_net_peering_resource_attributes_ok/step1.net_peering_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-105_net_peering_resource_attributes_ok/step1.net_peering_resource_attributes_ok.tf @@ -3,7 +3,7 @@ resource "outscale_net" "outscale_net" { } resource "outscale_net" "outscale_net2" { - ip_range = "10.31.0.0/16" + ip_range = "10.32.0.0/16" } resource "outscale_net_peering" "outscale_net_peering" { diff --git a/tests/qa_provider_oapi/data/nets/TF-106_net_peering_acceptation_resource_attributes_ok/step1.net_peering_acceptation_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-106_net_peering_acceptation_resource_attributes_ok/step1.net_peering_acceptation_resource_attributes_ok.ref index 327125618..34e635bb2 100644 --- a/tests/qa_provider_oapi/data/nets/TF-106_net_peering_acceptation_resource_attributes_ok/step1.net_peering_acceptation_resource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/nets/TF-106_net_peering_acceptation_resource_attributes_ok/step1.net_peering_acceptation_resource_attributes_ok.ref @@ -16,7 +16,7 @@ "attributes": { "dhcp_options_set_id": "##id-0##", "id": "##id-1##", - "ip_range": "10.10.0.0/24", + "ip_range": "10.12.0.0/24", "net_id": "##id-1##", "request_id": "########", "state": "available", @@ -39,7 +39,7 @@ "attributes": { "dhcp_options_set_id": "##id-0##", "id": "##id-2##", - "ip_range": "10.31.0.0/16", + "ip_range": "10.32.0.0/16", "net_id": "##id-2##", "request_id": "########", "state": "available", @@ -60,26 +60,32 @@ { "schema_version": 0, "attributes": { - "accepter_net": { - "account_id": "##id-3##", - "ip_range": "10.10.0.0/24", - "net_id": "##id-1##" - }, + "accepter_net": [ + { + "account_id": "##id-3##", + "ip_range": "10.12.0.0/24", + "net_id": "##id-1##" + } + ], "accepter_net_id": "##id-1##", "id": "##id-4##", "net_peering_id": "##id-4##", "request_id": "########", - "source_net": { - "account_id": "##id-3##", - "ip_range": "10.31.0.0/16", - "net_id": "##id-2##" - }, + "source_net": [ + { + "account_id": "##id-3##", + "ip_range": "10.32.0.0/16", + "net_id": "##id-2##" + } + ], "source_net_account_id": null, "source_net_id": "##id-2##", - "state": { - "message": "########", - "name": "pending-acceptance" - }, + "state": [ + { + "message": "########", + "name": "pending-acceptance" + } + ], "tags": [ { "key": "name", @@ -105,25 +111,31 @@ { "schema_version": 0, "attributes": { - "accepter_net": { - "account_id": "##id-3##", - "ip_range": "10.10.0.0/24", - "net_id": "##id-1##" - }, + "accepter_net": [ + { + "account_id": "##id-3##", + "ip_range": "10.12.0.0/24", + "net_id": "##id-1##" + } + ], "accepter_net_id": "##id-1##", "id": "##id-4##", "net_peering_id": "##id-4##", "request_id": "########", - "source_net": { - "account_id": "##id-3##", - "ip_range": "10.31.0.0/16", - "net_id": "##id-2##" - }, + "source_net": [ + { + "account_id": "##id-3##", + "ip_range": "10.32.0.0/16", + "net_id": "##id-2##" + } + ], "source_net_id": "##id-2##", - "state": { - "message": "########", - "name": "active" - }, + "state": [ + { + "message": "########", + "name": "active" + } + ], "tags": [ { "key": "name", diff --git a/tests/qa_provider_oapi/data/nets/TF-106_net_peering_acceptation_resource_attributes_ok/step1.net_peering_acceptation_resource_attributes_ok.tf b/tests/qa_provider_oapi/data/nets/TF-106_net_peering_acceptation_resource_attributes_ok/step1.net_peering_acceptation_resource_attributes_ok.tf index 94b8538b6..0db27f9a5 100644 --- a/tests/qa_provider_oapi/data/nets/TF-106_net_peering_acceptation_resource_attributes_ok/step1.net_peering_acceptation_resource_attributes_ok.tf +++ b/tests/qa_provider_oapi/data/nets/TF-106_net_peering_acceptation_resource_attributes_ok/step1.net_peering_acceptation_resource_attributes_ok.tf @@ -1,9 +1,9 @@ resource "outscale_net" "outscale_net" { - ip_range = "10.10.0.0/24" + ip_range = "10.12.0.0/24" } resource "outscale_net" "outscale_net2" { - ip_range = "10.31.0.0/16" + ip_range = "10.32.2.0/16" } resource "outscale_net_peering" "outscale_net_peering" { 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 37b9337a6..e3a989d1a 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 @@ -19,21 +19,8 @@ "filter": "########", "id": "##id-1##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-1##", @@ -42,25 +29,13 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" }, { "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -106,21 +81,8 @@ "filter": "########", "id": "##id-1##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-1##", @@ -129,25 +91,13 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" }, { "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -193,21 +143,17 @@ "filter": "########", "id": "##id-5##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "true", - "device_number": "0", - "link_nic_id": "##id-6##", - "state": "attached", - "vm_account_id": "##id-0##", - "vm_id": "##id-7##" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [ + { + "delete_on_vm_deletion": "true", + "device_number": 0, + "link_nic_id": "##id-6##", + "state": "attached", + "vm_account_id": "##id-0##", + "vm_id": "##id-7##" + } + ], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-5##", @@ -216,13 +162,7 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -259,21 +199,8 @@ "filter": "########", "id": "##id-9##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-9##", @@ -282,25 +209,13 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" }, { "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -342,21 +257,8 @@ "filter": "########", "id": "##id-1##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-1##", @@ -365,25 +267,13 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" }, { "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -429,21 +319,8 @@ "filter": "########", "id": "##id-1##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-1##", @@ -452,25 +329,13 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" }, { "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -538,21 +403,8 @@ "description": "TF-109", "id": "##id-1##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-1##", @@ -560,26 +412,14 @@ "private_ip": "########", "private_ips": [ { - "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "is_primary": true, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" }, { - "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "is_primary": false, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -633,21 +473,8 @@ "description": "", "id": "##id-9##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-9##", @@ -655,26 +482,14 @@ "private_ip": "########", "private_ips": [ { - "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "is_primary": true, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" }, { - "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "is_primary": false, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -721,21 +536,8 @@ "description": "", "id": "##id-11##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-11##", @@ -744,13 +546,7 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -959,12 +755,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-15##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-15##" + } + ], "device_name": "/dev/sda1" } ], 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 c8683c08c..cf4799657 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 @@ -41,21 +41,8 @@ "description": "", "id": "##id-3##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-1##", "nic_id": "##id-3##", @@ -64,13 +51,7 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -112,21 +93,8 @@ "description": "", "id": "##id-6##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-1##", "nic_id": "##id-6##", @@ -134,26 +102,14 @@ "private_ip": "########", "private_ips": [ { - "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "is_primary": true, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" }, { - "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "is_primary": false, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } 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 7570e4524..236b83d11 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 @@ -41,21 +41,8 @@ "description": "", "id": "##id-3##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-1##", "nic_id": "##id-3##", @@ -64,13 +51,7 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -115,21 +96,8 @@ "description": "", "id": "##id-6##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-1##", "nic_id": "##id-6##", @@ -137,26 +105,14 @@ "private_ip": "########", "private_ips": [ { - "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "is_primary": true, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" }, { - "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "is_primary": false, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } 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 75907963a..0526bc29d 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 @@ -11,7 +11,7 @@ resource "outscale_vm" "outscale_vm" { resource "outscale_net" "outscale_net" { - ip_range = "10.0.0.0/16" + ip_range = "10.0.3.0/16" } resource "outscale_security_group" "outscale_security_group" { @@ -22,7 +22,7 @@ resource "outscale_security_group" "outscale_security_group" { resource "outscale_subnet" "outscale_subnet" { subregion_name = "${var.region}a" - ip_range = "10.0.0.0/16" + ip_range = "10.0.3.0/16" 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 3a3e899be..5b11871a9 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 @@ -41,21 +41,8 @@ "description": "", "id": "##id-3##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-1##", "nic_id": "##id-3##", @@ -64,13 +51,7 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } 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 3d6f00824..e6d98cb48 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 @@ -1,16 +1,16 @@ resource "outscale_net" "outscale_net" { - ip_range = "10.0.0.0/16" + ip_range = "10.5.0.0/16" } resource "outscale_subnet" "subnet01" { subregion_name = "${var.region}a" - ip_range = "10.0.0.0/24" + ip_range = "10.5.0.0/24" net_id = outscale_net.outscale_net.net_id } resource "outscale_subnet" "subnet02" { subregion_name = "${var.region}b" - ip_range = "10.0.2.0/24" + ip_range = "10.5.2.0/24" net_id = outscale_net.outscale_net.net_id } @@ -33,12 +33,12 @@ resource "outscale_nic" "outscale_nic" { security_group_ids = [outscale_security_group.security_group01.security_group_id] private_ips { is_primary = true - private_ip = "10.0.0.45" + private_ip = "10.5.0.45" } private_ips { is_primary = false - private_ip = "10.0.0.46" + private_ip = "10.5.0.46" } tags { key = "Key:" @@ -54,11 +54,11 @@ resource "outscale_nic" "outscale_nic_2" { subnet_id = outscale_subnet.subnet01.subnet_id private_ips { is_primary = true - private_ip = "10.0.0.41" + private_ip = "10.5.0.41" } private_ips { is_primary = false - private_ip = "10.0.0.42" + private_ip = "10.5.0.42" } tags { key = "Name" @@ -71,7 +71,7 @@ resource "outscale_nic" "outscale_nic_3" { security_group_ids = [outscale_security_group.security_group01.security_group_id] private_ips { is_primary = true - private_ip = "10.0.2.21" + private_ip = "10.5.2.21" } tags { key = "Key:" @@ -122,7 +122,7 @@ depends_on =[outscale_nic_link.nic_link01,outscale_nic_link.nic_link02] data "outscale_nics" "nic-4" { filter { name = "private_ips_private_ips" - values = ["10.0.0.42","10.0.2.21"] + values = ["10.5.0.42","10.5.2.21"] } depends_on=[outscale_nic.outscale_nic,outscale_nic.outscale_nic_2,outscale_nic.outscale_nic_3,outscale_nic_link.nic_link01,outscale_nic_link.nic_link02] } 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 f31625fc2..85ffd262b 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 @@ -38,7 +38,7 @@ "attributes": { "dhcp_options_set_id": "##id-1##", "id": "##id-2##", - "ip_range": "10.0.0.0/16", + "ip_range": "10.22.0.0/16", "net_id": "##id-2##", "request_id": "########", "state": "available", @@ -63,21 +63,8 @@ "description": "", "id": "##id-4##", "is_source_dest_checked": true, - "link_nic": { - "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" - }, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_nic": [], + "link_public_ip": [], "mac_address": "########", "net_id": "##id-2##", "nic_id": "##id-4##", @@ -86,13 +73,7 @@ "private_ips": [ { "is_primary": true, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, + "link_public_ip": [], "private_dns_name": "########", "private_ip": "########" } @@ -208,7 +189,7 @@ "attributes": { "available_ips_count": "########", "id": "##id-6##", - "ip_range": "10.0.0.0/24", + "ip_range": "10.22.0.0/24", "map_public_ip_on_launch": false, "net_id": "##id-2##", "request_id": "########", @@ -240,12 +221,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-9##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-9##" + } + ], "device_name": "/dev/sda1" } ], 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.tf 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.tf index fe549cde9..adf0e2d32 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.tf +++ 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.tf @@ -4,12 +4,12 @@ resource "outscale_keypair" "my_keypair" { ## Test Private VM with multiple NICs ## resource "outscale_net" "outscale_net" { - ip_range = "10.0.0.0/16" + ip_range = "10.22.0.0/16" } resource "outscale_subnet" "outscale_subnet" { net_id = outscale_net.outscale_net.net_id - ip_range = "10.0.0.0/24" + ip_range = "10.22.0.0/24" subregion_name = "${var.region}a" } @@ -38,7 +38,7 @@ resource "outscale_vm" "outscale_vm" { subnet_id = outscale_subnet.outscale_subnet.subnet_id security_group_ids = [outscale_security_group.outscale_security_group.security_group_id] private_ips { - private_ip ="10.0.0.123" + private_ip ="10.22.0.123" is_primary = true } device_number = "0" 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 1f22c439c..d4c03b498 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -53,10 +57,12 @@ "security_groups": [ "##id-2##" ], - "source_security_group": { - "security_group_account_id": "##id-3##", - "security_group_name": "default" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-3##", + "security_group_name": "default" + } + ], "subnets": [ "##id-4##" ], 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 35b409cb2..48156e4f4 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -54,10 +58,12 @@ "##id-2##", "##id-3##" ], - "source_security_group": { - "security_group_account_id": "##id-4##", - "security_group_name": "terraform-sg-lbu-TF181-1" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-4##", + "security_group_name": "terraform-sg-lbu-TF181-2" + } + ], "subnets": [ "##id-5##" ], 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 5245eed29..56cfeed7b 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 @@ -786,7 +786,7 @@ "request_id": "########", "state": "available", "subnet_id": "##id-21##", - "subregion_name": "us-east-2a", + "subregion_name": "###region###a", "tags": [ { "key": "name", @@ -852,12 +852,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-24##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-24##" + } + ], "device_name": "/dev/sda1" } ], @@ -1016,12 +1018,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-28##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-28##" + } + ], "device_name": "/dev/sda1" } ], @@ -1180,12 +1184,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-31##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-31##" + } + ], "device_name": "/dev/sda1" } ], @@ -1352,12 +1358,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-36##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-36##" + } + ], "device_name": "/dev/sda1" } ], @@ -1516,12 +1524,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-41##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-41##" + } + ], "device_name": "/dev/sda1" } ], @@ -1680,12 +1690,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-46##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-46##" + } + ], "device_name": "/dev/sda1" } ], 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 9f4c7c71d..5b44bfdc9 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -61,10 +65,12 @@ "security_groups": [ "##id-2##" ], - "source_security_group": { - "security_group_account_id": "##id-3##", - "security_group_name": "sg1-terraform-lbu-test" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-3##", + "security_group_name": "sg1-terraform-lbu-test" + } + ], "subnets": [ "##id-4##" ], @@ -99,7 +105,7 @@ "attributes": { "dhcp_options_set_id": "##id-5##", "id": "##id-1##", - "ip_range": "10.0.0.0/16", + "ip_range": "10.10.0.0/16", "net_id": "##id-1##", "request_id": "########", "state": "available", @@ -165,7 +171,7 @@ "attributes": { "available_ips_count": "########", "id": "##id-4##", - "ip_range": "10.0.0.0/24", + "ip_range": "10.10.0.0/24", "map_public_ip_on_launch": false, "net_id": "##id-1##", "request_id": "########", 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 f068de54c..8d0582097 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 @@ -1,5 +1,5 @@ resource "outscale_net" "outscale_net" { - ip_range = "10.0.0.0/16" + ip_range = "10.10.0.0/16" } resource "outscale_security_group" "outscale_security_group" { @@ -14,7 +14,7 @@ resource "outscale_security_group" "outscale_security_group" { resource "outscale_subnet" "subnet-1" { net_id = outscale_net.outscale_net.net_id - ip_range = "10.0.0.0/24" + ip_range = "10.10.0.0/24" tags { key = "Name" value = "outscale_terraform_lbu_subnet" 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 9334a5778..3389c5bd8 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 @@ -60,24 +60,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-2##", "listeners": [ { @@ -108,10 +112,12 @@ "##id-3##", "##id-4##" ], - "source_security_group": { - "security_group_account_id": "##id-5##", - "security_group_name": "terraform-sg-lbu-2" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-5##", + "security_group_name": "terraform-sg-lbu-2" + } + ], "subnets": [ "##id-6##" ], @@ -280,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": [ @@ -294,7 +300,7 @@ ], "remove_default_outbound_rule": false, "request_id": "########", - "security_group_id": "##id-3##", + "security_group_id": "##id-4##", "security_group_name": "terraform-sg-lbu-1", "tag": null, "tags": [ @@ -323,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": [ @@ -337,7 +343,7 @@ ], "remove_default_outbound_rule": false, "request_id": "########", - "security_group_id": "##id-4##", + "security_group_id": "##id-3##", "security_group_name": "terraform-sg-lbu-2", "tag": null, "tags": [ 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 30eb4e9f0..ef7d023f9 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 @@ -14,25 +14,29 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", "filter": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -54,10 +58,12 @@ "security_groups": [ "##id-2##" ], - "source_security_group": { - "security_group_account_id": "##id-3##", - "security_group_name": "sg1-terraform-lbu-test" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-3##", + "security_group_name": "sg1-terraform-lbu-test" + } + ], "subnets": [ "##id-4##" ], @@ -88,24 +94,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -127,10 +137,12 @@ "security_groups": [ "##id-2##" ], - "source_security_group": { - "security_group_account_id": "##id-3##", - "security_group_name": "sg1-terraform-lbu-test" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-3##", + "security_group_name": "sg1-terraform-lbu-test" + } + ], "subnets": [ "##id-4##" ], @@ -169,7 +181,7 @@ "attributes": { "dhcp_options_set_id": "##id-5##", "id": "##id-1##", - "ip_range": "10.0.0.0/16", + "ip_range": "10.20.0.0/16", "net_id": "##id-1##", "request_id": "########", "state": "available", @@ -235,7 +247,7 @@ "attributes": { "available_ips_count": "########", "id": "##id-4##", - "ip_range": "10.0.0.0/24", + "ip_range": "10.20.0.0/24", "map_public_ip_on_launch": false, "net_id": "##id-1##", "request_id": "########", 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 0de4484a0..4408c0133 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 @@ -1,5 +1,5 @@ resource "outscale_net" "outscale_net" { - ip_range = "10.0.0.0/16" + ip_range = "10.20.0.0/16" } resource "outscale_security_group" "outscale_security_group" { @@ -14,7 +14,7 @@ resource "outscale_security_group" "outscale_security_group" { resource "outscale_subnet" "subnet-1" { net_id = outscale_net.outscale_net.net_id - ip_range = "10.0.0.0/24" + ip_range = "10.20.0.0/24" tags { key = "Name" value = "outscale_terraform_lbu_subnet" 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 bdf10d842..081e593f6 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 @@ -16,7 +16,7 @@ "attributes": { "dhcp_options_set_id": "##id-0##", "id": "##id-1##", - "ip_range": "10.0.0.0/16", + "ip_range": "10.20.0.0/16", "net_id": "##id-1##", "request_id": "########", "state": "available", @@ -82,7 +82,7 @@ "attributes": { "available_ips_count": "########", "id": "##id-4##", - "ip_range": "10.0.0.0/24", + "ip_range": "10.20.0.0/24", "map_public_ip_on_launch": false, "net_id": "##id-1##", "request_id": "########", diff --git a/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step2.load_balancer_datasource_remove_lbu.tf b/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step2.load_balancer_datasource_remove_lbu.tf index 64baa578b..a2c95882b 100644 --- a/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step2.load_balancer_datasource_remove_lbu.tf +++ b/tests/qa_provider_oapi/data/nets/TF-82_load_balancer_datasource_attributes_ok/step2.load_balancer_datasource_remove_lbu.tf @@ -1,5 +1,5 @@ resource "outscale_net" "outscale_net" { - ip_range = "10.0.0.0/16" + ip_range = "10.20.0.0/16" } resource "outscale_security_group" "outscale_security_group" { @@ -14,7 +14,7 @@ resource "outscale_security_group" "outscale_security_group" { resource "outscale_subnet" "subnet-1" { net_id = outscale_net.outscale_net.net_id - ip_range = "10.0.0.0/24" + ip_range = "10.20.0.0/24" tags { key = "Name" value = "outscale_terraform_lbu_subnet" 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 510df2778..6c893b4f5 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 @@ -18,24 +18,28 @@ "id": "##id-0##", "load_balancer": [ { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "listeners": [ { "backend_port": 80, @@ -53,10 +57,12 @@ "public_ip": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnet_id": [], "subregion_names": [ "us-east-2a" @@ -73,24 +79,28 @@ ] }, { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "listeners": [ { "backend_port": 8080, @@ -110,10 +120,12 @@ "security_groups": [ "##id-3##" ], - "source_security_group": { - "security_group_account_id": "##id-4##", - "security_group_name": "sg1-terraform-lbu-test" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-4##", + "security_group_name": "sg1-terraform-lbu-test" + } + ], "subnet_id": [ "##id-5##" ], @@ -144,24 +156,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-6##", "listeners": [ { @@ -183,10 +199,12 @@ "security_groups": [ "##id-3##" ], - "source_security_group": { - "security_group_account_id": "##id-4##", - "security_group_name": "sg1-terraform-lbu-test" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-4##", + "security_group_name": "sg1-terraform-lbu-test" + } + ], "subnets": [ "##id-5##" ], @@ -219,24 +237,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-7##", "listeners": [ { @@ -256,10 +278,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "us-east-2a" 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 70e420d86..dd1397394 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 @@ -14,24 +14,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "80", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 80, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-0##", "listeners": [ { @@ -51,10 +55,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-1##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-1##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "us-east-2a" 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 f0cc85100..7910b005a 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 @@ -744,7 +744,7 @@ "main": false, "request_id": "########", "route_table_id": "##id-16##", - "subnet_id": "##id-4##" + "subnet_id": "##id-7##" }, "sensitive_attributes": [], "private": "bnVsbA==", @@ -770,7 +770,7 @@ "main": false, "request_id": "########", "route_table_id": "##id-18##", - "subnet_id": "##id-7##" + "subnet_id": "##id-4##" }, "sensitive_attributes": [], "private": "bnVsbA==", 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 2931dcc75..ef3451391 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 @@ -109,12 +109,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sda1" } ], 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 2785c4199..d3ea5c95d 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 @@ -43,24 +43,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-2##", "listeners": [ { @@ -80,10 +84,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-3##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-3##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 584975b4f..7abc82034 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 @@ -43,24 +43,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-2##", "listeners": [ { @@ -80,10 +84,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-3##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-3##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 4cfcfefc2..c25130f6d 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 @@ -43,24 +43,28 @@ { "schema_version": 0, "attributes": { - "access_log": { - "is_enabled": "false", - "osu_bucket_name": "", - "osu_bucket_prefix": "", - "publication_interval": "60" - }, + "access_log": [ + { + "is_enabled": false, + "osu_bucket_name": "", + "osu_bucket_prefix": "", + "publication_interval": 60 + } + ], "application_sticky_cookie_policies": [], "backend_vm_ids": [], "dns_name": "########", - "health_check": { - "check_interval": "30", - "healthy_threshold": "10", - "path": "", - "port": "8080", - "protocol": "TCP", - "timeout": "5", - "unhealthy_threshold": "2" - }, + "health_check": [ + { + "check_interval": 30, + "healthy_threshold": 10, + "path": "", + "port": 8080, + "protocol": "TCP", + "timeout": 5, + "unhealthy_threshold": 2 + } + ], "id": "##id-2##", "listeners": [ { @@ -80,10 +84,12 @@ "request_id": "########", "secured_cookies": false, "security_groups": [], - "source_security_group": { - "security_group_account_id": "##id-3##", - "security_group_name": "outscale-elb-sg" - }, + "source_security_group": [ + { + "security_group_account_id": "##id-3##", + "security_group_name": "outscale-elb-sg" + } + ], "subnets": [], "subregion_names": [ "eu-west-2a" 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 842e0b72f..9d2e02006 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 @@ -17,12 +17,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-0##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-0##" + } + ], "device_name": "/dev/sda1" } ], @@ -99,12 +101,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" } ], @@ -177,12 +181,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-8##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-8##" + } + ], "device_name": "/dev/sda1" } ], @@ -306,12 +312,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-0##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-0##" + } + ], "device_name": "/dev/sda1" } ], @@ -399,12 +407,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" } ], @@ -480,12 +490,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-8##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-8##" + } + ], "device_name": "/dev/sda1" } ], 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 72df98fa8..4899e3320 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 @@ -17,12 +17,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-0##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-0##" + } + ], "device_name": "/dev/sda1" } ], @@ -99,12 +101,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-0##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-0##" + } + ], "device_name": "/dev/sda1" } ], @@ -181,12 +185,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-0##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-0##" + } + ], "device_name": "/dev/sda1" } ], @@ -263,12 +269,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" } ], @@ -341,12 +349,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-8##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-8##" + } + ], "device_name": "/dev/sda1" } ], @@ -470,12 +480,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-0##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-0##" + } + ], "device_name": "/dev/sda1" } ], @@ -563,12 +575,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" } ], @@ -644,12 +658,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-8##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-8##" + } + ], "device_name": "/dev/sda1" } ], 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 98fa1eec1..f4918b099 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 @@ -41,12 +41,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-1##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-1##" + } + ], "device_name": "/dev/sda1" } ], 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 9d1ecf309..77c459464 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 @@ -120,21 +120,25 @@ ], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "false", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": false, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sdb" } ], 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 541e54369..fd571e847 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 @@ -120,21 +120,25 @@ ], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "false", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": false, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sdb" } ], 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 64f3560a0..20f31591a 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 @@ -120,21 +120,25 @@ ], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "false", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": false, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sdb" } ], 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 42a50d216..d58903b6b 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 @@ -120,21 +120,25 @@ ], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "false", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": false, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sdb" } ], 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 a6390cfb5..d23c42932 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 @@ -107,7 +107,7 @@ "bsu": [ { "delete_on_vm_deletion": true, - "iops": 0, + "iops": null, "snapshot_id": "", "volume_size": 20, "volume_type": "standard" @@ -120,21 +120,25 @@ ], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sdb" } ], 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 065f3ed54..a0b870647 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 @@ -120,21 +120,25 @@ ], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sdb" } ], 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 17809ca49..6c1f5c7d5 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 @@ -120,21 +120,25 @@ ], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sdb" } ], 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 1e64c8caf..b4618c07d 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 @@ -120,21 +120,25 @@ ], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sdb" } ], 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 cba87be78..b982e7d99 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 @@ -120,21 +120,25 @@ ], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-5##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-5##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sdb" } ], 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 a564e154e..9748b4e7f 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 @@ -63,12 +63,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-2##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-2##" + } + ], "device_name": "/dev/sda1" } ], 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 363710802..bc190fab9 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 @@ -76,12 +76,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-4##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-4##" + } + ], "device_name": "/dev/sda1" } ], @@ -156,12 +158,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-8##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-8##" + } + ], "device_name": "/dev/sda1" } ], 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 394f2c7ed..5b998429d 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 @@ -22,12 +22,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-1##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-1##" + } + ], "device_name": "/dev/sda1" } ], @@ -81,12 +83,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sda1" } ], @@ -179,12 +183,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sda1" } ], @@ -252,12 +258,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-1##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-1##" + } + ], "device_name": "/dev/sda1" } ], @@ -332,12 +340,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-10##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-10##" + } + ], "device_name": "/dev/sda1" } ], 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 2ca8bec03..8fd9d9e38 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 @@ -22,12 +22,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-1##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-1##" + } + ], "device_name": "/dev/sda1" } ], @@ -81,12 +83,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sda1" } ], @@ -159,12 +163,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-10##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-10##" + } + ], "device_name": "/dev/sda1" } ], @@ -246,12 +252,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-10##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-10##" + } + ], "device_name": "/dev/sda1" } ], @@ -333,12 +341,14 @@ "architecture": "x86_64", "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-10##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-10##" + } + ], "device_name": "/dev/sda1" } ], @@ -440,12 +450,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sda1" } ], @@ -513,12 +525,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-1##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-1##" + } + ], "device_name": "/dev/sda1" } ], @@ -593,12 +607,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-10##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-10##" + } + ], "device_name": "/dev/sda1" } ], 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 d746b3419..165c022ab 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 @@ -51,7 +51,7 @@ "size": 15, "snapshot_id": "", "state": "available", - "subregion_name": "eu-west-2a", + "subregion_name": "###region###a", "tags": [ { "key": "Name", @@ -120,12 +120,14 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sda1" } ], 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 9cd963158..919c22954 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 @@ -51,7 +51,7 @@ "size": 15, "snapshot_id": "", "state": "available", - "subregion_name": "eu-west-2a", + "subregion_name": "###region###a", "tags": [ { "key": "Name", @@ -120,21 +120,25 @@ "block_device_mappings": [], "block_device_mappings_created": [ { - "bsu": { - "delete_on_vm_deletion": "true", - "link_date": "########", - "state": "attached", - "volume_id": "##id-6##" - }, + "bsu": [ + { + "delete_on_vm_deletion": true, + "link_date": "########", + "state": "attached", + "volume_id": "##id-6##" + } + ], "device_name": "/dev/sda1" }, { - "bsu": { - "delete_on_vm_deletion": "false", - "link_date": "########", - "state": "attached", - "volume_id": "##id-4##" - }, + "bsu": [ + { + "delete_on_vm_deletion": false, + "link_date": "########", + "state": "attached", + "volume_id": "##id-4##" + } + ], "device_name": "/dev/xvdc" } ],