4.6.0

internal/service/cloudapi/rg/flattens.go

@@ -91,9 +91,10 @@ func flattenResgroup(d *schema.ResourceData, details rg.RecordResourceGroup) err
 	d.Set("gid", details.GID)
 	d.Set("def_net_type", details.DefNetType)
 	d.Set("name", details.Name)
-	// d.Set("resources", flattenRgResource(details.Resources))
+	d.Set("quota", flattenQuota(details.ResourceLimits))
 	d.Set("account_name", details.AccountName)
 	d.Set("acl", flattenRgAcl(details.ACL))
+	d.Set("compute_features", details.ComputeFeatures)
 	d.Set("vms", details.Computes)
 	d.Set("created_by", details.CreatedBy)
 	d.Set("created_time", details.CreatedTime)
@@ -137,6 +138,23 @@ func flattenRgSeps(seps map[string]map[string]rg.DiskUsage) []map[string]interfa
 	return res
 }
 
+func flattenQuota(resource rg.ResourceLimits) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"cpu":         resource.CUC,
+		"ram":         resource.CUM,
+		"disk":        resource.CUDM,
+		"ext_ips":     resource.CUI,
+		"ext_traffic": resource.CUNP,
+		"gpu_units":   resource.GPUUnits,
+		"cu_d":        resource.CUD,
+	}
+
+	res = append(res, temp)
+
+	return res
+}
+
 func flattenResource(resource rg.Resource) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
@@ -161,6 +179,7 @@ func flattenRg(d *schema.ResourceData, itemRg rg.RecordResourceGroup) {
 	d.Set("account_name", itemRg.AccountName)
 	d.Set("acl", flattenRgAcl(itemRg.ACL))
 	d.Set("computes", itemRg.Computes)
+	d.Set("compute_features", itemRg.ComputeFeatures)
 	d.Set("created_by", itemRg.CreatedBy)
 	d.Set("created_time", itemRg.CreatedTime)
 	d.Set("def_net_id", itemRg.DefNetID)
@@ -212,6 +231,7 @@ func flattenRgList(rgl *rg.ListResourceGroups) []map[string]interface{} {
 			"account_acl":              flattenRgAcl(rg.ACL),
 			"account_id":               rg.AccountID,
 			"account_name":             rg.AccountName,
+			"compute_features":         rg.ComputeFeatures,
 			"created_by":               rg.CreatedBy,
 			"created_time":             rg.CreatedTime,
 			"def_net_id":               rg.DefNetID,
@@ -242,7 +262,6 @@ func flattenRgList(rgl *rg.ListResourceGroups) []map[string]interface{} {
 		res = append(res, temp)
 	}
 	return res
-
 }
 
 func flattenRgAcl(rgAcls rg.ListACL) []map[string]interface{} {
@@ -491,6 +510,8 @@ func flattenRgListVins(lv *rg.ListVINS) []map[string]interface{} {
 			"deleted_by":     vins.DeletedBy,
 			"deleted_time":   vins.DeletedTime,
 			"external_ip":    vins.ExternalIP,
+			"extnet_id":      vins.ExtnetId,
+			"free_ips":       vins.FreeIPs,
 			"id":             vins.ID,
 			"name":           vins.Name,
 			"network":        vins.Network,
@@ -542,7 +563,7 @@ func flattenRgListGroups(list *rg.ListAffinityGroups) []map[string]interface{} {
 		for label, ag := range groupVal {
 			temp := map[string]interface{}{
 				"label": label,
-				"ids":   ag,
+				"ids":   flattenRgAffinityListGroup(ag),
 			}
 			res = append(res, temp)
 		}
@@ -551,6 +572,19 @@ func flattenRgListGroups(list *rg.ListAffinityGroups) []map[string]interface{} {
 	return res
 }
 
+func flattenRgAffinityListGroup(list rg.ListAffinityGroup) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(list))
+	for _, ag := range list {
+		temp := map[string]interface{}{
+			"id":      ag.ID,
+			"node_id": ag.NodeID,
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}
+
 func flattenRgUsageResource(d *schema.ResourceData, usage rg.RecordResourceUsage) {
 	d.Set("cpu", usage.CPU)
 	d.Set("disk_size", usage.DiskSize)