From 0d449792d3abe9b7fea1a9303b1f47769500f897 Mon Sep 17 00:00:00 2001
From: Thiery Ouattara <opensource@outscale.com>
Date: Mon, 17 Apr 2023 16:12:55 +0000
Subject: [PATCH] Update integration test

---
 .../data_source_outscale_net_peerings_test.go |  10 +-
 ...exible_gpu_link_resource_attributes_ok.ref |   1 +
 ...flexible_gpus_datasource_attributes_ok.ref |   5 +-
 .../step1.image_datasource_attributes_ok.ref  |   1 +
 ...e_no-reboot_resource_std_attributes_ok.ref |   1 +
 ...unch_permission_resource_attributes_ok.ref |   1 +
 .../step1.images_datasource_attributes_ok.ref |   1 +
 .../step2.images_datasource_attributes_ok.ref |   1 +
 ...listener_rule_datasource_attributes_ok.ref |   1 +
 ...r_listener_rule_resource_attributes_ok.ref |   1 +
 ...r_listener_rule_resource_attributes_ok.ref |   1 +
 ...istener_rules_datasource_attributes_ok.ref |  23 +-
 ...cer_vm_health_datasource_attributes_ok.ref |   1 +
 ...ad_balancer_vms_resource_attributes_ok.ref |   4 +-
 ...oad_balancer_vms_resource_remove_vm_ok.ref |   2 +
 .../step1.nic_datasource_attributes_ok.ref    |   1 +
 .../step1.nic_link_resource_attributes_ok.ref |   1 +
 .../step1.nics_datasource_attributes_ok.ref   | 257 +++++++++---------
 .../step1.vm_resource_centos_ok.ref           |   3 +
 ...resource_private_with_multiple_NICs_ok.ref |   1 +
 .../step1.test_destroy_igw.ref                |   6 +
 ....public_ip_link_resource_attributes_ok.ref |   1 +
 .../step1.vm_datasource_centos_ok.ref         |   6 +
 .../step2.vm_datasource_centos_ok.ref         |   8 +
 ...m_resource_public_with_multiple_BDM_ok.ref |   6 +
 ...m_resource_public_with_multiple_BDM_ok.ref |   6 +
 .../step1.vm_resource_with_user_data_ok.ref   |   1 +
 .../step1.vm_resource_with_user_data_ok_2.ref |   1 +
 ...step1.vm_resource_update_attributes_ok.ref |   3 +
 .../step2.vm_resource_update_keypair_ok.ref   |   3 +
 ...3.vm_resource_update_security_group_ok.ref |   3 +
 ...resource_update_deletion_protection_ok.ref |   3 +
 .../step5.vm_resource_update_bdm_ok.ref       |   3 +
 ...tep6.vm_resource_update_performance_ok.ref |   3 +
 .../step7.vm_resource_update_vm_type_ok.ref   |   3 +
 .../step8.vm_resource_update_user_data_ok.ref |   3 +
 ...m_resource_update_shtdown_behaviour_ok.ref |   3 +
 ..._state_datasource_centos_attributes_ok.ref |   1 +
 ...states_datasource_centos_attributes_ok.ref |   2 +
 .../step1.vms_datasource_attributes_ok.ref    |   5 +
 .../step2.vms_datasource_attributes_ok.ref    |   8 +
 ...tep1.volumes_datasource_attributes_ok4.ref |   1 +
 ...tep2.volumes_datasource_attributes_ok4.ref |   7 +
 ...p1.volumes_link_resource_attributes_ok.ref |   1 +
 44 files changed, 257 insertions(+), 147 deletions(-)

