v1.12.5

pkg/cloudapi/compute/change_secutity_group.go

@@ -24,7 +24,7 @@ type ChangeSecGroupsRequest struct {
 
 	// Flag indicating whether security groups are enabled for this interface
 	// Required: false
-	EnableSecGroups bool `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty"`
+	EnableSecGroups interface{} `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty" validate:"omitempty,isBool"`
 }
 
 // ChangeSecGroups changes security groups for compute

pkg/cloudapi/compute/clone.go

@@ -3,8 +3,8 @@ package compute
 import (
 	"context"
 	"net/http"
-	"strconv"
 
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -18,6 +18,10 @@ type CloneRequest struct {
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`
 
+	// ID of the Storage Policy
+	// Required: true
+	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
+
 	// Timestamp of the parent's snapshot to create clone from
 	// Required: false
 	SnapshotTimestamp uint64 `url:"snapshotTimestamp,omitempty" json:"snapshotTimestamp,omitempty"`
@@ -30,26 +34,29 @@ type CloneRequest struct {
 	// Default: false
 	// Required: false
 	Force bool `url:"force" json:"force"`
+
+	// The name of the pool to migrate disks to
+	// Required: false
+	PoolName string `url:"pool_name" json:"pool_name"`
+
+	// The ID of the SEP to migrate disks to
+	// Required: false
+	SEPID uint64 `url:"sep_id" json:"sep_id"`
 }
 
 // Clone clones compute instance
-func (c Compute) Clone(ctx context.Context, req CloneRequest) (uint64, error) {
+func (c Compute) Clone(ctx context.Context, req CloneRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/clone"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	if err != nil {
-		return 0, err
+		return "", err
 	}
 
-	result, err := strconv.ParseUint(string(res), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return result, nil
+	return string(res), nil
 }

pkg/cloudapi/compute/clone_abort.go

@@ -0,0 +1,39 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// CloneAbortRequest struct to abort a compute clone
+type CloneAbortRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+}
+
+// CloneAbort aborts a compute clone
+func (c Compute) CloneAbort(ctx context.Context, req CloneAbortRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/clone_abort"
+
+	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
+	if err != nil {
+		return false, err
+	}
+
+	result, err := strconv.ParseBool(string(res))
+	if err != nil {
+		return false, err
+	}
+
+	return result, nil
+}

pkg/cloudapi/compute/clone_status.go

@@ -0,0 +1,40 @@
+package compute
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetCloneStatusRequest struct to get information about compute clone status
+type GetCloneStatusRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+}
+
+// GetCloneStatus gets information about compute clone status as a RecordCloneStatus struct
+func (c Compute) GetCloneStatus(ctx context.Context, req GetCloneStatusRequest) ([]RecordCloneStatus, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/clone_status"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	cloneStatus := make([]RecordCloneStatus, 0)
+
+	err = json.Unmarshal(res, &cloneStatus)
+	if err != nil {
+		return nil, err
+	}
+
+	return cloneStatus, nil
+}

pkg/cloudapi/compute/create_template.go

@@ -3,7 +3,6 @@ package compute
 import (
 	"context"
 	"net/http"
-	"strconv"
 	"strings"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
@@ -27,47 +26,15 @@ type wrapperCreateTemplateRequest struct {
 }
 
 // CreateTemplate create template from compute instance
-func (c Compute) CreateTemplate(ctx context.Context, req CreateTemplateRequest) (uint64, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperCreateTemplateRequest{
-		CreateTemplateRequest: req,
-		AsyncMode:                 false,
-	}
-
-	url := "/cloudapi/compute/createTemplate"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return 0, err
-	}
-
-	result, err := strconv.ParseUint(string(res), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return result, nil
-}
-
-// CreateTemplateAsync create template from compute instance
-func (c Compute) CreateTemplateAsync(ctx context.Context, req CreateTemplateRequest) (string, error) {
+func (c Compute) CreateTemplate(ctx context.Context, req CreateTemplateRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperCreateTemplateRequest{
-		CreateTemplateRequest: req,
-		AsyncMode:                 true,
-	}
-
 	url := "/cloudapi/compute/createTemplate"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return "", err
 	}

pkg/cloudapi/compute/models.go

@@ -311,6 +311,9 @@ type RecordCompute struct {
 	// Architecture
 	Architecture string `json:"arch"`
 
+	// Boot image ID
+	BootImageID uint64 `json:"boot_image_id"`
+
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
@@ -1013,6 +1016,9 @@ type ItemCompute struct {
 	// Architecture
 	Architecture string `json:"arch"`
 
+	// Boot image ID
+	BootImageID uint64 `json:"boot_image_id"`
+
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
@@ -1322,3 +1328,31 @@ type ListPCIDevices struct {
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
+
+type RecordCloneStatus struct {
+	// Disk ID
+	DiskID int `json:"disk_id"`
+
+	// Clone Status
+	Status CloneStatus `json:"status"`
+}
+
+type CloneStatus struct {
+	// Type
+	Type int `json:"type"`
+
+	// Copy speed
+	Bandwidth int `json:"bandwidth"`
+
+	// Current progress
+	Cur int `json:"cur"`
+
+	// Total size
+	End int `json:"end"`
+
+	// Operation status
+	Ready bool `json:"ready"`
+
+	// Progress percent
+	ProgressPercent int `json:"progress_percent"`
+}

pkg/cloudbroker/compute/change_secutity_group.go

@@ -24,7 +24,7 @@ type ChangeSecGroupsRequest struct {
 
 	// Flag indicating whether security groups are enabled for this interface
 	// Required: false
-	EnableSecGroups bool `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty"`
+	EnableSecGroups interface{} `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty" validate:"omitempty,isBool"`
 }
 
 // ChangeSecGroups changes security groups for compute

pkg/cloudbroker/compute/clone.go

@@ -3,8 +3,8 @@ package compute
 import (
 	"context"
 	"net/http"
-	"strconv"
 
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -18,6 +18,10 @@ type CloneRequest struct {
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`
 
+	// ID of the Storage Policy
+	// Required: true
+	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
+
 	// Timestamp of the parent's snapshot to create clone from
 	// Required: false
 	SnapshotTimestamp uint64 `url:"snapshotTimestamp" json:"snapshotTimestamp"`
@@ -30,26 +34,29 @@ type CloneRequest struct {
 	// Default: false
 	// Required: false
 	Force bool `url:"force" json:"force"`
+
+	// The name of the pool to migrate disks to
+	// Required: false
+	PoolName string `url:"pool_name" json:"pool_name"`
+
+	// The ID of the SEP to migrate disks to
+	// Required: false
+	SEPID uint64 `url:"sep_id" json:"sep_id"`
 }
 
 // Clone clones compute instance
-func (c Compute) Clone(ctx context.Context, req CloneRequest) (uint64, error) {
+func (c Compute) Clone(ctx context.Context, req CloneRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudbroker/compute/clone"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	if err != nil {
-		return 0, err
+		return "", err
 	}
 
-	result, err := strconv.ParseUint(string(res), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return result, nil
+	return string(res), nil
 }

pkg/cloudbroker/compute/clone_abort.go

@@ -0,0 +1,39 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// CloneAbortRequest struct to abort a compute clone
+type CloneAbortRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+}
+
+// CloneAbort aborts a compute clone
+func (c Compute) CloneAbort(ctx context.Context, req CloneAbortRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/compute/clone_abort"
+
+	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
+	if err != nil {
+		return false, err
+	}
+
+	result, err := strconv.ParseBool(string(res))
+	if err != nil {
+		return false, err
+	}
+
+	return result, nil
+}

pkg/cloudbroker/compute/clone_status.go

@@ -0,0 +1,40 @@
+package compute
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetCloneStatusRequest struct to get information about compute clone status
+type GetCloneStatusRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+}
+
+// GetCloneStatus gets information about compute clone status as a RecordCloneStatus struct
+func (c Compute) GetCloneStatus(ctx context.Context, req GetCloneStatusRequest) ([]RecordCloneStatus, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/compute/clone_status"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	cloneStatus := make([]RecordCloneStatus, 0)
+
+	err = json.Unmarshal(res, &cloneStatus)
+	if err != nil {
+		return nil, err
+	}
+
+	return cloneStatus, nil
+}

pkg/cloudbroker/compute/create_template.go

@@ -3,7 +3,6 @@ package compute
 import (
 	"context"
 	"net/http"
-	"strconv"
 	"strings"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
@@ -20,27 +19,16 @@ type CreateTemplateRequest struct {
 	Name string `url:"name" json:"name" validate:"required"`
 }
 
-type wrapperCreateTemplateRequest struct {
-	CreateTemplateRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
-// CreateTemplateAsync create template from compute instance
-func (c Compute) CreateTemplateAsync(ctx context.Context, req CreateTemplateRequest) (string, error) {
+// CreateTemplate create template from compute instance
+func (c Compute) CreateTemplate(ctx context.Context, req CreateTemplateRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperCreateTemplateRequest{
-		CreateTemplateRequest: req,
-		AsyncMode:                 true,
-	}
-
 	url := "/cloudbroker/compute/createTemplate"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return "", err
 	}
@@ -49,30 +37,3 @@ func (c Compute) CreateTemplateAsync(ctx context.Context, req CreateTemplateRequ
 
 	return result, nil
 }
-
-// CreateTemplate create template from compute instance
-func (c Compute) CreateTemplate(ctx context.Context, req CreateTemplateRequest) (uint64, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperCreateTemplateRequest{
-		CreateTemplateRequest: req,
-		AsyncMode:                 false,
-	}
-
-	url := "/cloudbroker/compute/createTemplate"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return 0, err
-	}
-
-	result, err := strconv.ParseUint(string(res), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return result, nil
-}

pkg/cloudbroker/compute/models.go

@@ -663,6 +663,9 @@ type InfoCompute struct {
 	// Architecture
 	Arch string `json:"arch"`
 
+	// Boot image ID
+	BootImageID uint64 `json:"boot_image_id"`
+
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
@@ -917,6 +920,9 @@ type RecordCompute struct {
 	// Architecture
 	Arch string `json:"arch"`
 
+	// Boot image ID
+	BootImageID uint64 `json:"boot_image_id"`
+
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
@@ -1420,3 +1426,31 @@ type MigrateStorageItem struct {
 	// Target stack ID
 	TargetStackID uint64 `json:"targetStackId"`
 }
+
+type RecordCloneStatus struct {
+	// Disk ID
+	DiskID int `json:"disk_id"`
+
+	// Clone Status
+	Status CloneStatus `json:"status"`
+}
+
+type CloneStatus struct {
+	// Type
+	Type int `json:"type"`
+
+	// Copy speed
+	Bandwidth int `json:"bandwidth"`
+
+	// Current progress
+	Cur int `json:"cur"`
+
+	// Total size
+	End int `json:"end"`
+
+	// Operation status
+	Ready bool `json:"ready"`
+
+	// Progress percent
+	ProgressPercent int `json:"progress_percent"`
+}

pkg/cloudbroker/disks/migrate.go

@@ -0,0 +1,46 @@
+package disks
+
+import (
+	"context"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// Migrate struct to move disk to another sep, pool and storage policy
+type MigrateRequest struct {
+	// ID of the disk
+	// Required: true
+	DiskID uint64 `url:"disk_id" json:"disk_id" validate:"required"`
+
+	// ID of the new SEP
+	// Required: true
+	SEPID uint64 `url:"sep_id" json:"sep_id" validate:"required"`
+
+	// New pool name
+	// Required: true
+	PoolName string `url:"pool_name" json:"pool_name" validate:"required"`
+
+	// ID if the storage policy
+	// Required: false
+	StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
+}
+
+// Move moves disk to another sep, pool and storage policy
+func (c Disks) Migrate(ctx context.Context, req MigrateRequest) (string, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return "", validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/disks/migrate"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return "", err
+	}
+
+	result := string(res)
+
+	return result, nil
+}

pkg/cloudbroker/disks/migrate_abort.go

@@ -0,0 +1,38 @@
+package disks
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// MigrateAbortRequest struct to abort migration
+type MigrateAbortRequest struct {
+	// ID of the disk
+	// Required: true
+	DiskID uint64 `url:"disk_id" json:"disk_id" validate:"required"`
+}
+
+// MigrateAbort aborts disk migration
+func (c Disks) MigrateAbort(ctx context.Context, req MigrateAbortRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/disks/migrate_abort"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return false, err
+	}
+
+	result, err := strconv.ParseBool(string(res))
+	if err != nil {
+		return false, err
+	}
+
+	return result, nil
+}

pkg/cloudbroker/disks/migrate_status.go

@@ -0,0 +1,40 @@
+package disks
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetMigrateStatusRequest struct to get information about disk migrate status
+type GetMigrateStatusRequest struct {
+	// ID of disk
+	// Required: true
+	DiskID uint64 `url:"disk_id" json:"disk_id" validate:"required"`
+}
+
+// GetMigrateStatus gets information about disk migrate status
+func (c Disks) GetMigrateStatus(ctx context.Context, req GetMigrateStatusRequest) (*MigrateStatus, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/disks/migrate_status"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	status := MigrateStatus{}
+
+	err = json.Unmarshal(res, &status)
+	if err != nil {
+		return nil, err
+	}
+
+	return &status, nil
+}

pkg/cloudbroker/disks/models.go

@@ -320,3 +320,20 @@ type ListTypes struct {
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
+
+type MigrateStatus struct {
+	// Type
+	Type int `json:"type"`
+
+	// Copy speed
+	Bandwidth int `json:"bandwidth"`
+
+	// Current progress
+	Cur interface{} `json:"cur"`
+
+	// Total size
+	End interface{} `json:"end"`
+
+	// Progress percent
+	ProgressPercent int `json:"progress_percent"`
+}

pkg/cloudbroker/image/create_image.go

@@ -11,7 +11,7 @@ import (
 
 // CreateRequest struct to create image
 type CreateRequest struct {
-	// Name of the rescue disk
+	// Name of the image
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`