From 157c93269613699185f3c208aa819a7174a92213 Mon Sep 17 00:00:00 2001 From: Thiery Ouattara Date: Tue, 19 Sep 2023 16:09:00 +0000 Subject: [PATCH] Add block for primary nic in VM To avoid confict nic inside VM with link_nic resouces we add a new block 'primary_nic' in VM for only nic with device number 0 --- outscale/data_source_outscale_vm.go | 174 +++++++++++- outscale/instance_set_set.go | 8 +- outscale/resource_outscale_vm.go | 226 ++++++++++++++-- outscale/resource_outscale_vm_test.go | 8 +- ....flexible_gpu_datasource_attributes_ok.ref | 1 + ...exible_gpu_link_resource_attributes_ok.ref | 1 + ...flexible_gpus_datasource_attributes_ok.ref | 1 + .../step1.image_datasource_attributes_ok.ref | 1 + ...e_no-reboot_resource_std_attributes_ok.ref | 3 +- ...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 | 1 + ...cer_vm_health_datasource_attributes_ok.ref | 1 + ...ad_balancer_vms_resource_attributes_ok.ref | 2 + ...oad_balancer_vms_resource_remove_vm_ok.ref | 2 + .../step1.nic_datasource_attributes_ok.ref | 42 +++ .../step1.nic_link_resource_attributes_ok.ref | 42 +++ .../step1.nics_datasource_attributes_ok.ref | 242 ++++++++++------- .../step1.vm_resource_centos_ok.ref | 44 +++ ...resource_private_with_multiple_NICs_ok.ref | 42 +++ .../step1.test_destroy_igw.ref | 252 ++++++++++++++++++ ....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 | 1 + ...m_resource_public_with_multiple_BDM_ok.ref | 1 + .../step1.vm_resource_with_user_data_ok.ref | 42 +++ .../step1.vm_resource_with_user_data_ok_2.ref | 1 + ...step1.vm_resource_update_attributes_ok.ref | 1 + .../step2.vm_resource_update_keypair_ok.ref | 1 + ...3.vm_resource_update_security_group_ok.ref | 5 +- ...resource_update_deletion_protection_ok.ref | 1 + .../step5.vm_resource_update_bdm_ok.ref | 1 + ...tep6.vm_resource_update_performance_ok.ref | 1 + .../step7.vm_resource_update_vm_type_ok.ref | 1 + .../step8.vm_resource_update_user_data_ok.ref | 1 + ...m_resource_update_shtdown_behaviour_ok.ref | 47 ++++ ..._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 | 53 ++-- ...tep2.volumes_datasource_attributes_ok4.ref | 53 ++-- ...p1.volumes_link_resource_attributes_ok.ref | 1 + 48 files changed, 1161 insertions(+), 180 deletions(-) diff --git a/outscale/data_source_outscale_vm.go b/outscale/data_source_outscale_vm.go index 995acafc9..c41ffde14 100644 --- a/outscale/data_source_outscale_vm.go +++ b/outscale/data_source_outscale_vm.go @@ -128,7 +128,11 @@ func oapiVMDescriptionAttributes(set AttributeSetter, vm *oscgo.Vm) error { if err := set("nested_virtualization", vm.GetNestedVirtualization()); err != nil { return err } - if err := set("nics", getOAPIVMNetworkInterfaceLightSet(vm.GetNics())); err != nil { + prNic, secNic := getOAPIVMNetworkInterfaceLightSet(vm.GetNics()) + if err := set("primary_nic", prNic); err != nil { + return err + } + if err := set("nics", secNic); err != nil { return err } if err := set("os_family", vm.GetOsFamily()); err != nil { @@ -383,6 +387,174 @@ func getOApiVMAttributesSchema() map[string]*schema.Schema { Type: schema.TypeString, Computed: true, }, + "primary_nic": { + Type: schema.TypeSet, + Computed: true, + Set: func(v interface{}) int { + return v.(map[string]interface{})["device_number"].(int) + }, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delete_on_vm_deletion": { + Type: schema.TypeBool, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "device_number": { + Type: schema.TypeInt, + Computed: true, + }, + "nic_id": { + Type: schema.TypeString, + Computed: true, + }, + "private_ips": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "is_primary": { + Type: schema.TypeBool, + Computed: true, + }, + "link_public_ip": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "public_dns_name": { + Type: schema.TypeString, + Computed: true, + }, + "public_ip": { + Type: schema.TypeString, + Computed: true, + }, + "public_ip_account_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "private_dns_name": { + Type: schema.TypeString, + Computed: true, + }, + "private_ip": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "secondary_private_ip_count": { + Type: schema.TypeInt, + Computed: true, + }, + "account_id": { + Type: schema.TypeString, + Computed: true, + }, + + "is_source_dest_checked": { + Type: schema.TypeBool, + Computed: true, + }, + + "subnet_id": { + Type: schema.TypeString, + Computed: true, + }, + "link_nic": { + Type: schema.TypeList, + MaxItems: 1, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delete_on_vm_deletion": { + Type: schema.TypeBool, + Computed: true, + }, + "device_number": { + Type: schema.TypeString, + Computed: true, + }, + "link_nic_id": { + Type: schema.TypeString, + Computed: true, + }, + "state": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "link_public_ip": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "public_dns_name": { + Type: schema.TypeString, + Computed: true, + }, + "public_ip": { + Type: schema.TypeString, + Computed: true, + }, + "public_ip_account_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "mac_address": { + Type: schema.TypeString, + Computed: true, + }, + "net_id": { + Type: schema.TypeString, + Computed: true, + }, + + "private_dns_name": { + Type: schema.TypeString, + Computed: true, + }, + "security_group_ids": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "security_groups": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "security_group_id": { + Type: schema.TypeString, + Computed: true, + }, + "security_group_name": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "state": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, "nics": { Type: schema.TypeList, Optional: true, diff --git a/outscale/instance_set_set.go b/outscale/instance_set_set.go index 514c168e6..ac97cf57c 100644 --- a/outscale/instance_set_set.go +++ b/outscale/instance_set_set.go @@ -109,7 +109,7 @@ func getOAPIPrivateIPs(privateIPs []oscgo.PrivateIp) (res []map[string]interface return } -func getOAPIVMNetworkInterfaceLightSet(nics []oscgo.NicLight) (res []map[string]interface{}) { +func getOAPIVMNetworkInterfaceLightSet(nics []oscgo.NicLight) (primaryNic []map[string]interface{}, secondaryNic []map[string]interface{}) { for _, nic := range nics { securityGroups, securityGroupIds := getOAPISecurityGroups(nic.GetSecurityGroups()) @@ -143,8 +143,10 @@ func getOAPIVMNetworkInterfaceLightSet(nics []oscgo.NicLight) (res []map[string] if nic.HasLinkNic() { nicMap["link_nic"] = getOAPILinkNicLight(nic.GetLinkNic()) } - - res = append(res, nicMap) + if nic.LinkNic.GetDeviceNumber() == 0 { + primaryNic = append(primaryNic, nicMap) + } + secondaryNic = append(secondaryNic, nicMap) } return } diff --git a/outscale/resource_outscale_vm.go b/outscale/resource_outscale_vm.go index 40382bde6..9fa4deaba 100644 --- a/outscale/resource_outscale_vm.go +++ b/outscale/resource_outscale_vm.go @@ -9,7 +9,6 @@ import ( "net/http" "time" - "github.com/aws/aws-sdk-go/aws" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -134,6 +133,201 @@ func resourceOutscaleOApiVM() *schema.Resource { Optional: true, Computed: true, }, + "primary_nic": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + ForceNew: true, + Set: func(v interface{}) int { + return v.(map[string]interface{})["device_number"].(int) + }, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delete_on_vm_deletion": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + ForceNew: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + Optional: true, + ForceNew: true, + }, + "device_number": { + Type: schema.TypeInt, + Required: true, + ForceNew: true, + ValidateFunc: func(number interface{}, key string) (warns []string, errs []error) { + deviceNumber := number.(int) + if deviceNumber != 0 { + errs = append(errs, fmt.Errorf("%q in primary_nic must be only '0', got: %d", key, deviceNumber)) + } + return + }, + }, + "nic_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "private_ips": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "is_primary": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + ForceNew: true, + }, + "link_public_ip": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "public_dns_name": { + Type: schema.TypeString, + Computed: true, + }, + "public_ip": { + Type: schema.TypeString, + Computed: true, + }, + "public_ip_account_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "private_dns_name": { + Type: schema.TypeString, + Computed: true, + }, + "private_ip": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + }, + }, + }, + "secondary_private_ip_count": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + ForceNew: true, + }, + "account_id": { + Type: schema.TypeString, + Computed: true, + }, + + "is_source_dest_checked": { + Type: schema.TypeBool, + Computed: true, + }, + + "subnet_id": { + Type: schema.TypeString, + Computed: true, + Optional: true, + ForceNew: true, + }, + "link_nic": { + Type: schema.TypeList, + MaxItems: 1, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delete_on_vm_deletion": { + Type: schema.TypeBool, + Computed: true, + }, + "device_number": { + Type: schema.TypeString, + Computed: true, + }, + "link_nic_id": { + Type: schema.TypeString, + Computed: true, + }, + "state": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "link_public_ip": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "public_dns_name": { + Type: schema.TypeString, + Computed: true, + }, + "public_ip": { + Type: schema.TypeString, + Computed: true, + }, + "public_ip_account_id": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "mac_address": { + Type: schema.TypeString, + Computed: true, + }, + "net_id": { + Type: schema.TypeString, + Computed: true, + }, + + "private_dns_name": { + Type: schema.TypeString, + Computed: true, + }, + "security_group_ids": { + Type: schema.TypeList, + Optional: true, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "security_groups": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "security_group_id": { + Type: schema.TypeString, + Computed: true, + }, + "security_group_name": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "state": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, "nics": { Type: schema.TypeSet, Optional: true, @@ -1084,10 +1278,20 @@ func expandBlockDeviceBSU(bsu map[string]interface{}) (oscgo.BsuToCreate, error) } func buildNetworkOApiInterfaceOpts(d *schema.ResourceData) []oscgo.NicForVmCreation { - nics := d.Get("nics").(*schema.Set).List() + networkInterfaces := []oscgo.NicForVmCreation{} + if nics := d.Get("primary_nic").(*schema.Set).List(); len(nics) > 0 { + buildNicForVmCreation(nics, &networkInterfaces) + } + if nics := d.Get("nics").(*schema.Set).List(); len(nics) > 0 { + buildNicForVmCreation(nics, &networkInterfaces) + } + return networkInterfaces +} - for i, v := range nics { +func buildNicForVmCreation(nics []interface{}, listNics *[]oscgo.NicForVmCreation) { + + for _, v := range nics { nic := v.(map[string]interface{}) ni := oscgo.NicForVmCreation{ DeviceNumber: oscgo.PtrInt32(int32(nic["device_number"].(int))), @@ -1099,29 +1303,19 @@ func buildNetworkOApiInterfaceOpts(d *schema.ResourceData) []oscgo.NicForVmCreat if v := nic["secondary_private_ip_count"].(int); v > 0 { ni.SetSecondaryPrivateIpCount(int32(v)) } - if delete, deleteOK := d.GetOk(fmt.Sprintf("nics.%d.delete_on_vm_deletion", i)); deleteOK { - log.Printf("[DEBUG] delete=%+v, deleteOK=%+v", delete, deleteOK) - ni.SetDeleteOnVmDeletion(delete.(bool)) + if v := nic["delete_on_vm_deletion"]; v != nil { + ni.SetDeleteOnVmDeletion(v.(bool)) } - ni.SetDescription(nic["description"].(string)) - ni.SetPrivateIps(expandPrivatePublicIps(nic["private_ips"].(*schema.Set))) ni.SetSubnetId(nic["subnet_id"].(string)) if sg := utils.InterfaceSliceToStringSlice(nic["security_group_ids"].([]interface{})); len(sg) > 0 { ni.SetSecurityGroupIds(sg) } - - if v, ok := d.GetOk("private_ip"); ok { - ni.SetPrivateIps([]oscgo.PrivateIpLight{{ - PrivateIp: aws.String(v.(string)), - }}) - } - networkInterfaces = append(networkInterfaces, ni) + *listNics = append(*listNics, ni) } - return networkInterfaces } func expandPrivatePublicIps(p *schema.Set) []oscgo.PrivateIpLight { diff --git a/outscale/resource_outscale_vm_test.go b/outscale/resource_outscale_vm_test.go index 759d7dde0..a9178afb5 100644 --- a/outscale/resource_outscale_vm_test.go +++ b/outscale/resource_outscale_vm_test.go @@ -700,6 +700,7 @@ func testAccCheckOutscaleOAPIVMConfigBasicWithNicAttached(omi, vmType, region, k is_primary = true } device_number = 0 + delete_on_vm_deletion = true } nics { @@ -736,13 +737,10 @@ func testAccCheckOutscaleOAPIVMConfigBasicWithNics(omi, vmType, keypair, region vm_type = "%[2]s" keypair_name = "%[3]s" - nics { + primary_nic { device_number = 0 subnet_id = outscale_subnet.outscale_subnet.subnet_id - - # nic_id = outscale_nic.outscale_nic.nic_id - # secondary_private_ip_count = 1 - + delete_on_vm_deletion = true security_group_ids = [outscale_security_group.outscale_security_group.security_group_id] private_ips { diff --git a/tests/qa_provider_oapi/data/flexible_gpu/TF-177_flexible_gpu_datasource_attributes_ok/step1.flexible_gpu_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/flexible_gpu/TF-177_flexible_gpu_datasource_attributes_ok/step1.flexible_gpu_datasource_attributes_ok.ref index 584c2ad5e..9eb77552f 100644 --- a/tests/qa_provider_oapi/data/flexible_gpu/TF-177_flexible_gpu_datasource_attributes_ok/step1.flexible_gpu_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/flexible_gpu/TF-177_flexible_gpu_datasource_attributes_ok/step1.flexible_gpu_datasource_attributes_ok.ref @@ -188,6 +188,7 @@ "performance": "highest", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 fce361411..270fe0f50 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 @@ -116,6 +116,7 @@ "performance": "highest", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 ac3f47ce1..96a1e1ea8 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 @@ -225,6 +225,7 @@ "performance": "highest", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 d2a01b165..27fe75342 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 @@ -586,6 +586,7 @@ "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 f1f3ac2d1..ca9e3a851 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 @@ -122,7 +122,7 @@ "permissions_to_launch": [ { "account_ids": [], - "global_permission": false + "global_permission": true } ], "product_codes": [ @@ -190,6 +190,7 @@ "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 3eb2041d3..25858515e 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 @@ -179,6 +179,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 d6d13d997..84843550c 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 @@ -124,6 +124,7 @@ "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 6a6701742..222f452d3 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 @@ -753,6 +753,7 @@ "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 94f78e950..aba24c776 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 @@ -271,6 +271,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 e8246562c..ec060c040 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 @@ -286,6 +286,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 344567b5a..cf9254172 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 @@ -285,6 +285,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 abedd48ce..28c23d76c 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 @@ -287,6 +287,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 571e96bd8..22065e458 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 @@ -321,6 +321,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 f1649e71c..ba30652b0 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 @@ -170,6 +170,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -247,6 +248,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 dca86c42d..eda8d82f2 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 @@ -171,6 +171,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -248,6 +249,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 3299e708c..c27e8adb3 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 @@ -1027,6 +1027,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-0##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-6##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-2##", + "nic_id": "##id-5##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-8##" + ], + "security_groups": [ + { + "security_group_id": "##id-8##", + "security_group_name": "default" + } + ], + "state": "in-use", + "subnet_id": "##id-4##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 27cab15a0..e24124cd1 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 @@ -302,6 +302,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-3##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-12##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-2##", + "nic_id": "##id-13##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-9##" + ], + "security_groups": [ + { + "security_group_id": "##id-9##", + "security_group_name": "sg1-test-group_test" + } + ], + "state": "in-use", + "subnet_id": "##id-6##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, diff --git a/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref b/tests/qa_provider_oapi/data/nets/TF-113_nics_datasource_attributes_ok/step1.nics_datasource_attributes_ok.ref index f2d463b99..8632f47bb 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 @@ -178,11 +178,11 @@ "is_source_dest_checked": true, "link_nic": { "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" + "device_number": "2", + "link_nic_id": "##id-13##", + "state": "attached", + "vm_account_id": "##id-1##", + "vm_id": "##id-3##" }, "link_public_ip": { "link_public_ip_id": "", @@ -207,25 +207,33 @@ }, "private_dns_name": "########", "private_ip": "########" + }, + { + "is_primary": false, + "link_public_ip": { + "link_public_ip_id": "", + "public_dns_name": "########", + "public_ip": "########", + "public_ip_account_id": "", + "public_ip_id": "" + }, + "private_dns_name": "########", + "private_ip": "########" } ], "security_groups": [ { - "security_group_id": "##id-6##", - "security_group_name": "Terraform-SG" + "security_group_id": "##id-11##", + "security_group_name": "default" } ], - "state": "available", - "subnet_id": "##id-14##", - "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" } ] }, @@ -235,11 +243,11 @@ "is_source_dest_checked": true, "link_nic": { "delete_on_vm_deletion": "false", - "device_number": "2", - "link_nic_id": "##id-15##", - "state": "attached", - "vm_account_id": "##id-1##", - "vm_id": "##id-3##" + "device_number": "0", + "link_nic_id": "", + "state": "", + "vm_account_id": "", + "vm_id": "" }, "link_public_ip": { "link_public_ip_id": "", @@ -264,33 +272,25 @@ }, "private_dns_name": "########", "private_ip": "########" - }, - { - "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, - "private_dns_name": "########", - "private_ip": "########" } ], "security_groups": [ { - "security_group_id": "##id-11##", - "security_group_name": "default" + "security_group_id": "##id-6##", + "security_group_name": "Terraform-SG" } ], - "state": "in-use", - "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "state": "available", + "subnet_id": "##id-16##", + "subregion_name": "us-east-2b", "tags": [ { - "key": "Name", - "value": "Nic-2" + "key": "Key:", + "value": ":value-tags" + }, + { + "key": "Key-2", + "value": "value-tags-2" } ] } @@ -315,15 +315,15 @@ "nics": [ { "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##", - "state": "attached", - "vm_account_id": "##id-1##", - "vm_id": "##id-3##" + "device_number": "0", + "link_nic_id": "", + "state": "", + "vm_account_id": "", + "vm_id": "" }, "link_public_ip": { "link_public_ip_id": "", @@ -348,18 +348,6 @@ }, "private_dns_name": "########", "private_ip": "########" - }, - { - "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, - "private_dns_name": "########", - "private_ip": "########" } ], "security_groups": [ @@ -368,9 +356,9 @@ "security_group_name": "Terraform-SG" } ], - "state": "in-use", - "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "state": "available", + "subnet_id": "##id-16##", + "subregion_name": "us-east-2b", "tags": [ { "key": "Key:", @@ -384,15 +372,15 @@ }, { "account_id": "##id-1##", - "description": "", + "description": "TF-109", "is_source_dest_checked": true, "link_nic": { "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" + "device_number": "1", + "link_nic_id": "##id-2##", + "state": "attached", + "vm_account_id": "##id-1##", + "vm_id": "##id-3##" }, "link_public_ip": { "link_public_ip_id": "", @@ -417,6 +405,18 @@ }, "private_dns_name": "########", "private_ip": "########" + }, + { + "is_primary": false, + "link_public_ip": { + "link_public_ip_id": "", + "public_dns_name": "########", + "public_ip": "########", + "public_ip_account_id": "", + "public_ip_id": "" + }, + "private_dns_name": "########", + "private_ip": "########" } ], "security_groups": [ @@ -425,9 +425,9 @@ "security_group_name": "Terraform-SG" } ], - "state": "available", - "subnet_id": "##id-14##", - "subregion_name": "us-east-2b", + "state": "in-use", + "subnet_id": "##id-7##", + "subregion_name": "us-east-2a", "tags": [ { "key": "Key:", @@ -460,15 +460,15 @@ "nics": [ { "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##", - "state": "attached", - "vm_account_id": "##id-1##", - "vm_id": "##id-3##" + "device_number": "0", + "link_nic_id": "", + "state": "", + "vm_account_id": "", + "vm_id": "" }, "link_public_ip": { "link_public_ip_id": "", @@ -493,18 +493,6 @@ }, "private_dns_name": "########", "private_ip": "########" - }, - { - "is_primary": false, - "link_public_ip": { - "link_public_ip_id": "", - "public_dns_name": "########", - "public_ip": "########", - "public_ip_account_id": "", - "public_ip_id": "" - }, - "private_dns_name": "########", - "private_ip": "########" } ], "security_groups": [ @@ -513,9 +501,9 @@ "security_group_name": "Terraform-SG" } ], - "state": "in-use", - "subnet_id": "##id-7##", - "subregion_name": "us-east-2a", + "state": "available", + "subnet_id": "##id-16##", + "subregion_name": "us-east-2b", "tags": [ { "key": "Key:", @@ -529,15 +517,15 @@ }, { "account_id": "##id-1##", - "description": "", + "description": "TF-109", "is_source_dest_checked": true, "link_nic": { "delete_on_vm_deletion": "false", - "device_number": "0", - "link_nic_id": "", - "state": "", - "vm_account_id": "", - "vm_id": "" + "device_number": "1", + "link_nic_id": "##id-2##", + "state": "attached", + "vm_account_id": "##id-1##", + "vm_id": "##id-3##" }, "link_public_ip": { "link_public_ip_id": "", @@ -562,6 +550,18 @@ }, "private_dns_name": "########", "private_ip": "########" + }, + { + "is_primary": false, + "link_public_ip": { + "link_public_ip_id": "", + "public_dns_name": "########", + "public_ip": "########", + "public_ip_account_id": "", + "public_ip_id": "" + }, + "private_dns_name": "########", + "private_ip": "########" } ], "security_groups": [ @@ -570,9 +570,9 @@ "security_group_name": "Terraform-SG" } ], - "state": "available", - "subnet_id": "##id-14##", - "subregion_name": "us-east-2b", + "state": "in-use", + "subnet_id": "##id-7##", + "subregion_name": "us-east-2a", "tags": [ { "key": "Key:", @@ -1195,6 +1195,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-1##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-9##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-4##", + "nic_id": "##id-10##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-11##" + ], + "security_groups": [ + { + "security_group_id": "##id-11##", + "security_group_name": "default" + } + ], + "state": "in-use", + "subnet_id": "##id-7##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, diff --git a/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref b/tests/qa_provider_oapi/data/nets/TF-144_vm_resource_centos_attributes_ok/step1.vm_resource_centos_ok.ref index 713b3ea83..72ab29be1 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 @@ -436,6 +436,7 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -523,6 +524,7 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -651,6 +653,48 @@ "performance": "medium", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-6##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-23##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-1##", + "nic_id": "##id-7##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-13##" + ], + "security_groups": [ + { + "security_group_id": "##id-13##", + "security_group_name": "terraform-sg" + } + ], + "state": "in-use", + "subnet_id": "##id-12##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 6b36e4bb6..7385b4a60 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 @@ -348,6 +348,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-3##", + "delete_on_vm_deletion": true, + "description": "", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-13##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-2##", + "nic_id": "##id-14##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-7##" + ], + "security_groups": [ + { + "security_group_id": "##id-7##", + "security_group_name": "private-sg-1" + } + ], + "state": "in-use", + "subnet_id": "##id-6##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, diff --git a/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.ref b/tests/qa_provider_oapi/data/nets/TF-65_Check_IGW_Destroy/step1.test_destroy_igw.ref index 78e0a5e55..629430df3 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 @@ -920,6 +920,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-9##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-26##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-1##", + "nic_id": "##id-10##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-23##" + ], + "security_groups": [ + { + "security_group_id": "##id-23##", + "security_group_name": "terraform-sg-22" + } + ], + "state": "in-use", + "subnet_id": "##id-4##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -1042,6 +1084,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-9##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-29##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-1##", + "nic_id": "##id-13##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-23##" + ], + "security_groups": [ + { + "security_group_id": "##id-23##", + "security_group_name": "terraform-sg-22" + } + ], + "state": "in-use", + "subnet_id": "##id-4##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -1164,6 +1248,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-9##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-33##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-1##", + "nic_id": "##id-34##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-23##" + ], + "security_groups": [ + { + "security_group_id": "##id-23##", + "security_group_name": "terraform-sg-22" + } + ], + "state": "in-use", + "subnet_id": "##id-4##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -1294,6 +1420,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-9##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-38##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-1##", + "nic_id": "##id-39##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-22##" + ], + "security_groups": [ + { + "security_group_id": "##id-22##", + "security_group_name": "terraform-sg-12" + } + ], + "state": "in-use", + "subnet_id": "##id-21##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -1416,6 +1584,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-9##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-43##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-1##", + "nic_id": "##id-44##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-22##" + ], + "security_groups": [ + { + "security_group_id": "##id-22##", + "security_group_name": "terraform-sg-12" + } + ], + "state": "in-use", + "subnet_id": "##id-21##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -1538,6 +1748,48 @@ "performance": "high", "placement_subregion_name": "us-east-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-9##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-48##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-1##", + "nic_id": "##id-49##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-22##" + ], + "security_groups": [ + { + "security_group_id": "##id-22##", + "security_group_name": "terraform-sg-12" + } + ], + "state": "in-use", + "subnet_id": "##id-21##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, diff --git a/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.ref b/tests/qa_provider_oapi/data/public_ip_link/TF-116_public_ip_link_resource_attributes_ok/step1.public_ip_link_resource_attributes_ok.ref index 311c74ab5..685686b5c 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 @@ -136,6 +136,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 0ef811dcd..308a7b024 100644 --- a/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step1.vm_datasource_centos_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step1.vm_datasource_centos_ok.ref @@ -44,6 +44,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -125,6 +126,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -202,6 +204,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -330,6 +333,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -422,6 +426,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -502,6 +507,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 4bd3a0939..00de2be50 100644 --- a/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step2.vm_datasource_centos_ok.ref +++ b/tests/qa_provider_oapi/data/vm/TF-143_vm_datasource_centos_attributes_ok/step2.vm_datasource_centos_ok.ref @@ -44,6 +44,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -125,6 +126,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -206,6 +208,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -287,6 +290,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -364,6 +368,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -492,6 +497,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -584,6 +590,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -664,6 +671,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 3d85c9d35..b2edfe240 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 @@ -164,6 +164,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 1b6d64beb..2fe55e843 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 @@ -164,6 +164,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 0a79d9889..cf28a324d 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 @@ -109,6 +109,48 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-5##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-6##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-4##", + "nic_id": "##id-7##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-8##" + ], + "security_groups": [ + { + "security_group_id": "##id-8##", + "security_group_name": "default" + } + ], + "state": "in-use", + "subnet_id": "##id-9##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 30b69bac5..e77d1f8fb 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 @@ -68,6 +68,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 f91038c61..9f415b025 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 @@ -156,6 +156,7 @@ "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 e8b6abd32..0b0cf9cd5 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 @@ -156,6 +156,7 @@ "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 c87510960..3a1332065 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 @@ -156,6 +156,7 @@ "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -169,8 +170,8 @@ "root_device_name": "/dev/sda1", "root_device_type": "ebs", "security_group_ids": [ - "##id-3##", - "##id-4##" + "##id-4##", + "##id-3##" ], "security_group_names": null, "security_groups": [ 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 65e8767f3..3ba3f50f5 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 @@ -156,6 +156,7 @@ "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 30f295157..a45de62b2 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 @@ -156,6 +156,7 @@ "performance": "medium", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 296d2b642..d033e559e 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 @@ -156,6 +156,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 b93ef93d4..3c37794f1 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 @@ -156,6 +156,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 e085d87e4..0f1a3d7ac 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 @@ -156,6 +156,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 5bb6e51b6..fbda634d0 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 @@ -202,6 +202,53 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [ + { + "account_id": "##id-2##", + "delete_on_vm_deletion": true, + "description": "Primary network interface", + "device_number": 0, + "is_source_dest_checked": true, + "link_nic": [ + { + "delete_on_vm_deletion": true, + "device_number": "0", + "link_nic_id": "##id-10##", + "state": "attached" + } + ], + "link_public_ip": [], + "mac_address": "########", + "net_id": "##id-9##", + "nic_id": "##id-11##", + "private_dns_name": "########", + "private_ips": [ + { + "is_primary": true, + "link_public_ip": [], + "private_dns_name": "########", + "private_ip": "########" + } + ], + "secondary_private_ip_count": 0, + "security_group_ids": [ + "##id-4##", + "##id-3##" + ], + "security_groups": [ + { + "security_group_id": "##id-4##", + "security_group_name": "terraform-sg-TF66-1" + }, + { + "security_group_id": "##id-3##", + "security_group_name": "terraform-sg-TF66-0" + } + ], + "state": "in-use", + "subnet_id": "##id-12##" + } + ], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 873bd58e1..9a9e16978 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 @@ -90,6 +90,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 8af1f589c..3e576c8ef 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 @@ -103,6 +103,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -182,6 +183,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 1f01f54b1..bc3f22742 100644 --- a/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step1.vms_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step1.vms_datasource_attributes_ok.ref @@ -47,6 +47,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": [], @@ -105,6 +106,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": [], @@ -204,6 +206,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -276,6 +279,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -355,6 +359,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 53659bf30..f65f68a0e 100644 --- a/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step2.vms_datasource_attributes_ok.ref +++ b/tests/qa_provider_oapi/data/vms/TF-151_vms_datasource_attributes_ok/step2.vms_datasource_attributes_ok.ref @@ -47,6 +47,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": [], @@ -105,6 +106,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": [], @@ -182,6 +184,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": [], @@ -268,6 +271,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": [], @@ -354,6 +358,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": [], @@ -462,6 +467,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -534,6 +540,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, @@ -613,6 +620,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 d3a954ff6..4e46f42bd 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 @@ -21,62 +21,62 @@ "volumes": [ { "creation_date": "########", - "iops": 150, - "linked_volumes": [], - "size": 15, + "iops": 100, + "linked_volumes": [ + { + "delete_on_vm_deletion": false, + "device_name": "/dev/xvdc", + "state": "attached", + "vm_id": "##id-1##", + "volume_id": "##id-2##" + } + ], + "size": 40, "snapshot_id": "", - "state": "available", + "state": "in-use", "subregion_name": "eu-west-2a", "tags": [ { - "key": "Name", - "value": "volume-standard-1" + "key": "type", + "value": "io1" } ], - "volume_id": "##id-1##", - "volume_type": "standard" + "volume_id": "##id-2##", + "volume_type": "io1" }, { "creation_date": "########", "iops": 150, "linked_volumes": [], - "size": 13, + "size": 15, "snapshot_id": "", "state": "available", "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", - "value": "volume-standard-2" + "value": "volume-standard-1" } ], - "volume_id": "##id-2##", + "volume_id": "##id-3##", "volume_type": "standard" }, { "creation_date": "########", - "iops": 100, - "linked_volumes": [ - { - "delete_on_vm_deletion": false, - "device_name": "/dev/xvdc", - "state": "attached", - "vm_id": "##id-3##", - "volume_id": "##id-4##" - } - ], - "size": 40, + "iops": 150, + "linked_volumes": [], + "size": 13, "snapshot_id": "", - "state": "in-use", + "state": "available", "subregion_name": "eu-west-2a", "tags": [ { - "key": "type", - "value": "io1" + "key": "Name", + "value": "volume-standard-2" } ], "volume_id": "##id-4##", - "volume_type": "io1" + "volume_type": "standard" } ] }, @@ -147,6 +147,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 d40e1cfc0..84c8bbfd6 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 @@ -21,62 +21,62 @@ "volumes": [ { "creation_date": "########", - "iops": 150, - "linked_volumes": [], - "size": 15, + "iops": 100, + "linked_volumes": [ + { + "delete_on_vm_deletion": false, + "device_name": "/dev/xvdc", + "state": "attached", + "vm_id": "##id-1##", + "volume_id": "##id-2##" + } + ], + "size": 40, "snapshot_id": "", - "state": "available", + "state": "in-use", "subregion_name": "eu-west-2a", "tags": [ { - "key": "Name", - "value": "volume-standard-1" + "key": "type", + "value": "io1" } ], - "volume_id": "##id-1##", - "volume_type": "standard" + "volume_id": "##id-2##", + "volume_type": "io1" }, { "creation_date": "########", "iops": 150, "linked_volumes": [], - "size": 13, + "size": 15, "snapshot_id": "", "state": "available", "subregion_name": "eu-west-2a", "tags": [ { "key": "Name", - "value": "volume-standard-2" + "value": "volume-standard-1" } ], - "volume_id": "##id-2##", + "volume_id": "##id-3##", "volume_type": "standard" }, { "creation_date": "########", - "iops": 100, - "linked_volumes": [ - { - "delete_on_vm_deletion": false, - "device_name": "/dev/xvdc", - "state": "attached", - "vm_id": "##id-3##", - "volume_id": "##id-4##" - } - ], - "size": 40, + "iops": 150, + "linked_volumes": [], + "size": 13, "snapshot_id": "", - "state": "in-use", + "state": "available", "subregion_name": "eu-west-2a", "tags": [ { - "key": "type", - "value": "io1" + "key": "Name", + "value": "volume-standard-2" } ], "volume_id": "##id-4##", - "volume_type": "io1" + "volume_type": "standard" } ] }, @@ -156,6 +156,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null, 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 b61468e98..47a9d9e4e 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 @@ -68,6 +68,7 @@ "performance": "high", "placement_subregion_name": "eu-west-2a", "placement_tenancy": "default", + "primary_nic": [], "private_dns_name": "########", "private_ip": "########", "private_ips": null,