4.13.0

internal/service/cloudbroker/disks/flattens.go

@@ -13,10 +13,11 @@ func flattenDisk(d *schema.ResourceData, disk *disks.RecordDisk) {
 	d.Set("account_id", disk.AccountID)
 	d.Set("account_name", disk.AccountName)
 	d.Set("acl", string(diskAcl))
-	d.Set("blk_discard", disk.BLKDiscard)
+	d.Set("discard", disk.Discard)
 	d.Set("block_size", disk.BlockSize)
 	d.Set("boot_partition", disk.BootPartition)
 	d.Set("computes", flattenDiskComputes(disk.Computes))
+	d.Set("computes_read_only", flattenDiskComputesReadOnly(disk.ComputesReadOnly))
 	d.Set("created_by", disk.CreatedBy)
 	d.Set("created_time", disk.CreatedTime)
 	d.Set("deleted_by", disk.DeletedBy)
@@ -157,6 +158,18 @@ func flattenDiskComputes(computes map[string]string) []map[string]interface{} {
 	return res
 }
 
+func flattenDiskComputesReadOnly(computesReadOnly map[string]bool) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(computesReadOnly))
+	for computeID, readOnly := range computesReadOnly {
+		tmp := map[string]interface{}{
+			"compute_id": computeID,
+			"read_only":  readOnly,
+		}
+		res = append(res, tmp)
+	}
+	return res
+}
+
 func flattenIOTune(iot disks.IOTune) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
@@ -187,10 +200,11 @@ func flattenDiskList(dl *disks.ListDisks) []map[string]interface{} {
 			"account_id":            disk.AccountID,
 			"account_name":          disk.AccountName,
 			"acl":                   string(diskAcl),
-			"blk_discard":           disk.BLKDiscard,
+			"discard":               disk.Discard,
 			"block_size":            disk.BlockSize,
 			"boot_partition":        disk.BootPartition,
 			"computes":              flattenDiskComputes(disk.Computes),
+			"computes_read_only":    flattenDiskComputesReadOnly(disk.ComputesReadOnly),
 			"created_by":            disk.CreatedBy,
 			"created_time":          disk.CreatedTime,
 			"deleted_by":            disk.DeletedBy,
@@ -255,6 +269,7 @@ func flattendDiskSnapshotList(sl disks.ListSnapshots) []interface{} {
 		temp := map[string]interface{}{
 			"guid":          snapshot.GUID,
 			"label":         snapshot.Label,
+			"pool_name":     snapshot.PoolName,
 			"reference_id":  snapshot.ReferenceID,
 			"res_id":        snapshot.ResID,
 			"snap_set_guid": snapshot.SnapSetGUID,
@@ -276,7 +291,7 @@ func flattenDiskListUnattached(ul *disks.ListUnattachedDisks) []map[string]inter
 			"account_id":            unattachedDisk.AccountID,
 			"account_name":          unattachedDisk.AccountName,
 			"acl":                   string(unattachedDiskAcl),
-			"blk_discard":           unattachedDisk.BLKDiscard,
+			"discard":               unattachedDisk.Discard,
 			"block_size":            unattachedDisk.BlockSize,
 			"boot_partition":        unattachedDisk.BootPartition,
 			"created_time":          unattachedDisk.CreatedTime,