diff --git a/outscale/data_source_outscale_net_peerings_test.go b/outscale/data_source_outscale_net_peerings_test.go
index 2cb2b133a..36fdf8200 100644
--- a/outscale/data_source_outscale_net_peerings_test.go
+++ b/outscale/data_source_outscale_net_peerings_test.go
@@ -40,8 +40,8 @@ const testAccDataSourceOutscaleOAPILinPeeringsConnectionConfig = `
 	}
 
 	resource "outscale_net_peering" "outscale_net_peering" {
-		accepter_net_id = "${outscale_net.outscale_net.net_id}"
-		source_net_id   = "${outscale_net.outscale_net2.net_id}"
+		accepter_net_id = outscale_net.outscale_net.net_id
+		source_net_id   = outscale_net.outscale_net2.net_id
 		tags {
 			key = "okht"
 			value = "testacc-peerings-ds"
@@ -50,14 +50,14 @@ const testAccDataSourceOutscaleOAPILinPeeringsConnectionConfig = `
 	}
 
 	resource "outscale_net_peering" "outscale_net_peering2" {
-		accepter_net_id = "${outscale_net.outscale_net.net_id}"
-		source_net_id   = "${outscale_net.outscale_net2.net_id}"
+		accepter_net_id = outscale_net.outscale_net.net_id
+		source_net_id   = outscale_net.outscale_net2.net_id
 	}
 
 	data "outscale_net_peerings" "outscale_net_peerings" {
 		filter {
 			name   = "net_peering_ids"
-			values = ["${outscale_net_peering.outscale_net_peering.net_peering_id}"]
+			values = [outscale_net_peering.outscale_net_peering.net_peering_id]
 		}
 	}
 `
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 3599e070b..5034b61a9 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
@@ -125,6 +125,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 e5655c20a..b02246a23 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
@@ -70,7 +70,7 @@
                                 "generation": "v5",
                                 "model_name": "nvidia-p6",
                                 "state": "allocated",
-                                "subregion_name": "eu-west-2a",
+                                "subregion_name": "###region###a",
                                 "vm_id": ""
                             },
                             {
@@ -79,7 +79,7 @@
                                 "generation": "v5",
                                 "model_name": "nvidia-p6",
                                 "state": "attached",
-                                "subregion_name": "eu-west-2a",
+                                "subregion_name": "###region###a",
                                 "vm_id": "##id-1##"
                             }
                         ],
@@ -234,6 +234,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 3d315b7e5..28c9a1c2c 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
@@ -592,6 +592,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
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 da5bb9b02..f8631775b 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
@@ -168,6 +168,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-7##"
                                     }
                                 ],
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 834ad112d..77296c656 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
@@ -186,6 +186,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 6edcd91f0..ab613a047 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
@@ -130,6 +130,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
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 f2e106c4a..bdbbe8465 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
@@ -760,6 +760,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-12##"
                                     }
                                 ],
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 65117746d..c5d12ec2e 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
@@ -285,6 +285,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-13##"
                                     }
                                 ],
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 1d390232a..b1a76d2de 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
@@ -301,6 +301,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-14##"
                                     }
                                 ],
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 be04b99cf..d8c90d2de 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
@@ -303,6 +303,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-14##"
                                     }
                                 ],
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 4e3cfe490..7a10aa561 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
@@ -19,24 +19,24 @@
                         "listener_rules": [
                             {
                                 "action": "forward",
-                                "host_name_pattern": "*.abc.-.abc.*.com",
+                                "host_name_pattern": "",
                                 "listener_id": "##id-1##",
                                 "listener_rule_id": "##id-2##",
-                                "listener_rule_name": "listener-rule-2",
-                                "path_pattern": "",
-                                "priority": 1,
+                                "listener_rule_name": "listener-rule-1",
+                                "path_pattern": "*.abc.*.abc.*.com",
+                                "priority": 10,
                                 "vm_ids": [
                                     "##id-3##"
                                 ]
                             },
                             {
                                 "action": "forward",
-                                "host_name_pattern": "",
+                                "host_name_pattern": "*.abc.-.abc.*.com",
                                 "listener_id": "##id-1##",
                                 "listener_rule_id": "##id-4##",
-                                "listener_rule_name": "listener-rule-1",
-                                "path_pattern": "*.abc.*.abc.*.com",
-                                "priority": 10,
+                                "listener_rule_name": "listener-rule-2",
+                                "path_pattern": "",
+                                "priority": 1,
                                 "vm_ids": [
                                     "##id-3##"
                                 ]
@@ -163,7 +163,7 @@
                                 "action": "forward",
                                 "host_name_pattern": "",
                                 "listener_id": "##id-1##",
-                                "listener_rule_id": "##id-4##",
+                                "listener_rule_id": "##id-2##",
                                 "listener_rule_name": "listener-rule-1",
                                 "path_pattern": "*.abc.*.abc.*.com",
                                 "priority": 10
@@ -206,7 +206,7 @@
                                 "action": "forward",
                                 "host_name_pattern": "*.abc.-.abc.*.com",
                                 "listener_id": "##id-1##",
-                                "listener_rule_id": "##id-2##",
+                                "listener_rule_id": "##id-4##",
                                 "listener_rule_name": "listener-rule-2",
                                 "path_pattern": "",
                                 "priority": 1
@@ -301,7 +301,8 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
-                                        "volume_id": "##id-13##"
+                                        "tags": [],
+                                        "volume_id": "##id-14##"
                                     }
                                 ],
                                 "device_name": "/dev/sda1"
diff --git a/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.ref
index 3a3acb1e5..b8c5c7f71 100644
--- a/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.ref
+++ b/tests/qa_provider_oapi/data/load_balancer_vm_health/TF-92_load_balancer_vm_health_datasource_attributes_ok/step1.load_balancer_vm_health_datasource_attributes_ok.ref
@@ -307,6 +307,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-8##"
                                     }
                                 ],
diff --git a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.ref
index cfde1901d..dc1b0d201 100644
--- a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.ref
+++ b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step1.load_balancer_vms_resource_attributes_ok.ref
@@ -182,7 +182,8 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
-                                        "volume_id": "##id-8##"
+                                        "tags": [],
+                                        "volume_id": "##id-6##"
                                     }
                                 ],
                                 "device_name": "/dev/sda1"
@@ -265,6 +266,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-11##"
                                     }
                                 ],
diff --git a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.ref b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.ref
index f4430adfb..60eacdfe9 100644
--- a/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.ref
+++ b/tests/qa_provider_oapi/data/load_balancer_vms/TF-93_load_balancer_vms_resource_attributes_ok/step2.load_balancer_vms_resource_remove_vm_ok.ref
@@ -184,6 +184,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-8##"
                                     }
                                 ],
@@ -267,6 +268,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-11##"
                                     }
                                 ],
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 ac9ea66f2..be883ba3b 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
@@ -761,6 +761,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-15##"
                                     }
                                 ],
diff --git a/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.ref
index 85f34304a..9ae73ae1b 100644
--- a/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.ref
+++ b/tests/qa_provider_oapi/data/nets/TF-111_nic_link_resource_attributes_ok/step1.nic_link_resource_attributes_ok.ref
@@ -223,6 +223,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-9##"
                                     }
                                 ],
diff --git a/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref
index ab7829147..1cd4e5934 100644
--- a/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref
+++ b/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref
@@ -150,11 +150,20 @@
                                 "account_id": "##id-1##",
                                 "description": "",
                                 "is_source_dest_checked": true,
-                                "link_nic": [],
+                                "link_nic": [
+                                    {
+                                        "delete_on_vm_deletion": false,
+                                        "device_number": 2,
+                                        "link_nic_id": "##id-12##",
+                                        "state": "attached",
+                                        "vm_account_id": "##id-1##",
+                                        "vm_id": "##id-3##"
+                                    }
+                                ],
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-12##",
+                                "nic_id": "##id-13##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -162,6 +171,12 @@
                                         "link_public_ip": [],
                                         "private_dns_name": "########",
                                         "private_ip": "########"
+                                    },
+                                    {
+                                        "is_primary": false,
+                                        "link_public_ip": [],
+                                        "private_dns_name": "########",
+                                        "private_ip": "########"
                                     }
                                 ],
                                 "security_groups": [
@@ -170,17 +185,13 @@
                                         "security_group_name": "Terraform-SG"
                                     }
                                 ],
-                                "state": "available",
-                                "subnet_id": "##id-13##",
-                                "subregion_name": "us-east-2b",
+                                "state": "in-use",
+                                "subnet_id": "##id-7##",
+                                "subregion_name": "us-east-2a",
                                 "tags": [
                                     {
-                                        "key": "Key:",
-                                        "value": ":value-tags"
-                                    },
-                                    {
-                                        "key": "Key-2",
-                                        "value": "value-tags-2"
+                                        "key": "Name",
+                                        "value": "Nic-2"
                                     }
                                 ]
                             },
@@ -188,20 +199,11 @@
                                 "account_id": "##id-1##",
                                 "description": "",
                                 "is_source_dest_checked": true,
-                                "link_nic": [
-                                    {
-                                        "delete_on_vm_deletion": false,
-                                        "device_number": 2,
-                                        "link_nic_id": "##id-14##",
-                                        "state": "attached",
-                                        "vm_account_id": "##id-1##",
-                                        "vm_id": "##id-3##"
-                                    }
-                                ],
+                                "link_nic": [],
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-15##",
+                                "nic_id": "##id-14##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -209,12 +211,6 @@
                                         "link_public_ip": [],
                                         "private_dns_name": "########",
                                         "private_ip": "########"
-                                    },
-                                    {
-                                        "is_primary": false,
-                                        "link_public_ip": [],
-                                        "private_dns_name": "########",
-                                        "private_ip": "########"
                                     }
                                 ],
                                 "security_groups": [
@@ -223,13 +219,17 @@
                                         "security_group_name": "Terraform-SG"
                                     }
                                 ],
-                                "state": "in-use",
-                                "subnet_id": "##id-7##",
-                                "subregion_name": "us-east-2a",
+                                "state": "available",
+                                "subnet_id": "##id-15##",
+                                "subregion_name": "us-east-2b",
                                 "tags": [
                                     {
-                                        "key": "Name",
-                                        "value": "Nic-2"
+                                        "key": "Key:",
+                                        "value": ":value-tags"
+                                    },
+                                    {
+                                        "key": "Key-2",
+                                        "value": "value-tags-2"
                                     }
                                 ]
                             }
@@ -307,13 +307,22 @@
                             },
                             {
                                 "account_id": "##id-1##",
-                                "description": "",
+                                "description": "Primary network interface",
                                 "is_source_dest_checked": true,
-                                "link_nic": [],
+                                "link_nic": [
+                                    {
+                                        "delete_on_vm_deletion": true,
+                                        "device_number": 0,
+                                        "link_nic_id": "##id-9##",
+                                        "state": "attached",
+                                        "vm_account_id": "##id-1##",
+                                        "vm_id": "##id-3##"
+                                    }
+                                ],
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-12##",
+                                "nic_id": "##id-10##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -329,19 +338,10 @@
                                         "security_group_name": "Terraform-SG"
                                     }
                                 ],
-                                "state": "available",
-                                "subnet_id": "##id-13##",
-                                "subregion_name": "us-east-2b",
-                                "tags": [
-                                    {
-                                        "key": "Key:",
-                                        "value": ":value-tags"
-                                    },
-                                    {
-                                        "key": "Key-2",
-                                        "value": "value-tags-2"
-                                    }
-                                ]
+                                "state": "in-use",
+                                "subnet_id": "##id-7##",
+                                "subregion_name": "us-east-2a",
+                                "tags": []
                             },
                             {
                                 "account_id": "##id-1##",
@@ -351,7 +351,7 @@
                                     {
                                         "delete_on_vm_deletion": false,
                                         "device_number": 2,
-                                        "link_nic_id": "##id-14##",
+                                        "link_nic_id": "##id-12##",
                                         "state": "attached",
                                         "vm_account_id": "##id-1##",
                                         "vm_id": "##id-3##"
@@ -360,7 +360,7 @@
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-15##",
+                                "nic_id": "##id-13##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -394,22 +394,13 @@
                             },
                             {
                                 "account_id": "##id-1##",
-                                "description": "Primary network interface",
+                                "description": "",
                                 "is_source_dest_checked": true,
-                                "link_nic": [
-                                    {
-                                        "delete_on_vm_deletion": true,
-                                        "device_number": 0,
-                                        "link_nic_id": "##id-9##",
-                                        "state": "attached",
-                                        "vm_account_id": "##id-1##",
-                                        "vm_id": "##id-3##"
-                                    }
-                                ],
+                                "link_nic": [],
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-10##",
+                                "nic_id": "##id-14##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -425,10 +416,19 @@
                                         "security_group_name": "Terraform-SG"
                                     }
                                 ],
-                                "state": "in-use",
-                                "subnet_id": "##id-7##",
-                                "subregion_name": "us-east-2a",
-                                "tags": []
+                                "state": "available",
+                                "subnet_id": "##id-15##",
+                                "subregion_name": "us-east-2b",
+                                "tags": [
+                                    {
+                                        "key": "Key:",
+                                        "value": ":value-tags"
+                                    },
+                                    {
+                                        "key": "Key-2",
+                                        "value": "value-tags-2"
+                                    }
+                                ]
                             }
                         ],
                         "request_id": "########"
@@ -451,13 +451,22 @@
                         "nics": [
                             {
                                 "account_id": "##id-1##",
-                                "description": "",
+                                "description": "TF-109",
                                 "is_source_dest_checked": true,
-                                "link_nic": [],
+                                "link_nic": [
+                                    {
+                                        "delete_on_vm_deletion": false,
+                                        "device_number": 1,
+                                        "link_nic_id": "##id-2##",
+                                        "state": "attached",
+                                        "vm_account_id": "##id-1##",
+                                        "vm_id": "##id-3##"
+                                    }
+                                ],
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-12##",
+                                "nic_id": "##id-5##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -465,6 +474,12 @@
                                         "link_public_ip": [],
                                         "private_dns_name": "########",
                                         "private_ip": "########"
+                                    },
+                                    {
+                                        "is_primary": false,
+                                        "link_public_ip": [],
+                                        "private_dns_name": "########",
+                                        "private_ip": "########"
                                     }
                                 ],
                                 "security_groups": [
@@ -473,9 +488,9 @@
                                         "security_group_name": "Terraform-SG"
                                     }
                                 ],
-                                "state": "available",
-                                "subnet_id": "##id-13##",
-                                "subregion_name": "us-east-2b",
+                                "state": "in-use",
+                                "subnet_id": "##id-7##",
+                                "subregion_name": "us-east-2a",
                                 "tags": [
                                     {
                                         "key": "Key:",
@@ -489,13 +504,13 @@
                             },
                             {
                                 "account_id": "##id-1##",
-                                "description": "TF-109",
+                                "description": "",
                                 "is_source_dest_checked": true,
                                 "link_nic": [
                                     {
                                         "delete_on_vm_deletion": false,
-                                        "device_number": 1,
-                                        "link_nic_id": "##id-2##",
+                                        "device_number": 2,
+                                        "link_nic_id": "##id-12##",
                                         "state": "attached",
                                         "vm_account_id": "##id-1##",
                                         "vm_id": "##id-3##"
@@ -504,7 +519,7 @@
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-5##",
+                                "nic_id": "##id-13##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -531,33 +546,20 @@
                                 "subregion_name": "us-east-2a",
                                 "tags": [
                                     {
-                                        "key": "Key:",
-                                        "value": ":value-tags"
-                                    },
-                                    {
-                                        "key": "Key-2",
-                                        "value": "value-tags-2"
+                                        "key": "Name",
+                                        "value": "Nic-2"
                                     }
                                 ]
                             },
                             {
                                 "account_id": "##id-1##",
-                                "description": "Primary network interface",
+                                "description": "",
                                 "is_source_dest_checked": true,
-                                "link_nic": [
-                                    {
-                                        "delete_on_vm_deletion": true,
-                                        "device_number": 0,
-                                        "link_nic_id": "##id-9##",
-                                        "state": "attached",
-                                        "vm_account_id": "##id-1##",
-                                        "vm_id": "##id-3##"
-                                    }
-                                ],
+                                "link_nic": [],
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-10##",
+                                "nic_id": "##id-14##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -573,20 +575,29 @@
                                         "security_group_name": "Terraform-SG"
                                     }
                                 ],
-                                "state": "in-use",
-                                "subnet_id": "##id-7##",
-                                "subregion_name": "us-east-2a",
-                                "tags": []
+                                "state": "available",
+                                "subnet_id": "##id-15##",
+                                "subregion_name": "us-east-2b",
+                                "tags": [
+                                    {
+                                        "key": "Key:",
+                                        "value": ":value-tags"
+                                    },
+                                    {
+                                        "key": "Key-2",
+                                        "value": "value-tags-2"
+                                    }
+                                ]
                             },
                             {
                                 "account_id": "##id-1##",
-                                "description": "",
+                                "description": "Primary network interface",
                                 "is_source_dest_checked": true,
                                 "link_nic": [
                                     {
-                                        "delete_on_vm_deletion": false,
-                                        "device_number": 2,
-                                        "link_nic_id": "##id-14##",
+                                        "delete_on_vm_deletion": true,
+                                        "device_number": 0,
+                                        "link_nic_id": "##id-9##",
                                         "state": "attached",
                                         "vm_account_id": "##id-1##",
                                         "vm_id": "##id-3##"
@@ -595,7 +606,7 @@
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-15##",
+                                "nic_id": "##id-10##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -603,12 +614,6 @@
                                         "link_public_ip": [],
                                         "private_dns_name": "########",
                                         "private_ip": "########"
-                                    },
-                                    {
-                                        "is_primary": false,
-                                        "link_public_ip": [],
-                                        "private_dns_name": "########",
-                                        "private_ip": "########"
                                     }
                                 ],
                                 "security_groups": [
@@ -620,12 +625,7 @@
                                 "state": "in-use",
                                 "subnet_id": "##id-7##",
                                 "subregion_name": "us-east-2a",
-                                "tags": [
-                                    {
-                                        "key": "Name",
-                                        "value": "Nic-2"
-                                    }
-                                ]
+                                "tags": []
                             }
                         ],
                         "request_id": "########"
@@ -654,7 +654,7 @@
                                 "link_public_ip": [],
                                 "mac_address": "########",
                                 "net_id": "##id-4##",
-                                "nic_id": "##id-12##",
+                                "nic_id": "##id-14##",
                                 "private_dns_name": "########",
                                 "private_ips": [
                                     {
@@ -671,7 +671,7 @@
                                     }
                                 ],
                                 "state": "available",
-                                "subnet_id": "##id-13##",
+                                "subnet_id": "##id-15##",
                                 "subregion_name": "us-east-2b",
                                 "tags": [
                                     {
@@ -795,13 +795,13 @@
                     "attributes": {
                         "account_id": "##id-1##",
                         "description": "",
-                        "id": "##id-15##",
+                        "id": "##id-13##",
                         "is_source_dest_checked": true,
                         "link_nic": [],
                         "link_public_ip": [],
                         "mac_address": "########",
                         "net_id": "##id-4##",
-                        "nic_id": "##id-15##",
+                        "nic_id": "##id-13##",
                         "private_dns_name": "########",
                         "private_ip": "########",
                         "private_ips": [
@@ -861,13 +861,13 @@
                     "attributes": {
                         "account_id": "##id-1##",
                         "description": "",
-                        "id": "##id-12##",
+                        "id": "##id-14##",
                         "is_source_dest_checked": true,
                         "link_nic": [],
                         "link_public_ip": [],
                         "mac_address": "########",
                         "net_id": "##id-4##",
-                        "nic_id": "##id-12##",
+                        "nic_id": "##id-14##",
                         "private_dns_name": "########",
                         "private_ip": "########",
                         "private_ips": [
@@ -890,7 +890,7 @@
                             }
                         ],
                         "state": "available",
-                        "subnet_id": "##id-13##",
+                        "subnet_id": "##id-15##",
                         "subregion_name": "us-east-2b",
                         "tags": [
                             {
@@ -956,9 +956,9 @@
                     "attributes": {
                         "delete_on_vm_deletion": false,
                         "device_number": 2,
-                        "id": "##id-14##",
-                        "link_nic_id": "##id-14##",
-                        "nic_id": "##id-15##",
+                        "id": "##id-12##",
+                        "link_nic_id": "##id-12##",
+                        "nic_id": "##id-13##",
                         "request_id": "########",
                         "state": null,
                         "vm_account_id": null,
@@ -1053,13 +1053,13 @@
                     "schema_version": 0,
                     "attributes": {
                         "available_ips_count": "########",
-                        "id": "##id-13##",
+                        "id": "##id-15##",
                         "ip_range": "10.5.2.0/24",
                         "map_public_ip_on_launch": false,
                         "net_id": "##id-4##",
                         "request_id": "########",
                         "state": "available",
-                        "subnet_id": "##id-13##",
+                        "subnet_id": "##id-15##",
                         "subregion_name": "us-east-2b",
                         "tags": [],
                         "timeouts": null
@@ -1091,6 +1091,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-20##"
                                     }
                                 ],
diff --git a/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref b/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref
index 2fe03a1ed..a9a7e442a 100644
--- a/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref
+++ b/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref
@@ -414,6 +414,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-15##"
                                     }
                                 ],
@@ -504,6 +505,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-19##"
                                     }
                                 ],
@@ -596,6 +598,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-22##"
                                     }
                                 ],
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 05256b523..833fc0b73 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
@@ -228,6 +228,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-9##"
                                     }
                                 ],
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 de8abed57..dcd28a742 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
@@ -857,6 +857,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-24##"
                                     }
                                 ],
@@ -1023,6 +1024,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-28##"
                                     }
                                 ],
@@ -1189,6 +1191,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-31##"
                                     }
                                 ],
@@ -1363,6 +1366,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-36##"
                                     }
                                 ],
@@ -1529,6 +1533,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-41##"
                                     }
                                 ],
@@ -1695,6 +1700,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-46##"
                                     }
                                 ],
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 8f91857ef..3668a230d 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
@@ -142,6 +142,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-7##"
                                     }
                                 ],
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 e01a58fda..a61bfef57 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
@@ -22,6 +22,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-0##"
                                     }
                                 ],
@@ -106,6 +107,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -186,6 +188,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-8##"
                                     }
                                 ],
@@ -317,6 +320,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-0##"
                                     }
                                 ],
@@ -414,6 +418,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -497,6 +502,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-8##"
                                     }
                                 ],
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 cf297adb2..2d300004c 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
@@ -22,6 +22,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-0##"
                                     }
                                 ],
@@ -106,6 +107,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-0##"
                                     }
                                 ],
@@ -190,6 +192,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-0##"
                                     }
                                 ],
@@ -274,6 +277,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -354,6 +358,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-8##"
                                     }
                                 ],
@@ -485,6 +490,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-0##"
                                     }
                                 ],
@@ -580,6 +586,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -663,6 +670,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-8##"
                                     }
                                 ],
diff --git a/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step1.vm_resource_public_with_multiple_BDM_ok.ref b/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step1.vm_resource_public_with_multiple_BDM_ok.ref
index 0ff5d756c..546a0100c 100644
--- a/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step1.vm_resource_public_with_multiple_BDM_ok.ref
+++ b/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step1.vm_resource_public_with_multiple_BDM_ok.ref
@@ -107,6 +107,7 @@
                                         "delete_on_vm_deletion": false,
                                         "iops": null,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 100,
                                         "volume_type": "standard"
                                     }
@@ -121,6 +122,7 @@
                                         "delete_on_vm_deletion": false,
                                         "iops": null,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 15,
                                         "volume_type": "standard"
                                     }
@@ -135,6 +137,7 @@
                                         "delete_on_vm_deletion": true,
                                         "iops": 150,
                                         "snapshot_id": "##id-3##",
+                                        "tags": [],
                                         "volume_size": 22,
                                         "volume_type": "io1"
                                     }
@@ -151,6 +154,7 @@
                                         "delete_on_vm_deletion": false,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -162,6 +166,7 @@
                                         "delete_on_vm_deletion": false,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
@@ -173,6 +178,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-7##"
                                     }
                                 ],
diff --git a/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step2.vm_resource_public_with_multiple_BDM_ok.ref b/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step2.vm_resource_public_with_multiple_BDM_ok.ref
index b385b3515..1fa6b2486 100644
--- a/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step2.vm_resource_public_with_multiple_BDM_ok.ref
+++ b/tests/qa_provider_oapi/data/vm/TF-146_vm_resource_public_with_BDM_attributes_ok/step2.vm_resource_public_with_multiple_BDM_ok.ref
@@ -107,6 +107,7 @@
                                         "delete_on_vm_deletion": true,
                                         "iops": null,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 100,
                                         "volume_type": "standard"
                                     }
@@ -121,6 +122,7 @@
                                         "delete_on_vm_deletion": false,
                                         "iops": null,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 15,
                                         "volume_type": "standard"
                                     }
@@ -135,6 +137,7 @@
                                         "delete_on_vm_deletion": true,
                                         "iops": 150,
                                         "snapshot_id": "##id-3##",
+                                        "tags": [],
                                         "volume_size": 22,
                                         "volume_type": "io1"
                                     }
@@ -151,6 +154,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -162,6 +166,7 @@
                                         "delete_on_vm_deletion": false,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
@@ -173,6 +178,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-7##"
                                     }
                                 ],
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 956cdfe77..8f912be2c 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
@@ -73,6 +73,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-3##"
                                     }
                                 ],
diff --git a/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok_2.ref b/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok_2.ref
index 5066fa659..553e87642 100644
--- a/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok_2.ref
+++ b/tests/qa_provider_oapi/data/vm/TF-148_vm_resource_with_user_data_attributes_ok/step1.vm_resource_with_user_data_ok_2.ref
@@ -73,6 +73,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-3##"
                                     }
                                 ],
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 77c459464..2cac49c58 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
@@ -109,6 +109,7 @@
                                         "delete_on_vm_deletion": false,
                                         "iops": null,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 20,
                                         "volume_type": "standard"
                                     }
@@ -125,6 +126,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -136,6 +138,7 @@
                                         "delete_on_vm_deletion": false,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 fd571e847..676a7e21b 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
@@ -109,6 +109,7 @@
                                         "delete_on_vm_deletion": false,
                                         "iops": 0,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 20,
                                         "volume_type": "standard"
                                     }
@@ -125,6 +126,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -136,6 +138,7 @@
                                         "delete_on_vm_deletion": false,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 fa4a601a8..869e172c9 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
@@ -109,6 +109,7 @@
                                         "delete_on_vm_deletion": false,
                                         "iops": 0,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 20,
                                         "volume_type": "standard"
                                     }
@@ -125,6 +126,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -136,6 +138,7 @@
                                         "delete_on_vm_deletion": false,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 fa4a601a8..869e172c9 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
@@ -109,6 +109,7 @@
                                         "delete_on_vm_deletion": false,
                                         "iops": 0,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 20,
                                         "volume_type": "standard"
                                     }
@@ -125,6 +126,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -136,6 +138,7 @@
                                         "delete_on_vm_deletion": false,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 b2dad41f5..f782384cf 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
@@ -109,6 +109,7 @@
                                         "delete_on_vm_deletion": true,
                                         "iops": null,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 20,
                                         "volume_type": "standard"
                                     }
@@ -125,6 +126,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -136,6 +138,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 f9efbac89..bc64accf0 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
@@ -109,6 +109,7 @@
                                         "delete_on_vm_deletion": true,
                                         "iops": 0,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 20,
                                         "volume_type": "standard"
                                     }
@@ -125,6 +126,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -136,6 +138,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 649b37ab3..0d2821be3 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
@@ -109,6 +109,7 @@
                                         "delete_on_vm_deletion": true,
                                         "iops": 0,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 20,
                                         "volume_type": "standard"
                                     }
@@ -125,6 +126,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -136,6 +138,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 913d700f0..d29f5681f 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
@@ -109,6 +109,7 @@
                                         "delete_on_vm_deletion": true,
                                         "iops": 0,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 20,
                                         "volume_type": "standard"
                                     }
@@ -125,6 +126,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -136,6 +138,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 8261f2882..7942e5ab5 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
@@ -109,6 +109,7 @@
                                         "delete_on_vm_deletion": true,
                                         "iops": 0,
                                         "snapshot_id": "",
+                                        "tags": [],
                                         "volume_size": 20,
                                         "volume_type": "standard"
                                     }
@@ -125,6 +126,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-5##"
                                     }
                                 ],
@@ -136,6 +138,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
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 4b72f0658..f915c92f1 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
@@ -95,6 +95,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-4##"
                                     }
                                 ],
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 305e4a5ad..7aed32091 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
@@ -108,6 +108,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
@@ -193,6 +194,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-9##"
                                     }
                                 ],
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 0e6103356..f1acdf274 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
@@ -27,6 +27,7 @@
                                                 "delete_on_vm_deletion": true,
                                                 "link_date": "########",
                                                 "state": "attached",
+                                                "tags": [],
                                                 "volume_id": "##id-1##"
                                             }
                                         ],
@@ -88,6 +89,7 @@
                                                 "delete_on_vm_deletion": true,
                                                 "link_date": "########",
                                                 "state": "attached",
+                                                "tags": [],
                                                 "volume_id": "##id-6##"
                                             }
                                         ],
@@ -215,6 +217,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
@@ -293,6 +296,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-1##"
                                     }
                                 ],
@@ -378,6 +382,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-11##"
                                     }
                                 ],
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 c829df4c4..7c71140bf 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
@@ -27,6 +27,7 @@
                                                 "delete_on_vm_deletion": true,
                                                 "link_date": "########",
                                                 "state": "attached",
+                                                "tags": [],
                                                 "volume_id": "##id-1##"
                                             }
                                         ],
@@ -88,6 +89,7 @@
                                                 "delete_on_vm_deletion": true,
                                                 "link_date": "########",
                                                 "state": "attached",
+                                                "tags": [],
                                                 "volume_id": "##id-6##"
                                             }
                                         ],
@@ -168,6 +170,7 @@
                                                 "delete_on_vm_deletion": true,
                                                 "link_date": "########",
                                                 "state": "attached",
+                                                "tags": [],
                                                 "volume_id": "##id-10##"
                                             }
                                         ],
@@ -257,6 +260,7 @@
                                                 "delete_on_vm_deletion": true,
                                                 "link_date": "########",
                                                 "state": "attached",
+                                                "tags": [],
                                                 "volume_id": "##id-10##"
                                             }
                                         ],
@@ -346,6 +350,7 @@
                                                 "delete_on_vm_deletion": true,
                                                 "link_date": "########",
                                                 "state": "attached",
+                                                "tags": [],
                                                 "volume_id": "##id-10##"
                                             }
                                         ],
@@ -482,6 +487,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-6##"
                                     }
                                 ],
@@ -560,6 +566,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-1##"
                                     }
                                 ],
@@ -645,6 +652,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-10##"
                                     }
                                 ],
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 3d43c18bf..5af7af1bc 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
@@ -152,6 +152,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-8##"
                                     }
                                 ],
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 09ce32e8b..b49257a4c 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
@@ -152,6 +152,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-8##"
                                     }
                                 ],
@@ -163,6 +164,12 @@
                                         "delete_on_vm_deletion": false,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [
+                                            {
+                                                "key": "type",
+                                                "value": "io1"
+                                            }
+                                        ],
                                         "volume_id": "##id-3##"
                                     }
                                 ],
diff --git a/tests/qa_provider_oapi/data/volumes_link/TF-160_volumes_link_resource_attributes_ok/step1.volumes_link_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/volumes_link/TF-160_volumes_link_resource_attributes_ok/step1.volumes_link_resource_attributes_ok.ref
index 0e5cf6698..79b9d988c 100644
--- a/tests/qa_provider_oapi/data/volumes_link/TF-160_volumes_link_resource_attributes_ok/step1.volumes_link_resource_attributes_ok.ref
+++ b/tests/qa_provider_oapi/data/volumes_link/TF-160_volumes_link_resource_attributes_ok/step1.volumes_link_resource_attributes_ok.ref
@@ -73,6 +73,7 @@
                                         "delete_on_vm_deletion": true,
                                         "link_date": "########",
                                         "state": "attached",
+                                        "tags": [],
                                         "volume_id": "##id-3##"
                                     }
                                 ],