v15.1.0

2026-06-11 16:54:48 +04:00
parent f1112e5a11
commit f6acddaa8d
36 changed files with 226 additions and 499 deletions
--- a/pkg/cloudbroker/kvmx86/create.go
+++ b/pkg/cloudbroker/kvmx86/create.go
@@ -2,10 +2,10 @@ package kvmx86

 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"

+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v15/internal/constants"
 	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v15/internal/validators"
 )

@@ -254,7 +254,6 @@ type CreateRequest struct {

 // GetRAM returns RAM field values
 func (r CreateRequest) GetRAM() map[string]uint64 {
-
 	res := make(map[string]uint64, 1)

 	res["RAM"] = r.RAM
@@ -262,12 +261,6 @@ func (r CreateRequest) GetRAM() map[string]uint64 {
 	return res
 }

-type wrapperCreateRequest struct {
-	CreateRequest
-	Interfaces []string `url:"interfaces,omitempty"`
-	DataDisks  []string `url:"dataDisks,omitempty"`
-}
-
 // Create creates KVM PowerPC VM based on specified OS image
 func (k KVMX86) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -275,55 +268,12 @@ func (k KVMX86) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}

-	var interfaces []string
-
-	if len(req.Interfaces) != 0 {
-		interfaces = make([]string, 0, len(req.Interfaces))
-
-		for i := range req.Interfaces {
-			b, err := json.Marshal(req.Interfaces[i])
-			if err != nil {
-				return 0, err
-			}
-
-			interfaces = append(interfaces, string(b))
-		}
-	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
-		interfaces = []string{"[]"}
-	}
-
-	var dataDisks []string
-
-	if len(req.DataDisks) != 0 {
-		dataDisks = make([]string, 0, len(req.DataDisks))
-
-		for i := range req.DataDisks {
-			b, err := json.Marshal(req.DataDisks[i])
-			if err != nil {
-				return 0, err
-			}
-
-			dataDisks = append(dataDisks, string(b))
-		}
-	}
-
-	reqWrapped := wrapperCreateRequest{
-		CreateRequest: req,
-		Interfaces:    interfaces,
-		DataDisks:     dataDisks,
-	}
-
 	url := "/cloudbroker/kvmx86/create"

-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := k.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	if err != nil {
 		return 0, err
 	}

-	result, err := strconv.ParseUint(string(res), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return result, nil
+	return strconv.ParseUint(string(res), 10, 64)
 }
--- a/pkg/cloudbroker/kvmx86/create_blank.go
+++ b/pkg/cloudbroker/kvmx86/create_blank.go
@@ -2,10 +2,10 @@ package kvmx86

 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"

+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v15/internal/constants"
 	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v15/internal/validators"
 )

@@ -149,12 +149,6 @@ func (r CreateBlankRequest) GetRAM() map[string]uint64 {
 	return res
 }

-type wrapperCreateBlankRequest struct {
-	CreateBlankRequest
-	Interfaces []string `url:"interfaces,omitempty"`
-	DataDisks  []string `url:"dataDisks,omitempty"`
-}
-
 // CreateBlank creates KVM x86 VM from scratch
 func (k KVMX86) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -162,56 +156,12 @@ func (k KVMX86) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64
 		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}

-	var interfaces []string
-
-	if len(req.Interfaces) != 0 {
-		interfaces = make([]string, 0, len(req.Interfaces))
-
-		for i := range req.Interfaces {
-			b, err := json.Marshal(req.Interfaces[i])
-			if err != nil {
-				return 0, err
-			}
-
-			interfaces = append(interfaces, string(b))
-		}
-	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
-		interfaces = []string{"[]"}
-	}
-
-	var dataDisks []string
-
-	if len(req.DataDisks) != 0 {
-		dataDisks = make([]string, 0, len(req.DataDisks))
-
-		for i := range req.DataDisks {
-			b, err := json.Marshal(req.DataDisks[i])
-			if err != nil {
-				return 0, err
-			}
-
-			dataDisks = append(dataDisks, string(b))
-		}
-	}
-
-	reqWrapped := wrapperCreateBlankRequest{
-		CreateBlankRequest: req,
-		Interfaces:         interfaces,
-		DataDisks:          dataDisks,
-	}
-
 	url := "/cloudbroker/kvmx86/createBlank"

-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := k.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	if err != nil {
 		return 0, err
 	}

-	result, err := strconv.ParseUint(string(res), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return result, nil
-
+	return strconv.ParseUint(string(res), 10, 64)
 }
--- a/pkg/cloudbroker/kvmx86/mass_create.go
+++ b/pkg/cloudbroker/kvmx86/mass_create.go
@@ -3,8 +3,11 @@ package kvmx86
 import (
 	"context"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"net/http"

+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v15/internal/constants"
 	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v15/internal/validators"
 )

@@ -177,14 +180,8 @@ type MassCreateRequest struct {
 	Clock string `url:"clock,omitempty" json:"clock,omitempty"`
 }

