4.10.1

internal/service/cloudapi/account/flattens.go

@@ -8,8 +8,8 @@ import (
 func flattenAccount(d *schema.ResourceData, acc account.RecordAccount) error {
 	d.Set("dc_location", acc.DCLocation)
 	d.Set("desc", acc.Description)
+	//TODO
 	// d.Set("resources", flattenAccResources(acc.Resources))
-	d.Set("ckey", acc.CKey)
 	d.Set("acl", flattenAccAcl(acc.ACL))
 	d.Set("company", acc.Company)
 	d.Set("companyurl", acc.CompanyURL)
@@ -37,6 +37,7 @@ func flattenAccount(d *schema.ResourceData, acc account.RecordAccount) error {
 	d.Set("cpu_allocation_parameter", acc.CPUAllocationParameter)
 	d.Set("cpu_allocation_ratio", acc.CPUAllocationRatio)
 	d.Set("default_zone_id", acc.DefaultZoneID)
+	d.Set("storage_policy_ids", acc.StoragePolicyIDs)
 	d.Set("zone_ids", flattenZones(acc.ZoneIDs))
 
 	if username, ok := d.GetOk("username"); ok {
@@ -48,6 +49,44 @@ func flattenAccount(d *schema.ResourceData, acc account.RecordAccount) error {
 	return nil
 }
 
+func flattenAccountResource(d *schema.ResourceData, acc account.RecordAccount) error {
+	d.Set("dc_location", acc.DCLocation)
+	d.Set("desc", acc.Description)
+	//TODO
+	// d.Set("resources", flattenAccResources(acc.Resources))
+	d.Set("acl", flattenAccAcl(acc.ACL))
+	d.Set("company", acc.Company)
+	d.Set("companyurl", acc.CompanyURL)
+	d.Set("compute_features", acc.ComputeFeatures)
+	d.Set("created_by", acc.CreatedBy)
+	d.Set("created_time", acc.CreatedTime)
+	d.Set("deactivation_time", acc.DeactivationTime)
+	d.Set("desc", acc.Description)
+	d.Set("deleted_by", acc.DeletedBy)
+	d.Set("deleted_time", acc.DeletedTime)
+	d.Set("displayname", acc.DisplayName)
+	d.Set("enable", flattenEnabled(acc.Status))
+	d.Set("guid", acc.GUID)
+	d.Set("account_id", acc.ID)
+	d.Set("account_name", acc.Name)
+	d.Set("resource_limits", flattenAccResourceLimits(acc.ResourceLimits))
+	d.Set("send_access_emails", acc.SendAccessEmails)
+	d.Set("status", acc.Status)
+	d.Set("updated_time", acc.UpdatedTime)
+	d.Set("version", acc.Version)
+	d.Set("vins", acc.VINS)
+	d.Set("vinses", acc.VINSes)
+	d.Set("computes", flattenAccComputes(acc.Computes))
+	d.Set("machines", flattenAccMachines(acc.Machines))
+	d.Set("cpu_allocation_parameter", acc.CPUAllocationParameter)
+	d.Set("cpu_allocation_ratio", acc.CPUAllocationRatio)
+	d.Set("default_zone_id", acc.DefaultZoneID)
+	d.Set("storage_policy_ids", acc.StoragePolicyIDs)
+	d.Set("zone_ids", flattenZonesInResource(acc.ZoneIDs))
+
+	return nil
+}
+
 func flattenEnabled(status string) bool {
 	return status == "CONFIRMED"
 }
@@ -100,20 +139,32 @@ func flattenResourceConsumption(d *schema.ResourceData, acc *account.RecordResou
 func flattenAccResourceLimits(rl account.ResourceLimits) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
-		"cu_c":      rl.CUC,
-		"cu_d":      rl.CUD,
-		"cu_dm":     rl.CUDM,
-		"cu_i":      rl.CUI,
-		"cu_m":      rl.CUM,
-		"cu_np":     rl.CUNP,
-		"gpu_units": rl.GPUUnits,
+		"cu_c":           rl.CUC,
+		"cu_d":           rl.CUD,
+		"cu_dm":          rl.CUDM,
+		"cu_i":           rl.CUI,
+		"cu_m":           rl.CUM,
+		"cu_np":          rl.CUNP,
+		"gpu_units":      rl.GPUUnits,
+		"storage_policy": flattenSTPolicy(rl.StoragePolicy),
 	}
 	res = append(res, temp)
-
 	return res
 
 }
 
+func flattenSTPolicy(ast []account.StoragePolicyItem) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(ast))
+	for _, item := range ast {
+		temp := map[string]interface{}{
+			"id":    item.ID,
+			"limit": item.Limit,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
 // func flattenAccResources(r account.Resources) []map[string]interface{} {
 // 	res := make([]map[string]interface{}, 0)
 // 	temp := map[string]interface{}{
@@ -151,11 +202,26 @@ func flattenAccResource(r account.Resource) []map[string]interface{} {
 		"gpu":           r.GPU,
 		"ram":           r.RAM,
 		"seps":          flattenAccountSeps(r.SEPs),
+		"policies":      flattenAccountPolicies(r.Policies),
 	}
 	res = append(res, temp)
 	return res
 }
 
+func flattenAccountPolicies(policies map[string]account.Policy) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for k, dataVal := range policies {
+		temp := map[string]interface{}{
+			"id":            k,
+			"disk_size":     dataVal.DiskSize,
+			"disk_size_max": dataVal.DiskSizeMax,
+			"seps":          flattenAccountSeps(dataVal.SEPs),
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
 func flattenAccResourceConsumption(lrc *account.ListResourceConsumption) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(lrc.Data))
 	for _, rc := range lrc.Data {
@@ -180,3 +246,11 @@ func flattenZones(zones []account.ZoneID) []map[string]interface{} {
 	}
 	return res
 }
+
+func flattenZonesInResource(zones []account.ZoneID) []int64 {
+	res := make([]int64, 0)
+	for _, zone := range zones {
+		res = append(res, zone.ID)
+	}
+	return res
+}