main v1.10.0
parent 88eb9e8898
commit e04dc42d2b

1
.gitignore vendored

@ -6,4 +6,5 @@ cmd/
tests/platform_upgrade/.env
tests/platform_upgrade/input.json
tests/platform_upgrade/*.txt
tests/platform_upgrade/*.log
*.env

@ -1,14 +1,64 @@
## Version 1.9.2
## Version 1.10.0
### Добавлено
#### kvmvm
#### compute
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-196 | Опциональное поле `MTU` в структуре `CreateRequest/Interface` в cloudapi/kvmvm и cloudbroker/kvmvm |
| BGOS-204 | Вычисляемое поле `VNCPassword` в моделях `RecordCompute` в cloudapi/compute и cloudbroker/compute |
| BGOS-204 | Опциональное поле `CDImageID` в структуре `ListRequest` в cloudbroker/compute |
| BGOS-211 | Вычисляемое поле `AutoStart` в моделях `RecordCompute, ItemCompute, InfoCompute` в cloudapi/compute и cloudbroker/compute |
| BGOS-211 | Опциональное поле `AutoStart` в структурах `PinToStackRequest, UpdateRequest` в cloudapi/compute и cloudbroker/compute |
#### extnet
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-204 | Вычисляемое поле `AccountID` в модели `ItemReservation` в cloudapi/extnet и cloudbroker/extnet |
| BGOS-205 | Методы API `cloudbroker/extnet/addReservedIp, cloudbroker/extnet/getReservedIp, cloudapi/extnet/getReservedIp, cloudbroker/extnet/delReservedIp` в cloudapi/extnet и cloudbroker/extnet |
#### image
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-214 | Вычисляемое поле `SnapshotID` в модели `RecordImage, ItemImage` в cloudbroker/image |
#### node
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-204 | Обязательное поле `Spoofchk` в структуре `SetVFsNumberRequest` в cloudbroker/node |
| BGOS-213 | Вычисляемое поле `NetAddr` в модели `RecordNode` в cloudbroker/node |
#### vgpu
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-204 | Опциональное поле `NID` в структуре `ListRequest` в cloudbroker/vgpu |
#### vins
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-204 | Вычисляемое поле `VNCPassword` в модели `RecordVNFDev` в cloudapi/vins и cloudbroker/vins |
| BGOS-204 | Вычисляемое поле `AccoundID` в модели `ItemReservation` в cloudapi/vins |
### Удалено
#### disks
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-206 | Метод `Resize` в cloudapi/disks и cloudbroker/disks |
#### sep
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-206 | Метод `UpdateCapacityLimit` cloudbroker/sep |
#### vins
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-204 | Вычисляемые поля `ClientType,Description,DomainName,Hostname` в модели `ItemReservation` в cloudapi/vins и cloudbroker/vins |
| BGOS-204 | Вычисляемое поле `СomputeIds` в структуре `StaticRouteAddRequest` в cloudapi/vins и cloudbroker/vins |
### Исправлено
#### compute
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-197 | Readme-файл `README_EN.md` |
| BATF-215 | Изменены возвращаемые параметры метода `PinToStack` на `bool,error` в cloudapi/compute |

@ -14,6 +14,7 @@ Decort SDK - это библиотека, написанная на языке G
- Версия 1.7.х Decort-SDK соответствует 3.8.9 версии платформы
- Версия 1.8.х Decort-SDK соответствует 4.0.0 версии платформы
- Версия 1.9.х Decort-SDK соответствует 4.1.0 версии платформы
- Версия 1.10.х Decort-SDK соответствует 4.2.0 версии платформы
## Оглавление

@ -374,7 +374,6 @@ func urlValidartor(fl validator.FieldLevel) bool {
func chipsetValidator(fe validator.FieldLevel) bool {
fieldValue := fe.Field().String()
fieldValue = strings.ToLower(fieldValue)
return IsInSlice(fieldValue, chipsetValues)
}

@ -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 {

@ -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"`

@ -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

@ -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

@ -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.

@ -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
}

@ -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"`
}

@ -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"`

@ -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

@ -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"`

@ -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

@ -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

@ -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

@ -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.

@ -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
}

@ -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
}

@ -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
}

@ -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"`
}

@ -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 {

@ -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"`

@ -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"`
}

@ -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

@ -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
}

@ -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"`

@ -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"`

@ -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

@ -20,6 +20,7 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/tasks"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
node_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/node"
account_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account"
audit_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/audit"
@ -563,6 +564,26 @@ func TestGetListCloudbroker(t *testing.T) {
t.Errorf("Can not test LB get because LB list is empty")
}
// Node
// List
bytes, err = client.CloudBroker().Node().ListRaw(context.Background(), node_cb.ListRequest{})
if err != nil {
t.Error(err)
}
testLogs = append(testLogs, getResult("Node list", bytes, node_cb.ListNodes{}, t))
// Get
listNode, _ := client.CloudBroker().Node().List(context.Background(), node_cb.ListRequest{})
if len(listLB.Data) > 0 {
id := listNode.Data[0].ID
bytes, err = client.CloudBroker().Node().GetRaw(context.Background(), node_cb.GetRequest{NID: id})
if err != nil {
t.Error(err)
}
testLogs = append(testLogs, getResult("Node get", bytes, node_cb.RecordNode{}, t))
} else {
t.Errorf("Can not test Node get because LB list is empty")
}
// Pcidevice
// List
bytes, err = client.CloudBroker().PCIDevice().ListRaw(context.Background(), pcidevice_cb.ListRequest{})
@ -684,10 +705,19 @@ func TestGetAllPaths(t *testing.T) {
decortUrls := readUrlFromDir("../../pkg", len(jsonUrls))
result := getMissingDecortUrls(jsonUrls, decortUrls)
if len(result) > 0 {
errorText := fmt.Sprintf("Below API handlers (%d in total) need to be added to decort-sdk:\n", len(result))
for _, r := range result {
missingUrls := getMissingDecortUrls(jsonUrls, decortUrls)
if len(missingUrls) > 0 {
errorText := fmt.Sprintf("Below API handlers (%d in total) need to be added to decort-sdk:\n", len(missingUrls))
for _, r := range missingUrls {
errorText += fmt.Sprintln(r)
}
t.Errorf(errorText)
}
deprecatedUrls := getDeprecatedDecortUrls(jsonUrls, decortUrls)
if len(deprecatedUrls) > 0 {
errorText := fmt.Sprintf("Below API handlers (%d in total) need to be delete to decort-sdk:\n", len(deprecatedUrls))
for _, r := range deprecatedUrls {
errorText += fmt.Sprintln(r)
}
t.Errorf(errorText)

@ -2,9 +2,11 @@ package test
import (
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/audit"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/dpdknet"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/flipgroup"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
@ -27,6 +29,7 @@ import (
backup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/backup"
compute_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/compute"
disks_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/disks"
dpdknet_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/dpdknet"
extnet_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/extnet"
flipgroup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/flipgroup"
grid_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/grid"
@ -78,6 +81,9 @@ func getRequestsMapCloudAPI() map[string]interface{} {
"/restmachine/cloudapi/account/update": account.UpdateRequest{},
"/restmachine/cloudapi/account/updateUser": account.UpdateUserRequest{},
//audit
"/restmachine/cloudapi/audit/get": audit.GetRequest{},
//bservice
"/restmachine/cloudapi/bservice/create": bservice.CreateRequest{},
"/restmachine/cloudapi/bservice/delete": bservice.DeleteRequest{},
@ -107,7 +113,6 @@ func getRequestsMapCloudAPI() map[string]interface{} {
"/restmachine/cloudapi/bservice/stop": bservice.StopRequest{},
// compute
"/restmachine/cloudapi/compute/affinityGroupCheckStart": compute.AffinityGroupCheckStartRequest{},
"/restmachine/cloudapi/compute/affinityLabelRemove": compute.AffinityLabelRemoveRequest{},
"/restmachine/cloudapi/compute/affinityLabelSet": compute.AffinityLabelSetRequest{},
"/restmachine/cloudapi/compute/affinityRelations": compute.AffinityRelationsRequest{},
@ -203,7 +208,6 @@ func getRequestsMapCloudAPI() map[string]interface{} {
"/restmachine/cloudapi/disks/replicationStatus": disks.ReplicationStatusRequest{},
"/restmachine/cloudapi/disks/replicationStop": disks.ReplicationStopRequest{},
"/restmachine/cloudapi/disks/replicationSuspend": disks.ReplicationSuspendRequest{},
"/restmachine/cloudapi/disks/resize": disks.ResizeRequest{},
"/restmachine/cloudapi/disks/resize2": disks.ResizeRequest{},
"/restmachine/cloudapi/disks/restore": disks.RestoreRequest{},
"/restmachine/cloudapi/disks/search": disks.SearchRequest{},
@ -212,9 +216,14 @@ func getRequestsMapCloudAPI() map[string]interface{} {
"/restmachine/cloudapi/disks/snapshotRollback": disks.SnapshotRollbackRequest{},
"/restmachine/cloudapi/disks/unshare": disks.UnshareRequest{},
//dpdknet
"/restmachine/cloudapi/dpdknet/get": dpdknet.GetRequest{},
"/restmachine/cloudapi/dpdknet/list": dpdknet.ListRequest{},
// extnet
"/restmachine/cloudapi/extnet/get": extnet.GetRequest{},
"/restmachine/cloudapi/extnet/getDefault": EmptyStruct{},
"/restmachine/cloudapi/extnet/getReservedIp": extnet.GetReservedIP{},
"/restmachine/cloudapi/extnet/list": extnet.ListRequest{},
"/restmachine/cloudapi/extnet/listComputes": extnet.ListComputesRequest{},
@ -374,8 +383,6 @@ func getRequestsMapCloudAPI() map[string]interface{} {
"/restmachine/cloudapi/vins/natRuleList": vins.NATRuleListRequest{},
"/restmachine/cloudapi/vins/restore": vins.RestoreRequest{},
"/restmachine/cloudapi/vins/search": vins.SearchRequest{},
"/restmachine/cloudapi/vins/staticRouteAccessGrant": vins.StaticRouteAccessGrantRequest{},
"/restmachine/cloudapi/vins/staticRouteAccessRevoke": vins.StaticRouteAccessRevokeRequest{},
"/restmachine/cloudapi/vins/staticRouteAdd": vins.StaticRouteAddRequest{},
"/restmachine/cloudapi/vins/staticRouteDel": vins.StaticRouteDelRequest{},
"/restmachine/cloudapi/vins/staticRouteList": vins.StaticRouteListRequest{},
@ -576,12 +583,23 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/disks/snapshotRollback": disks_cb.SnapshotRollbackRequest{},
"/restmachine/cloudbroker/disks/unshare": disks_cb.UnshareRequest{},
// dpdknet
"/restmachine/cloudbroker/dpdknet/get": dpdknet_cb.GetRequest{},
"/restmachine/cloudbroker/dpdknet/list": dpdknet_cb.ListRequest{},
"/restmachine/cloudbroker/dpdknet/disable": dpdknet_cb.DisableRequest{},
"/restmachine/cloudbroker/dpdknet/enable": dpdknet_cb.EnableRequest{},
"/restmachine/cloudbroker/dpdknet/create": dpdknet_cb.CreateRequest{},
"/restmachine/cloudbroker/dpdknet/update": dpdknet_cb.UpdateRequest{},
"/restmachine/cloudbroker/dpdknet/delete": dpdknet_cb.DeleteRequest{},
// extnet
"/restmachine/cloudbroker/extnet/accessAdd": extnet_cb.AccessAddRequest{},
"/restmachine/cloudbroker/extnet/accessRemove": extnet_cb.AccessRemoveRequest{},
"/restmachine/cloudbroker/extnet/addReservedIp": extnet_cb.AddReserveIPRequest{},
"/restmachine/cloudbroker/extnet/create": extnet_cb.CreateRequest{},
"/restmachine/cloudbroker/extnet/dnsApply": extnet_cb.DNSApplyRequest{},
"/restmachine/cloudbroker/extnet/defaultQosUpdate": extnet_cb.DefaultQOSUpdateRequest{},
"/restmachine/cloudbroker/extnet/delReservedIp": extnet_cb.DelReserveIPRequest{},
"/restmachine/cloudbroker/extnet/destroy": extnet_cb.DestroyRequest{},
"/restmachine/cloudbroker/extnet/deviceDeploy": extnet_cb.DeviceDeployRequest{},
"/restmachine/cloudbroker/extnet/deviceMigrate": extnet_cb.DeviceMigrateRequest{},
@ -591,6 +609,7 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/extnet/enable": extnet_cb.EnableRequest{},
"/restmachine/cloudbroker/extnet/get": extnet_cb.GetRequest{},
"/restmachine/cloudbroker/extnet/getDefault": EmptyStruct{},
"/restmachine/cloudbroker/extnet/getReservedIp": extnet.GetReservedIP{},
"/restmachine/cloudbroker/extnet/ipsExclude": extnet_cb.IPsExcludeRequest{},
"/restmachine/cloudbroker/extnet/ipsExcludeRange": extnet_cb.IPsExcludeRangeRequest{},
"/restmachine/cloudbroker/extnet/ipsInclude": extnet_cb.IPsExcludeRequest{},
@ -817,7 +836,6 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/sep/getConfig": sep_cb.GetConfigRequest{},
"/restmachine/cloudbroker/sep/getPool": sep_cb.GetPoolRequest{},
"/restmachine/cloudbroker/sep/list": sep_cb.ListRequest{},
"/restmachine/cloudbroker/sep/updateCapacityLimit": sep_cb.UpdateCapacityLimitRequest{},
// stack
"/restmachine/cloudbroker/stack/get": stack_cb.GetRequest{},

@ -1,31 +0,0 @@
[
"Account list: OK",
"Account get: OK",
"",
"Bservice get: OK",
"Compute list: \nPlatform has these fields that golang struct doesn't: [lb mgmt_target mgmt_mac mgmt_slot]\n",
"Compute get: \nPlatform has these fields that golang struct doesn't: [mgmt_target mgmt_mac mgmt_slot lb]\n",
"Disk list: OK",
"Disk get: OK",
"",
"ExtNet get: OK",
"FLIPGroup list: OK",
"",
"",
"Image get: \nPlatform has these fields that golang struct doesn't: [12]\n",
"K8CI list: OK",
"",
"K8S list: OK",
"K8S get: OK",
"LB list: \nPlatform has these fields that golang struct doesn't: [fs.inotify.max_queued_events kernel.kptr_restrict net.ipv4.tcp_congestion_control]\n",
"LB get: \nPlatform has these fields that golang struct doesn't: [kernel.kptr_restrict net.ipv4.tcp_congestion_control fs.inotify.max_queued_events]\n",
"Locations list: OK",
"RG list: OK",
"",
"Sizes list: OK",
"",
"Tasks list: \nPlatform has these fields that golang struct doesn't: [completed guid stage updateTime updatedTime auditId error log status]\n",
"Tasks get: \nPlatform has these fields that golang struct doesn't: [updatedTime completed error updateTime auditId stage status log]\n",
"",
"VINS get: OK"
]

@ -1,34 +0,0 @@
[
"Account list: OK",
"Account get: OK",
"",
"Audit get: OK",
"Compute list: \nPlatform has these fields that golang struct doesn't: [disks]\n",
"Compute get: OK",
"Disk list: \nPlatform has these fields that golang struct doesn't: [machineId machineName sepType devicename]\n",
"Disk get: \nPlatform has these fields that golang struct doesn't: [devicename sepType updatedBy]\n",
"ExtNet list: OK",
"ExtNet get: OK",
"FLIPGroup list: OK",
"",
"Grid list: \nPlatform has these fields that golang struct doesn't: [1 90 380 1 90 380]\n",
"Grid get: OK",
"Image list: OK",
"Image get: OK",
"K8CI list: \nPlatform has these fields that golang struct doesn't: [createdTime]\n",
"K8CI get: OK",
"K8S list: OK",
"K8S get: OK",
"LB list: OK",
"LB get: OK",
"Pcidevice list: OK",
"RG list: OK",
"RG get: OK",
"SEP list: \nPlatform has these fields that golang struct doesn't: [protocol disk_max_size format name name_prefix pools]\n",
"SEP get: \nPlatform has these fields that golang struct doesn't: [format name name_prefix pools protocol disk_max_size]\n",
"Stack list: OK",
"Stack get: OK",
"Tasks list: \nPlatform has these fields that golang struct doesn't: [stage status error log auditId completed updateTime guid]\n",
"",
"VINS get: \nPlatform has these fields that golang struct doesn't: [computes config config config]\n"
]

@ -1,14 +0,0 @@
[
"Path /cloudapi/compute/antiAffinityRuleAdd has following errors: [Field value has different required parameters on the platform and in golang structure]",
"Path /cloudapi/user/setData has following errors: [Field data has different required parameters on the platform and in golang structure]",
"Path /cloudapi/compute/affinityRuleRemove has following errors: [Field value has different required parameters on the platform and in golang structure]",
"Path /cloudapi/compute/createTemplate has following errors: [Platform (3) and golang structure (2) have different amount of fields. Platform has field asyncMode that golang structure doesn't]",
"Path /cloudapi/k8s/create has following errors: [Field oidcCertificate has different type parameters on the platform and in golang structure]",
"Path /cloudapi/disks/fromPlatformDisk has following errors: [Platform (14) and golang structure (13) have different amount of fields. Field drivers has different type parameters on the platform and in golang structure Platform has field asyncMode that golang structure doesn't]",
"Path /cloudapi/compute/affinityRuleAdd has following errors: [Field value has different required parameters on the platform and in golang structure]",
"Path /cloudapi/compute/antiAffinityRuleRemove has following errors: [Field value has different required parameters on the platform and in golang structure]",
"Path /cloudapi/compute/createTemplateFromBlank has following errors: [Platform (11) and golang structure (10) have different amount of fields. Platform has field asyncMode that golang structure doesn't]",
"Path /cloudapi/lb/create has following errors: [Field extnetId has different required parameters on the platform and in golang structure Field vinsId has different required parameters on the platform and in golang structure]",
"Path /cloudapi/image/list has following errors: [Field size has different type parameters on the platform and in golang structure]",
"Path /cloudapi/compute/snapshotDelete has following errors: [Platform (3) and golang structure (2) have different amount of fields. Platform has field asyncMode that golang structure doesn't]"
]

@ -1 +0,0 @@
["Path /cloudbroker/compute/createTemplate has following errors: [Platform (4) and golang structure (3) have different amount of fields. Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/backup/createDisksBackup has following errors: [Platform (3) and golang structure (2) have different amount of fields. Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/compute/affinityRuleAdd has following errors: [Field value has different required parameters on the platform and in golang structure]","Path /cloudbroker/apiaccess/update has following errors: [Platform has field apis that golang structure doesn't]","Path /cloudbroker/compute/antiAffinityRuleRemove has following errors: [Field value has different required parameters on the platform and in golang structure]","Path /cloudbroker/compute/snapshotDelete has following errors: [Platform (3) and golang structure (2) have different amount of fields. Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/backup/restoreDiskFromBackup has following errors: [Platform (5) and golang structure (4) have different amount of fields. Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/backup/createDiskBackup has following errors: [Platform (4) and golang structure (3) have different amount of fields. Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/compute/createTemplateFromBlank has following errors: [Platform (11) and golang structure (10) have different amount of fields. Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/account/setCpuAllocationRatio has following errors: [Field ratio has different required parameters on the platform and in golang structure]","Path /cloudbroker/disks/fromPlatformDisk has following errors: [Platform (14) and golang structure (13) have different amount of fields. Field drivers has different type parameters on the platform and in golang structure Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/lb/create has following errors: [Field extnetId has different required parameters on the platform and in golang structure Field vinsId has different required parameters on the platform and in golang structure]","Path /cloudbroker/stack/setCpuAllocationRatio has following errors: [Field ratio has different required parameters on the platform and in golang structure]","Path /cloudbroker/backup/deleteDiskBackup has following errors: [Platform (3) and golang structure (2) have different amount of fields. Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/image/updateNodes has following errors: [Field enabledStacks has different type parameters on the platform and in golang structure]","Path /cloudbroker/stack/setMemAllocationRatio has following errors: [Field ratio has different required parameters on the platform and in golang structure]","Path /cloudbroker/compute/antiAffinityRuleAdd has following errors: [Field value has different required parameters on the platform and in golang structure]","Path /cloudbroker/k8s/create has following errors: [Field oidcCertificate has different type parameters on the platform and in golang structure]","Path /cloudbroker/backup/restoreDisksFromBackup has following errors: [Platform (3) and golang structure (2) have different amount of fields. Platform has field disks that golang structure doesn't Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/node/enable has following errors: [Platform (4) and golang structure (3) have different amount of fields. Platform has field asyncMode that golang structure doesn't]","Path /cloudbroker/compute/affinityRuleRemove has following errors: [Field value has different required parameters on the platform and in golang structure]","Path /cloudbroker/image/list has following errors: [Field size has different type parameters on the platform and in golang structure]"]

@ -15,10 +15,14 @@ var DEPRECATED_GROUPS = []string{
"//cloudbroker/pgpu/",
"/cloudapi/gpu/",
"/cloudapi/portforwarding/",
"/cloudapi/account/create",
"/cloudapi/account/listVMs",
"/cloudapi/account/listCS",
"/cloudapi/account/getStats",
"/cloudapi/vgpu/list",
"/cloudapi/compute/affinityGroupCheckStart",
"/cloudapi/vins/staticRouteAccessGrant",
"/cloudapi/vins/staticRouteAccessRevoke",
"/cloudbroker/account/listVMs",
"/cloudbroker/account/listCS",
@ -42,6 +46,9 @@ var DEPRECATED_GROUPS = []string{
"/cloudbroker/iaas/",
"/cloudbroker/diagnostics/",
"/cloudbroker/milestones/",
"/cloudbroker/compute/affinityGroupCheckStart",
"/cloudbroker/vins/staticRouteAccessGrant",
"/cloudbroker/vins/staticRouteAccessRevoke",
}
// getUrlsFromBytes converts bytes to array of urls strings
@ -95,6 +102,26 @@ func getMissingDecortUrls(jsonUrls, decortUrls []string) []string {
return result
}
// getMissingDecortUrls returns array of url strings that are present in json swagger docs and absent in decort-sdk handlers.
func getDeprecatedDecortUrls(jsonUrls, decortUrls []string) []string {
result := make([]string, 0, len(decortUrls))
for _, decortUrl := range decortUrls {
var found bool
for _, jsonUrl := range jsonUrls {
if jsonUrl == decortUrl {
found = true
break
}
}
if !found && validateUrlFromJson(decortUrl) {
result = append(result, decortUrl)
}
}
return result
}
// readUrlFromDir reads all url addresses from given directory and its subdirectories and subfiles and returns array of urls found. Capacity will
func readUrlFromDir(dirName string, capacity int) []string {
result := make([]string, 0, capacity)

Loading…
Cancel
Save