-type asyncWrapperMassCreateRequest struct {
-	wrapperMassCreateRequest
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // GetRAM returns RAM field values
 func (r MassCreateRequest) GetRAM() map[string]uint64 {
-
 	res := make(map[string]uint64, 1)

 	res["RAM"] = r.RAM
@@ -194,8 +191,24 @@ func (r MassCreateRequest) GetRAM() map[string]uint64 {

 type wrapperMassCreateRequest struct {
 	MassCreateRequest
-	Interfaces []string `url:"interfaces,omitempty"`
-	DataDisks  []string `url:"dataDisks,omitempty"`
+	AsyncMode bool `json:"asyncMode"`
+}
+
+type massCreateResponse struct {
+	Created []uint64          `json:"created"`
+	Errors  map[string]string `json:"errors"`
+}
+
+type MassCreateError struct {
+	Errors map[string]string
+}
+
+func (e *MassCreateError) Error() string {
+	errs := make([]error, 0, len(e.Errors))
+	for k, v := range e.Errors {
+		errs = append(errs, fmt.Errorf("%s: %s", k, v))
+	}
+	return errors.Join(errs...).Error()
 }

 // MassCreate creates KVM x86 computes based on specified OS image
@@ -205,113 +218,42 @@ func (k KVMX86) MassCreate(ctx context.Context, req MassCreateRequest) ([]uint64
 		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}

-	var interfaces []string
-
-	if len(req.Interfaces) != 0 {
-		interfaces = make([]string, 0, len(req.Interfaces))
-
-		for i := range req.Interfaces {
-			b, err := json.Marshal(req.Interfaces[i])
-			if err != nil {
-				return nil, err
-			}
-
-			interfaces = append(interfaces, string(b))
-		}
-	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
-		interfaces = []string{"[]"}
-	}
-
-	var dataDisks []string
-
-	if len(req.DataDisks) != 0 {
-		dataDisks = make([]string, 0, len(req.DataDisks))
-
-		for i := range req.DataDisks {
-			b, err := json.Marshal(req.DataDisks[i])
-			if err != nil {
-				return nil, err
-			}
-
-			dataDisks = append(dataDisks, string(b))
-		}
-	}
-
-	reqWrapped := wrapperMassCreateRequest{
-		MassCreateRequest: req,
-		Interfaces:        interfaces,
-		DataDisks:         dataDisks,
-	}
-
-	finalReq := asyncWrapperMassCreateRequest{wrapperMassCreateRequest: reqWrapped, AsyncMode: false}
-
 	url := "/cloudbroker/kvmx86/massCreate"

-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, finalReq)
+	res, err := k.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, wrapperMassCreateRequest{
+		MassCreateRequest: req,
+		AsyncMode:         false,
+	})
 	if err != nil {
 		return nil, err
 	}

-	computes := make([]uint64, 0)
+	var result massCreateResponse

-	err = json.Unmarshal(res, &computes)
-	if err != nil {
+	if err = json.Unmarshal(res, &result); err != nil {
 		return nil, err
 	}

-	return computes, nil
+	if len(result.Errors) > 0 {
+		return result.Created, &MassCreateError{Errors: result.Errors}
+	}
+
+	return result.Created, nil
 }

-// MassCreate creates KVM x86 computes based on specified OS image in async mode
+// MassCreateAsync creates KVM x86 computes based on specified OS image in async mode
 func (k KVMX86) MassCreateAsync(ctx context.Context, req MassCreateRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}

-	var interfaces []string
-
-	if len(req.Interfaces) != 0 {
-		interfaces = make([]string, 0, len(req.Interfaces))
-
-		for i := range req.Interfaces {
-			b, err := json.Marshal(req.Interfaces[i])
-			if err != nil {
-				return "", err
-			}
-
-			interfaces = append(interfaces, string(b))
-		}
-	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
-		interfaces = []string{"[]"}
-	}
-
-	var dataDisks []string
-
-	if len(req.DataDisks) != 0 {
-		dataDisks = make([]string, 0, len(req.DataDisks))
-
-		for i := range req.DataDisks {
-			b, err := json.Marshal(req.DataDisks[i])
-			if err != nil {
-				return "", err
-			}
-
-			dataDisks = append(dataDisks, string(b))
-		}
-	}
-
-	reqWrapped := wrapperMassCreateRequest{
-		MassCreateRequest: req,
-		Interfaces:        interfaces,
-		DataDisks:         dataDisks,
-	}
-
-	finalReq := asyncWrapperMassCreateRequest{wrapperMassCreateRequest: reqWrapped, AsyncMode: true}
-
 	url := "/cloudbroker/kvmx86/massCreate"

-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, finalReq)
+	res, err := k.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, wrapperMassCreateRequest{
+		MassCreateRequest: req,
+		AsyncMode:         true,
+	})
 	if err != nil {
 		return "", err
 	}