main v1.11.3
asteam 1 week ago
parent 0c44daa241
commit c7a2c4ed5a

@ -1,21 +1,59 @@
## Version 1.11.2 ## Version 1.11.3
### Добавлено ### Добавлено
### account
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-467 | Опциональные поля `Name` и `Reason` в структуре запроса `DeleteRequest` в cloudbroker/account |
### apiaccess
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-470 | Опциональное поле `Desc` в структуре запроса `ListRequest` в cloudbroker/apiaccess |
#### bservice #### bservice
| Идентификатор<br>задачи | Описание | | Идентификатор<br>задачи | Описание |
| --- | --- | | --- | --- |
| BGOS-366 | Метод `Get` структура запроса `GetRequest` и структура ответа `RecordBasicService` в cloudbroker/bservice | | BGOS-361 | Группа ручек `bservice` в cloudbroker/bservice |
| BGOS-366 | Метод `List` структура запроса `ListRequest` и структура ответа `ListBasicServices` в cloudbroker/bservice |
#### prometheus #### location
| Идентификатор<br>задачи | Описание | | Идентификатор<br>задачи | Описание |
| --- | --- | | --- | --- |
| BGOS-406 | Добавлена группа ручек `prometheus` в cloudapi | | BGOS-471 | Поле `SDNSupport` в возвращаемой модели `ItemLocation` в cloudbroker/location |
### Исправлено ### Исправлено
#### compute #### disks
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-468 | Исправлен тип поля `UpdatedBy` c uint64 на string в структурах ответа `ItemComputeDisk` в cloudapi/disks и `ItemDisk` в cloudbroker/disks |
#### kvmvm
| Идентификатор<br>задачи | Описание | | Идентификатор<br>задачи | Описание |
| --- | --- | | --- | --- |
| BGOS-433 | Исправлена ошибка валидации поля LoaderType для всех структур в cloudapi/compute и в cloudbroker/compute | | BGOS-433 | Исправлена ошибка валидации поля LoaderType для всех структур в cloudapi/compute и в cloudbroker/compute |
| BGOS-458 | Изменен тип параметров `CPUPin`, `HPBacked`, `AutoStart`, `HotResize` с bool на interface в структуре `UpdateRequest` cloudapi/compute и в cloudbroker/compute |
#### node
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-472 | Исправлен тип поля `NumaNode` c uint64 на int в структуре ответа `Backplane1` в cloudbroker/node |
| BGOS-428 | Поле `Message` заменено на `Reason` в структуре запроса `EnableNodesRequest` в cloudbroker/node |
### Удалено
### compute
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-469 | Опциональное поле `SepID` в структуре запроса `CreateTemplateFromBlankRequest` в cloudapi/compute и cloudbroker/compute |
### disks
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-469 | Опциональное поле `SepID` в структуре запроса `FromPlatformDiskRequest` в cloudapi/disks и cloudbroker/disks |
#### rg
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-427 | Поле `RegisterComputes` в структурах ответа `RecordResourceGroup`, `ItemResourceGroup` в cloudapi/rg и `ItemRG` в cloudbroker/rg |

@ -74,7 +74,7 @@ type GroupAddRequest struct {
//Chipset "i440fx" or "Q35 //Chipset "i440fx" or "Q35
//Required: false //Required: false
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset,omitempty"`
} }
// GetRAM returns RAM field values // GetRAM returns RAM field values

@ -39,10 +39,6 @@ type CreateTemplateFromBlankRequest struct {
// Required: false // Required: false
AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"` AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
// SEP ID
// Required: false
SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
// Pool for image create // Pool for image create
// Required: false // Required: false
PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"` PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"`

@ -775,7 +775,7 @@ type ItemComputeDisk struct {
Type string `json:"type"` Type string `json:"type"`
// Updated by // Updated by
UpdatedBy uint64 `json:"updatedBy"` UpdatedBy string `json:"updatedBy"`
// Virtual machine ID // Virtual machine ID
VMID uint64 `json:"vmid"` VMID uint64 `json:"vmid"`

@ -30,24 +30,21 @@ type UpdateRequest struct {
// Default: none // Default: none
NumaAffinity string `url:"numaAffinity,omitempty" json:"numaAffinity,omitempty" validate:"omitempty,numaAffinity"` NumaAffinity string `url:"numaAffinity,omitempty" json:"numaAffinity,omitempty" validate:"omitempty,numaAffinity"`
// Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node // Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node, true or false
// Required: false // Required: false
// Default: false CPUPin interface{} `url:"cpupin,omitempty" json:"cpupin,omitempty" validate:"omitempty,isBool"`
CPUPin bool `url:"cpupin" json:"cpupin"`
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
// Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node // Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node, true or false
// Required: false // Required: false
// Default: false HPBacked interface{} `url:"hpBacked,omitempty" json:"hpBacked,omitempty" validate:"omitempty,isBool"`
HPBacked bool `url:"hpBacked" json:"hpBacked"`
// Auto start when node restarted // Auto start when node restarted, true or false
// Required: false // Required: false
// Default: false AutoStart interface{} `url:"autoStart,omitempty" json:"autoStart,omitempty" validate:"omitempty,isBool"`
AutoStart bool `url:"autoStart" json:"autoStart"`
// Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False // Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
// Required: false // Required: false
@ -65,9 +62,9 @@ type UpdateRequest struct {
// Required: false // Required: false
NetworkInterfaceNaming string `url:"networkInterfaceNaming,omitempty" json:"networkInterfaceNaming,omitempty" validate:"omitempty,networkInterfaceNaming"` NetworkInterfaceNaming string `url:"networkInterfaceNaming,omitempty" json:"networkInterfaceNaming,omitempty" validate:"omitempty,networkInterfaceNaming"`
// Does this machine supports hot resize // Does this machine supports hot resize, true or false
// Required: false // Required: false
HotResize bool `url:"hotResize,omitempty" json:"hotResize,omitempty"` HotResize interface{} `url:"hotResize,omitempty" json:"hotResize,omitempty" validate:"omitempty,isBool"`
} }
// Update updates some properties of the compute // Update updates some properties of the compute

@ -45,10 +45,6 @@ type FromPlatformDiskRequest struct {
// Required: false // Required: false
AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"` AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
// SEP ID
// Required: false
SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
// Pool for image create // Pool for image create
// Required: false // Required: false
PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"` PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"`

@ -28,6 +28,9 @@ type ItemLocation struct {
// CKey // CKey
CKey string `json:"_ckey"` CKey string `json:"_ckey"`
// Support of SDN
SDNSupport bool `json:"sdn_support"`
} }
// List of locations // List of locations

@ -30,7 +30,6 @@ var rgs = ListResourceGroups{
LockStatus: "UNLOCKED", LockStatus: "UNLOCKED",
Milestones: 363459, Milestones: 363459,
Name: "rg_1", Name: "rg_1",
RegisterComputes: false,
ResourceLimits: ResourceLimits{ ResourceLimits: ResourceLimits{
CUC: -1, CUC: -1,
CUI: -1, CUI: -1,
@ -73,7 +72,6 @@ var rgs = ListResourceGroups{
LockStatus: "UNLOCKED", LockStatus: "UNLOCKED",
Milestones: 363468, Milestones: 363468,
Name: "rg_2", Name: "rg_2",
RegisterComputes: false,
ResourceLimits: ResourceLimits{ ResourceLimits: ResourceLimits{
CUC: -1, CUC: -1,
CUI: -1, CUI: -1,
@ -116,7 +114,6 @@ var rgs = ListResourceGroups{
LockStatus: "kjLOCKED", LockStatus: "kjLOCKED",
Milestones: 363471, Milestones: 363471,
Name: "rg_3", Name: "rg_3",
RegisterComputes: false,
ResourceLimits: ResourceLimits{ ResourceLimits: ResourceLimits{
CUC: -1, CUC: -1,
CUI: -1, CUI: -1,

@ -128,9 +128,6 @@ type RecordResourceGroup struct {
// Name // Name
Name string `json:"name"` Name string `json:"name"`
// RegisterComputes
RegisterComputes bool `json:"registerComputes"`
// Resource limits // Resource limits
ResourceLimits ResourceLimits `json:"resourceLimits"` ResourceLimits ResourceLimits `json:"resourceLimits"`
@ -224,9 +221,6 @@ type ItemResourceGroup struct {
// Name // Name
Name string `json:"name"` Name string `json:"name"`
// RegisterComputes
RegisterComputes bool `json:"registerComputes"`
// Resource limits // Resource limits
ResourceLimits ResourceLimits `json:"resourceLimits"` ResourceLimits ResourceLimits `json:"resourceLimits"`

@ -16,6 +16,14 @@ type DeleteRequest struct {
// Whether to completely delete the account // Whether to completely delete the account
// Required: false // Required: false
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"` Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
// Name of account
// Required: false
Name string `url:"name,omitempty" json:"name,omitempty"`
// Reason of deleting
// Required: false
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
} }
// Delete completes delete an account from the system Returns true if account is deleted or was already deleted or never existed // Delete completes delete an account from the system Returns true if account is deleted or was already deleted or never existed

@ -21,9 +21,7 @@ type APIFindRequest struct {
//API endpoint to find (delete, create, etc) //API endpoint to find (delete, create, etc)
//Required: true //Required: true
APIMethod string `url:"api_method" json:"api_method" valudate:"required"` APIMethod string `url:"api_method" json:"api_method" validate:"required"`
} }
// APIFind outputs a list of apiaccess groups that mention the specified API function. // APIFind outputs a list of apiaccess groups that mention the specified API function.

