v1.10.0

pkg/cloudapi/compute/get_log.go

@@ -42,7 +42,7 @@ func (c Compute) GetLogGet(ctx context.Context, req GetLogRequest) (string, erro
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := "/cloudapi//compute/getLog"
+	url := "/cloudapi/compute/getLog"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
 	if err != nil {

pkg/cloudapi/compute/models.go

@@ -299,6 +299,9 @@ type RecordCompute struct {
 	// List anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
+	// Auto start when node restarted
+	AutoStart bool `json:"autoStart"`
+
 	// Architecture
 	Architecture string `json:"arch"`
 
@@ -484,6 +487,9 @@ type RecordCompute struct {
 
 	// Virtual image name
 	VirtualImageName string `json:"virtualImageName"`
+
+	// VNC password
+	VNCPassword string `json:"vncPasswd"`
 }
 
 // Information about libvirt settings
@@ -866,6 +872,9 @@ type ItemCompute struct {
 	// List anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
+	// Auto start when node restarted
+	AutoStart bool `json:"autoStart"`
+
 	// Architecture
 	Architecture string `json:"arch"`
 

pkg/cloudapi/compute/pin_to_stack.go

@@ -13,25 +13,30 @@ type PinToStackRequest struct {
 	// ID of the compute instance
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Auto start when node restarted
+	// Required: false
+	// Default: false
+	AutoStart bool `url:"autoStart" json:"autoStart"`
 }
 
 // PinToStack pin compute to current stack
-func (c Compute) PinToStack(ctx context.Context, req PinToStackRequest) (uint64, error) {
+func (c Compute) PinToStack(ctx context.Context, req PinToStackRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/pinToStack"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return 0, err
+		return false, err
 	}
 
-	result, err := strconv.ParseUint(string(res), 10, 64)
+	result, err := strconv.ParseBool(string(res))
 	if err != nil {
-		return 0, err
+		return false, err
 	}
 
 	return result, nil

pkg/cloudapi/compute/update.go

@@ -43,6 +43,11 @@ type UpdateRequest struct {
 	// Required: false
 	// Default: false
 	HPBacked bool `url:"hpBacked" json:"hpBacked"`
+
+	// Auto start when node restarted
+	// Required: false
+	// Default: false
+	AutoStart bool `url:"autoStart" json:"autoStart"`
 }
 
 // Update updates some properties of the compute

pkg/cloudapi/disks/resize.go

@@ -19,31 +19,6 @@ type ResizeRequest struct {
 	Size uint64 `url:"size" json:"size" validate:"required"`
 }
 
-// Resize resizes disk
-// Returns 200 if disk is resized online, else will return 202,
-// in that case please stop and start your machine after changing the disk size, for your changes to be reflected.
-// This method will not be used for disks, assigned to computes. Only unassigned disks and disks, assigned with "old" virtual machines.
-func (d Disks) Resize(ctx context.Context, req ResizeRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/resize"
-
-	res, err := d.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
-}
-
 // Resize2 resize disk
 // Returns 200 if disk is resized online, else will return 202,
 // in that case please stop and start your machine after changing the disk size, for your changes to be reflected.

pkg/cloudapi/extnet/get_reserved_ip.go

@@ -0,0 +1,50 @@
+package extnet
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetRequest struct to get information about reserved address or address poll
+type GetReservedIP struct {
+	// AccountID of the account whose reservation information we want to receive
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Field for specifying the ID of extnet whose reservation information we want to receive
+	// Required: false
+	ExtNetID uint64 `url:"extnetId,omitempty" json:"extnetId,omitempty"`
+}
+
+// GetReservedIP gets information about reserved address or address poll as a slice of RecordReservedIP struct
+func (e ExtNet) GetReservedIP(ctx context.Context, req GetReservedIP) ([]RecordReservedIP, error) {
+	res, err := e.GetReservedIPRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	reservedIP := make([]RecordReservedIP, 0)
+
+	err = json.Unmarshal(res, &reservedIP)
+	if err != nil {
+		return nil, err
+	}
+
+	return reservedIP, nil
+}
+
+// GetRaw gets detailed information about external network as an array of bytes
+func (e ExtNet) GetReservedIPRaw(ctx context.Context, req GetReservedIP) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/extnet/getReservedIp"
+
+	res, err := e.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/extnet/models.go

@@ -87,6 +87,9 @@ type QOS struct {
 
 // Main information about reservations
 type ItemReservation struct {
+	// Account ID
+	AccountID uint64 `json:"account_id"`
+
 	// ClientType
 	ClientType string `json:"clientType"`
 
@@ -226,3 +229,20 @@ type RecordExtNet struct {
 	// VNFs
 	VNFs VNFs `json:"vnfs"`
 }
+
+// Detailed information about reserved address or address pool
+type RecordReservedIP struct {
+	ExtnetID     int            `json:"extnet_id"`
+	Reservations []Reservations `json:"reservations"`
+}
+
+type Reservations struct {
+	AccountID  int    `json:"account_id"`
+	ClientType string `json:"clientType"`
+	DomainName string `json:"domainname"`
+	Hostname   string `json:"hostname"`
+	IP         string `json:"ip"`
+	Mac        string `json:"mac"`
+	Type       string `json:"type"`
+	VMID       int    `json:"vmId"`
+}

pkg/cloudapi/vins/models.go

@@ -208,6 +208,9 @@ type RecordVNFDev struct {
 
 	// List of VINS IDs
 	VINS []uint64 `json:"vins"`
+
+	// VNC password
+	VNCPassword string `json:"vncPasswd"`
 }
 
 // VNF config
@@ -793,17 +796,8 @@ type ListNATRules struct {
 
 // Main information about reservation
 type ItemReservation struct {
-	// Client type
-	ClientType string `json:"clientType"`
-
-	// Description
-	Description string `json:"desc"`
-
-	// Domain name
-	DomainName string `json:"domainname"`
-
-	// Hostname
-	Hostname string `json:"hostname"`
+	// Account ID
+	AccountID uint64 `json:"account_id"`
 
 	// IP
 	IP string `json:"ip"`

pkg/cloudapi/vins/static_route_add.go

@@ -25,10 +25,6 @@ type StaticRouteAddRequest struct {
 	// Next hop host, IP address from ViNS ID free IP pool
 	// Required: true
 	Gateway string `url:"gateway" json:"gateway" validate:"required"`
-
-	// List of Compute IDs which have access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
 }
 
 // StaticRouteAdd adds new static route to ViNS

pkg/cloudbroker/compute/list.go

@@ -50,6 +50,10 @@ type ListRequest struct {
 	// Required: false
 	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
 
+	// Find by CD image ID
+	// Required: false
+	CDImageID uint64 `url:"cdImageId,omitempty" json:"cdImageId,omitempty"`
+
 	// Find by external network name
 	// Required: false
 	ExtNetName string `url:"extNetName,omitempty" json:"extNetName,omitempty"`

pkg/cloudbroker/compute/models.go

@@ -624,6 +624,9 @@ type InfoCompute struct {
 	// Anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
+	// Auto start when node restarted
+	AutoStart bool `json:"autoStart"`
+
 	// Architecture
 	Arch string `json:"arch"`
 
@@ -846,6 +849,9 @@ type RecordCompute struct {
 	// Anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
+	// Auto start when node restarted
+	AutoStart bool `json:"autoStart"`
+
 	// Architecture
 	Arch string `json:"arch"`
 
@@ -1043,6 +1049,9 @@ type RecordCompute struct {
 
 	// VirtualImageName
 	VirtualImageName string `json:"virtualImageName"`
+
+	// VNC password
+	VNCPassword string `json:"vncPasswd"`
 }
 
 // Information about of disk IDs

pkg/cloudbroker/compute/pin_to_stack.go

@@ -21,6 +21,11 @@ type PinToStackRequest struct {
 	// Try to migrate or not if compute in running states
 	// Required: false
 	Force bool `url:"force" json:"force"`
+
+	// Auto start when node restarted
+	// Required: false
+	// Default: false
+	AutoStart bool `url:"autoStart" json:"autoStart"`
 }
 
 // PinToStack pins compute to current stack

pkg/cloudbroker/compute/update.go

@@ -43,6 +43,11 @@ type UpdateRequest struct {
 	// Required: false
 	// Default: false
 	HPBacked bool `url:"hpBacked" json:"hpBacked"`
+
+	// Auto start when node restarted
+	// Required: false
+	// Default: false
+	AutoStart bool `url:"autoStart" json:"autoStart"`
 }
 
 // Update updates some properties of the compute

pkg/cloudbroker/disks/resize.go

@@ -19,31 +19,6 @@ type ResizeRequest struct {
 	Size uint64 `url:"size" json:"size" validate:"required"`
 }
 
-// Resize resizes disk
-// Returns 200 if disk is resized online, else will return 202,
-// in that case please stop and start your machine after changing the disk size, for your changes to be reflected.
-// This method will not be used for disks, assigned to computes. Only unassigned disks and disks, assigned with "old" virtual machines.
-func (d Disks) Resize(ctx context.Context, req ResizeRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudbroker/disks/resize"
-
-	res, err := d.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
-}
-
 // Resize2 resize disk
 // Returns 200 if disk is resized online, else will return 202,
 // in that case please stop and start your machine after changing the disk size, for your changes to be reflected.

pkg/cloudbroker/extnet/add_reserved_ip.go

@@ -0,0 +1,50 @@
+package extnet
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// AddReserveIPRequest struct to reserved address or address poll
+type AddReserveIPRequest struct {
+	// AccountID to which a reserved address or address pool is added
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// ExtNetID from which the address or address pool is reserved
+	// Required: true
+	ExtNetID uint64 `url:"extnetId" json:"extnetId" validate:"required"`
+
+	// Field for specifying the number of reserved addresses
+	// Required: false
+	IPCount uint64 `url:"ipCount,omitempty" json:"ipCount,omitempty"`
+
+	// List of IPs for specifying the desired address
+	// Required: false
+	IPs []string `url:"ips,omitempty" json:"ips,omitempty"`
+}
+
+// AddReserveIP reserves address or address poll to external network for account ID
+func (e ExtNet) AddReserveIP(ctx context.Context, req AddReserveIPRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/extnet/addReservedIp"
+
+	res, err := e.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/extnet/del_reserved_ip.go

@@ -0,0 +1,50 @@
+package extnet
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// DelReserveIPRequest struct to delete reserved address or address poll
+type DelReserveIPRequest struct {
+	// AccountID to which a reserved address or address pool is added
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// ExtNetID from which the address or address pool is reserved
+	// Required: true
+	ExtNetID uint64 `url:"extnetId" json:"extnetId" validate:"required"`
+
+	// Field for specifying the number of reserved addresses
+	// Required: false
+	IPCount uint64 `url:"ipCount,omitempty" json:"ipCount,omitempty"`
+
+	// List of IPs for specifying the desired address
+	// Required: false
+	IPs []string `url:"ips,omitempty" json:"ips,omitempty"`
+}
+
+// DelReserveIP deletes reserved address or address poll to external network for account ID
+func (e ExtNet) DelReserveIP(ctx context.Context, req DelReserveIPRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/extnet/delReservedIp"
+
+	res, err := e.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/extnet/get_reserved_ip.go

@@ -0,0 +1,50 @@
+package extnet
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetRequest struct to get information about reserved address or address poll
+type GetReservedIP struct {
+	// AccountID of the account whose reservation information we want to receive
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Field for specifying the ID of extnet whose reservation information we want to receive
+	// Required: false
+	ExtNetID uint64 `url:"extnetId,omitempty" json:"extnetId,omitempty"`
+}
+
+// GetReservedIP gets information about reserved address or address poll as a slice of RecordReservedIP struct
+func (e ExtNet) GetReservedIP(ctx context.Context, req GetReservedIP) ([]RecordReservedIP, error) {
+	res, err := e.GetReservedIPRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	reservedIP := make([]RecordReservedIP, 0)
+
+	err = json.Unmarshal(res, &reservedIP)
+	if err != nil {
+		return nil, err
+	}
+
+	return reservedIP, nil
+}
+
+// GetRaw gets detailed information about external network as an array of bytes
+func (e ExtNet) GetReservedIPRaw(ctx context.Context, req GetReservedIP) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/extnet/getReservedIp"
+
+	res, err := e.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudbroker/extnet/models.go

@@ -17,6 +17,9 @@ type QOS struct {
 
 // Main information about reservations
 type ItemReservation struct {
+	// Account ID
+	AccountID uint64 `json:"account_id"`
+
 	// Client type
 	ClientType string `json:"clientType"`
 
@@ -238,3 +241,20 @@ type ItemRoutes struct {
 	//Destination network mask in 255.255.255.255 format
 	Netmask string `json:"netmask"`
 }
+
+// Detailed information about reserved address or address pool
+type RecordReservedIP struct {
+	ExtnetID     int            `json:"extnet_id"`
+	Reservations []Reservations `json:"reservations"`
+}
+
+type Reservations struct {
+	AccountID  int    `json:"account_id"`
+	ClientType string `json:"clientType"`
+	DomainName string `json:"domainname"`
+	Hostname   string `json:"hostname"`
+	IP         string `json:"ip"`
+	Mac        string `json:"mac"`
+	Type       string `json:"type"`
+	VMID       int    `json:"vmId"`
+}

pkg/cloudbroker/grid/get_diagnosis.go

@@ -2,7 +2,6 @@ package grid
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
@@ -39,7 +38,7 @@ func (g Grid) GetDiagnosisGET(ctx context.Context, req GetDiagnosisRequest) (str
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := fmt.Sprintf("/cloudbroker/grid/getDiagnosis/?gid=%d", req.GID)
+	url := "/cloudbroker/grid/getDiagnosis"
 
 	res, err := g.client.DecortApiCall(ctx, http.MethodGet, url, req)
 	if err != nil {

pkg/cloudbroker/image/models.go

@@ -104,6 +104,9 @@ type RecordImage struct {
 	// Size
 	Size uint64 `json:"size"`
 
+	// SnapshotId
+	SnapshotID string `json:"snapshotId"`
+
 	// Status
 	Status string `json:"status"`
 
@@ -227,6 +230,9 @@ type ItemImage struct {
 	// Size
 	Size uint64 `json:"size"`
 
+	// SnapshotId
+	SnapshotID string `json:"snapshotId"`
+
 	// Status
 	Status string `json:"status"`
 

pkg/cloudbroker/node/models.go

@@ -29,6 +29,9 @@ type RecordNode struct {
 	// NeedReboot
 	NeedReboot bool `json:"needReboot"`
 
+	// Netaddr
+	NetAddr NetAddr `json:"netaddr"`
+
 	// Nic Info
 	NicInfo ListNicInfo `json:"nicInfo"`
 
@@ -314,3 +317,12 @@ type ListNodes struct {
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
+
+// Net address
+type NetAddr struct {
+	// Name
+	Name string `json:"name"`
+
+	// IP list backplane1 node
+	IP []string `json:"ip"`
+}

pkg/cloudbroker/node/set_vfs_number.go

@@ -24,6 +24,10 @@ type SetVFsNumberRequest struct {
 	// Trust
 	// Required: true
 	Trust bool `url:"trust" json:"trust" validate:"required"`
+
+	// Enable spoof checking
+	// Required: true
+	Spoofchk bool `url:"spoofchk" json:"spoofchk" validate:"required"`
 }
 
 // SetVFsNumber sets number of VFs for individual NIC on node

pkg/cloudbroker/sep/update_capacity_limit.go

@@ -1,38 +0,0 @@
-package sep
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// UpdateCapacityLimitRequest struct to update capacity limits
-type UpdateCapacityLimitRequest struct {
-	// Storage endpoint provider ID
-	// Required: true
-	SEPID uint64 `url:"sep_id" json:"sep_id" validate:"required"`
-}
-
-// UpdateCapacityLimit updates SEP capacity limit
-func (s SEP) UpdateCapacityLimit(ctx context.Context, req UpdateCapacityLimitRequest) (uint64, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudbroker/sep/updateCapacityLimit"
-
-	res, err := s.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	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/vgpu/list.go

@@ -30,6 +30,10 @@ type ListRequest struct {
 	// Required: false
 	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
 
+	// Find by id node
+	// Required: false
+	NID uint64 `url:"nid,omitempty" json:"nid,omitempty"`
+
 	// Find by account id
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`

pkg/cloudbroker/vins/models.go

@@ -235,22 +235,13 @@ type VNFDev struct {
 
 	//List of VINS IDs
 	VINS []uint64 `json:"vins"`
+
+	// VNC password
+	VNCPassword string `json:"vncPasswd"`
 }
 
 // Main information about reservation
 type ItemReservation struct {
-	// Client type
-	ClientType string `json:"clientType"`
-
-	// Description
-	Description string `json:"desc"`
-
-	// Domain name
-	DomainName string `json:"domainname"`
-
-	// Hostname
-	Hostname string `json:"hostname"`
-
 	// IP
 	IP string `json:"ip"`
 

pkg/cloudbroker/vins/static_route_add.go

@@ -25,10 +25,6 @@ type StaticRouteAddRequest struct {
 	// Next hop host, IP address from ViNS ID free IP pool
 	// Required: true
 	Gateway string `url:"gateway" json:"gateway" validate:"required"`
-
-	// List of Compute IDs which have access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
 }
 
 // StaticRouteAdd adds new static route to ViNS