4.10.2

internal/service/cloudapi/kvmvm/flattens.go

@@ -225,28 +225,28 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"numa_affinity":         compute.NumaAffinity,
 			"numa_node_id":          compute.NumaNodeId,
 			"os_version":            compute.OSVersion,
-			// "pinned":              compute.Pinned,
-			"preferred_cpu":      compute.PreferredCPU,
-			"qemu_guest":         flattenQemuQuest(compute.QemuQuest),
-			"ram":                compute.RAM,
-			"reference_id":       compute.ReferenceID,
-			"registered":         compute.Registered,
-			"res_name":           compute.ResName,
-			"reserved_node_cpus": compute.ReservedNodeCpus,
-			"rg_id":              compute.RGID,
-			"rg_name":            compute.RGName,
-			"snap_sets":          flattenSnapSets(compute.SnapSets),
-			"stateless_sep_id":   compute.StatelessSepID,
-			"stateless_sep_type": compute.StatelessSepType,
-			"status":             compute.Status,
-			"tags":               flattenTags(compute.Tags),
-			"tech_status":        compute.TechStatus,
-			"total_disk_size":    compute.TotalDiskSize,
-			"updated_by":         compute.UpdatedBy,
-			"updated_time":       compute.UpdatedTime,
-			"user_managed":       compute.UserManaged,
-			"vgpus":              compute.VGPUs,
-			"vins_connected":     compute.VINSConnected,
+			"pinned":                compute.PinnedToStack,
+			"preferred_cpu":         compute.PreferredCPU,
+			"qemu_guest":            flattenQemuQuest(compute.QemuQuest),
+			"ram":                   compute.RAM,
+			"reference_id":          compute.ReferenceID,
+			"registered":            compute.Registered,
+			"res_name":              compute.ResName,
+			"reserved_node_cpus":    compute.ReservedNodeCpus,
+			"rg_id":                 compute.RGID,
+			"rg_name":               compute.RGName,
+			"snap_sets":             flattenSnapSets(compute.SnapSets),
+			"stateless_sep_id":      compute.StatelessSepID,
+			"stateless_sep_type":    compute.StatelessSepType,
+			"status":                compute.Status,
+			"tags":                  flattenTags(compute.Tags),
+			"tech_status":           compute.TechStatus,
+			"total_disk_size":       compute.TotalDiskSize,
+			"updated_by":            compute.UpdatedBy,
+			"updated_time":          compute.UpdatedTime,
+			"user_managed":          compute.UserManaged,
+			"vgpus":                 compute.VGPUs,
+			"vins_connected":        compute.VINSConnected,
 			//TODO
 			// "virtual_image_id":         compute.VirtualImageID,
 			"loader_type":              compute.LoaderType,
@@ -289,10 +289,6 @@ func flattenBootDisk(bootDisk *compute.ItemComputeDisk) []map[string]interface{}
 func flattenComputeDisksDemo(disksList compute.ListComputeDisks, disksBlocks, extraDisks []interface{}, bootDiskId uint64) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(disksList))
 
-	if len(disksBlocks) == 0 {
-		return res
-	}
-
 	sort.Slice(disksList, func(i, j int) bool {
 		return disksList[i].ID < disksList[j].ID
 	})
@@ -304,9 +300,19 @@ func flattenComputeDisksDemo(disksList compute.ListComputeDisks, disksBlocks, ex
 			continue
 		}
 
-		pernamentlyValue := disksBlocks[indexDataDisks].(map[string]interface{})["permanently"].(bool)
+		var pernamentlyValue bool
+		if indexDataDisks < len(disksBlocks) {
+			if diskBlock, ok := disksBlocks[indexDataDisks].(map[string]interface{}); ok {
+				if perm, exists := diskBlock["permanently"]; exists {
+					if permBool, ok := perm.(bool); ok {
+						pernamentlyValue = permBool
+					}
+				}
+			}
+		}
 
 		temp := map[string]interface{}{
+			"devicename":        disk.DeviceName,
 			"disk_name":         disk.Name,
 			"disk_id":           disk.ID,
 			"disk_type":         disk.Type,
@@ -318,9 +324,15 @@ func flattenComputeDisksDemo(disksList compute.ListComputeDisks, disksBlocks, ex
 			"desc":              disk.Description,
 			"image_id":          disk.ImageID,
 			"size":              disk.SizeMax,
-			"permanently":       pernamentlyValue,
 			"present_to":        disk.PresentTo,
 			"storage_policy_id": disk.StoragePolicyID,
+			"to_clean":          disk.ToClean,
+			"created_by":        disk.CreatedBy,
+			"created_time":      disk.CreatedTime,
+			"deleted_by":        disk.DeletedBy,
+			"deleted_time":      disk.DeletedTime,
+			"updated_time":      disk.UpdatedTime,
+			"permanently":       pernamentlyValue,
 		}
 		res = append(res, temp)
 		indexDataDisks++
@@ -439,7 +451,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	if err := d.Set("os_users", parseOsUsers(computeRec.OSUsers)); err != nil {
 		return err
 	}
-	// d.Set("pinned", computeRec.Pinned)
+	d.Set("pinned", computeRec.PinnedToStack)
 	d.Set("preferred_cpu", computeRec.PreferredCPU)
 	d.Set("ram", computeRec.RAM)
 	d.Set("reference_id", computeRec.ReferenceID)
@@ -467,6 +479,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("hot_resize", computeRec.HotResize)
 	d.Set("network_interface_naming", computeRec.NetworkInterfaceNaming)
 	d.Set("zone_id", computeRec.ZoneID)
+	d.Set("loader_meta_iso", flattenLoaderMetaIso(computeRec.LoaderMetaIso))
 
 	d.Set("enabled", false)
 	if computeRec.Status == status.Enabled {
@@ -486,6 +499,16 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	return nil
 }
 
+func flattenLoaderMetaIso(loaderMetaIso compute.LoaderMetaIso) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"device_name": loaderMetaIso.DeviceName,
+		"path":        loaderMetaIso.Path,
+	}
+	res = append(res, temp)
+	return res
+}
+
 func flattenACL(acl compute.RecordACL) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
@@ -565,7 +588,10 @@ func flattenListComputeDisks(disks compute.ListComputeDisks) []map[string]interf
 			"boot_partition":        disk.BootPartition,
 			"bus_number":            disk.BusNumber,
 			"created_time":          disk.CreatedTime,
+			"created_by":            disk.CreatedBy,
 			"deleted_time":          disk.DeletedTime,
+			"deleted_by":            disk.DeletedBy,
+			"devicename":            disk.DeviceName,
 			"description":           disk.Description,
 			"destruction_time":      disk.DestructionTime,
 			"disk_path":             disk.DiskPath,
@@ -601,6 +627,7 @@ func flattenListComputeDisks(disks compute.ListComputeDisks) []map[string]interf
 			"tech_status":           disk.TechStatus,
 			"type":                  disk.Type,
 			"to_clean":              disk.ToClean,
+			"updated_time":          disk.UpdatedTime,
 		}
 		res = append(res, temp)
 	}
@@ -726,6 +753,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("hot_resize", computeRec.HotResize)
 	d.Set("network_interface_naming", computeRec.NetworkInterfaceNaming)
 	d.Set("zone_id", computeRec.ZoneID)
+	d.Set("loader_meta_iso", flattenLoaderMetaIso(computeRec.LoaderMetaIso))
 	d.Set("os_version", computeRec.OSVersion)
 }