@ -22,6 +22,9 @@ type ListRequest struct {
// Required: false // Required: false
Status string `url:"status,omitempty" json:"status,omitempty"` Status string `url:"status,omitempty" json:"status,omitempty"`
// Find by description
// Required: false
Desc string `url:"desc,omitempty" json:"desc,omitempty"`
// Find by created after time (unix timestamp) // Find by created after time (unix timestamp)
// Required: false // Required: false

@ -0,0 +1,50 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// CreateRequest struct for BasicService
type CreateRequest struct {
// Name of the service
// Required: true
Name string `url:"name" json:"name" validate:"required"`
// ID of the Resource Group where this service will be placed
// Required: true
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
// Name of the user to deploy SSH key for. Pass empty string if no SSH key deployment is required
// Required: false
SSHUser string `url:"sshUser,omitempty" json:"sshUser,omitempty"`
// SSH key to deploy for the specified user. Same key will be deployed to all computes of the service
// Required: false
SSHKey string `url:"sshKey,omitempty" json:"sshKey,omitempty"`
}
// Create creates blank BasicService instance
func (b BService) Create(ctx context.Context, req CreateRequest) (uint64, error) {
err := validators.ValidateRequest(req)
if err != nil {
return 0, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/create"
res, err := b.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
}

@ -0,0 +1,42 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// DeleteRequest struct to delete basic service
type DeleteRequest struct {
// ID of the BasicService to be delete
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// If set to False, Basic service will be deleted to recycle bin. Otherwise destroyed immediately
// Required: true
Permanently bool `url:"permanently" json:"permanently"`
}
// Delete deletes BasicService instance
func (b BService) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/delete"
res, err := b.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,40 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// DisableRequest struct for disable service
type DisableRequest struct {
// ID of the service to disable
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
}
// Disable disables service.
// Disabling a service technically means setting model status
// of all computes and service itself to DISABLED and stopping all computes.
func (b BService) Disable(ctx context.Context, req DisableRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/disable"
res, err := b.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,41 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// EnableRequest struct to disable service
type EnableRequest struct {
// ID of the service to enable
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
}
// Enable enables service.
// Enabling a service technically means setting model status of
// all computes and service itself to ENABLED.
// It does not start computes.
func (b BService) Enable(ctx context.Context, req EnableRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/enable"
res, err := b.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,112 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupAddRequest struct to create new compute group within BasicService
type GroupAddRequest struct {
// ID of the Basic Service to add a group to
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// Name of the Compute Group to add
// Required: true
Name string `url:"name" json:"name" validate:"required"`
// Computes number. Defines how many computes must be there in the group
// Required: true
Count uint64 `url:"count" json:"count" validate:"required"`
// Compute CPU number. All computes in the group have the same CPU count
// Required: true
CPU uint64 `url:"cpu" json:"cpu" validate:"required"`
// Compute RAM volume in MB. All computes in the group have the same RAM volume
// Required: true
RAM uint64 `url:"ram" json:"ram" validate:"required"`
// Compute boot disk size in GB
// Required: true
Disk uint64 `url:"disk" json:"disk" validate:"required"`
// OS image ID to create computes from
// Required: true
ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
// Compute driver
// should be one of:
// - KVM_X86
// Required: true
Driver string `url:"driver" json:"driver" validate:"driver"`
// Storage endpoint provider ID
// Required: false
SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
// Pool to use if sepId is set, can be also empty if needed to be chosen by system
// Required: false
SEPPool string `url:"sepPool,omitempty" json:"sepPool,omitempty"`
// Group role tag. Can be empty string, does not have to be unique
// Required: false
Role string `url:"role,omitempty" json:"role,omitempty"`
// List of ViNSes to connect computes to
// Required: false
VINSes []uint64 `url:"vinses,omitempty" json:"vinses,omitempty"`
// List of external networks to connect computes to
// Required: false
ExtNets []uint64 `url:"extnets,omitempty" json:"extnets,omitempty"`
// Time of Compute Group readiness
// Required: false
TimeoutStart uint64 `url:"timeoutStart,omitempty" json:"timeoutStart,omitempty"`
// Meta data for working group computes, format YAML "user_data": 1111
// Required: false
UserData string `url:"userData,omitempty" json:"userData,omitempty"`
//Chipset "i440fx" or "Q35
//Required: false
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset"`
}
// GetRAM returns RAM field values
func (r GroupAddRequest) GetRAM() map[string]uint64 {
res := make(map[string]uint64, 1)
res["RAM"] = r.RAM
return res
}
// GroupAdd creates new Compute Group within BasicService.
// Compute Group is NOT started automatically,
// so you need to explicitly start it
func (b BService) GroupAdd(ctx context.Context, req GroupAddRequest) (uint64, error) {
err := validators.ValidateRequest(req)
if err != nil {
return 0, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupAdd"
res, err := b.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
}

@ -0,0 +1,46 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupComputeRemoveRequest struct to remove group compute
type GroupComputeRemoveRequest struct {
// ID of the Basic Service
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute GROUP
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
// ID of the Compute
// Required: true
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
}
// GroupComputeRemove makes group compute remove of the Basic Service
func (b BService) GroupComputeRemove(ctx context.Context, req GroupComputeRemoveRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupComputeRemove"
res, err := b.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,44 @@
package bservice
import (
"context"
"encoding/json"
"net/http"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupGetRequest struct to get detailed information about Compute Group
type GroupGetRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
}
// GroupGet gets detailed specifications for the Compute Group
func (b BService) GroupGet(ctx context.Context, req GroupGetRequest) (*RecordGroup, error) {
err := validators.ValidateRequest(req)
if err != nil {
return nil, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupGet"
res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil {
return nil, err
}
info := RecordGroup{}
err = json.Unmarshal(res, &info)
if err != nil {
return nil, err
}
return &info, nil
}

@ -0,0 +1,48 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupParentRemoveRequest struct to remove parent Compute Group
// relation from the specified Compute Group
type GroupParentRemoveRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
// ID of the parent Compute Group
// to remove from the current Compute Group
// Required: true
ParentID uint64 `url:"parentId" json:"parentId" validate:"required"`
}
// GroupParentRemove removes parent Compute Group relation to the specified Compute Group
func (b BService) GroupParentRemove(ctx context.Context, req GroupParentRemoveRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupParentRemove"
res, err := b.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,46 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupParentAddRequest struct to add parent Compute Group relation to the specified Compute Group
type GroupParentAddRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
// ID of the parent Compute Group to register with the current Compute Group
// Required: true
ParentID uint64 `url:"parentId" json:"parentId" validate:"required"`
}
// GroupParentAdd add parent Compute Group relation to the specified Compute Group
func (b BService) GroupParentAdd(ctx context.Context, req GroupParentAddRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupParentAdd"
res, err := b.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,43 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupRemoveRequest struct for destroy the specified Compute Group
type GroupRemoveRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
}
// GroupRemove destroy the specified Compute Group
func (b BService) GroupRemove(ctx context.Context, req GroupRemoveRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupRemove"
res, err := b.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,59 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupResizeRequest struct to resize the group
type GroupResizeRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group to resize
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
// Either delta or absolute value of computes
// Required: true
Count int64 `url:"count" json:"count" validate:"required"`
//Chipset for new computes, either i440fx or Q35 (i440fx by default)
//Available values : i440fx, Q35
//Default value : i440fx
//Required: true
Chipset string `url:"chipset" json:"chipset" validate:"required,chipset"`
// Either delta or absolute value of computes
// Should be one of:
// - ABSOLUTE
// - RELATIVE
// Required: true
Mode string `url:"mode" json:"mode" validate:"bserviceMode"`
}
// GroupResize resize the group by changing the number of computes
func (b BService) GroupResize(ctx context.Context, req GroupResizeRequest) (uint64, error) {
err := validators.ValidateRequest(req)
if err != nil {
return 0, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupResize"
res, err := b.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
}

@ -0,0 +1,42 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupStartRequest struct to start the specified Compute Group
type GroupStartRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group to start
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
}
// GroupStart starts the specified Compute Group within BasicService
func (b BService) GroupStart(ctx context.Context, req GroupStartRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupStart"
res, err := b.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,46 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupStopRequest struct to stop the specified Compute Group
type GroupStopRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group to stop
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
// Force stop Compute Group
// Required: false
Force bool `url:"force,omitempty" json:"force,omitempty"`
}
// GroupStop stops the specified Compute Group within BasicService
func (b BService) GroupStop(ctx context.Context, req GroupStopRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupStop"
res, err := b.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,76 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupUpdateRequest struct to update existing Compute group
type GroupUpdateRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
// Specify non-empty string to update Compute Group name
// Required: false
Name string `url:"name,omitempty" json:"name,omitempty"`
// Specify non-empty string to update group role
// Required: false
Role string `url:"role,omitempty" json:"role,omitempty"`
// Specify positive value to set new compute CPU count
// Required: false
CPU uint64 `url:"cpu,omitempty" json:"cpu,omitempty"`
// Specify positive value to set new compute RAM volume in MB
// Required: false
RAM uint64 `url:"ram,omitempty" json:"ram,omitempty"`
// Specify new compute boot disk size in GB
// Required: false
Disk uint64 `url:"disk,omitempty" json:"disk,omitempty"`
// Force resize Compute Group
// Required: false
Force bool `url:"force,omitempty" json:"force,omitempty"`
}
// GetRAM returns RAM field values
func (r GroupUpdateRequest) GetRAM() map[string]uint64 {
res := make(map[string]uint64, 1)
res["RAM"] = r.RAM
return res
}
// GroupUpdate updates existing Compute group within Basic Service and apply new settings to its computes as necessary
func (b BService) GroupUpdate(ctx context.Context, req GroupUpdateRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupUpdate"
res, err := b.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,46 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupUpdateExtNetRequest struct to update External Network settings
type GroupUpdateExtNetRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
// List of Extnets to connect computes
// Required: false
ExtNets []uint64 `url:"extnets,omitempty" json:"extnets,omitempty"`
}
// GroupUpdateExtNet updates External Network settings for the group according to the new list
func (b BService) GroupUpdateExtNet(ctx context.Context, req GroupUpdateExtNetRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupUpdateExtnet"
res, err := b.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,46 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GroupUpdateVINSRequest struct to update VINS settings
type GroupUpdateVINSRequest struct {
// ID of the Basic Service of Compute Group
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// ID of the Compute Group
// Required: true
CompGroupID uint64 `url:"compgroupId" json:"compgroupId" validate:"required"`
// List of ViNSes to connect computes
// Required: false
VINSes []uint64 `url:"vinses,omitempty" json:"vinses,omitempty"`
}
// GroupUpdateVINS update ViNS settings for the group according to the new list
func (b BService) GroupUpdateVINS(ctx context.Context, req GroupUpdateVINSRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/groupUpdateVins"
res, err := b.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,56 @@
package bservice
import (
"context"
"encoding/json"
"net/http"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// ListDeletedRequest struct to get list of deleted BasicService instances
type ListDeletedRequest struct {
// ID of the account to query for BasicService instances
// Required: false
AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
// ID of the resource group to query for BasicService instances
// Required: false
RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
// Sort by one of supported fields, format +|-(field)
// Required: false
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
// Page number
// Required: false
Page uint64 `url:"page,omitempty" json:"page,omitempty"`
// Page size
// Required: false
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
}
// ListDeleted gets list of deleted BasicService instances associated with the specified Resource Group
func (b BService) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListBasicServices, error) {
if err := validators.ValidateRequest(req); err != nil {
return nil, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/listDeleted"
res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil {
return nil, err
}
list := ListBasicServices{}
err = json.Unmarshal(res, &list)
if err != nil {
return nil, err
}
return &list, nil
}

@ -255,3 +255,147 @@ type ItemBasicService struct {
// User Managed or not // User Managed or not
UserManaged bool `json:"userManaged"` UserManaged bool `json:"userManaged"`
} }
// List of Snapshots
type ListInfoSnapshots struct {
// Data
Data ListSnapshots `json:"data"`
// EntryCount
EntryCount uint64 `json:"entryCount"`
}
// Main information about Group
type RecordGroup struct {
// Account ID
AccountID uint64 `json:"accountId"`
// Account Name
AccountName string `json:"accountName"`
// List of Computes
Computes ListGroupComputes `json:"computes"`
// Consistency or not
Consistency bool `json:"consistency"`
// Number of CPU
CPU uint64 `json:"cpu"`
// Created by
CreatedBy string `json:"createdBy"`
// Created time
CreatedTime uint64 `json:"createdTime"`
// Deleted by
DeletedBy string `json:"deletedBy"`
// Deleted time
DeletedTime uint64 `json:"deletedTime"`
// Amount of disk
Disk uint64 `json:"disk"`
// Driver
Driver string `json:"driver"`
// list of External Network IDs
ExtNets []uint64 `json:"extnets"`
// Grid ID
GID uint64 `json:"gid"`
// GUID
GUID uint64 `json:"guid"`
// ID
ID uint64 `json:"id"`
// Image ID
ImageID uint64 `json:"imageId"`
// Milestones
Milestones uint64 `json:"milestones"`
// Name
Name string `json:"name"`
// List of Parent IDs
Parents []uint64 `json:"parents"`
// Pool name
PoolName string `json:"poolName"`
// Number of RAM, MB
RAM uint64 `json:"ram"`
// Resource group ID
RGID uint64 `json:"rgId"`
// Resource group name
RGName string `json:"rgName"`
// Role
Role string `json:"role"`
// SEPID
SEPID uint64 `json:"sepId"`
// Sequence number
SeqNo uint64 `json:"seqNo"`
// Service ID
ServiceID uint64 `json:"serviceId"`
// Status
Status string `json:"status"`
// TechStatus
TechStatus string `json:"techStatus"`
// Timeout Start
TimeoutStart uint64 `json:"timeoutStart"`
// Updated by
UpdatedBy string `json:"updatedBy"`
// Updated time
UpdatedTime uint64 `json:"updatedTime"`
// List of VINS IDs
VINSes []uint64 `json:"vinses"`
}
// List of Group Computes
type ListGroupComputes []ItemGroupCompute
// Main information about Group Compute
type ItemGroupCompute struct {
// ID
ID uint64 `json:"id"`
// IP Addresses
IPAddresses []string `json:"ipAddresses"`
// Name
Name string `json:"name"`
// List of information about OS Users
OSUsers ListOSUsers `json:"osUsers"`
//Chipset
Chipset string `json:"chipset"`
}
// List of information about OS Users
type ListOSUsers []ItemOSUser
// Main information about OS User
type ItemOSUser struct {
// Login
Login string `json:"login"`
// Password
Password string `json:"password"`
}

@ -0,0 +1,38 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// RestoreRequest struct to restore BasicService instance
type RestoreRequest struct {
// ID of the BasicService to be restored
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
}
// Restore restores BasicService instance
func (b BService) Restore(ctx context.Context, req RestoreRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/restore"
res, err := b.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,42 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// SnapshotCreateRequest struct to create snapshot
type SnapshotCreateRequest struct {
// ID of the Basic Service
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// Label of the snapshot
// Required: true
Label string `url:"label" json:"label" validate:"required"`
}
// SnapshotCreate create snapshot of the Basic Service
func (b BService) SnapshotCreate(ctx context.Context, req SnapshotCreateRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/snapshotCreate"
res, err := b.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,42 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// SnapshotDeleteRequest struct to delete snapshot
type SnapshotDeleteRequest struct {
// ID of the Basic Service
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// Label of the snapshot
// Required: true
Label string `url:"label" json:"label" validate:"required"`
}
// SnapshotDelete delete snapshot of the Basic Service
func (b BService) SnapshotDelete(ctx context.Context, req SnapshotDeleteRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/snapshotDelete"
res, err := b.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,40 @@
package bservice
import (
"context"
"encoding/json"
"net/http"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// SnapshotListRequest struct to get list of existing snapshots
type SnapshotListRequest struct {
// ID of the Basic Service
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
}
// SnapshotList gets list existing snapshots of the Basic Service
func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (*ListInfoSnapshots, error) {
err := validators.ValidateRequest(req)
if err != nil {
return nil, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/snapshotList"
res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil {
return nil, err
}
list := ListInfoSnapshots{}
err = json.Unmarshal(res, &list)
if err != nil {
return nil, err
}
return &list, nil
}

@ -0,0 +1,42 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// SnapshotRollbackRequest struct to rollback snapshot
type SnapshotRollbackRequest struct {
// ID of the Basic Service
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
// Label of the snapshot
// Required: true
Label string `url:"label" json:"label" validate:"required"`
}
// SnapshotRollback rollback snapshot of the Basic Service
func (b BService) SnapshotRollback(ctx context.Context, req SnapshotRollbackRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/snapshotRollback"
res, err := b.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,40 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// StartRequest struct to start service
type StartRequest struct {
// ID of the service to start
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
}
// Start starts service.
// Starting a service technically means starting computes from all
// service groups according to group relations
func (b BService) Start(ctx context.Context, req StartRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/start"
res, err := b.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,40 @@
package bservice
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// StopRequest struct to stop service
type StopRequest struct {
// ID of the service to stop
// Required: true
ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
}
// Stop stops service.
// Stopping a service technically means stopping computes from
// all service groups
func (b BService) Stop(ctx context.Context, req StopRequest) (bool, error) {
err := validators.ValidateRequest(req)
if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/bservice/stop"
res, err := b.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
}

@ -39,10 +39,6 @@ type CreateTemplateFromBlankRequest struct {
// Required: false // Required: false
AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"` AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
// SEP ID
// Required: false
SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
// Pool for image create // Pool for image create
// Required: false // Required: false
PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"` PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"`

@ -485,7 +485,7 @@ type ItemDisk struct {
Type string `json:"type"` Type string `json:"type"`
// Updated by // Updated by
UpdatedBy uint64 `json:"updatedBy"` UpdatedBy string `json:"updatedBy"`
// Virtual machine ID // Virtual machine ID
VMID uint64 `json:"vmid"` VMID uint64 `json:"vmid"`

@ -30,24 +30,21 @@ type UpdateRequest struct {
// Default: none // Default: none
NumaAffinity string `url:"numaAffinity,omitempty" json:"numaAffinity,omitempty" validate:"omitempty,numaAffinity"` NumaAffinity string `url:"numaAffinity,omitempty" json:"numaAffinity,omitempty" validate:"omitempty,numaAffinity"`
// Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node // Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node, true or false
// Required: false // Required: false
// Default: false CPUPin interface{} `url:"cpupin,omitempty" json:"cpupin,omitempty" validate:"omitempty,isBool"`
CPUPin bool `url:"cpupin" json:"cpupin"`
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
// Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node // Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node, true or false
// Required: false // Required: false
// Default: false HPBacked interface{} `url:"hpBacked,omitempty" json:"hpBacked,omitempty" validate:"omitempty,isBool"`
HPBacked bool `url:"hpBacked" json:"hpBacked"`
// Auto start when node restarted // Auto start when node restarted, true or false
// Required: false // Required: false
// Default: false AutoStart interface{} `url:"autoStart,omitempty" json:"autoStart,omitempty" validate:"omitempty,isBool"`
AutoStart bool `url:"autoStart" json:"autoStart"`
// Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False // Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
// Required: false // Required: false
@ -65,9 +62,9 @@ type UpdateRequest struct {
// Required: false // Required: false
NetworkInterfaceNaming string `url:"networkInterfaceNaming,omitempty" json:"networkInterfaceNaming,omitempty" validate:"omitempty,networkInterfaceNaming"` NetworkInterfaceNaming string `url:"networkInterfaceNaming,omitempty" json:"networkInterfaceNaming,omitempty" validate:"omitempty,networkInterfaceNaming"`
// Does this machine supports hot resize // Does this machine supports hot resize, true or false
// Required: false // Required: false
HotResize bool `url:"hotResize,omitempty" json:"hotResize,omitempty"` HotResize interface{} `url:"hotResize,omitempty" json:"hotResize,omitempty" validate:"omitempty,isBool"`
} }
// Update updates some properties of the compute // Update updates some properties of the compute

@ -5,9 +5,10 @@ import "testing"
var disks = ListDisks{ var disks = ListDisks{
Data: []ItemDisk{ Data: []ItemDisk{
{ {
RecordDisk: RecordDisk{
MachineID: 0, MachineID: 0,
MachineName: "", MachineName: "",
RecordDisk: RecordDisk{
DeviceName: "vda", DeviceName: "vda",
SEPType: "", SEPType: "",
InfoDisk: InfoDisk{ InfoDisk: InfoDisk{
@ -64,9 +65,10 @@ var disks = ListDisks{
}, },
}, },
{ {
RecordDisk: RecordDisk{
MachineID: 0, MachineID: 0,
MachineName: "", MachineName: "",
RecordDisk: RecordDisk{
DeviceName: "vda", DeviceName: "vda",
SEPType: "", SEPType: "",
InfoDisk: InfoDisk{ InfoDisk: InfoDisk{

@ -45,10 +45,6 @@ type FromPlatformDiskRequest struct {
// Required: false // Required: false
AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"` AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
// SEP ID
// Required: false
SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
// Pool for image create // Pool for image create
// Required: false // Required: false
PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"` PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"`

@ -13,9 +13,9 @@ type EnableNodesRequest struct {
// Required: true // Required: true
NIDs []uint64 `url:"nids" json:"nids" validate:"required"` NIDs []uint64 `url:"nids" json:"nids" validate:"required"`
// Message // Reason
// Required: false // Required: false
Message string `url:"message,omitempty" json:"message,omitempty"` Reason string `url:"reason,omitempty" json:"reason,omitempty"`
} }
// EnableNodes enables nodes from maintenance status to enabled // EnableNodes enables nodes from maintenance status to enabled

@ -371,7 +371,7 @@ type Bridges struct {
// Backplane1 // Backplane1
type Backplane1 struct { type Backplane1 struct {
Interfaces []string `json:"interfaces"` Interfaces []string `json:"interfaces"`
NumaNode uint64 `json:"numa_node"` NumaNode int64 `json:"numa_node"`
} }
// Role // Role

@ -30,7 +30,6 @@ var rgs = ListRG{
LockStatus: "UNLOCKED", LockStatus: "UNLOCKED",
Milestones: 363459, Milestones: 363459,
Name: "rg_1", Name: "rg_1",
RegisterComputes: false,
ResourceLimits: ResourceLimits{ ResourceLimits: ResourceLimits{
CUC: -1, CUC: -1,
CuD: -1, CuD: -1,
@ -74,7 +73,6 @@ var rgs = ListRG{
LockStatus: "UNLOCKED", LockStatus: "UNLOCKED",
Milestones: 363468, Milestones: 363468,
Name: "rg_2", Name: "rg_2",
RegisterComputes: false,
ResourceLimits: ResourceLimits{ ResourceLimits: ResourceLimits{
CUC: -1, CUC: -1,
CuD: -1, CuD: -1,
@ -118,7 +116,6 @@ var rgs = ListRG{
LockStatus: "kjLOCKED", LockStatus: "kjLOCKED",
Milestones: 363471, Milestones: 363471,
Name: "rg_3", Name: "rg_3",
RegisterComputes: false,
ResourceLimits: ResourceLimits{ ResourceLimits: ResourceLimits{
CUC: -1, CUC: -1,
CuD: -1, CuD: -1,

@ -196,9 +196,6 @@ type ItemRG struct {
// Name // Name
Name string `json:"name"` Name string `json:"name"`
// Register computes
RegisterComputes bool `json:"registerComputes"`
// Resource limits // Resource limits
ResourceLimits ResourceLimits `json:"resourceLimits"` ResourceLimits ResourceLimits `json:"resourceLimits"`

@ -17,7 +17,7 @@
1. Тесты находятся по директории `decort-sdk/tests/platform_upgrade` 1. Тесты находятся по директории `decort-sdk/tests/platform_upgrade`
2. Внутри директории нужно создать и заполнить файл `.env` по аналогии с `.env.template` для доступа к платформе 2. Внутри директории нужно создать и заполнить файл `.env` по аналогии с `.env.template` для доступа к платформе
3. Внутри директории нужно создать и заполнить файл `input.json`, содержащий json с раздела [POST /system/docgenerator/prepareCatalog](https://delta.qa.loc/system/ActorApi?group=system#!/system__docgenerator/post_system_docgenerator_prepareCatalog) (для получения json нажать кнопку Try it Out!) - требуется только для тестов запросов и тестов API методов 3. Внутри директории нужно создать и заполнить файл `input.json`, содержащий json из метода [POST /system/docgenerator/prepareCatalog](https://delta.qa.loc/portal/#/api/system) (для получения json нажать кнопку Try it Out!) - требуется только для тестов запросов и тестов API методов
Примечание: тесты можно запускать напрямую методами среды разработки либо из командной строки из нужной директории, например командой `go test -v -run <TestName>`, где `<TestName>` - название запускаемого теста. Примечание: тесты можно запускать напрямую методами среды разработки либо из командной строки из нужной директории, например командой `go test -v -run <TestName>`, где `<TestName>` - название запускаемого теста.

@ -21,10 +21,6 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack" "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/tasks"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
disks_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/disks"
image_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
node_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/node"
account_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account" account_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account"
audit_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/audit" audit_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/audit"
bservice_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/bservice" bservice_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/bservice"
@ -33,9 +29,11 @@ import (
extnet_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/extnet" extnet_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/extnet"
flipgroup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/flipgroup" flipgroup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/flipgroup"
grid_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/grid" grid_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/grid"
image_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
k8ci_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8ci" k8ci_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8ci"
k8s_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s" k8s_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
lb_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/lb" lb_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/lb"
node_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/node"
pcidevice_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/pcidevice" pcidevice_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/pcidevice"
rg_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg" rg_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
sep_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/sep" sep_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/sep"
@ -53,8 +51,6 @@ func TestGetListCloudAPI(t *testing.T) {
t.Fatalf("Cannot get client: %v", err) t.Fatalf("Cannot get client: %v", err)
} }
const logFileName = "test_get_list_cloudAPI.log"
var testLogs []string
// Account // Account
// List // List
bytes, err = client.CloudAPI().Account().ListRaw(context.Background(), account.ListRequest{}) bytes, err = client.CloudAPI().Account().ListRaw(context.Background(), account.ListRequest{})
@ -62,7 +58,7 @@ func TestGetListCloudAPI(t *testing.T) {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Account list", bytes, account.ListAccounts{}, t)) getResult("Account list", bytes, account.ListAccounts{}, t)
// Get // Get
listAcc, _ := client.CloudAPI().Account().List(context.Background(), account.ListRequest{}) listAcc, _ := client.CloudAPI().Account().List(context.Background(), account.ListRequest{})
if len(listAcc.Data) > 0 { if len(listAcc.Data) > 0 {
@ -71,7 +67,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Account get", bytes, account.RecordAccount{}, t)) getResult("Account get", bytes, account.RecordAccount{}, t)
} else { } else {
t.Errorf("Can not test Account get because account list is empty") t.Errorf("Can not test Account get because account list is empty")
} }
@ -82,7 +78,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Bservice list", bytes, bservice.ListBasicServices{}, t)) getResult("Bservice list", bytes, bservice.ListBasicServices{}, t)
// Get // Get
listBServ, _ := client.CloudAPI().BService().List(context.Background(), bservice.ListRequest{}) listBServ, _ := client.CloudAPI().BService().List(context.Background(), bservice.ListRequest{})
if len(listBServ.Data) > 0 { if len(listBServ.Data) > 0 {
@ -91,7 +87,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Bservice get", bytes, bservice.RecordBasicService{}, t)) getResult("Bservice get", bytes, bservice.RecordBasicService{}, t)
} else { } else {
t.Errorf("Can not test Bservice get because bservice list is empty") t.Errorf("Can not test Bservice get because bservice list is empty")
} }
@ -102,7 +98,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Compute list", bytes, compute.ListComputes{}, t)) getResult("Compute list", bytes, compute.ListComputes{}, t)
// Get // Get
listComp, _ := client.CloudAPI().Compute().List(context.Background(), compute.ListRequest{}) listComp, _ := client.CloudAPI().Compute().List(context.Background(), compute.ListRequest{})
if len(listComp.Data) > 0 { if len(listComp.Data) > 0 {
@ -111,7 +107,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Compute get", bytes, compute.RecordCompute{}, t)) getResult("Compute get", bytes, compute.RecordCompute{}, t)
} else { } else {
t.Errorf("Can not test Compute get because compute list is empty") t.Errorf("Can not test Compute get because compute list is empty")
} }
@ -122,7 +118,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Disk list", bytes, disks.ListDisks{}, t)) getResult("Disk list", bytes, disks.ListDisks{}, t)
// Get // Get
listDisk, _ := client.CloudAPI().Disks().List(context.Background(), disks.ListRequest{}) listDisk, _ := client.CloudAPI().Disks().List(context.Background(), disks.ListRequest{})
if len(listDisk.Data) > 0 { if len(listDisk.Data) > 0 {
@ -131,7 +127,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Disk get", bytes, disks.RecordDisk{}, t)) getResult("Disk get", bytes, disks.RecordDisk{}, t)
} else { } else {
t.Errorf("Can not test Disk get because disk list is empty") t.Errorf("Can not test Disk get because disk list is empty")
} }
@ -142,7 +138,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("ExtNet list", bytes, extnet.ListExtNets{}, t)) getResult("ExtNet list", bytes, extnet.ListExtNets{}, t)
// Get // Get
listExtNet, _ := client.CloudAPI().ExtNet().List(context.Background(), extnet.ListRequest{}) listExtNet, _ := client.CloudAPI().ExtNet().List(context.Background(), extnet.ListRequest{})
if len(listExtNet.Data) > 0 { if len(listExtNet.Data) > 0 {
@ -151,7 +147,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("ExtNet get", bytes, extnet.RecordExtNet{}, t)) getResult("ExtNet get", bytes, extnet.RecordExtNet{}, t)
} else { } else {
t.Errorf("Can not test ExtNet get because listExtNet list is empty") t.Errorf("Can not test ExtNet get because listExtNet list is empty")
} }
@ -162,7 +158,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("FLIPGroup list", bytes, flipgroup.ListFLIPGroups{}, t)) getResult("FLIPGroup list", bytes, flipgroup.ListFLIPGroups{}, t)
// Get // Get
listFG, _ := client.CloudAPI().FLIPGroup().List(context.Background(), flipgroup.ListRequest{}) listFG, _ := client.CloudAPI().FLIPGroup().List(context.Background(), flipgroup.ListRequest{})
if len(listFG.Data) > 0 { if len(listFG.Data) > 0 {
@ -171,7 +167,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("FLIPGroup get", bytes, flipgroup.RecordFLIPGroup{}, t)) getResult("FLIPGroup get", bytes, flipgroup.RecordFLIPGroup{}, t)
} else { } else {
t.Errorf("Can not test FLIPGroup get because flipgroup list is empty") t.Errorf("Can not test FLIPGroup get because flipgroup list is empty")
} }
@ -182,7 +178,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Image list", bytes, image.ListImages{}, t)) getResult("Image list", bytes, image.ListImages{}, t)
// Get // Get
listImg, _ := client.CloudAPI().Image().List(context.Background(), image.ListRequest{}) listImg, _ := client.CloudAPI().Image().List(context.Background(), image.ListRequest{})
if len(listImg.Data) > 0 { if len(listImg.Data) > 0 {
@ -191,7 +187,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Image get", bytes, image.RecordImage{}, t)) getResult("Image get", bytes, image.RecordImage{}, t)
} else { } else {
t.Errorf("Can not test Image get because Image list is empty") t.Errorf("Can not test Image get because Image list is empty")
} }
@ -202,7 +198,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("K8CI list", bytes, k8ci.ListK8CI{}, t)) getResult("K8CI list", bytes, k8ci.ListK8CI{}, t)
// Get // Get
listk8ci, _ := client.CloudAPI().K8CI().List(context.Background(), k8ci.ListRequest{}) listk8ci, _ := client.CloudAPI().K8CI().List(context.Background(), k8ci.ListRequest{})
if len(listk8ci.Data) > 0 { if len(listk8ci.Data) > 0 {
@ -211,7 +207,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("K8CI get", bytes, k8ci.RecordK8CI{}, t)) getResult("K8CI get", bytes, k8ci.RecordK8CI{}, t)
} else { } else {
t.Errorf("Can not test K8CI get because K8CI list is empty") t.Errorf("Can not test K8CI get because K8CI list is empty")
} }
@ -222,7 +218,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("K8S list", bytes, k8s.ListK8SClusters{}, t)) getResult("K8S list", bytes, k8s.ListK8SClusters{}, t)
// Get // Get
listk8s, _ := client.CloudAPI().K8S().List(context.Background(), k8s.ListRequest{}) listk8s, _ := client.CloudAPI().K8S().List(context.Background(), k8s.ListRequest{})
if len(listk8s.Data) > 0 { if len(listk8s.Data) > 0 {
@ -231,7 +227,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("K8S get", bytes, k8s.RecordK8S{}, t)) getResult("K8S get", bytes, k8s.RecordK8S{}, t)
} else { } else {
t.Errorf("Can not test K8S get because K8S list is empty") t.Errorf("Can not test K8S get because K8S list is empty")
} }
@ -242,7 +238,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("LB list", bytes, lb.ListLB{}, t)) getResult("LB list", bytes, lb.ListLB{}, t)
// Get // Get
listLB, _ := client.CloudAPI().LB().List(context.Background(), lb.ListRequest{}) listLB, _ := client.CloudAPI().LB().List(context.Background(), lb.ListRequest{})
if len(listLB.Data) > 0 { if len(listLB.Data) > 0 {
@ -251,7 +247,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("LB get", bytes, lb.RecordLB{}, t)) getResult("LB get", bytes, lb.RecordLB{}, t)
} else { } else {
t.Errorf("Can not test LB get because LB list is empty") t.Errorf("Can not test LB get because LB list is empty")
} }
@ -262,7 +258,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Locations list", bytes, locations.ListLocations{}, t)) getResult("Locations list", bytes, locations.ListLocations{}, t)
// RG // RG
// List // List
@ -270,7 +266,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("RG list", bytes, rg.ListResourceGroups{}, t)) getResult("RG list", bytes, rg.ListResourceGroups{}, t)
// Get // Get
listRG, _ := client.CloudAPI().RG().List(context.Background(), rg.ListRequest{}) listRG, _ := client.CloudAPI().RG().List(context.Background(), rg.ListRequest{})
if len(listRG.Data) > 0 { if len(listRG.Data) > 0 {
@ -279,7 +275,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("RG get", bytes, rg.RecordResourceGroup{}, t)) getResult("RG get", bytes, rg.RecordResourceGroup{}, t)
} else { } else {
t.Errorf("Can not test RG get because RG list is empty") t.Errorf("Can not test RG get because RG list is empty")
} }
@ -290,7 +286,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("SEP list", bytes, sep.ListAvailableSEP{}, t)) getResult("SEP list", bytes, sep.ListAvailableSEP{}, t)
// Stack // Stack
// List // List
@ -298,7 +294,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Stack list", bytes, stack.ListStacks{}, t)) getResult("Stack list", bytes, stack.ListStacks{}, t)
// Tasks // Tasks
// List // List
@ -306,7 +302,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Tasks list", bytes, tasks.ListTasks{}, t)) getResult("Tasks list", bytes, tasks.ListTasks{}, t)
// Get // Get
listTasks, _ := client.CloudAPI().Tasks().List(context.Background(), tasks.ListRequest{}) listTasks, _ := client.CloudAPI().Tasks().List(context.Background(), tasks.ListRequest{})
if len(listTasks.Data) > 0 { if len(listTasks.Data) > 0 {
@ -315,7 +311,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Tasks get", bytes, tasks.RecordAsyncTask{}, t)) getResult("Tasks get", bytes, tasks.RecordAsyncTask{}, t)
} else { } else {
t.Errorf("Can not test Tasks get because Tasks list is empty") t.Errorf("Can not test Tasks get because Tasks list is empty")
} }
@ -326,7 +322,7 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("VINS list", bytes, vins.ListVINS{}, t)) getResult("VINS list", bytes, vins.ListVINS{}, t)
// Get // Get
listVINS, _ := client.CloudAPI().VINS().List(context.Background(), vins.ListRequest{}) listVINS, _ := client.CloudAPI().VINS().List(context.Background(), vins.ListRequest{})
if len(listVINS.Data) > 0 { if len(listVINS.Data) > 0 {
@ -335,12 +331,11 @@ func TestGetListCloudAPI(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("VINS get", bytes, vins.RecordVINS{}, t)) getResult("VINS get", bytes, vins.RecordVINS{}, t)
} else { } else {
t.Errorf("Can not test VINS get because VINS list is empty") t.Errorf("Can not test VINS get because VINS list is empty")
} }
compareLogs(logFileName, testLogs, t, "get")
} }
// WARNING: not working correctly due to inclusions of tagless structures in cloudbroker // WARNING: not working correctly due to inclusions of tagless structures in cloudbroker
@ -353,15 +348,13 @@ func TestGetListCloudbroker(t *testing.T) {
t.Fatalf("Cannot get client: %v", err) t.Fatalf("Cannot get client: %v", err)
} }
const logFileName = "test_get_list_cloudbroker.log"
var testLogs = make([]string, 0)
// Account // Account
// List // List
bytes, err = client.CloudBroker().Account().ListRaw(context.Background(), account_cb.ListRequest{}) bytes, err = client.CloudBroker().Account().ListRaw(context.Background(), account_cb.ListRequest{})
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Account list", bytes, account_cb.ListAccounts{}, t)) getResult("Account list", bytes, account_cb.ListAccounts{}, t)
// Get // Get
listAcc, _ := client.CloudBroker().Account().List(context.Background(), account_cb.ListRequest{}) listAcc, _ := client.CloudBroker().Account().List(context.Background(), account_cb.ListRequest{})
if len(listAcc.Data) > 0 { if len(listAcc.Data) > 0 {
@ -370,7 +363,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Account get", bytes, account_cb.RecordAccount{}, t)) getResult("Account get", bytes, account_cb.RecordAccount{}, t)
} else { } else {
t.Errorf("Can not test Account get because account list is empty") t.Errorf("Can not test Account get because account list is empty")
} }
@ -381,7 +374,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Audit list", bytes, audit_cb.ListAudits{}, t)) getResult("Audit list", bytes, audit_cb.ListAudits{}, t)
// Get // Get
listAudits, _ := client.CloudBroker().Audit().List(context.Background(), audit_cb.ListRequest{}) listAudits, _ := client.CloudBroker().Audit().List(context.Background(), audit_cb.ListRequest{})
if len(listAudits.Data) > 0 { if len(listAudits.Data) > 0 {
@ -390,7 +383,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Audit get", bytes, audit_cb.RecordAudit{}, t)) getResult("Audit get", bytes, audit_cb.RecordAudit{}, t)
} else { } else {
t.Errorf("Can not test Audit get because Audit list is empty") t.Errorf("Can not test Audit get because Audit list is empty")
} }
@ -401,7 +394,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Bservice list", bytes, bservice_cb.ListBasicServices{}, t)) getResult("Bservice list", bytes, bservice_cb.ListBasicServices{}, t)
// Get // Get
listBServ, _ := client.CloudBroker().BService().List(context.Background(), bservice_cb.ListRequest{}) listBServ, _ := client.CloudBroker().BService().List(context.Background(), bservice_cb.ListRequest{})
if len(listBServ.Data) > 0 { if len(listBServ.Data) > 0 {
@ -410,7 +403,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Bservice get", bytes, bservice_cb.RecordBasicService{}, t)) getResult("Bservice get", bytes, bservice_cb.RecordBasicService{}, t)
} else { } else {
t.Errorf("Can not test Bservice get because bservice list is empty") t.Errorf("Can not test Bservice get because bservice list is empty")
} }
@ -421,7 +414,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Compute list", bytes, compute_cb.ListComputes{}, t)) getResult("Compute list", bytes, compute_cb.ListComputes{}, t)
// Get // Get
listComp, _ := client.CloudBroker().Compute().List(context.Background(), compute_cb.ListRequest{}) listComp, _ := client.CloudBroker().Compute().List(context.Background(), compute_cb.ListRequest{})
if len(listComp.Data) > 0 { if len(listComp.Data) > 0 {
@ -430,7 +423,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Compute get", bytes, compute_cb.RecordCompute{}, t)) getResult("Compute get", bytes, compute_cb.RecordCompute{}, t)
} else { } else {
t.Errorf("Can not test Compute get because compute list is empty") t.Errorf("Can not test Compute get because compute list is empty")
} }
@ -441,7 +434,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Disk list", bytes, disks_cb.ListDisks{}, t)) getResult("Disk list", bytes, disks_cb.ListDisks{}, t)
// Get // Get
listDisk, _ := client.CloudBroker().Disks().List(context.Background(), disks_cb.ListRequest{}) listDisk, _ := client.CloudBroker().Disks().List(context.Background(), disks_cb.ListRequest{})
if len(listDisk.Data) > 0 { if len(listDisk.Data) > 0 {
@ -450,7 +443,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Disk get", bytes, disks_cb.RecordDisk{}, t)) getResult("Disk get", bytes, disks_cb.RecordDisk{}, t)
} else { } else {
t.Errorf("Can not test Disk get because disk list is empty") t.Errorf("Can not test Disk get because disk list is empty")
} }
@ -461,7 +454,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("ExtNet list", bytes, extnet_cb.ListExtNet{}, t)) getResult("ExtNet list", bytes, extnet_cb.ListExtNet{}, t)
// Get // Get
listExtNet, _ := client.CloudBroker().ExtNet().List(context.Background(), extnet_cb.ListRequest{}) listExtNet, _ := client.CloudBroker().ExtNet().List(context.Background(), extnet_cb.ListRequest{})
if len(listExtNet.Data) > 0 { if len(listExtNet.Data) > 0 {
@ -470,7 +463,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("ExtNet get", bytes, extnet_cb.RecordExtNet{}, t)) getResult("ExtNet get", bytes, extnet_cb.RecordExtNet{}, t)
} else { } else {
t.Errorf("Can not test ExtNet get because listExtNet list is empty") t.Errorf("Can not test ExtNet get because listExtNet list is empty")
} }
@ -481,7 +474,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("FLIPGroup list", bytes, flipgroup_cb.ListFLIPGroups{}, t)) getResult("FLIPGroup list", bytes, flipgroup_cb.ListFLIPGroups{}, t)
// Get // Get
listFG, _ := client.CloudBroker().FLIPGroup().List(context.Background(), flipgroup_cb.ListRequest{}) listFG, _ := client.CloudBroker().FLIPGroup().List(context.Background(), flipgroup_cb.ListRequest{})
if len(listFG.Data) > 0 { if len(listFG.Data) > 0 {
@ -490,7 +483,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("FLIPGroup get", bytes, flipgroup_cb.RecordFLIPGroup{}, t)) getResult("FLIPGroup get", bytes, flipgroup_cb.RecordFLIPGroup{}, t)
} else { } else {
t.Errorf("Can not test FLIPGroup get because flipgroup list is empty") t.Errorf("Can not test FLIPGroup get because flipgroup list is empty")
} }
@ -501,7 +494,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Grid list", bytes, grid_cb.ListGrids{}, t)) getResult("Grid list", bytes, grid_cb.ListGrids{}, t)
// Get // Get
listGrid, _ := client.CloudBroker().Grid().List(context.Background(), grid_cb.ListRequest{}) listGrid, _ := client.CloudBroker().Grid().List(context.Background(), grid_cb.ListRequest{})
if len(listGrid.Data) > 0 { if len(listGrid.Data) > 0 {
@ -510,7 +503,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Grid get", bytes, grid_cb.RecordGrid{}, t)) getResult("Grid get", bytes, grid_cb.RecordGrid{}, t)
} else { } else {
t.Errorf("Can not test Grid get because Grid list is empty") t.Errorf("Can not test Grid get because Grid list is empty")
} }
@ -521,7 +514,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Image list", bytes, image_cb.ListImages{}, t)) getResult("Image list", bytes, image_cb.ListImages{}, t)
// Get // Get
listImg, _ := client.CloudBroker().Image().List(context.Background(), image_cb.ListRequest{}) listImg, _ := client.CloudBroker().Image().List(context.Background(), image_cb.ListRequest{})
if len(listImg.Data) > 0 { if len(listImg.Data) > 0 {
@ -530,7 +523,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Image get", bytes, image_cb.RecordImage{}, t)) getResult("Image get", bytes, image_cb.RecordImage{}, t)
} else { } else {
t.Errorf("Can not test Image get because Image list is empty") t.Errorf("Can not test Image get because Image list is empty")
} }
@ -541,7 +534,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("K8CI list", bytes, k8ci_cb.ListK8CI{}, t)) getResult("K8CI list", bytes, k8ci_cb.ListK8CI{}, t)
// Get // Get
listk8ci, _ := client.CloudBroker().K8CI().List(context.Background(), k8ci_cb.ListRequest{}) listk8ci, _ := client.CloudBroker().K8CI().List(context.Background(), k8ci_cb.ListRequest{})
if len(listk8ci.Data) > 0 { if len(listk8ci.Data) > 0 {
@ -550,7 +543,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("K8CI get", bytes, k8ci_cb.RecordK8CI{}, t)) getResult("K8CI get", bytes, k8ci_cb.RecordK8CI{}, t)
} else { } else {
t.Errorf("Can not test K8CI get because K8CI list is empty") t.Errorf("Can not test K8CI get because K8CI list is empty")
} }
@ -561,7 +554,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("K8S list", bytes, k8s_cb.ListK8S{}, t)) getResult("K8S list", bytes, k8s_cb.ListK8S{}, t)
// Get // Get
listk8s, _ := client.CloudBroker().K8S().List(context.Background(), k8s_cb.ListRequest{}) listk8s, _ := client.CloudBroker().K8S().List(context.Background(), k8s_cb.ListRequest{})
if len(listk8s.Data) > 0 { if len(listk8s.Data) > 0 {
@ -570,7 +563,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("K8S get", bytes, k8s_cb.RecordK8S{}, t)) getResult("K8S get", bytes, k8s_cb.RecordK8S{}, t)
} else { } else {
t.Errorf("Can not test K8S get because K8S list is empty") t.Errorf("Can not test K8S get because K8S list is empty")
} }
@ -581,7 +574,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("LB list", bytes, lb_cb.ListLB{}, t)) getResult("LB list", bytes, lb_cb.ListLB{}, t)
// Get // Get
listLB, _ := client.CloudBroker().LB().List(context.Background(), lb_cb.ListRequest{}) listLB, _ := client.CloudBroker().LB().List(context.Background(), lb_cb.ListRequest{})
if len(listLB.Data) > 0 { if len(listLB.Data) > 0 {
@ -590,7 +583,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("LB get", bytes, lb_cb.RecordLB{}, t)) getResult("LB get", bytes, lb_cb.RecordLB{}, t)
} else { } else {
t.Errorf("Can not test LB get because LB list is empty") t.Errorf("Can not test LB get because LB list is empty")
} }
@ -601,7 +594,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Node list", bytes, node_cb.ListNodes{}, t)) getResult("Node list", bytes, node_cb.ListNodes{}, t)
// Get // Get
listNode, _ := client.CloudBroker().Node().List(context.Background(), node_cb.ListRequest{}) listNode, _ := client.CloudBroker().Node().List(context.Background(), node_cb.ListRequest{})
if len(listLB.Data) > 0 { if len(listLB.Data) > 0 {
@ -610,7 +603,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Node get", bytes, node_cb.RecordNode{}, t)) getResult("Node get", bytes, node_cb.RecordNode{}, t)
} else { } else {
t.Errorf("Can not test Node get because LB list is empty") t.Errorf("Can not test Node get because LB list is empty")
} }
@ -621,7 +614,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Pcidevice list", bytes, pcidevice_cb.ListPCIDevices{}, t)) getResult("Pcidevice list", bytes, pcidevice_cb.ListPCIDevices{}, t)
// RG // RG
// List // List
@ -629,7 +622,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("RG list", bytes, rg_cb.ListRG{}, t)) getResult("RG list", bytes, rg_cb.ListRG{}, t)
// Get // Get
listRG, _ := client.CloudBroker().RG().List(context.Background(), rg_cb.ListRequest{}) listRG, _ := client.CloudBroker().RG().List(context.Background(), rg_cb.ListRequest{})
if len(listRG.Data) > 0 { if len(listRG.Data) > 0 {
@ -638,7 +631,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("RG get", bytes, rg_cb.RecordRG{}, t)) getResult("RG get", bytes, rg_cb.RecordRG{}, t)
} else { } else {
t.Errorf("Can not test RG get because RG list is empty") t.Errorf("Can not test RG get because RG list is empty")
} }
@ -649,7 +642,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("SEP list", bytes, sep_cb.ListSEP{}, t)) getResult("SEP list", bytes, sep_cb.ListSEP{}, t)
// Get // Get
listSEP, _ := client.CloudBroker().SEP().List(context.Background(), sep_cb.ListRequest{}) listSEP, _ := client.CloudBroker().SEP().List(context.Background(), sep_cb.ListRequest{})
if len(listSEP.Data) > 0 { if len(listSEP.Data) > 0 {
@ -658,7 +651,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("SEP get", bytes, sep_cb.RecordSEP{}, t)) getResult("SEP get", bytes, sep_cb.RecordSEP{}, t)
} else { } else {
t.Errorf("Can not test SEP get because SEP list is empty") t.Errorf("Can not test SEP get because SEP list is empty")
} }
@ -667,7 +660,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("SEP and pools list", bytes, sep_cb.ListAvailableSEP{}, t)) getResult("SEP and pools list", bytes, sep_cb.ListAvailableSEP{}, t)
// Stack // Stack
// List // List
@ -675,7 +668,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Stack list", bytes, stack_cb.ListStacks{}, t)) getResult("Stack list", bytes, stack_cb.ListStacks{}, t)
// Get // Get
listStack, _ := client.CloudBroker().Stack().List(context.Background(), stack_cb.ListRequest{}) listStack, _ := client.CloudBroker().Stack().List(context.Background(), stack_cb.ListRequest{})
if len(listStack.Data) > 0 { if len(listStack.Data) > 0 {
@ -684,7 +677,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Stack get", bytes, stack_cb.InfoStack{}, t)) getResult("Stack get", bytes, stack_cb.InfoStack{}, t)
} else { } else {
t.Errorf("Can not test Stack get because Stack list is empty") t.Errorf("Can not test Stack get because Stack list is empty")
} }
@ -695,7 +688,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("Tasks list", bytes, tasks_cb.ListTasks{}, t)) getResult("Tasks list", bytes, tasks_cb.ListTasks{}, t)
// VINS // VINS
// List // List
@ -703,7 +696,7 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("VINS list", bytes, vins_cb.ListVINS{}, t)) getResult("VINS list", bytes, vins_cb.ListVINS{}, t)
// Get // Get
listVINS, _ := client.CloudBroker().VINS().List(context.Background(), vins_cb.ListRequest{}) listVINS, _ := client.CloudBroker().VINS().List(context.Background(), vins_cb.ListRequest{})
if len(listVINS.Data) > 0 { if len(listVINS.Data) > 0 {
@ -712,11 +705,10 @@ func TestGetListCloudbroker(t *testing.T) {
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
testLogs = append(testLogs, getResult("VINS get", bytes, vins_cb.RecordVINS{}, t)) getResult("VINS get", bytes, vins_cb.RecordVINS{}, t)
} else { } else {
t.Errorf("Can not test VINS get because VINS list is empty") t.Errorf("Can not test VINS get because VINS list is empty")
} }
compareLogs(logFileName, testLogs, t, "get")
} }
// TestRequestsCloudAPI tests platform requests vs. golang request structures in sdk for cloudapi requests // TestRequestsCloudAPI tests platform requests vs. golang request structures in sdk for cloudapi requests
@ -759,4 +751,38 @@ func TestGetAllPaths(t *testing.T) {
} }
t.Errorf(errorText) t.Errorf(errorText)
} }
caTestUrls := getRequestsMapCloudAPI()
cbTestUrls := getRequestsMapCloudbroker()
urlsInTest := make([]string, len(caTestUrls)+len(cbTestUrls))
i := 0
for k := range caTestUrls {
urlsInTest[i] = k
i++
}
for k := range cbTestUrls {
urlsInTest[i] = k
i++
}
missingUrls = getMissingDecortUrls(jsonUrls, urlsInTest)
if len(missingUrls) > 0 {
errorText := fmt.Sprintf("Below API handlers (%d in total) need to be added to request map:\n", len(missingUrls))
for _, r := range missingUrls {
errorText += fmt.Sprintln(r)
}
t.Errorf(errorText)
}
deprecatedUrls = getDeprecatedDecortUrls(jsonUrls, urlsInTest)
if len(deprecatedUrls) > 0 {
errorText := fmt.Sprintf("Below API handlers (%d in total) need to be delete to request map:\n", len(deprecatedUrls))
for _, r := range deprecatedUrls {
errorText += fmt.Sprintln(r)
}
t.Errorf(errorText)
}
} }

@ -16,7 +16,9 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/pcidevice" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/pcidevice"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/prometheus"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/sep"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack" "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/tasks"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/user" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/user"
@ -41,6 +43,7 @@ import (
lb_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/lb" lb_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/lb"
node_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/node" node_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/node"
pcidevice_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/pcidevice" pcidevice_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/pcidevice"
prometheus_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/prometheus"
rg_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg" rg_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
sep_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/sep" sep_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/sep"
stack_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/stack" stack_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/stack"
@ -188,6 +191,8 @@ func getRequestsMapCloudAPI() map[string]interface{} {
"/restmachine/cloudapi/compute/userList": compute.UserListRequest{}, "/restmachine/cloudapi/compute/userList": compute.UserListRequest{},
"/restmachine/cloudapi/compute/userRevoke": compute.UserRevokeRequest{}, "/restmachine/cloudapi/compute/userRevoke": compute.UserRevokeRequest{},
"/restmachine/cloudapi/compute/userUpdate": compute.UserUpdateRequest{}, "/restmachine/cloudapi/compute/userUpdate": compute.UserUpdateRequest{},
"/restmachine/cloudapi/compute/changeMac": compute.ChangeMACRequest{},
"/restmachine/cloudapi/compute/changeIp": compute.ChangeIPRequest{},
// disks // disks
"/restmachine/cloudapi/disks/create": disks.CreateRequest{}, "/restmachine/cloudapi/disks/create": disks.CreateRequest{},
@ -315,6 +320,23 @@ func getRequestsMapCloudAPI() map[string]interface{} {
// pcidevice // pcidevice
"/restmachine/cloudapi/pcidevice/list": pcidevice.ListRequest{}, "/restmachine/cloudapi/pcidevice/list": pcidevice.ListRequest{},
// prometheus
"/restmachine/cloudapi/prometheus/computeTransmitPackets": prometheus.ComputeTransmitPacketsRequest{},
"/restmachine/cloudapi/prometheus/computeWriteRequests": prometheus.ComputeWriteRequestsRequest{},
"/restmachine/cloudapi/prometheus/computeCPUload": prometheus.ComputeCPULoadRequest{},
"/restmachine/cloudapi/prometheus/computeTransmitBytes": prometheus.ComputeTransmitBytesRequest{},
"/restmachine/cloudapi/prometheus/computeMemoryUsed": prometheus.ComputeMemoryUsedRequest{},
"/restmachine/cloudapi/prometheus/computeMemoryUsable": prometheus.ComputeMemoryUsableRequest{},
"/restmachine/cloudapi/prometheus/computeMemoryAvailable": prometheus.ComputeMemoryAvailableRequest{},
"/restmachine/cloudapi/prometheus/computeReceiveBytes": prometheus.ComputeReceiveBytesRequest{},
"/restmachine/cloudapi/prometheus/computes": prometheus.ComputesRequest{},
"/restmachine/cloudapi/prometheus/computeReceivePackets": prometheus.ComputeReceivePacketsRequest{},
"/restmachine/cloudapi/prometheus/computeReadRequests": prometheus.ComputeReadRequestsRequest{},
"/restmachine/cloudapi/prometheus/computeWriteBytes": prometheus.ComputeWriteBytesRequest{},
"/restmachine/cloudapi/prometheus/computeReadBytes": prometheus.ComputeReadBytesRequest{},
"/restmachine/cloudapi/prometheus/computeMemoryUsage": prometheus.ComputeMemoryUsageRequest{},
"/restmachine/cloudapi/prometheus/computeMemoryUnused": prometheus.ComputeMemoryUnusedRequest{},
// rg // rg
"/restmachine/cloudapi/rg/accessGrant": rg.AccessGrantRequest{}, "/restmachine/cloudapi/rg/accessGrant": rg.AccessGrantRequest{},
"/restmachine/cloudapi/rg/accessRevoke": rg.AccessRevokeRequest{}, "/restmachine/cloudapi/rg/accessRevoke": rg.AccessRevokeRequest{},
@ -339,6 +361,10 @@ func getRequestsMapCloudAPI() map[string]interface{} {
"/restmachine/cloudapi/rg/setDefNet": rg.SetDefNetRequest{}, "/restmachine/cloudapi/rg/setDefNet": rg.SetDefNetRequest{},
"/restmachine/cloudapi/rg/update": rg.UpdateRequest{}, "/restmachine/cloudapi/rg/update": rg.UpdateRequest{},
"/restmachine/cloudapi/rg/usage": rg.UsageRequest{}, "/restmachine/cloudapi/rg/usage": rg.UsageRequest{},
"/restmachine/cloudapi/rg/removeDefNet": rg.RemoveDefNetRequest{},
// sep
"/restmachine/cloudapi/sep/listAvailableSepAndPools": sep.ListAvailableSEPAndPoolsRequest{},
// stack, tasks // stack, tasks
"/restmachine/cloudapi/stack/get": stack.GetRequest{}, "/restmachine/cloudapi/stack/get": stack.GetRequest{},
@ -436,18 +462,19 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/apiaccess/descUpdate": apiaccess_cb.DescUpdateRequest{}, "/restmachine/cloudbroker/apiaccess/descUpdate": apiaccess_cb.DescUpdateRequest{},
"/restmachine/cloudbroker/apiaccess/get": apiaccess_cb.GetRequest{}, "/restmachine/cloudbroker/apiaccess/get": apiaccess_cb.GetRequest{},
"/restmachine/cloudbroker/apiaccess/getFull": EmptyStruct{}, "/restmachine/cloudbroker/apiaccess/getFull": EmptyStruct{},
"/restmachine/cloudbroker/apiaccess/getPreGroups": EmptyStruct{},
"/restmachine/cloudbroker/apiaccess/list": apiaccess_cb.ListRequest{}, "/restmachine/cloudbroker/apiaccess/list": apiaccess_cb.ListRequest{},
"/restmachine/cloudbroker/apiaccess/setDefault": apiaccess_cb.SetDefaultRequest{}, "/restmachine/cloudbroker/apiaccess/setDefault": apiaccess_cb.SetDefaultRequest{},
"/restmachine/cloudbroker/apiaccess/subtract": apiaccess_cb.SubtractRequest{}, "/restmachine/cloudbroker/apiaccess/subtract": apiaccess_cb.SubtractRequest{},
"/restmachine/cloudbroker/apiaccess/union": apiaccess_cb.UnionRequest{}, "/restmachine/cloudbroker/apiaccess/union": apiaccess_cb.UnionRequest{},
"/restmachine/cloudbroker/apiaccess/update": apiaccess_cb.UpdateRequest{}, "/restmachine/cloudbroker/apiaccess/update": apiaccess_cb.UpdateRequest{},
"/restmachine/cloudbroker/apiaccess/userList": apiaccess_cb.UserListRequest{}, "/restmachine/cloudbroker/apiaccess/userList": apiaccess_cb.UserListRequest{},
"/restmachine/cloudbroker/apiaccess/getDefault": EmptyStruct{},
// audit_cb // audit_cb
"/restmachine/cloudbroker/audit/get": audit_cb.GetRequest{}, "/restmachine/cloudbroker/audit/get": audit_cb.GetRequest{},
"/restmachine/cloudbroker/audit/linkedJobs": audit_cb.LinkedJobsRequest{}, "/restmachine/cloudbroker/audit/linkedJobs": audit_cb.LinkedJobsRequest{},
"/restmachine/cloudbroker/audit/list": audit_cb.ListRequest{}, "/restmachine/cloudbroker/audit/list": audit_cb.ListRequest{},
"/restmachine/cloudbroker/audit/exportAuditsToFile": EmptyStruct{},
// backup_cb // backup_cb
"/restmachine/cloudbroker/backup/createDiskBackup": backup_cb.CreateDiskBackupRequest{}, "/restmachine/cloudbroker/backup/createDiskBackup": backup_cb.CreateDiskBackupRequest{},
@ -548,6 +575,9 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/compute/userList": compute_cb.UserListRequest{}, "/restmachine/cloudbroker/compute/userList": compute_cb.UserListRequest{},
"/restmachine/cloudbroker/compute/userRevoke": compute_cb.UserRevokeRequest{}, "/restmachine/cloudbroker/compute/userRevoke": compute_cb.UserRevokeRequest{},
"/restmachine/cloudbroker/compute/userUpdate": compute_cb.UserUpdateRequest{}, "/restmachine/cloudbroker/compute/userUpdate": compute_cb.UserUpdateRequest{},
"/restmachine/cloudbroker/compute/changeIp": compute_cb.ChangeIPRequest{},
"/restmachine/cloudbroker/compute/changeMac": compute_cb.ChangeMACRequest{},
"/restmachine/cloudbroker/compute/setNetConfig": compute_cb.SetNetConfigRequest{},
// disks // disks
"/restmachine/cloudbroker/disks/create": disks_cb.CreateRequest{}, "/restmachine/cloudbroker/disks/create": disks_cb.CreateRequest{},
@ -570,7 +600,6 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/disks/replicationStatus": disks_cb.ReplicationStatusRequest{}, "/restmachine/cloudbroker/disks/replicationStatus": disks_cb.ReplicationStatusRequest{},
"/restmachine/cloudbroker/disks/replicationStop": disks_cb.ReplicationStopRequest{}, "/restmachine/cloudbroker/disks/replicationStop": disks_cb.ReplicationStopRequest{},
"/restmachine/cloudbroker/disks/replicationSuspend": disks_cb.ReplicationSuspendRequest{}, "/restmachine/cloudbroker/disks/replicationSuspend": disks_cb.ReplicationSuspendRequest{},
"/restmachine/cloudbroker/disks/resize": disks_cb.ResizeRequest{},
"/restmachine/cloudbroker/disks/resize2": disks_cb.ResizeRequest{}, "/restmachine/cloudbroker/disks/resize2": disks_cb.ResizeRequest{},
"/restmachine/cloudbroker/disks/restore": disks_cb.RestoreRequest{}, "/restmachine/cloudbroker/disks/restore": disks_cb.RestoreRequest{},
"/restmachine/cloudbroker/disks/search": disks_cb.SearchRequest{}, "/restmachine/cloudbroker/disks/search": disks_cb.SearchRequest{},
@ -652,6 +681,7 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/grid/setMemAllocationRatio": grid_cb.SetMemAllocationRatioRequest{}, "/restmachine/cloudbroker/grid/setMemAllocationRatio": grid_cb.SetMemAllocationRatioRequest{},
"/restmachine/cloudbroker/grid/setPasswordPolicy": grid_cb.SetPasswordPolicyRequest{}, "/restmachine/cloudbroker/grid/setPasswordPolicy": grid_cb.SetPasswordPolicyRequest{},
"/restmachine/cloudbroker/grid/status": EmptyStruct{}, "/restmachine/cloudbroker/grid/status": EmptyStruct{},
"/restmachine/cloudbroker/grid/getSettings": grid_cb.GetSettingsRequest{},
// group // group
"/restmachine/cloudbroker/group/get": group_cb.GetRequest{}, "/restmachine/cloudbroker/group/get": group_cb.GetRequest{},
@ -679,6 +709,7 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/image/share": image_cb.ShareRequest{}, "/restmachine/cloudbroker/image/share": image_cb.ShareRequest{},
"/restmachine/cloudbroker/image/syncCreateImage": image_cb.SyncCreateRequest{}, "/restmachine/cloudbroker/image/syncCreateImage": image_cb.SyncCreateRequest{},
"/restmachine/cloudbroker/image/updateNodes": image_cb.UpdateNodesRequest{}, "/restmachine/cloudbroker/image/updateNodes": image_cb.UpdateNodesRequest{},
"/restmachine/cloudbroker/image/uploadImageFile": image_cb.UploadImageFileResponse{},
// k8ci // k8ci
"/restmachine/cloudbroker/k8ci/accessAdd": k8ci_cb.AccessAddRequest{}, "/restmachine/cloudbroker/k8ci/accessAdd": k8ci_cb.AccessAddRequest{},
@ -768,6 +799,7 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/node/setsriovstatus": node_cb.SetSRIOVStatusRequest{}, "/restmachine/cloudbroker/node/setsriovstatus": node_cb.SetSRIOVStatusRequest{},
"/restmachine/cloudbroker/node/setVFsNumber": node_cb.SetVFsNumberRequest{}, "/restmachine/cloudbroker/node/setVFsNumber": node_cb.SetVFsNumberRequest{},
"/restmachine/cloudbroker/node/update": node_cb.UpdateRequest{}, "/restmachine/cloudbroker/node/update": node_cb.UpdateRequest{},
"/restmachine/cloudbroker/node/setVFsParams": node_cb.VFParam{},
// pcidevice // pcidevice
"/restmachine/cloudbroker/pcidevice/create": pcidevice_cb.CreateRequest{}, "/restmachine/cloudbroker/pcidevice/create": pcidevice_cb.CreateRequest{},
@ -776,6 +808,23 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/pcidevice/enable": pcidevice_cb.EnableRequest{}, "/restmachine/cloudbroker/pcidevice/enable": pcidevice_cb.EnableRequest{},
"/restmachine/cloudbroker/pcidevice/list": pcidevice_cb.ListRequest{}, "/restmachine/cloudbroker/pcidevice/list": pcidevice_cb.ListRequest{},
// prometheus
"/restmachine/cloudbroker/prometheus/computeTransmitPackets": prometheus_cb.ComputeTransmitPacketsRequest{},
"/restmachine/cloudbroker/prometheus/computeWriteRequests": prometheus_cb.ComputeWriteRequestsRequest{},
"/restmachine/cloudbroker/prometheus/computeCPUload": prometheus_cb.ComputeCPULoadRequest{},
"/restmachine/cloudbroker/prometheus/computeTransmitBytes": prometheus_cb.ComputeTransmitBytesRequest{},
"/restmachine/cloudbroker/prometheus/computeMemoryUsed": prometheus_cb.ComputeMemoryUsedRequest{},
"/restmachine/cloudbroker/prometheus/computeMemoryUsable": prometheus_cb.ComputeMemoryUsableRequest{},
"/restmachine/cloudbroker/prometheus/computeMemoryAvailable": prometheus_cb.ComputeMemoryAvailableRequest{},
"/restmachine/cloudbroker/prometheus/computeReceiveBytes": prometheus_cb.ComputeReceiveBytesRequest{},
"/restmachine/cloudbroker/prometheus/computes": prometheus_cb.ComputesRequest{},
"/restmachine/cloudbroker/prometheus/computeReceivePackets": prometheus_cb.ComputeReceivePacketsRequest{},
"/restmachine/cloudbroker/prometheus/computeReadRequests": prometheus_cb.ComputeReadRequestsRequest{},
"/restmachine/cloudbroker/prometheus/computeWriteBytes": prometheus_cb.ComputeWriteBytesRequest{},
"/restmachine/cloudbroker/prometheus/computeReadBytes": prometheus_cb.ComputeReadBytesRequest{},
"/restmachine/cloudbroker/prometheus/computeMemoryUsage": prometheus_cb.ComputeMemoryUsageRequest{},
"/restmachine/cloudbroker/prometheus/computeMemoryUnused": prometheus_cb.ComputeMemoryUnusedRequest{},
// rg // rg
"/restmachine/cloudbroker/rg/accessGrant": rg_cb.AccessGrantRequest{}, "/restmachine/cloudbroker/rg/accessGrant": rg_cb.AccessGrantRequest{},
"/restmachine/cloudbroker/rg/accessRevoke": rg_cb.AccessRevokeRequest{}, "/restmachine/cloudbroker/rg/accessRevoke": rg_cb.AccessRevokeRequest{},
@ -807,6 +856,7 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/rg/updateComputeFeatures": rg_cb.UpdateComputeFeaturesRequest{}, "/restmachine/cloudbroker/rg/updateComputeFeatures": rg_cb.UpdateComputeFeaturesRequest{},
"/restmachine/cloudbroker/rg/updateResourceTypes": rg_cb.UpdateResourceTypesRequest{}, "/restmachine/cloudbroker/rg/updateResourceTypes": rg_cb.UpdateResourceTypesRequest{},
"/restmachine/cloudbroker/rg/usage": rg_cb.UsageRequest{}, "/restmachine/cloudbroker/rg/usage": rg_cb.UsageRequest{},
"/restmachine/cloudbroker/rg/removeDefNet": rg_cb.RemoveDefNetRequest{},
// sep // sep
"/restmachine/cloudbroker/sep/accessGrant": sep_cb.AccessGrantRequest{}, "/restmachine/cloudbroker/sep/accessGrant": sep_cb.AccessGrantRequest{},
@ -832,6 +882,9 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/sep/getConfig": sep_cb.GetConfigRequest{}, "/restmachine/cloudbroker/sep/getConfig": sep_cb.GetConfigRequest{},
"/restmachine/cloudbroker/sep/getPool": sep_cb.GetPoolRequest{}, "/restmachine/cloudbroker/sep/getPool": sep_cb.GetPoolRequest{},
"/restmachine/cloudbroker/sep/list": sep_cb.ListRequest{}, "/restmachine/cloudbroker/sep/list": sep_cb.ListRequest{},
"/restmachine/cloudbroker/sep/sharedLockStop": sep_cb.SharedLockStopRequest{},
"/restmachine/cloudbroker/sep/listAvailableSepAndPools": sep_cb.ListAvailableSEPAndPoolsRequest{},
"/restmachine/cloudbroker/sep/sharedLockStart": sep_cb.SharedLockStartRequest{},
// stack // stack
"/restmachine/cloudbroker/stack/get": stack_cb.GetRequest{}, "/restmachine/cloudbroker/stack/get": stack_cb.GetRequest{},

@ -1,119 +0,0 @@
package test
import (
"bufio"
"encoding/json"
"io"
"os"
"regexp"
"sort"
"strings"
"testing"
)
func compareLogs(logFileName string, logsData []string, t *testing.T, testType string) {
if _, err := os.Stat(logFileName); os.IsNotExist(err) {
file, err := os.Create(logFileName)
if err != nil {
t.Errorf("Failed to create log file: %v", err)
}
defer file.Close()
writer := bufio.NewWriter(file)
jsonData, err := json.MarshalIndent(logsData, "", " ")
if err != nil {
t.Errorf("Failed to marshal logsData to JSON: %v", err)
}
_, err = writer.WriteString(string(jsonData))
if err != nil {
t.Errorf("Failed to write JSON to log file: %v", err)
}
writer.Flush()
} else {
file, err := os.Open(logFileName)
if err != nil {
t.Errorf("Failed to open log file: %v", err)
}
defer file.Close()
reader := bufio.NewReader(file)
var sb strings.Builder
for {
line, err := reader.ReadString('\n')
if err != nil {
if err == io.EOF {
sb.WriteString(strings.TrimSpace(line))
break
}
t.Errorf("Error reading log file: %v", err)
return
}
sb.WriteString(strings.TrimSpace(line))
}
var fileContent = sb.String()
var fileLogsData []string
err = json.Unmarshal([]byte(fileContent), &fileLogsData)
if err != nil {
t.Errorf("Failed to unmarshal JSON from log file: %v", err)
}
if len(fileLogsData) != len(logsData) {
t.Errorf("Log data length does not match. Got: %d, Expected: %d", len(fileLogsData), len(logsData))
}
var allLinesMatch = true
switch testType {
default:
for i := range logsData {
if sortBracketsContent(fileLogsData[i]) != sortBracketsContent(logsData[i]) {
allLinesMatch = false
t.Errorf("Line %d does not match. Got: %s, Expected: %s", i+1, sortBracketsContent(fileLogsData[i]), sortBracketsContent(logsData[i]))
}
}
if allLinesMatch {
t.Log("\nAll lines match the log file.")
}
case "request":
var tmp = make(map[string]struct{})
for _, v := range fileLogsData {
if _, ok := tmp[v]; ok {
delete(tmp, v)
} else {
tmp[v] = struct{}{}
}
}
for _, v := range logsData {
if _, ok := tmp[v]; ok {
delete(tmp, v)
} else {
tmp[v] = struct{}{}
}
}
if len(tmp) == 0 {
t.Log("\nAll lines match the log file.")
return
}
for i := range tmp {
t.Errorf("Line %s does not match.", i)
}
}
}
}
func sortBracketsContent(log string) string {
re := regexp.MustCompile(`\[([^\[\]]*)\]`)
return re.ReplaceAllStringFunc(log, func(match string) string {
content := match[1 : len(match)-1]
parts := strings.Split(content, " ")
sort.Strings(parts)
return "[" + strings.Join(parts, " ") + "]"
})
}

@ -51,15 +51,12 @@ func getBytesFromJSON(fileName string, t *testing.T) []byte {
func getErrorsFromJSON(bytes []byte, t *testing.T, cloud string) { func getErrorsFromJSON(bytes []byte, t *testing.T, cloud string) {
var requests map[string]interface{} var requests map[string]interface{}
var logFileName string
switch cloud { switch cloud {
case "cloudapi": case "cloudapi":
requests = getRequestsMapCloudAPI() requests = getRequestsMapCloudAPI()
logFileName = "test_requests_cloudAPI.log"
case "cloudbroker": case "cloudbroker":
requests = getRequestsMapCloudbroker() requests = getRequestsMapCloudbroker()
logFileName = "test_requests_cloudbroker.log"
default: default:
t.Fatalf("Wrong cloud provided, expected `cloudapi` or `cloudbroker`, got %s", cloud) t.Fatalf("Wrong cloud provided, expected `cloudapi` or `cloudbroker`, got %s", cloud)
} }
@ -151,7 +148,6 @@ func getErrorsFromJSON(bytes []byte, t *testing.T, cloud string) {
t.Error(msg) t.Error(msg)
dataLogs = append(dataLogs, msg) dataLogs = append(dataLogs, msg)
} }
compareLogs(logFileName, dataLogs, t, "request")
} }
// checkName checks if name field from platform has the same value as json tag in golang structure (maybe including omitempty) // checkName checks if name field from platform has the same value as json tag in golang structure (maybe including omitempty)

@ -11,7 +11,6 @@ import (
var DEPRECATED_GROUPS = []string{ var DEPRECATED_GROUPS = []string{
"/cloudapi/machine/", "/cloudapi/machine/",
"/cloudapi/cloudspace/", "/cloudapi/cloudspace/",
"/cloudapi/prometheus/",
"//cloudbroker/pgpu/", "//cloudbroker/pgpu/",
"/cloudapi/gpu/", "/cloudapi/gpu/",
"/cloudapi/portforwarding/", "/cloudapi/portforwarding/",
@ -28,7 +27,6 @@ var DEPRECATED_GROUPS = []string{
"/cloudbroker/account/listCS", "/cloudbroker/account/listCS",
"/cloudbroker/machine/", "/cloudbroker/machine/",
"/cloudbroker/bservice/", "/cloudbroker/bservice/",
"/cloudbroker/prometheus/",
"/cloudbroker/auditcollector/", "/cloudbroker/auditcollector/",
"/cloudbroker/health/", "/cloudbroker/health/",
"/cloudbroker/metering/", "/cloudbroker/metering/",

Loading…
Cancel
Save