4.0.0

internal/service/cloudbroker/vgpu/data_source_vgpu.go

@@ -46,16 +46,16 @@ func dataSourceVGPURead(ctx context.Context, d *schema.ResourceData, m interface
 		return diag.FromErr(err)
 	}
 
-	d.SetId(strconv.Itoa(vgpu.ID))
+	d.SetId(strconv.FormatUint(vgpu.ID, 10))
 	d.Set("vgpu_id", vgpu.ID)
 	d.Set("account_id", vgpu.AccountID)
 	d.Set("mode", vgpu.Mode)
-	d.Set("pgpu", vgpu.PgpuID)
+	d.Set("pgpu", vgpu.PGPUID)
 	d.Set("profile_id", vgpu.ProfileID)
 	d.Set("ram", vgpu.RAM)
 	d.Set("status", vgpu.Status)
 	d.Set("type", vgpu.Type)
-	d.Set("vm_id", vgpu.VmID)
+	d.Set("vm_id", vgpu.VMID)
 
 	return nil
 }

internal/service/cloudbroker/vgpu/models.go

@@ -1,44 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package vgpu
-
-type VGPU struct {
-	AccountID int    `json:"accountId"`
-	ID        int    `json:"id"`
-	Mode      string `json:"mode"`
-	PgpuID    int    `json:"pgpuid"`
-	ProfileID int    `json:"profileId"`
-	RAM       int    `json:"ram"`
-	Status    string `json:"status"`
-	Type      string `json:"type"`
-	VmID      int    `json:"vmid"`
-}

internal/service/cloudbroker/vgpu/utility_vgpu.go

@@ -33,47 +33,38 @@ package vgpu
 
 import (
 	"context"
-	"encoding/json"
-	"net/url"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/vgpu"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
-func utilityVGPUCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*VGPU, error) {
+func utilityVGPUCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*vgpu.ItemVGPU, error) {
 	c := m.(*controller.ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("size", "50")
+	req := vgpu.ListRequest{
+		Size: 50,
+	}
 
-	var vgpuId int
+	var vgpuId uint64
 	var err error
 
 	if vId, ok := d.GetOk("vgpu_id"); ok {
-		vgpuId = vId.(int)
+		vgpuId = uint64(vId.(int))
 	} else {
-		vgpuId, err = strconv.Atoi(d.Id())
+		vgpuId, err = strconv.ParseUint(d.Id(), 10, 64)
 		if err != nil {
 			return nil, err
 		}
 	}
 
 	for page := 1; ; page++ {
-		urlValues.Set("page", strconv.Itoa(page))
-		resp, err := c.DecortAPICall(ctx, "POST", vgpuListAPI, urlValues)
+		req.Page = uint64(page)
+		vgpus, err := c.CloudBroker().VGPU().List(ctx, req)
 		if err != nil {
 			return nil, err
 		}
 
-		if resp == "[]" {
-			return nil, nil
-		}
-
-		var vgpus []VGPU
-		if err := json.Unmarshal([]byte(resp), &vgpus); err != nil {
-			return nil, err
-		}
-
 		for _, vgpu := range vgpus {
 			if vgpu.ID == vgpuId {
 				return &vgpu, nil