v1.7.7

CHANGELOG.md

@@ -1,5 +1,4 @@
-## Version 1.7.4
+## Version 1.7.7
 
-## Bugfix
+### Bugfix
-
+- Fix url for Disable method in cloudapi/bservice
-- Remove tag "required" from field Value in AffinityRuleAddRequest, AntiAffinityRuleAddRequest, AffinityRuleRemoveRequest AntiAffinityRuleRemoveRequest in cloudapi/compute and cloudbroker/compute

internal/validators/values.go

@@ -39,7 +39,7 @@ var (
 
 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
 
-	networkPluginValues = []string{"flannel", "weawenet", "calico"}
+	networkPluginValues = []string{"flannel", "weavenet", "calico"}
 
 	strictLooseValues = []string{"strict", "loose"}
 

pkg/cloudapi/bservice/disable.go

@@ -24,7 +24,7 @@ func (b BService) Disable(ctx context.Context, req DisableRequest) (bool, error)
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := "/cloudapi/bservice/delete"
+	url := "/cloudapi/bservice/disable"
 
 	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {

pkg/cloudapi/bservice/models.go

@@ -93,7 +93,7 @@ type RecordBasicService struct {
 // Main information about Compute
 type ItemCompute struct {
 	// Account ID
-	AccountID uint64
+	AccountID uint64 `json:"accountId"`
 
 	// Architecture
 	Architecture string `json:"arch"`

pkg/cloudapi/compute/models.go

@@ -380,6 +380,9 @@ type RecordCompute struct {
 	// Name
 	Name string `json:"name"`
 
+	// NeedReboot
+	NeedReboot bool `json:"needReboot"`
+
 	// Natable VINS ID
 	NatableVINSID uint64 `json:"natableVinsId"`
 
@@ -857,6 +860,9 @@ type ItemCompute struct {
 	// Name
 	Name string `json:"name"`
 
+	// NeedReboot
+	NeedReboot bool `json:"needReboot"`
+
 	// Pinned or not
 	Pinned bool `json:"pinned"`
 

pkg/cloudapi/image/get.go

@@ -16,7 +16,7 @@ type GetRequest struct {
 
 	// If set to False returns only images in status CREATED
 	// Required: false
-	ShowAll bool `url:"show_all,omitempty" json:"show_all,omitempty"`
+	ShowAll bool `url:"showAll,omitempty" json:"showAll,omitempty"`
 }
 
 // Get gets image by ID.

pkg/cloudapi/k8ci/list.go

@@ -10,7 +10,7 @@ import (
 type ListRequest struct {
 	// Find by ID
 	// Required: false
-	ByID uint64 `url:"id,omitempty" json:"id,omitempty"`
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
 
 	// Find by name
 	// Required: false

pkg/cloudapi/k8s/create.go

@@ -29,7 +29,7 @@ type CreateRequest struct {
 	WorkerGroupName string `url:"workerGroupName" json:"workerGroupName" validate:"required,workerGroupName"`
 
 	// Network plugin
-	// Must be one of these values: flannel, weawenet, calico
+	// Must be one of these values: flannel, weavenet, calico
 	// Required: true
 	NetworkPlugin string `url:"networkPlugin" json:"networkPlugin" validate:"required,networkPlugin"`
 

pkg/cloudapi/lb/list.go

@@ -18,7 +18,7 @@ type ListRequest struct {
 
 	// Find by account ID
 	// Required: false
-	AccountID uint64 `url:"accountID,omitempty" json:"accountID,omitempty"`
+	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
 	// Find by resource group ID
 	// Required: false

pkg/cloudapi/lb/restart.go

@@ -13,6 +13,11 @@ type RestartRequest struct {
 	// ID of the load balancer instance to restart
 	// Required: true
 	LBID uint64 `url:"lbId" json:"lbId" validate:"required"`
+
+	// restart secondary and primary nodes sequentially in HA mode
+	// Default is true
+	// Required: false
+	Safe bool `url:"safe" json:"safe"`
 }
 
 // Restart restarts specified load balancer instance

pkg/cloudapi/rg/ids.go

@@ -55,10 +55,12 @@ func (lrc ListResourceConsumption) IDs() []uint64 {
 }
 
 // IDs gets array of ResourceGroupIDs from ListAffinityGroup struct
-func (lag ListAffinityGroup) IDs() []uint64 {
+func (lag ListAffinityGroups) IDs() []uint64 {
-	res := make([]uint64, 0, len(lag))
+	res := make([]uint64, 0, len(lag.Data))
-	for _, ag := range lag {
+	for _, ag := range lag.Data {
-		res = append(res, ag.ID)
+		for _, v := range ag {
+			res = append(res, v...)
+		}
 	}
 	return res
 }

pkg/cloudapi/rg/models.go

@@ -331,19 +331,10 @@ type ItemAffinityGroupComputes struct {
 // List of affinity groups
 type ListAffinityGroupsComputes []ItemAffinityGroupComputes
 
-// Main information about
-type ItemAffinityGroup struct {
-	ID     uint64 `json:"id"`
-	NodeID uint64 `json:"node_id"`
-}
-
-// List of affinity group
-type ListAffinityGroup []ItemAffinityGroup
-
 // List of affinity groups
 type ListAffinityGroups struct {
 	// Data
-	Data []map[string]ListAffinityGroup `json:"data"`
+	Data []map[string][]uint64 `json:"data"`
 
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`

pkg/cloudapi/vins/create_in_rg.go

@@ -25,7 +25,8 @@ type CreateInRGRequest struct {
 
 	// External network ID
 	// Required: false
-	ExtNetID uint64 `url:"extNetId,omitempty" json:"extNetId,omitempty"`
+	// -1 - not connect to extnet, 0 - auto select, 1+ - extnet ID
+	ExtNetID int64 `url:"extNetId" json:"extNetId"`
 
 	// External IP, related only for extNetId >= 0
 	// Required: false

pkg/cloudbroker/audit/audit.go

@@ -8,8 +8,8 @@ type Audit struct {
 }
 
 // Builder for audit endpoint
-func New(client interfaces.Caller) *Audit{
+func New(client interfaces.Caller) *Audit {
 	return &Audit{
 		client: client,
 	}
-}
+}

pkg/cloudbroker/audit/linked_jobs.go

@@ -43,4 +43,4 @@ func (a Audit) GetRawLinkedJobs(ctx context.Context, req LinkedJobsRequest) ([]b
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	return res, err
-}
+}

pkg/cloudbroker/k8ci/access_add.go

@@ -19,7 +19,7 @@ type AccessAddRequest struct {
 }
 
 // Add accountId to sharedWith access list for k8ci.
-func (k K8CI) AccessAdd (ctx context.Context, req AccessAddRequest) (string, error) {
+func (k K8CI) AccessAdd(ctx context.Context, req AccessAddRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return "", validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudbroker/k8ci/access_remove.go

@@ -19,7 +19,7 @@ type AccessRemoveRequest struct {
 }
 
 // Remove accountId from sharedWith access list for k8ci.
-func (k K8CI) AccessRemove (ctx context.Context, req AccessRemoveRequest) (string, error) {
+func (k K8CI) AccessRemove(ctx context.Context, req AccessRemoveRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return "", validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudbroker/k8ci/create.go

@@ -60,7 +60,7 @@ type CreateRequest struct {
 	MaxWorkerCount uint64 `url:"maxWorkerCount" json:"maxWorkerCount" validate:"required"`
 
 	// Network plugins
-	// Values of slice must be flannel, weawenet or calico
+	// Values of slice must be flannel, weavenet or calico
 	//Required: true
 	NetworkPlugins []string `url:"networkPlugins" json:"networkPlugins" validate:"required,networkPlugins"`
 }

pkg/cloudbroker/k8ci/delete.go

@@ -16,7 +16,7 @@ type DeleteRequest struct {
 
 	// Delete permanently or not
 	// Required: false
-	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+	Permanently bool `url:"permanently" json:"permanently"`
 }
 
 // Delete deletes K8CI by ID

pkg/cloudbroker/k8s/create.go

@@ -29,7 +29,7 @@ type CreateRequest struct {
 	WorkerGroupName string `url:"workerGroupName" json:"workerGroupName" validate:"required,workerGroupName"`
 
 	// Network plugin
-	// Must be one of these values: flunnel, weawenet, calico
+	// Must be one of these values: flunnel, weavenet, calico
 	// Required: true
 	NetworkPlugin string `url:"networkPlugin" json:"networkPlugin" validate:"required,networkPlugin"`
 

pkg/cloudbroker/vins/create_in_rg.go

@@ -25,7 +25,8 @@ type CreateInRGRequest struct {
 
 	// External network ID
 	// Required: false
-	ExtNetID uint64 `url:"extNetId,omitempty" json:"extNetId,omitempty"`
+	// -1 - not connect to extnet, 0 - auto select, 1+ - extnet ID
+	ExtNetID int64 `url:"extNetId" json:"extNetId"`
 
 	// External IP, related only for extNetId >= 0
 	// Required: false