Merge 'dev' into 'main'

2022-10-03 16:56:47 +03:00
parent 6271fa6d45
commit 5fd450382c
400 changed files with 14394 additions and 13407 deletions
--- a/pkg/cloudapi/lb/create.go
+++ b/pkg/cloudapi/lb/create.go
@@ -1,64 +1,53 @@
-package lb
-
-import (
-	"context"
-	"errors"
-	"strings"
-
-	"github.com/rudecs/decort-sdk/opts"
-	"github.com/rudecs/decort-sdk/typed"
-)
-
-type CreateRequest struct {
-	RGID        uint64 `url:"rgId"`
-	Name        string `url:"name"`
-	ExtnetId    uint64 `url:"extnetId"`
-	VinsId      uint64 `url:"vinsId"`
-	Start       bool   `url:"start"`
-	Description string `url:"desc,omitempty"`
-}
-
-func (lbrq CreateRequest) Validate() error {
-	if lbrq.RGID == 0 {
-		return errors.New("validation-error: field RGID can not be empty or equal to 0")
-	}
-
-	if lbrq.Name == "" {
-		return errors.New("validation-error: field Name can not be empty")
-	}
-
-	if lbrq.ExtnetId == 0 {
-		return errors.New("validation-error: field ExtnetId can not be empty or equal to 0")
-	}
-
-	if lbrq.VinsId == 0 {
-		return errors.New("validation-error: field VinsId can not be empty or equal to 0")
-	}
-
-	return nil
-}
-
-func (l LB) Create(ctx context.Context, req CreateRequest, options ...opts.DecortOpts) (string, error) {
-	err := req.Validate()
-	if err != nil {
-		return "", err
-	}
-
-	url := "/lb/create"
-	prefix := "/cloudapi"
-
-	option := opts.New(options)
-
-	if option != nil {
-		if option.IsAdmin {
-			prefix = "/" + option.AdminValue
-		}
-	}
-	url = prefix + url
-	res, err := l.client.DecortApiCall(ctx, typed.POST, url, req)
-	if err != nil {
-		return "", err
-	}
-
-	return strings.ReplaceAll(string(res), "\"", ""), nil
-}
+package lb
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"strings"
+)
+
+type CreateRequest struct {
+	RGID        uint64 `url:"rgId"`
+	Name        string `url:"name"`
+	ExtNetID    uint64 `url:"extnetId"`
+	VINSID      uint64 `url:"vinsId"`
+	Start       bool   `url:"start"`
+	Description string `url:"desc,omitempty"`
+}
+
+func (lbrq CreateRequest) Validate() error {
+	if lbrq.RGID == 0 {
+		return errors.New("validation-error: field RGID can not be empty or equal to 0")
+	}
+
+	if lbrq.Name == "" {
+		return errors.New("validation-error: field Name can not be empty")
+	}
+
+	if lbrq.ExtNetID == 0 {
+		return errors.New("validation-error: field ExtNetID can not be empty or equal to 0")
+	}
+
+	if lbrq.VINSID == 0 {
+		return errors.New("validation-error: field VINSID can not be empty or equal to 0")
+	}
+
+	return nil
+}
+
+func (l LB) Create(ctx context.Context, req CreateRequest) (string, error) {
+	err := req.Validate()
+	if err != nil {
+		return "", err
+	}
+
+	url := "/cloudapi/lb/create"
+
+	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return "", err
+	}
+
+	return strings.ReplaceAll(string(res), "\"", ""), nil
+}