4.0.0

internal/service/cloudapi/kvmvm/flattens.go

@@ -39,10 +39,11 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
 )
 
-func flattenDisks(disks []InfoDisk) []map[string]interface{} {
+func flattenDisks(disks []compute.InfoDisk) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, disk := range disks {
 		temp := map[string]interface{}{
@@ -53,7 +54,7 @@ func flattenDisks(disks []InfoDisk) []map[string]interface{} {
 	}
 	return res
 }
-func flattenQOS(qos QOS) []map[string]interface{} {
+func flattenQOS(qos compute.QOS) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"e_rate":   qos.ERate,
@@ -64,7 +65,7 @@ func flattenQOS(qos QOS) []map[string]interface{} {
 	res = append(res, temp)
 	return res
 }
-func flattenInterfaces(interfaces ListInterfaces) []map[string]interface{} {
+func flattenInterfaces(interfaces compute.ListInterfaces) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, interfaceItem := range interfaces {
 		temp := map[string]interface{}{
@@ -90,7 +91,7 @@ func flattenInterfaces(interfaces ListInterfaces) []map[string]interface{} {
 	}
 	return res
 }
-func flattenSnapSets(snapSets ListSnapSets) []map[string]interface{} {
+func flattenSnapSets(snapSets compute.ListSnapSets) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, snapSet := range snapSets {
 		temp := map[string]interface{}{
@@ -115,7 +116,7 @@ func flattenTags(tags map[string]string) []map[string]interface{} {
 	return res
 }
 
-func flattenListRules(listRules ListRules) []map[string]interface{} {
+func flattenListRules(listRules compute.ListRules) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, rule := range listRules {
 		temp := map[string]interface{}{
@@ -130,18 +131,11 @@ func flattenListRules(listRules ListRules) []map[string]interface{} {
 	}
 	return res
 }
-func flattenListACL(listAcl ListACL) []map[string]interface{} {
+func flattenListACL(listAcl compute.ListACL) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, acl := range listAcl {
-		var explicit interface{}
-		switch acl.Explicit.(type) { //Платформенный хак
-		case bool:
-			explicit = acl.Explicit.(bool)
-		case string:
-			explicit, _ = strconv.ParseBool(acl.Explicit.(string))
-		}
 		temp := map[string]interface{}{
-			"explicit":      explicit,
+			"explicit":      acl.Explicit,
 			"guid":          acl.GUID,
 			"right":         acl.Right,
 			"status":        acl.Status,
@@ -152,7 +146,8 @@ func flattenListACL(listAcl ListACL) []map[string]interface{} {
 	}
 	return res
 }
-func flattenComputeList(computes ListComputes) []map[string]interface{} {
+
+func flattenComputeList(computes compute.ListComputes) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, compute := range computes {
 		customFields, _ := json.Marshal(compute.CustomFields)
@@ -219,7 +214,29 @@ func flattenComputeList(computes ListComputes) []map[string]interface{} {
 	return res
 }
 
-func flattenComputeDisksDemo(disksList ListComputeDisks, extraDisks []interface{}) []map[string]interface{} {
+func flattenBootDisk(bootDisk *compute.ItemComputeDisk) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+
+	temp := map[string]interface{}{
+		"disk_name": bootDisk.Name,
+		"disk_id":   bootDisk.ID,
+		"disk_type": bootDisk.Type,
+		"sep_id":    bootDisk.SepID,
+		"shareable": bootDisk.Shareable,
+		"size_max":  bootDisk.SizeMax,
+		"size_used": bootDisk.SizeUsed,
+		"pool":      bootDisk.Pool,
+		"desc":      bootDisk.Description,
+		"image_id":  bootDisk.ImageID,
+		"size":      bootDisk.SizeMax,
+	}
+
+	res = append(res, temp)
+
+	return res
+}
+
+func flattenComputeDisksDemo(disksList compute.ListComputeDisks, extraDisks []interface{}) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(disksList))
 	for _, disk := range disksList {
 		if disk.Name == "bootdisk" || findInExtraDisks(uint(disk.ID), extraDisks) { //skip main bootdisk and extraDisks
@@ -246,7 +263,7 @@ func flattenComputeDisksDemo(disksList ListComputeDisks, extraDisks []interface{
 	return res
 }
 
-func flattenNetwork(interfaces ListInterfaces) []map[string]interface{} {
+func flattenNetwork(interfaces compute.ListInterfaces) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(interfaces))
 	//index := 0
 	for _, network := range interfaces {
@@ -261,7 +278,7 @@ func flattenNetwork(interfaces ListInterfaces) []map[string]interface{} {
 	return res
 }
 
-func findBootDisk(disks ListComputeDisks) *ItemComputeDisk {
+func findBootDisk(disks compute.ListComputeDisks) *compute.ItemComputeDisk {
 	for _, disk := range disks {
 		if disk.Name == "bootdisk" {
 			return &disk
@@ -270,139 +287,109 @@ func findBootDisk(disks ListComputeDisks) *ItemComputeDisk {
 	return nil
 }
 
-func flattenCompute(d *schema.ResourceData, compute RecordCompute) error {
+func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute) error {
 	// This function expects that compFacts string contains response from API compute/get,
 	// i.e. detailed information about compute instance.
 	//
 	// NOTE: this function modifies ResourceData argument - as such it should never be called
 	// from resourceComputeExists(...) method
-	log.Debugf("flattenCompute: ID %d, RG ID %d", compute.ID, compute.RGID)
+	log.Debugf("flattenCompute: ID %d, RG ID %d", computeRec.ID, computeRec.RGID)
 
-	devices, _ := json.Marshal(compute.Devices)
-	userdata, _ := json.Marshal(compute.Userdata)
+	devices, _ := json.Marshal(computeRec.Devices)
+	userdata, _ := json.Marshal(computeRec.Userdata)
+	bootDisk := findBootDisk(computeRec.Disks)
 
 	//check extraDisks, ipa_type, is,
-	d.SetId(strconv.FormatUint(compute.ID, 10))
-	d.Set("acl", flattenACL(compute.ACL))
-	d.Set("account_id", compute.AccountID)
-	d.Set("account_name", compute.AccountName)
-	d.Set("affinity_weight", compute.AffinityWeight)
-	d.Set("arch", compute.Architecture)
-	d.Set("boot_order", compute.BootOrder)
-	d.Set("boot_disk_size", compute.BootDiskSize)
-	bootDisk := findBootDisk(compute.Disks)
+	d.SetId(strconv.FormatUint(computeRec.ID, 10))
+	d.Set("acl", flattenACL(computeRec.ACL))
+	d.Set("account_id", computeRec.AccountID)
+	d.Set("account_name", computeRec.AccountName)
+	d.Set("affinity_weight", computeRec.AffinityWeight)
+	d.Set("arch", computeRec.Architecture)
+	d.Set("boot_order", computeRec.BootOrder)
+	d.Set("boot_disk_size", computeRec.BootDiskSize)
+	d.Set("boot_disk", flattenBootDisk(bootDisk))
 	d.Set("boot_disk_id", bootDisk.ID)
 	d.Set("sep_id", bootDisk.SepID)
 	d.Set("pool", bootDisk.Pool)
-	d.Set("clone_reference", compute.CloneReference)
-	d.Set("clones", compute.Clones)
+	d.Set("clone_reference", computeRec.CloneReference)
+	d.Set("clones", computeRec.Clones)
 	if string(userdata) != "{}" {
 		d.Set("cloud_init", string(userdata))
 	}
-	d.Set("computeci_id", compute.ComputeCIID)
-	d.Set("created_by", compute.CreatedBy)
-	d.Set("created_time", compute.CreatedTime)
-	d.Set("custom_fields", flattenCustomFields(compute.CustomFields))
-	d.Set("deleted_by", compute.DeletedBy)
-	d.Set("deleted_time", compute.DeletedTime)
-	d.Set("description", compute.Description)
+	d.Set("computeci_id", computeRec.ComputeCIID)
+	d.Set("created_by", computeRec.CreatedBy)
+	d.Set("created_time", computeRec.CreatedTime)
+	d.Set("custom_fields", flattenCustomFields(computeRec.CustomFields))
+	d.Set("deleted_by", computeRec.DeletedBy)
+	d.Set("deleted_time", computeRec.DeletedTime)
+	d.Set("description", computeRec.Description)
 	d.Set("devices", string(devices))
-	err := d.Set("disks", flattenComputeDisksDemo(compute.Disks, d.Get("extra_disks").(*schema.Set).List()))
+	err := d.Set("disks", flattenComputeDisksDemo(computeRec.Disks, d.Get("extra_disks").(*schema.Set).List()))
 	if err != nil {
 		return err
 	}
-	d.Set("driver", compute.Driver)
-	d.Set("cpu", compute.CPU)
-	d.Set("gid", compute.GID)
-	d.Set("guid", compute.GUID)
-	d.Set("compute_id", compute.ID)
-	if compute.VirtualImageID != 0 {
-		d.Set("image_id", compute.VirtualImageID)
+	d.Set("driver", computeRec.Driver)
+	d.Set("cpu", computeRec.CPU)
+	d.Set("gid", computeRec.GID)
+	d.Set("guid", computeRec.GUID)
+	d.Set("compute_id", computeRec.ID)
+	if computeRec.VirtualImageID != 0 {
+		d.Set("image_id", computeRec.VirtualImageID)
 	} else {
-		d.Set("image_id", compute.ImageID)
+		d.Set("image_id", computeRec.ImageID)
 	}
-	d.Set("interfaces", flattenInterfaces(compute.Interfaces))
-	d.Set("lock_status", compute.LockStatus)
-	d.Set("manager_id", compute.ManagerID)
-	d.Set("manager_type", compute.ManagerType)
-	d.Set("migrationjob", compute.MigrationJob)
-	d.Set("milestones", compute.Milestones)
-	d.Set("name", compute.Name)
-	d.Set("natable_vins_id", compute.NatableVINSID)
-	d.Set("natable_vins_ip", compute.NatableVINSIP)
-	d.Set("natable_vins_name", compute.NatableVINSName)
-	d.Set("natable_vins_network", compute.NatableVINSNetwork)
-	d.Set("natable_vins_network_name", compute.NatableVINSNetworkName)
-	if err := d.Set("os_users", parseOsUsers(compute.OSUsers)); err != nil {
+	d.Set("interfaces", flattenInterfaces(computeRec.Interfaces))
+	d.Set("lock_status", computeRec.LockStatus)
+	d.Set("manager_id", computeRec.ManagerID)
+	d.Set("manager_type", computeRec.ManagerType)
+	d.Set("migrationjob", computeRec.MigrationJob)
+	d.Set("milestones", computeRec.Milestones)
+	d.Set("name", computeRec.Name)
+	d.Set("natable_vins_id", computeRec.NatableVINSID)
+	d.Set("natable_vins_ip", computeRec.NatableVINSIP)
+	d.Set("natable_vins_name", computeRec.NatableVINSName)
+	d.Set("natable_vins_network", computeRec.NatableVINSNetwork)
+	d.Set("natable_vins_network_name", computeRec.NatableVINSNetworkName)
+	if err := d.Set("os_users", parseOsUsers(computeRec.OSUsers)); err != nil {
 		return err
 	}
-	d.Set("pinned", compute.Pinned)
-	d.Set("ram", compute.RAM)
-	d.Set("reference_id", compute.ReferenceID)
-	d.Set("registered", compute.Registered)
-	d.Set("res_name", compute.ResName)
-	d.Set("rg_id", compute.RGID)
-	d.Set("rg_name", compute.RGName)
-	d.Set("snap_sets", flattenSnapSets(compute.SnapSets))
-	d.Set("stateless_sep_id", compute.StatelessSepID)
-	d.Set("stateless_sep_type", compute.StatelessSepType)
-	d.Set("status", compute.Status)
-	d.Set("tags", flattenTags(compute.Tags))
-	d.Set("tech_status", compute.TechStatus)
-	d.Set("updated_by", compute.UpdatedBy)
-	d.Set("updated_time", compute.UpdatedTime)
-	d.Set("user_managed", compute.UserManaged)
-	d.Set("vgpus", compute.VGPUs)
-	d.Set("virtual_image_id", compute.VirtualImageID)
-	d.Set("virtual_image_name", compute.VirtualImageName)
+	d.Set("pinned", computeRec.Pinned)
+	d.Set("ram", computeRec.RAM)
+	d.Set("reference_id", computeRec.ReferenceID)
+	d.Set("registered", computeRec.Registered)
+	d.Set("res_name", computeRec.ResName)
+	d.Set("rg_id", computeRec.RGID)
+	d.Set("rg_name", computeRec.RGName)
+	d.Set("snap_sets", flattenSnapSets(computeRec.SnapSets))
+	d.Set("stateless_sep_id", computeRec.StatelessSepID)
+	d.Set("stateless_sep_type", computeRec.StatelessSepType)
+	d.Set("status", computeRec.Status)
+	d.Set("tags", flattenTags(computeRec.Tags))
+	d.Set("tech_status", computeRec.TechStatus)
+	d.Set("updated_by", computeRec.UpdatedBy)
+	d.Set("updated_time", computeRec.UpdatedTime)
+	d.Set("user_managed", computeRec.UserManaged)
+	d.Set("vgpus", computeRec.VGPUs)
+	d.Set("virtual_image_id", computeRec.VirtualImageID)
+	d.Set("virtual_image_name", computeRec.VirtualImageName)
 
 	d.Set("enabled", false)
-	if compute.Status == status.Enabled {
+	if computeRec.Status == status.Enabled {
 		d.Set("enabled", true)
 	}
 
 	d.Set("started", false)
-	if compute.TechStatus == "STARTED" {
+	if computeRec.TechStatus == "STARTED" {
 		d.Set("started", true)
 	}
 
-	d.Set("network", flattenNetwork(compute.Interfaces))
-
-	//if len(model.Disks) > 0 {
-	//log.Debugf("flattenCompute: calling parseComputeDisksToExtraDisks for %d disks", len(model.Disks))
-	//if err = d.Set("extra_disks", parseComputeDisksToExtraDisks(model.Disks)); err != nil {
-	//return err
-	//}
-	//}
+	d.Set("network", flattenNetwork(computeRec.Interfaces))
 
 	return nil
 }
 
-func flattenDataComputeDisksDemo(disksList ListComputeDisks, extraDisks []interface{}) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, disk := range disksList {
-		if findInExtraDisks(uint(disk.ID), extraDisks) { //skip main bootdisk and extraDisks
-			continue
-		}
-		temp := map[string]interface{}{
-			"disk_name": disk.Name,
-			"disk_id":   disk.ID,
-			"disk_type": disk.Type,
-			"sep_id":    disk.SepID,
-			"shareable": disk.Shareable,
-			"size_max":  disk.SizeMax,
-			"size_used": disk.SizeUsed,
-			"pool":      disk.Pool,
-			"desc":      disk.Description,
-			"image_id":  disk.ImageID,
-			"size":      disk.SizeMax,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func flattenACL(acl RecordACL) []map[string]interface{} {
+func flattenACL(acl compute.RecordACL) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"account_acl": flattenListACL(acl.AccountACL),
@@ -413,7 +400,7 @@ func flattenACL(acl RecordACL) []map[string]interface{} {
 	return res
 }
 
-func flattenAffinityRules(affinityRules ListRules) []map[string]interface{} {
+func flattenAffinityRules(affinityRules compute.ListRules) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, affinityRule := range affinityRules {
 		temp := map[string]interface{}{
@@ -430,7 +417,7 @@ func flattenAffinityRules(affinityRules ListRules) []map[string]interface{} {
 	return res
 }
 
-func flattenIotune(iotune IOTune) []map[string]interface{} {
+func flattenIotune(iotune compute.IOTune) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"read_bytes_sec":      iotune.ReadBytesSec,
@@ -452,7 +439,7 @@ func flattenIotune(iotune IOTune) []map[string]interface{} {
 	return res
 }
 
-func flattenSnapshots(snapshots SnapshotExtendList) []map[string]interface{} {
+func flattenSnapshots(snapshots compute.SnapshotExtendList) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, snapshot := range snapshots {
 		temp := map[string]interface{}{
@@ -469,7 +456,7 @@ func flattenSnapshots(snapshots SnapshotExtendList) []map[string]interface{} {
 	return res
 }
 
-func flattenListComputeDisks(disks ListComputeDisks) []map[string]interface{} {
+func flattenListComputeDisks(disks compute.ListComputeDisks) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, disk := range disks {
 		acl, _ := json.Marshal(disk.ACL)
@@ -532,7 +519,7 @@ func flattenCustomFields(customFileds map[string]interface{}) []map[string]inter
 	}
 	return res
 }
-func flattenOsUsers(osUsers ListOSUser) []map[string]interface{} {
+func flattenOsUsers(osUsers compute.ListOSUser) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, user := range osUsers {
 		temp := map[string]interface{}{
@@ -546,72 +533,72 @@ func flattenOsUsers(osUsers ListOSUser) []map[string]interface{} {
 	return res
 }
 
-func flattenDataCompute(d *schema.ResourceData, compute RecordCompute) {
-	devices, _ := json.Marshal(compute.Devices)
-	userdata, _ := json.Marshal(compute.Userdata)
-	d.Set("acl", flattenACL(compute.ACL))
-	d.Set("account_id", compute.AccountID)
-	d.Set("account_name", compute.AccountName)
-	d.Set("affinity_label", compute.AffinityLabel)
-	d.Set("affinity_rules", flattenAffinityRules(compute.AffinityRules))
-	d.Set("affinity_weight", compute.AffinityWeight)
-	d.Set("anti_affinity_rules", flattenListRules(compute.AntiAffinityRules))
-	d.Set("arch", compute.Architecture)
-	d.Set("boot_order", compute.BootOrder)
-	d.Set("bootdisk_size", compute.BootDiskSize)
-	d.Set("clone_reference", compute.CloneReference)
-	d.Set("clones", compute.Clones)
-	d.Set("computeci_id", compute.ComputeCIID)
-	d.Set("cpus", compute.CPU)
-	d.Set("created_by", compute.CreatedBy)
-	d.Set("created_time", compute.CreatedTime)
-	d.Set("custom_fields", flattenCustomFields(compute.CustomFields))
-	d.Set("deleted_by", compute.DeletedBy)
-	d.Set("deleted_time", compute.DeletedTime)
-	d.Set("desc", compute.Description)
+func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute) {
+	devices, _ := json.Marshal(computeRec.Devices)
+	userdata, _ := json.Marshal(computeRec.Userdata)
+	d.Set("acl", flattenACL(computeRec.ACL))
+	d.Set("account_id", computeRec.AccountID)
+	d.Set("account_name", computeRec.AccountName)
+	d.Set("affinity_label", computeRec.AffinityLabel)
+	d.Set("affinity_rules", flattenAffinityRules(computeRec.AffinityRules))
+	d.Set("affinity_weight", computeRec.AffinityWeight)
+	d.Set("anti_affinity_rules", flattenListRules(computeRec.AntiAffinityRules))
+	d.Set("arch", computeRec.Architecture)
+	d.Set("boot_order", computeRec.BootOrder)
+	d.Set("bootdisk_size", computeRec.BootDiskSize)
+	d.Set("clone_reference", computeRec.CloneReference)
+	d.Set("clones", computeRec.Clones)
+	d.Set("computeci_id", computeRec.ComputeCIID)
+	d.Set("cpus", computeRec.CPU)
+	d.Set("created_by", computeRec.CreatedBy)
+	d.Set("created_time", computeRec.CreatedTime)
+	d.Set("custom_fields", flattenCustomFields(computeRec.CustomFields))
+	d.Set("deleted_by", computeRec.DeletedBy)
+	d.Set("deleted_time", computeRec.DeletedTime)
+	d.Set("desc", computeRec.Description)
 	d.Set("devices", string(devices))
-	d.Set("disks", flattenListComputeDisks(compute.Disks))
-	d.Set("driver", compute.Driver)
-	d.Set("gid", compute.GID)
-	d.Set("guid", compute.GUID)
-	d.Set("compute_id", compute.ID)
-	d.Set("image_id", compute.ImageID)
-	d.Set("interfaces", flattenInterfaces(compute.Interfaces))
-	d.Set("lock_status", compute.LockStatus)
-	d.Set("manager_id", compute.ManagerID)
-	d.Set("manager_type", compute.ManagerType)
-	d.Set("migrationjob", compute.MigrationJob)
-	d.Set("milestones", compute.Milestones)
-	d.Set("name", compute.Name)
-	d.Set("natable_vins_id", compute.NatableVINSID)
-	d.Set("natable_vins_ip", compute.NatableVINSIP)
-	d.Set("natable_vins_name", compute.NatableVINSName)
-	d.Set("natable_vins_network", compute.NatableVINSNetwork)
-	d.Set("natable_vins_network_name", compute.NatableVINSNetworkName)
-	d.Set("os_users", flattenOsUsers(compute.OSUsers))
-	d.Set("pinned", compute.Pinned)
-	d.Set("ram", compute.RAM)
-	d.Set("reference_id", compute.ReferenceID)
-	d.Set("registered", compute.Registered)
-	d.Set("res_name", compute.ResName)
-	d.Set("rg_id", compute.RGID)
-	d.Set("rg_name", compute.RGName)
-	d.Set("snap_sets", flattenSnapSets(compute.SnapSets))
-	d.Set("stateless_sep_id", compute.StatelessSepID)
-	d.Set("stateless_sep_type", compute.StatelessSepType)
-	d.Set("status", compute.Status)
-	d.Set("tags", compute.Tags)
-	d.Set("tech_status", compute.TechStatus)
-	d.Set("updated_by", compute.UpdatedBy)
-	d.Set("updated_time", compute.UpdatedTime)
-	d.Set("user_managed", compute.UserManaged)
+	d.Set("disks", flattenListComputeDisks(computeRec.Disks))
+	d.Set("driver", computeRec.Driver)
+	d.Set("gid", computeRec.GID)
+	d.Set("guid", computeRec.GUID)
+	d.Set("compute_id", computeRec.ID)
+	d.Set("image_id", computeRec.ImageID)
+	d.Set("interfaces", flattenInterfaces(computeRec.Interfaces))
+	d.Set("lock_status", computeRec.LockStatus)
+	d.Set("manager_id", computeRec.ManagerID)
+	d.Set("manager_type", computeRec.ManagerType)
+	d.Set("migrationjob", computeRec.MigrationJob)
+	d.Set("milestones", computeRec.Milestones)
+	d.Set("name", computeRec.Name)
+	d.Set("natable_vins_id", computeRec.NatableVINSID)
+	d.Set("natable_vins_ip", computeRec.NatableVINSIP)
+	d.Set("natable_vins_name", computeRec.NatableVINSName)
+	d.Set("natable_vins_network", computeRec.NatableVINSNetwork)
+	d.Set("natable_vins_network_name", computeRec.NatableVINSNetworkName)
+	d.Set("os_users", flattenOsUsers(computeRec.OSUsers))
+	d.Set("pinned", computeRec.Pinned)
+	d.Set("ram", computeRec.RAM)
+	d.Set("reference_id", computeRec.ReferenceID)
+	d.Set("registered", computeRec.Registered)
+	d.Set("res_name", computeRec.ResName)
+	d.Set("rg_id", computeRec.RGID)
+	d.Set("rg_name", computeRec.RGName)
+	d.Set("snap_sets", flattenSnapSets(computeRec.SnapSets))
+	d.Set("stateless_sep_id", computeRec.StatelessSepID)
+	d.Set("stateless_sep_type", computeRec.StatelessSepType)
+	d.Set("status", computeRec.Status)
+	d.Set("tags", computeRec.Tags)
+	d.Set("tech_status", computeRec.TechStatus)
+	d.Set("updated_by", computeRec.UpdatedBy)
+	d.Set("updated_time", computeRec.UpdatedTime)
+	d.Set("user_managed", computeRec.UserManaged)
 	d.Set("userdata", string(userdata))
-	d.Set("vgpus", compute.VGPUs)
-	d.Set("virtual_image_id", compute.VirtualImageID)
-	d.Set("virtual_image_name", compute.VirtualImageName)
+	d.Set("vgpus", computeRec.VGPUs)
+	d.Set("virtual_image_id", computeRec.VirtualImageID)
+	d.Set("virtual_image_name", computeRec.VirtualImageName)
 }
 
-func flattenComputeAudits(computeAudits ListAudits) []map[string]interface{} {
+func flattenComputeAudits(computeAudits compute.ListAudits) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, computeAudit := range computeAudits {
 		temp := map[string]interface{}{
@@ -626,7 +613,7 @@ func flattenComputeAudits(computeAudits ListAudits) []map[string]interface{} {
 	return res
 }
 
-func flattenPfwList(computePfws ListPFWs) []map[string]interface{} {
+func flattenPfwList(computePfws compute.ListPFWs) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, computePfw := range computePfws {
 		temp := map[string]interface{}{
@@ -643,13 +630,13 @@ func flattenPfwList(computePfws ListPFWs) []map[string]interface{} {
 	return res
 }
 
-func flattenUserList(d *schema.ResourceData, userList RecordACL) {
+func flattenUserList(d *schema.ResourceData, userList compute.RecordACL) {
 	d.Set("account_acl", flattenListACL(userList.AccountACL))
 	d.Set("compute_acl", flattenListACL(userList.ComputeACL))
 	d.Set("rg_acl", flattenListACL(userList.RGACL))
 }
 
-func flattenComputeGetAudits(computeAudits ListShortAudits) []map[string]interface{} {
+func flattenComputeGetAudits(computeAudits compute.ListShortAudits) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, computeAudit := range computeAudits {
 		temp := map[string]interface{}{
@@ -661,9 +648,9 @@ func flattenComputeGetAudits(computeAudits ListShortAudits) []map[string]interfa
 	return res
 }
 
-func flattenSnapshotUsage(computeSnapshotUasges ListUsageSnapshots) []map[string]interface{} {
+func flattenSnapshotUsage(computeSnapshotUsages compute.ListUsageSnapshots) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
-	for _, computeUsage := range computeSnapshotUasges {
+	for _, computeUsage := range computeSnapshotUsages {
 		temp := map[string]interface{}{
 			"count":     computeUsage.Count,
 			"stored":    computeUsage.Stored,