4.0.0

internal/service/cloudapi/rg/flattens.go

@@ -34,10 +34,10 @@ package rg
 
 import (
 	"encoding/json"
-	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg"
 )
 
 func flattenAccountSeps(seps map[string]map[string]DiskUsage) []map[string]interface{} {
@@ -83,22 +83,10 @@ func flattenRgResources(r Resources) []map[string]interface{} {
 	return res
 }
 
-func flattenResgroup(d *schema.ResourceData, details RecordResourceGroup) error {
-	// NOTE: this function modifies ResourceData argument - as such it should never be called
-	// from resourceRsgroupExists(...) method
-	// log.Debugf("%s", rg_facts)
-	//log.Debugf("flattenResgroup: ready to decode response body from API")
-	//details := ResgroupGetResp{}
-	//err := json.Unmarshal([]byte(rg_facts), &details)
-	//if err != nil {
-	//return err
-	//}
-
+func flattenResgroup(d *schema.ResourceData, details rg.RecordResourceGroup) error {
 	log.Debugf("flattenResgroup: decoded RG name %q / ID %d, account ID %d",
 		details.Name, details.ID, details.AccountID)
 
-	d.SetId(fmt.Sprintf("%d", details.ID))
-
 	d.Set("account_id", details.AccountID)
 	d.Set("gid", details.GID)
 	d.Set("def_net_type", details.DefNetType)
@@ -127,11 +115,13 @@ func flattenResgroup(d *schema.ResourceData, details RecordResourceGroup) error
 	d.Set("updated_time", details.UpdatedTime)
 	d.Set("uniq_pools", details.UniqPools)
 	d.Set("vins", details.VINS)
+	d.Set("cpu_allocation_parameter", details.CPUAllocationParameter)
+	d.Set("cpu_allocation_ratio", details.CPUAllocationRatio)
 
 	return nil
 }
 
-func flattenRgSeps(seps map[string]map[string]DiskUsage) []map[string]interface{} {
+func flattenRgSeps(seps map[string]map[string]rg.DiskUsage) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for sepKey, sepVal := range seps {
 		SepMap := map[string]interface{}{}
@@ -148,7 +138,7 @@ func flattenRgSeps(seps map[string]map[string]DiskUsage) []map[string]interface{
 	return res
 }
 
-func flattenResource(resource Resource) []map[string]interface{} {
+func flattenResource(resource rg.Resource) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 
 	temp := map[string]interface{}{
@@ -167,7 +157,7 @@ func flattenResource(resource Resource) []map[string]interface{} {
 	return res
 }
 
-func flattenRgResource(itemResource Resources) []map[string]interface{} {
+func flattenRgResource(itemResource rg.Resources) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"current":  flattenResource(itemResource.Current),
@@ -178,7 +168,7 @@ func flattenRgResource(itemResource Resources) []map[string]interface{} {
 	return res
 }
 
-func flattenRg(d *schema.ResourceData, itemRg RecordResourceGroup) {
+func flattenRg(d *schema.ResourceData, itemRg rg.RecordResourceGroup) {
 	d.Set("resources", flattenRgResource(itemRg.Resources))
 	d.Set("account_id", itemRg.AccountID)
 	d.Set("account_name", itemRg.AccountName)
@@ -207,9 +197,11 @@ func flattenRg(d *schema.ResourceData, itemRg RecordResourceGroup) {
 	d.Set("updated_time", itemRg.UpdatedTime)
 	d.Set("uniq_pools", itemRg.UniqPools)
 	d.Set("vins", itemRg.VINS)
+	d.Set("cpu_allocation_parameter", itemRg.CPUAllocationParameter)
+	d.Set("cpu_allocation_ratio", itemRg.CPUAllocationRatio)
 }
 
-func flattenRgAudits(rgAudits ListAudits) []map[string]interface{} {
+func flattenRgAudits(rgAudits rg.ListAudits) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, rgAudit := range rgAudits {
 		temp := map[string]interface{}{
@@ -226,38 +218,40 @@ func flattenRgAudits(rgAudits ListAudits) []map[string]interface{} {
 	return res
 }
 
-func flattenRgList(rgl ListResourceGroups) []map[string]interface{} {
+func flattenRgList(rgl rg.ListResourceGroups) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, rg := range rgl {
 		temp := map[string]interface{}{
-			"account_acl":       flattenRgAcl(rg.ACL),
-			"account_id":        rg.AccountID,
-			"account_name":      rg.AccountName,
-			"acl":               flattenRgAcl(rg.ACL),
-			"created_by":        rg.CreatedBy,
-			"created_time":      rg.CreatedTime,
-			"def_net_id":        rg.DefNetID,
-			"def_net_type":      rg.DefNetType,
-			"deleted_by":        rg.DeletedBy,
-			"deleted_time":      rg.DeletedTime,
-			"desc":              rg.Description,
-			"dirty":             rg.Dirty,
-			"gid":               rg.GID,
-			"guid":              rg.GUID,
-			"rg_id":             rg.ID,
-			"lock_status":       rg.LockStatus,
-			"milestones":        rg.Milestones,
-			"name":              rg.Name,
-			"register_computes": rg.RegisterComputes,
-			"resource_limits":   flattenRgResourceLimits(rg.ResourceLimits),
-			"secret":            rg.Secret,
-			"status":            rg.Status,
-			"updated_by":        rg.UpdatedBy,
-			"updated_time":      rg.UpdatedTime,
-			"vins":              rg.VINS,
-			"vms":               rg.Computes,
-			"resource_types":    rg.ResTypes,
-			"uniq_pools":        rg.UniqPools,
+			"account_acl":              flattenRgAcl(rg.ACL),
+			"account_id":               rg.AccountID,
+			"account_name":             rg.AccountName,
+			"acl":                      flattenRgAcl(rg.ACL),
+			"created_by":               rg.CreatedBy,
+			"created_time":             rg.CreatedTime,
+			"def_net_id":               rg.DefNetID,
+			"def_net_type":             rg.DefNetType,
+			"deleted_by":               rg.DeletedBy,
+			"deleted_time":             rg.DeletedTime,
+			"desc":                     rg.Description,
+			"dirty":                    rg.Dirty,
+			"gid":                      rg.GID,
+			"guid":                     rg.GUID,
+			"rg_id":                    rg.ID,
+			"lock_status":              rg.LockStatus,
+			"milestones":               rg.Milestones,
+			"name":                     rg.Name,
+			"register_computes":        rg.RegisterComputes,
+			"resource_limits":          flattenRgResourceLimits(rg.ResourceLimits),
+			"secret":                   rg.Secret,
+			"status":                   rg.Status,
+			"updated_by":               rg.UpdatedBy,
+			"updated_time":             rg.UpdatedTime,
+			"vins":                     rg.VINS,
+			"vms":                      rg.Computes,
+			"resource_types":           rg.ResTypes,
+			"uniq_pools":               rg.UniqPools,
+			"cpu_allocation_parameter": rg.CPUAllocationParameter,
+			"cpu_allocation_ratio":     rg.CPUAllocationRatio,
 		}
 		res = append(res, temp)
 	}
@@ -265,7 +259,7 @@ func flattenRgList(rgl ListResourceGroups) []map[string]interface{} {
 
 }
 
-func flattenRgAcl(rgAcls ListACL) []map[string]interface{} {
+func flattenRgAcl(rgAcls rg.ListACL) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, rgAcl := range rgAcls {
 		temp := map[string]interface{}{
@@ -281,7 +275,7 @@ func flattenRgAcl(rgAcls ListACL) []map[string]interface{} {
 	return res
 }
 
-func flattenRgResourceLimits(rl ResourceLimits) []map[string]interface{} {
+func flattenRgResourceLimits(rl rg.ResourceLimits) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"cu_c":      rl.CUC,
@@ -289,7 +283,7 @@ func flattenRgResourceLimits(rl ResourceLimits) []map[string]interface{} {
 		"cu_i":      rl.CUI,
 		"cu_m":      rl.CUM,
 		"cu_np":     rl.CUNP,
-		"gpu_units": rl.GpuUnits,
+		"gpu_units": rl.GPUUnits,
 	}
 	res = append(res, temp)
 
@@ -297,7 +291,7 @@ func flattenRgResourceLimits(rl ResourceLimits) []map[string]interface{} {
 
 }
 
-func flattenRules(list ListRules) []map[string]interface{} {
+func flattenRules(list rg.ListRules) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, rule := range list {
 		temp := map[string]interface{}{
@@ -315,7 +309,7 @@ func flattenRules(list ListRules) []map[string]interface{} {
 	return res
 }
 
-func flattenRgListComputes(lc ListComputes) []map[string]interface{} {
+func flattenRgListComputes(lc rg.ListComputes) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, compute := range lc {
 		temp := map[string]interface{}{
@@ -350,7 +344,7 @@ func flattenRgListComputes(lc ListComputes) []map[string]interface{} {
 	return res
 }
 
-func flattenServerSettings(settings ServerSettings) []map[string]interface{} {
+func flattenServerSettings(settings rg.RecordServerSettings) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"inter":      settings.Inter,
@@ -367,7 +361,7 @@ func flattenServerSettings(settings ServerSettings) []map[string]interface{} {
 	return res
 }
 
-func flattenListServers(list ListServers) []map[string]interface{} {
+func flattenListServers(list rg.ListServers) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, serv := range list {
 		temp := map[string]interface{}{
@@ -384,7 +378,7 @@ func flattenListServers(list ListServers) []map[string]interface{} {
 	return res
 }
 
-func flattenBackends(b ListBackends) []map[string]interface{} {
+func flattenBackends(b rg.ListBackends) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, item := range b {
 		temp := map[string]interface{}{
@@ -399,7 +393,7 @@ func flattenBackends(b ListBackends) []map[string]interface{} {
 	return res
 }
 
-func flattenBindings(list ListBindings) []map[string]interface{} {
+func flattenBindings(list rg.ListBindings) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, bind := range list {
 		temp := map[string]interface{}{
@@ -414,7 +408,7 @@ func flattenBindings(list ListBindings) []map[string]interface{} {
 	return res
 }
 
-func flattenFrontends(list ListFrontends) []map[string]interface{} {
+func flattenFrontends(list rg.ListFrontends) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, front := range list {
 		temp := map[string]interface{}{
@@ -429,7 +423,7 @@ func flattenFrontends(list ListFrontends) []map[string]interface{} {
 	return res
 }
 
-func flattenNode(node RecordNode) []map[string]interface{} {
+func flattenNode(node rg.RecordNode) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"backend_ip":  node.BackendIP,
@@ -443,7 +437,7 @@ func flattenNode(node RecordNode) []map[string]interface{} {
 	return res
 }
 
-func flattenRgListLb(listLb ListLB) []map[string]interface{} {
+func flattenRgListLb(listLb rg.ListLB) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, lb := range listLb {
 		temp := map[string]interface{}{
@@ -478,7 +472,7 @@ func flattenRgListLb(listLb ListLB) []map[string]interface{} {
 	return res
 }
 
-func flattenRgListPfw(listPfw ListPFW) []map[string]interface{} {
+func flattenRgListPfw(listPfw rg.ListPortForwards) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, pfw := range listPfw {
 		temp := map[string]interface{}{
@@ -497,7 +491,7 @@ func flattenRgListPfw(listPfw ListPFW) []map[string]interface{} {
 	return res
 }
 
-func flattenRgListVins(lv ListVINS) []map[string]interface{} {
+func flattenRgListVins(lv rg.ListVINS) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, vins := range lv {
 		temp := map[string]interface{}{
@@ -525,7 +519,7 @@ func flattenRgListVins(lv ListVINS) []map[string]interface{} {
 	return res
 }
 
-func flattenRgAffinityGroupComputes(list ListAffinityGroupCompute) []map[string]interface{} {
+func flattenRgAffinityGroupComputes(list rg.ListAffinityGroups) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 
 	for _, item := range list {
@@ -567,12 +561,12 @@ func flattenRgListGroups(list map[string][]uint64) []map[string]interface{} {
 	return res
 }
 
-func flattenRgUsageResource(d *schema.ResourceData, usage Resource) {
+func flattenRgUsageResource(d *schema.ResourceData, usage rg.RecordResourceUsage) {
 	d.Set("cpu", usage.CPU)
 	d.Set("disk_size", usage.DiskSize)
 	d.Set("disk_size_max", usage.DiskSizeMax)
 	d.Set("extips", usage.ExtIPs)
-	d.Set("exttraffic", usage.ExtTraffic)
+	d.Set("exttraffic", usage.ExtraTraffic)
 	d.Set("gpu", usage.GPU)
 	d.Set("ram", usage.RAM)
 	d.Set("seps", flattenRgSeps(usage.SEPs))