Compare commits

...

4 Commits

Author SHA1 Message Date
dayterr
f111bf25fc v1.13.2 2025-12-23 17:39:58 +03:00
dayterr
055b256d6b v1.13.1 2025-12-16 14:22:57 +03:00
asteam
f0dee6360a v1.13.0 2025-12-08 16:16:35 +03:00
a267d35ddf v1.12.10 2025-11-18 14:42:39 +03:00
137 changed files with 1000 additions and 1276 deletions

View File

@@ -1,73 +1,57 @@
## Version 1.12.9 ## Version 1.13.2
Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами
Метод `ListStacks` в cloudbroker/image стал deprecated и в следующих версиях будет удалён Метод `ListNodes` в cloudbroker/image стал deprecated и в следующих версиях будет удалён
Методы `AccessGrant`, `AccessGrantToPool`, `AccessRevoke`, `AccessRevokeToPool` в cloudbroker/sep стали deprecated и в следующих версиях будут удалены Методы `AccessGrant`, `AccessGrantToPool`, `AccessRevoke`, `AccessRevokeToPool` в cloudbroker/sep стали deprecated и в следующих версиях будут удалены
Методы `ComputeCISet`, `ComputeCIUnset`, `GetAudits` в cloudbroker/computeGetAudits и `GetAudits` в cloudbroker/compute стали deprecated и будут удалены в следующих версиях
Все методы группы `.SDN()` находятся в альфа-версии. Все методы группы `.SDN()` находятся в альфа-версии.
### Добавлено ### Добавлено
#### address pool #### audit
| Идентификатор<br>задачи | Описание | | Идентификатор<br>задачи | Описание |
| --- | --- | | --- | ---|
| BGOS-515 | Группа методов address pool в sdn | | BGOS-706 | Поля `ResgroupID`, `AccountID`, `ComputeID` в структуру ответа `RecordAudit` в cloudbroker/audit |
#### compute #### compute
| Идентификатор<br>задачи | Описание | | Идентификатор<br>задачи | Описание |
| --- | --- | | --- | --- |
| BGOS-650 | Поля `BusNumber`, `EnableSecGroups`, `LibvirtSettings`, `MTU`, `NodeID`, `SDNInterfaceID`, `SecurityGroups`, `TrunkTags` в структуру ответа `RecordNetAttach` в compute/cloudapi и compute/cloudbroker | | BGOS-703 | Опциональное поле `NetMask` в структуру запроса `NetAttachRequest` в cloudbroker/compute |
| BGOS-704 | Поле `SepID` в структуру ответа `InfoDisk` в cloudapi/compute и cloudbroker/compute |
#### default security policies
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-516 | Группа методов default security policies в sdn |
#### image
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-648 | Поле `ToClean` в структурах ответа `RecordImage` в cloudapi/image и `RecordImage`, `ItemImage` cloudbroker/image |
#### network object groups
| Идентификатор<br>задачи | Описание |
| --- | --- |
| Идентификатор<br>задачи | Описание |
| BGOS-520 | Группа методов network object groups в sdn |
#### logical ports
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-519 | Группа методов logical ports в sdn |
#### security policies
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-521 | Группа методов security policies в sdn |
#### sdn external networks
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-517 | Группа методов external networks в sdn |
#### sdn floating ips
| Идентификатор<br>задачи | Описание |
|--- | --- |
| BGOS-594 | Группа методов floating ips в sdn |
#### sdn routers
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-524 | Группа методов external routers в sdn |
#### sdn segments
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-523 | Группа методов segments в sdn |
### Исправлено
#### kvmx86 #### kvmx86
| Идентификатор<br>задачи | Описание | | Идентификатор<br>задачи | Описание |
| --- | --- | | --- | --- |
| BGOS-652 | Структура `Interface` заменена на `InterfaceMassCreate` в структуре `MassCreateRequest` в cloudbroker/kvmx86 | | BGOS-703 | Опциональное поле `NetMask` в структуры запросов `Interface` в cloudapi/kvmx86 и cloudbroker/kvmx86 |
#### sep
| Идентификатор<br>задачи | Описание |
| --- | ---|
| BGOS-704 | Опциональное поле `SepIDs` в структуре запроса `ListRequest` в cloudbroker/sep |
#### storage policy
| Идентификатор<br>задачи | Описание |
| --- | ---|
| BGOS-708 | Поле `SepTechStatus` в структуру запроса `ListRequest` в cloudapi/stpolicy и в cloudbroker/stpolicy |
| BGOS-710 | Обязательное поле `AccessSEPsPool` в структуру запроса `UpdateRequest` в cloudbroker/stpolicy |
#### trunk
| Идентификатор<br>задачи | Описание |
| --- | ---|
| BGOS-705 | Поле `MTU` в структуру ответа `ItemTrunk` в cloudapi/trunk и в cloudbroker/trunk |
| BGOS-705 | Опциональное поле `MTU` в структуры запроса`CreateRequest` и `UpdateRequest` в cloudbroker/trunk |
### Изменено
#### compute
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-707 | Поле `Value` стало обязательным в структурах запроса `AntiAffinityRuleAddRequest`, `AntiAffinityRuleRemoveRequest`, `AffinityRuleAddRequest` и `AffinityRuleRemoveRequest` в cloudapi/compute и в cloudbroker/compute |
| BGOS-707 | Тип поля `StoragePolicyID` изменен с обязательного на опциональный в структуре запроса`CloneRequest` в cloudbroker/compute |
| BGOS-707 | Тип поля `ComputeID` с `uint64` на `string` в структуре запроса `GetCloneStatusRequest` в cloudbroker/compute |
#### node
| Идентификатор<br>задачи | Описание |
| --- | --- |
| BGOS-709 | Поле `VFNum` заменено на поле `FNID` в структуре `VFParam` в структуре запроса `SetVFsParamsRequest` в cloudbroker/node |

View File

@@ -17,6 +17,7 @@ Decort SDK - это библиотека, написанная на языке G
- Версия 1.10.х Decort-SDK соответствует 4.2.0 версии платформы - Версия 1.10.х Decort-SDK соответствует 4.2.0 версии платформы
- Версия 1.11.х Decort-SDK соответствует 4.3.0 версии платформы - Версия 1.11.х Decort-SDK соответствует 4.3.0 версии платформы
- Версия 1.12.х Decort-SDK соответствует 4.4.0 версии платформы - Версия 1.12.х Decort-SDK соответствует 4.4.0 версии платформы
- Версия 1.13.х Decort-SDK соответствует 4.5.0 версии платформы
## Оглавление ## Оглавление
@@ -83,6 +84,8 @@ Decort SDK - это библиотека, написанная на языке G
- [Пример выполнения запроса](#пример-выполнения-запроса-4) - [Пример выполнения запроса](#пример-выполнения-запроса-4)
- [Проверка соответствия версии платформы и версии dynamix](#проверка-соответствия-версии-платформы-и-версии-dynamix) - [Проверка соответствия версии платформы и версии dynamix](#проверка-соответствия-версии-платформы-и-версии-dynamix)
- [Пример выполнения запроса](#пример-выполнения-запроса-5) - [Пример выполнения запроса](#пример-выполнения-запроса-5)
- [Создание mock клиента](#создание-mock-клиента)
- [Пример создания mock клиента](#пример-создания-mock-клиента)
## Установка ## Установка
@@ -123,7 +126,6 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
- `RG` - управление ресурсными группами аккаунта; - `RG` - управление ресурсными группами аккаунта;
- `Security group` управление группами безопасности; - `Security group` управление группами безопасности;
- `SEP` - управление storage endpoint (sep); - `SEP` - управление storage endpoint (sep);
- `Stack` - получение информации о вычислительных узлах;
- `Storage policy` получение информации о политиках хранения; - `Storage policy` получение информации о политиках хранения;
- `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера); - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
- `Trunk` - получение информации о транковых портах; - `Trunk` - получение информации о транковых портах;
@@ -160,7 +162,6 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
- `RG` - управление ресурсными группами аккаунта; - `RG` - управление ресурсными группами аккаунта;
- `Security group` управление группами безопасности; - `Security group` управление группами безопасности;
- `SEP` - управление storage endpoint (sep); - `SEP` - управление storage endpoint (sep);
- `Stack` - получение информации о вычислительных узлах;
- `Storage policy` управление политиками хранения; - `Storage policy` управление политиками хранения;
- `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера); - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
- `Trunk` - управление транковыми портами; - `Trunk` - управление транковыми портами;
@@ -335,7 +336,6 @@ func main() {
- `pkg/cloudapi/rg` - для `RG` - `pkg/cloudapi/rg` - для `RG`
- `pkg/cloudapi/secgroup` - для `Security group` - `pkg/cloudapi/secgroup` - для `Security group`
- `pkg/cloudapi/sep` - для `SEP` - `pkg/cloudapi/sep` - для `SEP`
- `pkg/cloudapi/stack` - для `Stack`
- `pkg/cloudapi/stpolicy` - для `Storage policy` - `pkg/cloudapi/stpolicy` - для `Storage policy`
- `pkg/cloudapi/tasks` - для `Tasks` - `pkg/cloudapi/tasks` - для `Tasks`
- `pkg/cloudapi/trunk` - для `Trunk` - `pkg/cloudapi/trunk` - для `Trunk`
@@ -367,7 +367,6 @@ func main() {
- `pkg/cloudbroker/rg` - для `RG` - `pkg/cloudbroker/rg` - для `RG`
- `pkg/cloudbroker/secgroup` - для `Security group` - `pkg/cloudbroker/secgroup` - для `Security group`
- `pkg/cloudbroker/sep` - для `SEP` - `pkg/cloudbroker/sep` - для `SEP`
- `pkg/cloudbroker/stack` - для `Stack`
- `pkg/cloudbroker/stpolicy` - для `Storage policy` - `pkg/cloudbroker/stpolicy` - для `Storage policy`
- `pkg/cloudbroker/tasks` - для `Tasks` - `pkg/cloudbroker/tasks` - для `Tasks`
- `pkg/cloudbroker/trunk` - для `Trunk` - `pkg/cloudbroker/trunk` - для `Trunk`
@@ -464,9 +463,9 @@ type CreateRequest struct {
// Required: false // Required: false
Start bool `url:"start,omitempty" json:"start,omitempty"` Start bool `url:"start,omitempty" json:"start,omitempty"`
// Stack ID // Node ID
// Required: false // Required: false
StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"` NodeID uint64 `url:"nodeId,omitempty" json:"nodeId,omitempty"`
// System name // System name
// Required: false // Required: false
@@ -543,7 +542,6 @@ func main() {
- `.RG()` - для работы с `RG` - `.RG()` - для работы с `RG`
- `.SecurityGroup()` - для работы с `Security Group` - `.SecurityGroup()` - для работы с `Security Group`
- `.SEP()` - для работы с `SEP` - `.SEP()` - для работы с `SEP`
- `.Stack()` - для работы с `Stack`
- `.StPolicy()` - для работы с `Storage Policy` - `.StPolicy()` - для работы с `Storage Policy`
- `.Tasks()` - для работы с `Tasks` - `.Tasks()` - для работы с `Tasks`
- `.Trunk()` - для работы с `Trunk` - `.Trunk()` - для работы с `Trunk`
@@ -577,7 +575,6 @@ func main() {
- `.RG()` - для работы с `RG` - `.RG()` - для работы с `RG`
- `.SecurityGroup()` - для работы с `Security Group` - `.SecurityGroup()` - для работы с `Security Group`
- `.SEP()` - для работы с `SEP` - `.SEP()` - для работы с `SEP`
- `.Stack()` - для работы с `Stack`
- `.StPolicy()` - для работы с `Storage Policy` - `.StPolicy()` - для работы с `Storage Policy`
- `.Tasks()` - для работы с `Tasks` - `.Tasks()` - для работы с `Tasks`
- `.Trunk()` - для работы с `Trunk` - `.Trunk()` - для работы с `Trunk`
@@ -1709,4 +1706,35 @@ func main(){
// Проверка соответствия версии // Проверка соответствия версии
checkInfo, err := client.Check() checkInfo, err := client.Check()
} }
```
# Создание mock клиента
Создание клиента происходит с помощью функции-строителя `NewMockDecortClient` из основного пакета `decort-sdk`. Функция принимает mock реализацию интерфейса interfaces.Calller, возвращает структуру `MockDecortClient`, с помощью которой можно производить unit тестирование API Decort SDK без подключения к серверу
#### Пример создания mock клиента
```go
package unit_test
import (
"testing"
"go.uber.org/mock/gomock"
decortsdk "repository.basistech.ru/BASIS/decort-golang-sdk"
)
// Пример юнит тестирования на моках
func TestClient(t *testing.T) {
ctrl := gomock.NewController(t)
// Создаем mock интерфейса Caller
mockCaller := decortsdk.NewMockCaller(ctrl)
// Создаем mock интерфейса DecortClient
mockClient := decortsdk.NewMockDecortClient(mockCaller)
// ....
}
```
Пример юнит теста можно посмотреть в файле [samples/client/client_test.go](samples/client/client_test.go)
При редактировании интерфеса interface.Caller необходимо перегенерировать Mock :
``` shell
make gen-mock
``` ```

32
client_mock.go Normal file
View File

@@ -0,0 +1,32 @@
package decortsdk
import (
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
)
type MockDecortClient struct {
apiCaller *MockCaller
}
func NewMockDecortClient(apiCaller *MockCaller) ClientInterface {
return &MockDecortClient{
apiCaller: apiCaller,
}
}
// CloudAPI builder
func (mdc *MockDecortClient) CloudAPI() *cloudapi.CloudAPI {
return cloudapi.New(mdc.apiCaller)
}
// CloudBroker builder
func (mdc *MockDecortClient) CloudBroker() *cloudbroker.CloudBroker {
return cloudbroker.New(mdc.apiCaller)
}
// SDN builder
func (mdc *MockDecortClient) SDN() *sdn.SDN {
return sdn.New(mdc.apiCaller)
}

86
client_mock_gen.go Normal file
View File

@@ -0,0 +1,86 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: interfaces/caller.go
//
// Generated by this command:
//
// mockgen -package decortsdk -source interfaces/caller.go
//
// Package decortsdk is a generated GoMock package.
package decortsdk
import (
context "context"
reflect "reflect"
gomock "go.uber.org/mock/gomock"
)
// MockCaller is a mock of Caller interface.
type MockCaller struct {
ctrl *gomock.Controller
recorder *MockCallerMockRecorder
isgomock struct{}
}
// MockCallerMockRecorder is the mock recorder for MockCaller.
type MockCallerMockRecorder struct {
mock *MockCaller
}
// NewMockCaller creates a new mock instance.
func NewMockCaller(ctrl *gomock.Controller) *MockCaller {
mock := &MockCaller{ctrl: ctrl}
mock.recorder = &MockCallerMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use.
func (m *MockCaller) EXPECT() *MockCallerMockRecorder {
return m.recorder
}
// DecortApiCall mocks base method.
func (m *MockCaller) DecortApiCall(ctx context.Context, method, url string, params any) ([]byte, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "DecortApiCall", ctx, method, url, params)
ret0, _ := ret[0].([]byte)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// DecortApiCall indicates an expected call of DecortApiCall.
func (mr *MockCallerMockRecorder) DecortApiCall(ctx, method, url, params any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DecortApiCall", reflect.TypeOf((*MockCaller)(nil).DecortApiCall), ctx, method, url, params)
}
// DecortApiCallCtype mocks base method.
func (m *MockCaller) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params any) ([]byte, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "DecortApiCallCtype", ctx, method, url, ctype, params)
ret0, _ := ret[0].([]byte)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// DecortApiCallCtype indicates an expected call of DecortApiCallCtype.
func (mr *MockCallerMockRecorder) DecortApiCallCtype(ctx, method, url, ctype, params any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DecortApiCallCtype", reflect.TypeOf((*MockCaller)(nil).DecortApiCallCtype), ctx, method, url, ctype, params)
}
// DecortApiCallMP mocks base method.
func (m *MockCaller) DecortApiCallMP(ctx context.Context, method, url string, params any) ([]byte, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "DecortApiCallMP", ctx, method, url, params)
ret0, _ := ret[0].([]byte)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// DecortApiCallMP indicates an expected call of DecortApiCallMP.
func (mr *MockCallerMockRecorder) DecortApiCallMP(ctx, method, url, params any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DecortApiCallMP", reflect.TypeOf((*MockCaller)(nil).DecortApiCallMP), ctx, method, url, params)
}

4
go.mod
View File

@@ -6,15 +6,19 @@ require (
github.com/go-playground/validator/v10 v10.28.0 github.com/go-playground/validator/v10 v10.28.0
github.com/google/go-querystring v1.1.0 github.com/google/go-querystring v1.1.0
github.com/joho/godotenv v1.5.1 github.com/joho/godotenv v1.5.1
github.com/stretchr/testify v1.9.0
go.uber.org/mock v0.6.0
gopkg.in/yaml.v3 v3.0.1 gopkg.in/yaml.v3 v3.0.1
) )
require ( require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gabriel-vasile/mimetype v1.4.10 // indirect github.com/gabriel-vasile/mimetype v1.4.10 // indirect
github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/google/go-cmp v0.5.9 // indirect github.com/google/go-cmp v0.5.9 // indirect
github.com/leodido/go-urn v1.4.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/crypto v0.42.0 // indirect golang.org/x/crypto v0.42.0 // indirect
golang.org/x/sys v0.36.0 // indirect golang.org/x/sys v0.36.0 // indirect
golang.org/x/text v0.29.0 // indirect golang.org/x/text v0.29.0 // indirect

32
go.sum
View File

@@ -1,16 +1,13 @@
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0= github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688= github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU= github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -20,37 +17,22 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

View File

@@ -28,6 +28,7 @@ var FileName = map[string]string{
var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"} var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}
var VersionMap = map[string]string{ var VersionMap = map[string]string{
"4.5.0": "-",
"4.4.0": "-", "4.4.0": "-",
"4.3.0": "-", "4.3.0": "-",
"4.2.0": "-", "4.2.0": "-",

View File

@@ -471,3 +471,10 @@ func addressPoolNetTypeValidator(fe validator.FieldLevel) bool {
return IsInSlice(fieldValue, addressPoolNetTypeValues) return IsInSlice(fieldValue, addressPoolNetTypeValues)
} }
// sepTechStatusValidator is used to validate SepTechStatus fields
func sepTechStatusValidator(fe validator.FieldLevel) bool {
fieldValue := fe.Field().String()
return IsInSlice(fieldValue, sepTechStatusValues)
}

View File

@@ -366,6 +366,12 @@ func errorMessage(fe validator.FieldError) string {
prefix, prefix,
fe.Field(), fe.Field(),
joinValues(ipTypeValues)) joinValues(ipTypeValues))
case "sepTechStatus":
return fmt.Sprintf("%s %s must be one of the following: %s",
prefix,
fe.Field(),
joinValues(sepTechStatusValues))
} }
return fe.Error() return fe.Error()

View File

@@ -311,5 +311,10 @@ func registerAllValidators(validate *validator.Validate) error {
return err return err
} }
err = validate.RegisterValidation("sepTechStatus", sepTechStatusValidator)
if err != nil {
return err
}
return nil return nil
} }

View File

@@ -7,7 +7,7 @@ var (
resTypesValues = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"} resTypesValues = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
protoValues = []string{"tcp", "udp"} protoValues = []string{"tcp", "udp"}
accountCUTypeValues = []string{"CU_M", "CU_C", "CU_D", "CU_DM", "CU_S", "CU_A", "CU_NO", "CU_I", "CU_NP"} accountCUTypeValues = []string{"CU_M", "CU_C", "CU_D", "CU_DM", "CU_I", "gpu_units"}
bserviceModeValues = []string{"ABSOLUTE", "RELATIVE"} bserviceModeValues = []string{"ABSOLUTE", "RELATIVE"}
@@ -81,6 +81,8 @@ var (
addressPoolNetTypeValues = []string{"IPv4", "IPv6", "MAC"} addressPoolNetTypeValues = []string{"IPv4", "IPv6", "MAC"}
ipTypeValues = []string{"v4, v6"} ipTypeValues = []string{"v4, v6"}
sepTechStatusValues = []string{"ENABLED", "DISABLED"}
) )
const ( const (

View File

@@ -27,11 +27,8 @@ type GetConsumedCloudUnitsByTypeRequest struct {
// - CU_C: returns number of virtual cpu cores // - CU_C: returns number of virtual cpu cores
// - CU_D: returns consumed virtual disk storage in GB // - CU_D: returns consumed virtual disk storage in GB
// - CU_DM: returns consumed max virtual disk storage in GB // - CU_DM: returns consumed max virtual disk storage in GB
// - CU_S: returns consumed primary storage (NAS) in TB
// - CU_A: returns consumed secondary storage (Archive) in TB
// - CU_NO: returns sent/received network transfer in operator in GB
// - CU_NP: returns sent/received network transfer peering in GB
// - CU_I: returns number of public IPs // - CU_I: returns number of public IPs
// - gpu_units: return number of GPU units
func (a Account) GetConsumedCloudUnitsByType(ctx context.Context, req GetConsumedCloudUnitsByTypeRequest) (float64, error) { func (a Account) GetConsumedCloudUnitsByType(ctx context.Context, req GetConsumedCloudUnitsByTypeRequest) (float64, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {

View File

@@ -68,9 +68,6 @@ type ResourceLimits struct {
// RAM size, MB // RAM size, MB
CUM float64 `json:"CU_M"` CUM float64 `json:"CU_M"`
// Traffic volume, GB
CUNP float64 `json:"CU_NP"`
// Number of graphics cores // Number of graphics cores
GPUUnits float64 `json:"gpu_units"` GPUUnits float64 `json:"gpu_units"`
@@ -150,9 +147,6 @@ type Resource struct {
// Number of External IPs // Number of External IPs
ExtIPs int64 `json:"extips"` ExtIPs int64 `json:"extips"`
// External traffic
ExtTraffic int64 `json:"exttraffic"`
// Number of grafic cores // Number of grafic cores
GPU int64 `json:"gpu"` GPU int64 `json:"gpu"`
@@ -554,9 +548,6 @@ type LimitsRG struct {
// Number of External IPs // Number of External IPs
ExtIPs int64 `json:"extips"` ExtIPs int64 `json:"extips"`
// External traffic
ExtTraffic int64 `json:"exttraffic"`
// Number of grafic cores // Number of grafic cores
GPU int64 `json:"gpu"` GPU int64 `json:"gpu"`
@@ -565,6 +556,9 @@ type LimitsRG struct {
// SEPs // SEPs
SEPs uint64 `json:"seps"` SEPs uint64 `json:"seps"`
// Policies
Policies map[string]Policy `json:"policies"`
} }
// Main information about resource group // Main information about resource group

View File

@@ -34,10 +34,6 @@ type UpdateRequest struct {
// Required: false // Required: false
MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"` MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
// Max sent/received network transfer peering
// Required: false
MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
// Max number of assigned public IPs // Max number of assigned public IPs
// Required: false // Required: false
MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"` MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`

View File

@@ -70,8 +70,9 @@ type GroupAddRequest struct {
// Required: false // Required: false
UserData string `url:"userData,omitempty" json:"userData,omitempty"` UserData string `url:"userData,omitempty" json:"userData,omitempty"`
//Chipset "i440fx" or "Q35 // Chipset "i440fx" or "Q35
//Required: false // Default value : Q35
// Required: false
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset,omitempty"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset,omitempty"`
// ID of the chosen storage policy // ID of the chosen storage policy

View File

@@ -22,10 +22,10 @@ type GroupResizeRequest struct {
// Required: true // Required: true
Count int64 `url:"count" json:"count" validate:"required"` Count int64 `url:"count" json:"count" validate:"required"`
//Chipset for new computes, either i440fx or Q35 (i440fx by default) // Chipset for new computes, either i440fx or Q35 (i440fx by default)
//Available values : i440fx, Q35 // Available values : i440fx, Q35
//Default value : i440fx // Default value : Q35
//Required: true // Required: true
Chipset string `url:"chipset" json:"chipset" validate:"required,chipset"` Chipset string `url:"chipset" json:"chipset" validate:"required,chipset"`
// Either delta or absolute value of computes // Either delta or absolute value of computes

View File

@@ -119,8 +119,8 @@ type ItemCompute struct {
// Resource group ID // Resource group ID
RGID uint64 `json:"rgId"` RGID uint64 `json:"rgId"`
// StackID // NodeID
StackID uint64 `json:"stackId"` NodeID uint64 `json:"node_id"`
// Status // Status
Status string `json:"status"` Status string `json:"status"`

View File

@@ -38,9 +38,8 @@ type AffinityRuleAddRequest struct {
Key string `url:"key" json:"key" validate:"required"` Key string `url:"key" json:"key" validate:"required"`
// Value that must match the key to be taken into account when analyzing this rule // Value that must match the key to be taken into account when analyzing this rule
// Required: false // Required: true
// Not required on purpose: despite required tag on platform, empty string is allowed Value string `url:"value" json:"value" validate:"required"`
Value string `url:"value" json:"value"`
} }
// AffinityRuleAdd add affinity rule // AffinityRuleAdd add affinity rule

View File

@@ -38,9 +38,8 @@ type AffinityRuleRemoveRequest struct {
Key string `url:"key" json:"key" validate:"required"` Key string `url:"key" json:"key" validate:"required"`
// Value that must match the key to be taken into account when analyzing this rule // Value that must match the key to be taken into account when analyzing this rule
// Required: false // Required: true
// Not required on purpose: despite required tag on platform, empty string is allowed Value string `url:"value" json:"value" validate:"required"`
Value string `url:"value" json:"value"`
} }
// AffinityRuleRemove remove affinity rule // AffinityRuleRemove remove affinity rule

View File

@@ -38,9 +38,8 @@ type AntiAffinityRuleAddRequest struct {
Key string `url:"key" json:"key" validate:"required"` Key string `url:"key" json:"key" validate:"required"`
// Value that must match the key to be taken into account when analyzing this rule // Value that must match the key to be taken into account when analyzing this rule
// Required: false // Required: true
// Not required on purpose: despite required tag on platform, empty string is allowed Value string `url:"value" json:"value" validate:"required"`
Value string `url:"value" json:"value"`
} }
// AntiAffinityRuleAdd add anti affinity rule // AntiAffinityRuleAdd add anti affinity rule

View File

@@ -38,9 +38,8 @@ type AntiAffinityRuleRemoveRequest struct {
Key string `url:"key" json:"key" validate:"required"` Key string `url:"key" json:"key" validate:"required"`
// Value that must match the key to be taken into account when analyzing this rule // Value that must match the key to be taken into account when analyzing this rule
// Required: false // Required: true
// Not required on purpose: despite required tag on platform, empty string is allowed Value string `url:"value" json:"value" validate:"required"`
Value string `url:"value" json:"value"`
} }
// AntiAffinityRuleRemove remove anti affinity rule // AntiAffinityRuleRemove remove anti affinity rule

View File

@@ -62,7 +62,7 @@ var computes = ListComputes{
MigrationJob: 0, MigrationJob: 0,
Milestones: 363500, Milestones: 363500,
Name: "test", Name: "test",
PinnedToStack: true, PinnedToNode: true,
RAM: 4096, RAM: 4096,
ReferenceID: "c7cb19ac-af4a-4067-852f-c5572949207e", ReferenceID: "c7cb19ac-af4a-4067-852f-c5572949207e",
Registered: true, Registered: true,
@@ -126,7 +126,7 @@ var computes = ListComputes{
RAM: 4096, RAM: 4096,
ReferenceID: "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff", ReferenceID: "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff",
Registered: true, Registered: true,
PinnedToStack: true, PinnedToNode: true,
ResName: "compute-48556", ResName: "compute-48556",
RGID: 79727, RGID: 79727,
RGName: "sdk_negative_fields_test", RGName: "sdk_negative_fields_test",

View File

@@ -476,8 +476,8 @@ type RecordCompute struct {
// List OS Users // List OS Users
OSUsers ListOSUser `json:"osUsers"` OSUsers ListOSUser `json:"osUsers"`
// Pinned to stack // Pinned to node
PinnedToStack bool `json:"pinnedToStack"` PinnedToNode bool `json:"pinnedToNode"`
// PreferredCPU // PreferredCPU
PreferredCPU []int64 `json:"preferredCpu"` PreferredCPU []int64 `json:"preferredCpu"`
@@ -485,6 +485,9 @@ type RecordCompute struct {
// Qemu_quest // Qemu_quest
QemuQuest QemuQuest `json:"qemu_guest"` QemuQuest QemuQuest `json:"qemu_guest"`
// ReadOnly indicates read-only mode state
ReadOnly bool `json:"read_only"`
// Number of RAM // Number of RAM
RAM uint64 `json:"ram"` RAM uint64 `json:"ram"`
@@ -1151,8 +1154,8 @@ type ItemCompute struct {
//NumaNodeId //NumaNodeId
NumaNodeId int64 `json:"numaNodeId"` NumaNodeId int64 `json:"numaNodeId"`
// Pinned to stack // Pinned to node
PinnedToStack bool `json:"pinnedToStack"` PinnedToNode bool `json:"pinnedToNode"`
// PreferredCPU // PreferredCPU
PreferredCPU []int64 `json:"preferredCpu"` PreferredCPU []int64 `json:"preferredCpu"`
@@ -1166,6 +1169,9 @@ type ItemCompute struct {
// Qemu_quest // Qemu_quest
QemuQuest QemuQuest `json:"qemu_guest"` QemuQuest QemuQuest `json:"qemu_guest"`
// ReadOnly indicates read-only mode state
ReadOnly bool `json:"read_only"`
// Reference ID // Reference ID
ReferenceID string `json:"referenceId"` ReferenceID string `json:"referenceId"`
@@ -1231,6 +1237,9 @@ type ListInfoDisks []InfoDisk
type InfoDisk struct { type InfoDisk struct {
// ID // ID
ID uint64 `json:"id"` ID uint64 `json:"id"`
// SEP ID
SepID int64 `json:"sepId"`
} }
// List information about computes // List information about computes
@@ -1331,8 +1340,8 @@ type ItemPCIDevice struct {
// Resource group ID // Resource group ID
RGID uint64 `json:"rgId"` RGID uint64 `json:"rgId"`
// Stack ID // Node ID
StackID uint64 `json:"stackId"` NodeID uint64 `json:"nodeId"`
// Status // Status
Status string `json:"status"` Status string `json:"status"`

View File

@@ -8,8 +8,8 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
) )
// PinToStackRequest struct to pin compute to stack // PinToNodeRequest struct to pin compute to node
type PinToStackRequest struct { type PinToNodeRequest struct {
// ID of the compute instance // ID of the compute instance
// Required: true // Required: true
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"` ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
@@ -20,14 +20,14 @@ type PinToStackRequest struct {
AutoStart bool `url:"autoStart" json:"autoStart"` AutoStart bool `url:"autoStart" json:"autoStart"`
} }
// PinToStack pin compute to current stack // PinToNode pin compute to current node
func (c Compute) PinToStack(ctx context.Context, req PinToStackRequest) (bool, error) { func (c Compute) PinToNode(ctx context.Context, req PinToNodeRequest) (bool, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err)) return false, validators.ValidationErrors(validators.GetErrors(err))
} }
url := "/cloudapi/compute/pinToStack" url := "/cloudapi/compute/pin_to_node"
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req) res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil { if err != nil {

View File

@@ -16,12 +16,12 @@ type RedeployRequest struct {
// Storage policy id of compute. The rules of the specified storage policy will be used. // Storage policy id of compute. The rules of the specified storage policy will be used.
// Required: true // Required: true
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"` StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
// ID of the new OS image, if image change is required // ID of the new OS image, if image change is required
// Required: false // Required: false
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"` ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
// The OS version that will be installed on the virtual machine // The OS version that will be installed on the virtual machine
// Required: false // Required: false
OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"` OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`

View File

@@ -8,21 +8,21 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
) )
// UnpinFromStackRequest struct for unpin from stack // UnpinFromNodeRequest struct for unpin from node
type UnpinFromStackRequest struct { type UnpinFromNodeRequest struct {
// ID of the compute instance // ID of the compute instance
// Required: true // Required: true
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"` ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
} }
// UnpinFromStack unpins compute from current stack // UnpinFromNode unpins compute from current node
func (c Compute) UnpinFromStack(ctx context.Context, req UnpinFromStackRequest) (bool, error) { func (c Compute) UnpinFromNode(ctx context.Context, req UnpinFromNodeRequest) (bool, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err)) return false, validators.ValidationErrors(validators.GetErrors(err))
} }
url := "/cloudapi/compute/unpinFromStack" url := "/cloudapi/compute/unpin_from_node"
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req) res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil { if err != nil {

View File

@@ -169,6 +169,7 @@ type CreateRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
// Zone ID // Zone ID

View File

@@ -24,6 +24,7 @@ type WorkerAddRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
} }

View File

@@ -66,6 +66,7 @@ type WorkersGroupAddRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
} }

View File

@@ -35,6 +35,11 @@ type Interface struct {
// Required: false // Required: false
MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"` MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
// Net mask
// Used only to DPDK or VFNIC net type
// Required: false
NetMask uint64 `url:"netMask,omitempty" json:"netMask,omitempty"`
// MAC address to assign to this VM when connecting to the specified network // MAC address to assign to this VM when connecting to the specified network
// Required: false // Required: false
MAC string `url:"mac,omitempty" json:"mac,omitempty" validate:"omitempty"` MAC string `url:"mac,omitempty" json:"mac,omitempty" validate:"omitempty"`
@@ -189,6 +194,7 @@ type CreateRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
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

View File

@@ -63,8 +63,27 @@ type CreateBlankRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
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
// Required: false
// Default: false
HPBacked bool `url:"hp_backed" json:"hp_backed"`
// Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node
// Required: false
// Default: false
CPUPin bool `url:"cpu_pin" json:"cpu_pin"`
// Rule for VM placement with NUMA affinity.
// Possible values - none (placement without NUMA affinity),
// strict (strictly with NUMA affinity, if not possible - do not start VM),
// loose (use NUMA affinity if possible)
// Required: false
// Default: none
NumaAffinity string `url:"numa_affinity,omitempty" json:"numa_affinity,omitempty" validate:"omitempty,numaAffinity"`
// Text description of this VM // Text description of this VM
// Required: false // Required: false
Description string `url:"desc,omitempty" json:"desc,omitempty"` Description string `url:"desc,omitempty" json:"desc,omitempty"`

View File

@@ -29,8 +29,8 @@ type ItemPCIDevice struct {
// Resource group ID // Resource group ID
RGID uint64 `json:"rgId"` RGID uint64 `json:"rgId"`
// Stack ID // Node ID
StackID uint64 `json:"stackId"` NodeID uint64 `json:"nodeId"`
// Status // Status
Status string `json:"status"` Status string `json:"status"`
@@ -47,4 +47,3 @@ type ListPCIDevices struct {
// Entry count // Entry count
EntryCount uint64 `json:"entryCount"` EntryCount uint64 `json:"entryCount"`
} }

View File

@@ -39,10 +39,6 @@ type CreateRequest struct {
// Required: false // Required: false
MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"` MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
// Max sent/received network transfer peering
// Required: false
MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
// Max number of assigned public IPs // Max number of assigned public IPs
// Required: false // Required: false
MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"` MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`

View File

@@ -34,7 +34,6 @@ var rgs = ListResourceGroups{
CUC: -1, CUC: -1,
CUI: -1, CUI: -1,
CUM: -1, CUM: -1,
CUNP: -1,
GPUUnits: -1, GPUUnits: -1,
}, },
Secret: "", Secret: "",
@@ -76,7 +75,6 @@ var rgs = ListResourceGroups{
CUC: -1, CUC: -1,
CUI: -1, CUI: -1,
CUM: -1, CUM: -1,
CUNP: -1,
GPUUnits: -1, GPUUnits: -1,
}, },
Secret: "", Secret: "",
@@ -118,7 +116,6 @@ var rgs = ListResourceGroups{
CUC: -1, CUC: -1,
CUI: -1, CUI: -1,
CUM: -1, CUM: -1,
CUNP: -1,
GPUUnits: -1, GPUUnits: -1,
}, },
Secret: "", Secret: "",

View File

@@ -14,9 +14,6 @@ type Resource struct {
// Number of External IPs // Number of External IPs
ExtIPs int64 `json:"extips"` ExtIPs int64 `json:"extips"`
// External traffic
ExtTraffic int64 `json:"exttraffic"`
// Number of grafic cores // Number of grafic cores
GPU int64 `json:"gpu"` GPU int64 `json:"gpu"`
@@ -309,9 +306,6 @@ type ResourceLimits struct {
// CUM // CUM
CUM float64 `json:"CU_M"` CUM float64 `json:"CU_M"`
// CUNP
CUNP float64 `json:"CU_NP"`
// GPU units // GPU units
GPUUnits float64 `json:"gpu_units"` GPUUnits float64 `json:"gpu_units"`
@@ -849,9 +843,6 @@ type RecordResourceUsage struct {
// Number of external IPs // Number of external IPs
ExtIPs uint64 `json:"extips"` ExtIPs uint64 `json:"extips"`
// ExtraTraffic
ExtraTraffic uint64 `json:"exttraffic"`
// Number of GPU // Number of GPU
GPU uint64 `json:"gpu"` GPU uint64 `json:"gpu"`

View File

@@ -35,10 +35,6 @@ type UpdateRequest struct {
// Required: false // Required: false
MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"` MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
// Max sent/received network transfer peering
// Required: false
MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
// Max number of assigned public IPs // Max number of assigned public IPs
// Required: false // Required: false
MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"` MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`

View File

@@ -7,7 +7,7 @@ type SecurityGroup struct {
client interfaces.Caller client interfaces.Caller
} }
// Builder for stack endpoint // Builder for security policy endpoint
func New(client interfaces.Caller) *SecurityGroup { func New(client interfaces.Caller) *SecurityGroup {
return &SecurityGroup{ return &SecurityGroup{
client: client, client: client,

View File

@@ -1,10 +0,0 @@
package cloudapi
import (
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack"
)
// Accessing the Stack method group
func (ca *CloudAPI) Stack() *stack.Stack {
return stack.New(ca.client)
}

View File

@@ -1,46 +0,0 @@
package stack
import (
"context"
"encoding/json"
"net/http"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// GetRequest struct to get info of stack
type GetRequest struct {
// Find by ID
// Required: true
StackId uint64 `url:"stackId" json:"stackId" validate:"required"`
}
// Get gets stack details by ID as an InfoStack struct
func (i Stack) Get(ctx context.Context, req GetRequest) (*InfoStack, error) {
res, err := i.GetRaw(ctx, req)
if err != nil {
return nil, err
}
info := InfoStack{}
err = json.Unmarshal(res, &info)
if err != nil {
return nil, err
}
return &info, nil
}
// GetRaw gets stack details by ID as an array of bytes
func (i Stack) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
err := validators.ValidateRequest(req)
if err != nil {
return nil, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudapi/stack/get"
res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
return res, err
}

View File

@@ -1,10 +0,0 @@
package stack
// IDs gets array of StackIDs from ListStacks struct
func (ls ListStacks) IDs() []uint64 {
res := make([]uint64, 0, len(ls.Data))
for _, s := range ls.Data {
res = append(res, s.ID)
}
return res
}

View File

@@ -1,71 +0,0 @@
package stack
import (
"context"
"encoding/json"
"net/http"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// ListRequest struct to get list of stacks
type ListRequest struct {
// Find by ID
// Required: false
ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
// Find by name
// Required: false
Name string `url:"name,omitempty" json:"name,omitempty"`
// Find by type
// Required: false
Type string `url:"type,omitempty" json:"type,omitempty"`
// Find by status
// Required: false
Status string `url:"status,omitempty" json:"status,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"`
}
// List gets list of stacks as a ListStacks struct
func (i Stack) List(ctx context.Context, req ListRequest) (*ListStacks, error) {
res, err := i.ListRaw(ctx, req)
if err != nil {
return nil, err
}
list := ListStacks{}
err = json.Unmarshal(res, &list)
if err != nil {
return nil, err
}
return &list, nil
}
// ListRaw gets list of stacks as an array of bytes
func (i Stack) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
if err := validators.ValidateRequest(req); err != nil {
return nil, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudapi/stack/list"
res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
return res, err
}

View File

@@ -1,53 +0,0 @@
package stack
// Main information about stack
type InfoStack struct {
// CPU allocation ratio
CPUAllocationRatio float64 `json:"cpu_allocation_ratio"`
// Descr
Descr string `json:"descr"`
// Drivers
Drivers []string `json:"drivers"`
// ID
ID uint64 `json:"id"`
// Mem allocation ratio
MemAllocationRatio float64 `json:"mem_allocation_ratio"`
// Name
Name string `json:"name"`
// Status
Status string `json:"status"`
// Type
Type string `json:"type"`
}
// Information about stack in list
type ItemStack struct {
// ID
ID uint64 `json:"id"`
// Name
Name string `json:"name"`
// Status
Status string `json:"status"`
// Type
Type string `json:"type"`
}
// List of stacks
type ListStacks struct {
//List
Data []ItemStack `json:"data"`
//Entry count
EntryCount uint64 `json:"entryCount"`
}

View File

@@ -1,16 +0,0 @@
// Lists all the stack.
package stack
import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
// Structure for creating request to stack
type Stack struct {
client interfaces.Caller
}
// Builder for stack endpoint
func New(client interfaces.Caller) *Stack {
return &Stack{
client: client,
}
}

View File

@@ -56,6 +56,10 @@ type ListRequest struct {
// Search by pool name // Search by pool name
// Required: false // Required: false
PoolName string `url:"pool_name,omitempty" json:"pool_name,omitempty"` PoolName string `url:"pool_name,omitempty" json:"pool_name,omitempty"`
// Filter SEP's by tech status (ENABLED, DISABLED)
// Required: false
SepTechStatus string `url:"sep_tech_status,omitempty" json:"sep_tech_status,omitempty" validate:"omitempty,sepTechStatus"`
} }
// List gets list of storage policies as a ListStoragePolicies struct // List gets list of storage policies as a ListStoragePolicies struct

View File

@@ -77,6 +77,9 @@ type AccessSEPPool struct {
// Pool names // Pool names
PoolNames []string `json:"pool_names"` PoolNames []string `json:"pool_names"`
// Technical status of the SEP
SepTechStatus string `json:"sep_tech_status"`
} }
type Usage struct { type Usage struct {

View File

@@ -7,7 +7,7 @@ type StPolicy struct {
client interfaces.Caller client interfaces.Caller
} }
// Builder for stack endpoint // Builder for storage policy endpoint
func New(client interfaces.Caller) *StPolicy { func New(client interfaces.Caller) *StPolicy {
return &StPolicy{ return &StPolicy{
client: client, client: client,

View File

@@ -29,6 +29,9 @@ type ItemTrunk struct {
// MAC // MAC
MAC string `json:"mac"` MAC string `json:"mac"`
// MTU
MTU uint64 `json:"mtu"`
// Name of a trunk // Name of a trunk
Name string `json:"name"` Name string `json:"name"`

View File

@@ -156,9 +156,6 @@ type Resources struct {
// ExtIPs // ExtIPs
ExtIPs uint64 `json:"extips"` ExtIPs uint64 `json:"extips"`
// ExtTraffic
ExtTraffic uint64 `json:"exttraffic"`
// GPU // GPU
GPU uint64 `json:"gpu"` GPU uint64 `json:"gpu"`

View File

@@ -251,8 +251,8 @@ type RecordResources struct {
// Number of RAM // Number of RAM
RAM uint64 `json:"ram"` RAM uint64 `json:"ram"`
// Stack ID // Node ID
StackID uint64 `json:"stackId"` NodeID uint64 `json:"node_id"`
// UUID // UUID
UUID string `json:"uuid"` UUID string `json:"uuid"`

View File

@@ -43,10 +43,6 @@ type CreateRequest struct {
// Required: false // Required: false
MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"` MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
// Max sent/received network transfer peering
// Required: false
MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
// Max number of assigned public IPs // Max number of assigned public IPs
// Required: false // Required: false
MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"` MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`

View File

@@ -71,9 +71,6 @@ type Resource struct {
// Number of External IPs // Number of External IPs
ExtIPs int64 `json:"extips"` ExtIPs int64 `json:"extips"`
// External traffic
ExtTraffic int64 `json:"exttraffic"`
// Number of grafic cores // Number of grafic cores
GPU int64 `json:"gpu"` GPU int64 `json:"gpu"`
@@ -143,9 +140,6 @@ type ResourceLimits struct {
// CuM // CuM
CuM float64 `json:"CU_M"` CuM float64 `json:"CU_M"`
// CuNP
CuNP float64 `json:"CU_NP"`
// GPUUnits // GPUUnits
GPUUnits float64 `json:"gpu_units"` GPUUnits float64 `json:"gpu_units"`
@@ -480,9 +474,6 @@ type Limits struct {
// External IPs // External IPs
ExtIPs int64 `json:"extips"` ExtIPs int64 `json:"extips"`
// External traffic
ExtTraffic int64 `json:"exttraffic"`
// Number of GPU // Number of GPU
GPU int64 `json:"gpu"` GPU int64 `json:"gpu"`
@@ -491,6 +482,9 @@ type Limits struct {
// SEPs number // SEPs number
SEPs uint64 `json:"seps"` SEPs uint64 `json:"seps"`
// Policies
Policies map[string]Policy `json:"policies"`
} }
// Resources of resource group // Resources of resource group

View File

@@ -35,10 +35,6 @@ type UpdateRequest struct {
// Required: false // Required: false
MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"` MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
// Max sent/received network transfer peering
// Required: false
MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
// Max number of assigned public IPs // Max number of assigned public IPs
// Required: false // Required: false
MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"` MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`

View File

@@ -158,7 +158,6 @@ type CloudBrokerEndpoints struct {
Machine []string `json:"machine,omitempty"` Machine []string `json:"machine,omitempty"`
Metering []string `json:"metering,omitempty"` Metering []string `json:"metering,omitempty"`
Milestones []string `json:"milestones,omitempty"` Milestones []string `json:"milestones,omitempty"`
Node []string `json:"node,omitempty"`
Openshift []string `json:"openshift,omitempty"` Openshift []string `json:"openshift,omitempty"`
OpenshiftCI []string `json:"openshiftci,omitempty"` OpenshiftCI []string `json:"openshiftci,omitempty"`
Ovsnode []string `json:"ovsnode,omitempty"` Ovsnode []string `json:"ovsnode,omitempty"`
@@ -169,7 +168,7 @@ type CloudBrokerEndpoints struct {
Resmon interface{} `json:"resmon,omitempty"` Resmon interface{} `json:"resmon,omitempty"`
RG []string `json:"rg,omitempty"` RG []string `json:"rg,omitempty"`
Sep []string `json:"sep,omitempty"` Sep []string `json:"sep,omitempty"`
Stack []string `json:"stack,omitempty"` Node []string `json:"node,omitempty"`
Tasks []string `json:"tasks,omitempty"` Tasks []string `json:"tasks,omitempty"`
TLock []string `json:"tlock,omitempty"` TLock []string `json:"tlock,omitempty"`
User []string `json:"user,omitempty"` User []string `json:"user,omitempty"`

View File

@@ -4,7 +4,7 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/audit" "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/audit"
) )
// Accessing the Stack method group // Accessing the Audit method group
func (cb *CloudBroker) Audit() *audit.Audit { func (cb *CloudBroker) Audit() *audit.Audit {
return audit.New(cb.client) return audit.New(cb.client)
} }

View File

@@ -95,6 +95,15 @@ type RecordAudit struct {
// TTL // TTL
TTL string `json:"_ttl"` TTL string `json:"_ttl"`
// Resgroup ID
ResgroupID uint64 `json:"resgroup_id"`
// Account ID
AccountID uint64 `json:"account_id"`
// Compute ID
ComputeID uint64 `json:"compute_id"`
} }
// List of Linked Jobs // List of Linked Jobs

View File

@@ -14,6 +14,9 @@ type RestoreDiskFromBackupRequest struct {
// Compute ID // Compute ID
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"` ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
// Node ID
NodeID uint64 `url:"nodeId,omitempty" json:"nodeId,omitempty"`
// Disk ID // Disk ID
DiskID uint64 `url:"diskId" json:"diskId" validate:"required"` DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`

View File

@@ -25,6 +25,9 @@ type RestoreDisksFromBackupRequest struct {
// Compute ID // Compute ID
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"` ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
// Node ID
NodeID uint64 `url:"nodeId,omitempty" json:"nodeId,omitempty"`
//Backup files //Backup files
BackupFiles []BackupFile `url:"disks" json:"disks" validate:"required,dive"` BackupFiles []BackupFile `url:"disks" json:"disks" validate:"required,dive"`
} }

View File

@@ -70,8 +70,9 @@ type GroupAddRequest struct {
// Required: false // Required: false
UserData string `url:"userData,omitempty" json:"userData,omitempty"` UserData string `url:"userData,omitempty" json:"userData,omitempty"`
//Chipset "i440fx" or "Q35 // Chipset "i440fx" or "Q35
//Required: false // Default value : Q35
// Required: false
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset"`
// ID of the chosen storage policy // ID of the chosen storage policy

View File

@@ -24,7 +24,7 @@ type GroupResizeRequest struct {
//Chipset for new computes, either i440fx or Q35 (i440fx by default) //Chipset for new computes, either i440fx or Q35 (i440fx by default)
//Available values : i440fx, Q35 //Available values : i440fx, Q35
//Default value : i440fx //Default value : Q35
//Required: true //Required: true
Chipset string `url:"chipset" json:"chipset" validate:"required,chipset"` Chipset string `url:"chipset" json:"chipset" validate:"required,chipset"`

View File

@@ -146,8 +146,8 @@ type ItemCompute struct {
// Resource group ID // Resource group ID
RGID uint64 `json:"rgId"` RGID uint64 `json:"rgId"`
// StackID // NodeID
StackID uint64 `json:"stackId"` NodeID uint64 `json:"node_id"`
// Status // Status
Status string `json:"status"` Status string `json:"status"`

View File

@@ -40,9 +40,8 @@ type AffinityRuleAddRequest struct {
Key string `url:"key" json:"key" validate:"required"` Key string `url:"key" json:"key" validate:"required"`
// Value that must match the key to be taken into account when analyzing this rule // Value that must match the key to be taken into account when analyzing this rule
// Required: false // Required: true
// Not required on purpose: despite required tag on platform, empty string is allowed Value string `url:"value" json:"value" validate:"required"`
Value string `url:"value" json:"value"`
} }
// AffinityRuleAdd adds affinity rule // AffinityRuleAdd adds affinity rule

View File

@@ -38,9 +38,8 @@ type AffinityRuleRemoveRequest struct {
Key string `url:"key" json:"key" validate:"required"` Key string `url:"key" json:"key" validate:"required"`
// Value that must match the key to be taken into account when analyzing this rule // Value that must match the key to be taken into account when analyzing this rule
// Required: false // Required: true
// Not required on purpose: despite required tag on platform, empty string is allowed Value string `url:"value" json:"value" validate:"required"`
Value string `url:"value" json:"value"`
} }
// AffinityRuleRemove remove affinity rule // AffinityRuleRemove remove affinity rule

View File

@@ -38,9 +38,8 @@ type AntiAffinityRuleAddRequest struct {
Key string `url:"key" json:"key" validate:"required"` Key string `url:"key" json:"key" validate:"required"`
// Value that must match the key to be taken into account when analyzing this rule // Value that must match the key to be taken into account when analyzing this rule
// Required: false // Required: true
// Not required on purpose: despite required tag on platform, empty string is allowed Value string `url:"value" json:"value" validate:"required"`
Value string `url:"value" json:"value"`
} }
// AntiAffinityRuleAdd adds anti affinity rule // AntiAffinityRuleAdd adds anti affinity rule

View File

@@ -38,9 +38,8 @@ type AntiAffinityRuleRemoveRequest struct {
Key string `url:"key" json:"key" validate:"required"` Key string `url:"key" json:"key" validate:"required"`
// Value that must match the key to be taken into account when analyzing this rule // Value that must match the key to be taken into account when analyzing this rule
// Required: false // Required: true
// Not required on purpose: despite required tag on platform, empty string is allowed Value string `url:"value" json:"value" validate:"required"`
Value string `url:"value" json:"value"`
} }
// AntiAffinityRuleRemove removes anti affinity rule // AntiAffinityRuleRemove removes anti affinity rule

View File

@@ -0,0 +1,41 @@
package compute
import (
"context"
"net/http"
"strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// ChangeReadOnlyRequest defines parameters for toggling read-only mode.
type ChangeReadOnlyRequest struct {
// Compute ID
// Required: true
ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
// ReadOnly indicates whether the read-only mode is enabled
// Required: true
ReadOnly bool `url:"read_only" json:"read_only" validate:"required"`
}
// ChangeReadOnly toggles compute read-only mode.
func (c Compute) ChangeReadOnly(ctx context.Context, req ChangeReadOnlyRequest) (bool, error) {
if err := validators.ValidateRequest(req); err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/compute/change_read_only"
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil {
return false, err
}
result, err := strconv.ParseBool(string(res))
if err != nil {
return false, err
}
return result, nil
}

View File

@@ -19,8 +19,8 @@ type CloneRequest struct {
Name string `url:"name" json:"name" validate:"required"` Name string `url:"name" json:"name" validate:"required"`
// ID of the Storage Policy // ID of the Storage Policy
// Required: true // Required: false
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"` StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id"`
// Timestamp of the parent's snapshot to create clone from // Timestamp of the parent's snapshot to create clone from
// Required: false // Required: false

View File

@@ -12,7 +12,7 @@ import (
type GetCloneStatusRequest struct { type GetCloneStatusRequest struct {
// ID of compute instance // ID of compute instance
// Required: true // Required: true
ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"` ComputeID string `url:"compute_id" json:"compute_id" validate:"required"`
} }
// GetCloneStatus gets information about compute clone status as a RecordCloneStatus struct // GetCloneStatus gets information about compute clone status as a RecordCloneStatus struct

View File

@@ -65,7 +65,7 @@ var computes = ListComputes{
MigrationJob: 0, MigrationJob: 0,
Milestones: 363500, Milestones: 363500,
Name: "test", Name: "test",
PinnedToStack: 1, PinnedToNode: 1,
RAM: 4096, RAM: 4096,
ReferenceID: "c7cb19ac-af4a-4067-852f-c5572949207e", ReferenceID: "c7cb19ac-af4a-4067-852f-c5572949207e",
Registered: true, Registered: true,
@@ -127,7 +127,7 @@ var computes = ListComputes{
MigrationJob: 0, MigrationJob: 0,
Milestones: 363853, Milestones: 363853,
Name: "compute_2", Name: "compute_2",
PinnedToStack: 1, PinnedToNode: 1,
RAM: 4096, RAM: 4096,
ReferenceID: "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff", ReferenceID: "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff",
Registered: true, Registered: true,

View File

@@ -42,17 +42,17 @@ type ListRequest struct {
// Required: false // Required: false
IPAddress string `url:"ipAddress,omitempty" json:"ipAddress,omitempty"` IPAddress string `url:"ipAddress,omitempty" json:"ipAddress,omitempty"`
// Find by stack ID // Find by node ID
// Required: false // Required: false
StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"` NodeID uint64 `url:"node_id,omitempty" json:"node_id,omitempty"`
// Find by CD image ID // Find by CD image ID
// Required: false // Required: false
CDImageID uint64 `url:"cdImageId,omitempty" json:"cdImageId,omitempty"` CDImageID uint64 `url:"cdImageId,omitempty" json:"cdImageId,omitempty"`
// Find by stack name // Find by node name
// Required: false // Required: false
StackName string `url:"stackName,omitempty" json:"stackName,omitempty"` NodeName string `url:"nodeName,omitempty" json:"nodeName,omitempty"`
// Find by external network name // Find by external network name
// Required: false // Required: false

View File

@@ -15,9 +15,9 @@ type MigrateRequest struct {
// Required: true // Required: true
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"` ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
// Particular Stack ID to migrate this compute to // Particular Node ID to migrate this compute to
// Required: false // Required: false
TargetStackID uint64 `url:"targetStackId,omitempty" json:"targetStackId,omitempty"` TargetNodeID uint64 `url:"targetNodeId,omitempty" json:"targetNodeId,omitempty"`
// If live migration fails, destroy compute // If live migration fails, destroy compute
// on source node and recreate on the target // on source node and recreate on the target
@@ -30,7 +30,7 @@ type AsyncWrapperMigrateRequest struct {
SyncMode bool `url:"sync"` SyncMode bool `url:"sync"`
} }
// Migrate migrates compute to another stack // Migrate migrates compute to another node
func (c Compute) Migrate(ctx context.Context, req MigrateRequest) (bool, error) { func (c Compute) Migrate(ctx context.Context, req MigrateRequest) (bool, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {
@@ -54,7 +54,7 @@ func (c Compute) Migrate(ctx context.Context, req MigrateRequest) (bool, error)
return result, nil return result, nil
} }
// AsyncMigrate migrates compute to another stack in async mode // AsyncMigrate migrates compute to another node in async mode
func (c Compute) AsyncMigrate(ctx context.Context, req MigrateRequest) (string, error) { func (c Compute) AsyncMigrate(ctx context.Context, req MigrateRequest) (string, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {

View File

@@ -22,9 +22,9 @@ type MigrateStorageRequest struct {
// Required: true // Required: true
PoolName string `url:"poolName" json:"poolName" validate:"required"` PoolName string `url:"poolName" json:"poolName" validate:"required"`
// Target stack ID // Target node ID
// Required: true // Required: true
StackID uint64 `url:"stackId" json:"stackId" validate:"required"` NodeID uint64 `url:"node_id" json:"node_id" validate:"required"`
// Async API call // Async API call
// Required: true // Required: true
@@ -32,7 +32,7 @@ type MigrateStorageRequest struct {
} }
// MigrateStorage gets complex compute migration // MigrateStorage gets complex compute migration
// Compute will be migrated to specified stack, and compute disks will // Compute will be migrated to specified node, and compute disks will
// be migrated to specified SEP to specified pool. // be migrated to specified SEP to specified pool.
// This action can take up to 84 hours // This action can take up to 84 hours
func (c Compute) MigrateStorage(ctx context.Context, req MigrateStorageRequest) (string, error) { func (c Compute) MigrateStorage(ctx context.Context, req MigrateStorageRequest) (string, error) {

View File

@@ -804,8 +804,8 @@ type InfoCompute struct {
// Name of OS // Name of OS
OSVersion string `json:"os_version"` OSVersion string `json:"os_version"`
// Pinned to stack // Pinned to node
PinnedToStack int64 `json:"pinnedToStack"` PinnedToNode int64 `json:"pinnedToNode"`
// PreferredCPU // PreferredCPU
PreferredCPU []int64 `json:"preferredCpu"` PreferredCPU []int64 `json:"preferredCpu"`
@@ -813,6 +813,9 @@ type InfoCompute struct {
// Qemu_quest // Qemu_quest
QemuQuest QemuQuest `json:"qemu_guest"` QemuQuest QemuQuest `json:"qemu_guest"`
// ReadOnly indicates read-only mode state
ReadOnly bool `json:"read_only"`
// Number of RAM // Number of RAM
RAM uint64 `json:"ram"` RAM uint64 `json:"ram"`
@@ -837,11 +840,11 @@ type InfoCompute struct {
// SnapSets // SnapSets
SnapSets ListSnapshots `json:"snapSets"` SnapSets ListSnapshots `json:"snapSets"`
// Stack ID // Node ID
StackID uint64 `json:"stackId"` NodeID uint64 `json:"node_id"`
// Stack name // Node name
StackName string `json:"stackName"` NodeName string `json:"nodeName"`
// Stateless SEP ID // Stateless SEP ID
StatelessSEPID int64 `json:"statelessSepId"` StatelessSEPID int64 `json:"statelessSepId"`
@@ -1055,9 +1058,6 @@ type RecordCompute struct {
// Name // Name
Name string `json:"name"` Name string `json:"name"`
// Node ID
NodeID uint64 `json:"nodeId"`
// Natable VINS ID // Natable VINS ID
NatableVINSID uint64 `json:"natableVinsId"` NatableVINSID uint64 `json:"natableVinsId"`
@@ -1091,8 +1091,8 @@ type RecordCompute struct {
// Name of OS // Name of OS
OSVersion string `json:"os_version"` OSVersion string `json:"os_version"`
// Pinned to stack // Pinned to node
PinnedToStack int64 `json:"pinnedToStack"` PinnedToNode int64 `json:"pinnedToNode"`
// PreferredCPU // PreferredCPU
PreferredCPU []int64 `json:"preferredCpu"` PreferredCPU []int64 `json:"preferredCpu"`
@@ -1100,6 +1100,9 @@ type RecordCompute struct {
// Qemu_quest // Qemu_quest
QemuQuest QemuQuest `json:"qemu_guest"` QemuQuest QemuQuest `json:"qemu_guest"`
// ReadOnly indicates read-only mode state
ReadOnly bool `json:"read_only"`
// Number of RAM // Number of RAM
RAM uint64 `json:"ram"` RAM uint64 `json:"ram"`
@@ -1124,11 +1127,11 @@ type RecordCompute struct {
// SnapSets // SnapSets
SnapSets ListSnapshots `json:"snapSets"` SnapSets ListSnapshots `json:"snapSets"`
// Stack ID // Node ID
StackID uint64 `json:"stackId"` NodeID uint64 `json:"node_id"`
// Stack name // Node name
StackName string `json:"stackName"` NodeName string `json:"nodeName"`
// Stateless SEP ID // Stateless SEP ID
StatelessSEPID int64 `json:"statelessSepId"` StatelessSEPID int64 `json:"statelessSepId"`
@@ -1168,6 +1171,9 @@ type RecordCompute struct {
// Zone ID // Zone ID
ZoneID uint64 `json:"zoneId"` ZoneID uint64 `json:"zoneId"`
//todo
_ uint64 `json:"nodeId"`
} }
type LoaderMetaIso struct { type LoaderMetaIso struct {
@@ -1277,6 +1283,9 @@ type ItemDeletedCompute struct {
type InfoDisk struct { type InfoDisk struct {
// ID // ID
ID uint64 `json:"id"` ID uint64 `json:"id"`
// SEP ID
SepID int64 `json:"sepId"`
} }
// List computes // List computes
@@ -1338,8 +1347,8 @@ type ItemPCIDevice struct {
// Resource group ID // Resource group ID
RGID uint64 `json:"rgId"` RGID uint64 `json:"rgId"`
// Stack ID // Node ID
StackID uint64 `json:"stackId"` NodeID uint64 `json:"nodeId"`
// Status // Status
Status string `json:"status"` Status string `json:"status"`
@@ -1441,14 +1450,14 @@ type MigrateStorageItem struct {
// Migration process log // Migration process log
Log []string `json:"log"` Log []string `json:"log"`
// Source stack ID // Source node ID
SourceStackID uint64 `json:"sourceStackId"` SourceNodeID uint64 `json:"sourceNodeId"`
// Migration status // Migration status
Status string `json:"status"` Status string `json:"status"`
// Target stack ID // Target node ID
TargetStackID uint64 `json:"targetStackId"` TargetNodeID uint64 `json:"targetNodeId"`
} }
type RecordCloneStatus struct { type RecordCloneStatus struct {

View File

@@ -45,6 +45,11 @@ type NetAttachRequest struct {
// Required: false // Required: false
MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"` MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
// Net mask
// Used only to DPDK or VFNIC net type
// Required: false
NetMask uint64 `url:"netMask,omitempty" json:"netMask,omitempty"`
// Unique identifier of logical port on SDN side // Unique identifier of logical port on SDN side
// Required: false // Required: false
SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty" validate:"omitempty"` SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty" validate:"omitempty"`

View File

@@ -8,15 +8,15 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
) )
// PinToStackRequest struct to pin compute to stack // PinToNodeRequest struct to pin compute to node
type PinToStackRequest struct { type PinToNodeRequest struct {
// ID of the compute instance // ID of the compute instance
// Required: true // Required: true
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"` ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
// Stack ID to pin to // Node ID to pin to
// Required: false // Required: false
TargetStackID uint64 `url:"targetStackId" json:"targetStackId"` TargetNodeID uint64 `url:"targetNodeId" json:"targetNodeId"`
// Try to migrate or not if compute in running states // Try to migrate or not if compute in running states
// Required: false // Required: false
@@ -28,14 +28,14 @@ type PinToStackRequest struct {
AutoStart bool `url:"autoStart" json:"autoStart"` AutoStart bool `url:"autoStart" json:"autoStart"`
} }
// PinToStack pins compute to current stack // PinToNode pins compute to current node
func (c Compute) PinToStack(ctx context.Context, req PinToStackRequest) (uint64, error) { func (c Compute) PinToNode(ctx context.Context, req PinToNodeRequest) (uint64, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {
return 0, validators.ValidationErrors(validators.GetErrors(err)) return 0, validators.ValidationErrors(validators.GetErrors(err))
} }
url := "/cloudbroker/compute/pinToStack" url := "/cloudbroker/compute/pin_to_node"
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req) res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil { if err != nil {

View File

@@ -24,7 +24,7 @@ type RedeployRequest struct {
// Storage policy id of compute. The rules of the specified storage policy will be used. // Storage policy id of compute. The rules of the specified storage policy will be used.
// Required: true // Required: true
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"` StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
// New size for the boot disk in GB, if boot disk size change is required // New size for the boot disk in GB, if boot disk size change is required
// Required: false // Required: false

View File

@@ -18,9 +18,9 @@ type StartRequest struct {
// Required: false // Required: false
AltBootID uint64 `url:"altBootId,omitempty" json:"altBootId,omitempty"` AltBootID uint64 `url:"altBootId,omitempty" json:"altBootId,omitempty"`
// ID of stack to start compute // ID of node to start compute
// Required: false // Required: false
StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"` NodeID uint64 `url:"node_id,omitempty" json:"node_id,omitempty"`
} }
// Start starts compute // Start starts compute

View File

@@ -13,9 +13,9 @@ type StartMigrationINRequest struct {
// Required: true // Required: true
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"` ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
// ID of the stack where the compute will be staged for migration-in // ID of the node where the compute will be staged for migration-in
// Required: false // Required: false
StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"` NodeID uint64 `url:"node_id,omitempty" json:"node_id,omitempty"`
} }
// StartMigrationIN starts compute for external migration in // StartMigrationIN starts compute for external migration in

View File

@@ -8,21 +8,21 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
) )
// UnpinFromStackRequest struct to unpin from stack // UnpinFromNodeRequest struct to unpin from node
type UnpinFromStackRequest struct { type UnpinFromNodeRequest struct {
// ID of the compute instance // ID of the compute instance
// Required: true // Required: true
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"` ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
} }
// UnpinFromStack unpins compute from current stack // UnpinFromNode unpins compute from current node
func (c Compute) UnpinFromStack(ctx context.Context, req UnpinFromStackRequest) (bool, error) { func (c Compute) UnpinFromNode(ctx context.Context, req UnpinFromNodeRequest) (bool, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {
return false, validators.ValidationErrors(validators.GetErrors(err)) return false, validators.ValidationErrors(validators.GetErrors(err))
} }
url := "/cloudbroker/compute/unpinFromStack" url := "/cloudbroker/compute/unpin_from_node"
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req) res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil { if err != nil {

View File

@@ -14,9 +14,9 @@ type DeviceMigrateRequest struct {
// Required: true // Required: true
NetID uint64 `url:"net_id" json:"net_id" validate:"required"` NetID uint64 `url:"net_id" json:"net_id" validate:"required"`
// Target stack ID to migrate to // Target node ID to migrate to
// Required: false // Required: false
StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"` NodeID uint64 `url:"node_id,omitempty" json:"node_id,omitempty"`
// Target device to migrate // Target device to migrate
// Required: false // Required: false

View File

@@ -11,7 +11,6 @@ var grids = ListGrids{
DiskSize: 976, DiskSize: 976,
DiskSizeMax: 1200, DiskSizeMax: 1200,
ExtIPs: 132, ExtIPs: 132,
ExtTraffic: 0,
GPU: 79500, GPU: 79500,
RAM: 0, RAM: 0,
SEPs: map[string]map[string]DiskUsage{}, SEPs: map[string]map[string]DiskUsage{},
@@ -21,7 +20,6 @@ var grids = ListGrids{
DiskSize: 976, DiskSize: 976,
DiskSizeMax: 1200, DiskSizeMax: 1200,
ExtIPs: 132, ExtIPs: 132,
ExtTraffic: 0,
GPU: 0, GPU: 0,
RAM: 152600, RAM: 152600,
SEPs: map[string]map[string]DiskUsage{}, SEPs: map[string]map[string]DiskUsage{},
@@ -41,7 +39,6 @@ var grids = ListGrids{
DiskSize: 976, DiskSize: 976,
DiskSizeMax: 1200, DiskSizeMax: 1200,
ExtIPs: 132, ExtIPs: 132,
ExtTraffic: 0,
GPU: 79500, GPU: 79500,
RAM: 0, RAM: 0,
SEPs: map[string]map[string]DiskUsage{}, SEPs: map[string]map[string]DiskUsage{},
@@ -51,7 +48,6 @@ var grids = ListGrids{
DiskSize: 976, DiskSize: 976,
DiskSizeMax: 1200, DiskSizeMax: 1200,
ExtIPs: 132, ExtIPs: 132,
ExtTraffic: 0,
GPU: 0, GPU: 0,
RAM: 152600, RAM: 152600,
SEPs: map[string]map[string]DiskUsage{}, SEPs: map[string]map[string]DiskUsage{},
@@ -71,7 +67,6 @@ var grids = ListGrids{
DiskSize: 976, DiskSize: 976,
DiskSizeMax: 1200, DiskSizeMax: 1200,
ExtIPs: 132, ExtIPs: 132,
ExtTraffic: 0,
GPU: 79500, GPU: 79500,
RAM: 0, RAM: 0,
SEPs: map[string]map[string]DiskUsage{}, SEPs: map[string]map[string]DiskUsage{},
@@ -81,7 +76,6 @@ var grids = ListGrids{
DiskSize: 976, DiskSize: 976,
DiskSizeMax: 1200, DiskSizeMax: 1200,
ExtIPs: 132, ExtIPs: 132,
ExtTraffic: 0,
GPU: 0, GPU: 0,
RAM: 152600, RAM: 152600,
SEPs: map[string]map[string]DiskUsage{}, SEPs: map[string]map[string]DiskUsage{},

View File

@@ -43,9 +43,6 @@ type RecordResource struct {
// External IPs // External IPs
ExtIPs uint64 `json:"extips"` ExtIPs uint64 `json:"extips"`
// External traffic
ExtTraffic uint64 `json:"exttraffic"`
// Number of GPU // Number of GPU
GPU uint64 `json:"gpu"` GPU uint64 `json:"gpu"`

View File

@@ -9,15 +9,6 @@ func (li ListImages) IDs() []uint64 {
return res return res
} }
// IDs gets array of StackIDs from ListStacks struct
func (ls ListStacks) IDs() []uint64 {
res := make([]uint64, 0, len(ls.Data))
for _, h := range ls.Data {
res = append(res, h.ID)
}
return res
}
// IDs gets array of HistoryIDs from ListHistory struct // IDs gets array of HistoryIDs from ListHistory struct
func (lh ListHistory) IDs() []uint64 { func (lh ListHistory) IDs() []uint64 {
res := make([]uint64, 0, len(lh)) res := make([]uint64, 0, len(lh))

View File

@@ -1,65 +0,0 @@
package image
import (
"context"
"encoding/json"
"net/http"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// ListStacksRequest struct to get list of stack
type ListStacksRequest struct {
// Image ID
// Required: true
ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
// Page number
// Required: false
Page uint64 `url:"page,omitempty" json:"page,omitempty"`
// Page size
// Required: false
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
// Find by name
// Required: false
Name string `url:"name,omitempty" json:"name,omitempty"`
// Find by status
// Required: false
Status string `url:"status,omitempty" json:"status,omitempty"`
// Find by type
// Required: false
Type string `url:"type,omitempty" json:"type,omitempty"`
// Sort by one of supported fields, format +|-(field)
// Required: false
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
}
// ListStacks gets list stack by image ID
func (i Image) ListStacks(ctx context.Context, req ListStacksRequest) (*ListStacks, error) {
err := validators.ValidateRequest(req)
if err != nil {
return nil, validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/image/listStacks"
res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil {
return nil, err
}
list := ListStacks{}
err = json.Unmarshal(res, &list)
if err != nil {
return nil, err
}
return &list, nil
}

View File

@@ -329,84 +329,6 @@ func (r *GUID) UnmarshalJSON(b []byte) error {
// List history // List history
type ListHistory []History type ListHistory []History
// List stacks
type ListStacks struct {
// Data
Data []ItemListStacks `json:"data"`
// Entry count
EntryCount uint64 `json:"entryCount"`
}
// Detailed information about image
type ItemListStacks struct {
// CKey
CKey string `json:"_ckey"`
// API URL
APIURL string `json:"apiUrl"`
// API key
APIKey string `json:"apikey"`
// App ID
AppID string `json:"appId"`
// CPU allocation ratio
CPUAllocationRatio float64 `json:"cpu_allocation_ratio"`
// Description
Description string `json:"desc"`
// Descr
Descr string `json:"descr"`
// Drivers
Drivers []string `json:"drivers"`
// Eco
Eco interface{} `json:"eco"`
// Error
Error uint64 `json:"error"`
// Grid ID
GID uint64 `json:"gid"`
// GID
GUID uint64 `json:"guid"`
// ID
ID uint64 `json:"id"`
// List image IDs
Images []uint64 `json:"images"`
// Login
Login string `json:"login"`
// Mem allocation ratio
MemAllocationRatio float64 `json:"mem_allocation_ratio"`
// Name
Name string `json:"name"`
// Packegas
Packages Packages `json:"packages"`
// Password
Password string `json:"passwd"`
// Reference ID
ReferenceID string `json:"referenceId"`
// Status
Status string `json:"status"`
// Type
Type string `json:"type"`
}
// Package // Package
type Packages struct { type Packages struct {
// LibvirtBin // LibvirtBin

View File

@@ -171,6 +171,7 @@ type CreateRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
// Zone ID // Zone ID

View File

@@ -24,6 +24,7 @@ type WorkerAddRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
} }

View File

@@ -69,6 +69,7 @@ type WorkersGroupAddRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"` Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
} }

View File

@@ -37,6 +37,11 @@ type Interface struct {
// Required: false // Required: false
MAC string `url:"mac,omitempty" json:"mac,omitempty" validate:"omitempty"` MAC string `url:"mac,omitempty" json:"mac,omitempty" validate:"omitempty"`
// Net mask
// Used only to DPDK or VFNIC net type
// Required: false
NetMask uint64 `url:"netMask,omitempty" json:"netMask,omitempty"`
// SDN interface id // SDN interface id
// Required: false // Required: false
SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty"` SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty"`
@@ -160,9 +165,9 @@ type CreateRequest struct {
// Required: false // Required: false
Start bool `url:"start" json:"start"` Start bool `url:"start" json:"start"`
// Stack ID // Node ID
// Required: false // Required: false
StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"` NodeID uint64 `url:"node_id,omitempty" json:"node_id,omitempty"`
// System name // System name
// Required: false // Required: false
@@ -191,6 +196,7 @@ type CreateRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
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

View File

@@ -67,8 +67,27 @@ type CreateBlankRequest struct {
// Type of the emulated system, Q35 or i440fx // Type of the emulated system, Q35 or i440fx
// Required: false // Required: false
// Default: Q35
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
// Required: false
// Default: false
HPBacked bool `url:"hp_backed" json:"hp_backed"`
// Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node
// Required: false
// Default: false
CPUPin bool `url:"cpu_pin" json:"cpu_pin"`
// Rule for VM placement with NUMA affinity.
// Possible values - none (placement without NUMA affinity),
// strict (strictly with NUMA affinity, if not possible - do not start VM),
// loose (use NUMA affinity if possible)
// Required: false
// Default: none
NumaAffinity string `url:"numa_affinity,omitempty" json:"numa_affinity,omitempty" validate:"omitempty,numaAffinity"`
// 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
PreferredCPU []int64 `url:"preferredCpu,omitempty" json:"preferredCpu,omitempty" validate:"omitempty,preferredCPU"` PreferredCPU []int64 `url:"preferredCpu,omitempty" json:"preferredCpu,omitempty" validate:"omitempty,preferredCPU"`

View File

@@ -1,4 +1,4 @@
package stack package node
import ( import (
"context" "context"
@@ -8,21 +8,21 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
) )
// GetLogicalCoresCountRequest struct to get logical cores count by stack // GetLogicalCoresCountRequest struct to get logical cores count by node
type GetLogicalCoresCountRequest struct { type GetLogicalCoresCountRequest struct {
// Stack ID // Node ID
// Required: true // Required: true
StackId uint64 `url:"stackId" json:"stackId" validate:"required"` NodeId uint64 `url:"node_id" json:"node_id" validate:"required"`
} }
// GetLogicalCoresCount get logical cores count by stack // GetLogicalCoresCount get logical cores count by node
func (i Stack) GetLogicalCoresCount(ctx context.Context, req GetLogicalCoresCountRequest) (uint64, error) { func (i Node) GetLogicalCoresCount(ctx context.Context, req GetLogicalCoresCountRequest) (uint64, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {
return 0, validators.ValidationErrors(validators.GetErrors(err)) return 0, validators.ValidationErrors(validators.GetErrors(err))
} }
url := "/cloudbroker/stack/getLogicalCoresCount" url := "/cloudbroker/node/get_logical_cores_count"
res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req) res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil { if err != nil {

View File

@@ -53,9 +53,6 @@ type RecordNode struct {
// SriovEnabled // SriovEnabled
SriovEnabled bool `json:"sriovEnabled"` SriovEnabled bool `json:"sriovEnabled"`
// StackID
StackID uint64 `json:"stackId"`
// Status // Status
Status string `json:"status"` Status string `json:"status"`
@@ -76,6 +73,18 @@ type RecordNode struct {
// Zone ID // Zone ID
ZoneID uint64 `json:"zoneId"` ZoneID uint64 `json:"zoneId"`
// OpenvSwitch Bridges
OpenvSwitchBridges []string `json:"openvswitch_bridges"`
// Description
Description string `json:"description"`
// SDN Hypervisor Name
SDNHypervisorName string `json:"sdn_hypervisor_name"`
// CPU used by the node
UsableCPUs []string `json:"usable_cpus"`
} }
// Resource consumption of the node // Resource consumption of the node
@@ -102,7 +111,7 @@ type FreeResourcesInfo struct {
RAM float64 `json:"RAM"` RAM float64 `json:"RAM"`
// VCPU // VCPU
VCPU uint64 `json:"vCPU"` VCPU uint64 `json:"vCPUs"`
} }
// Resources Info // Resources Info
@@ -136,6 +145,12 @@ type CpuInfo struct {
// PhysCount // PhysCount
PhysCount uint64 `json:"physCount"` PhysCount uint64 `json:"physCount"`
// Flags
Flags []string `json:"flags"`
// Mddel name
ModelName string `json:"model_name"`
} }
// Main information about node // Main information about node
@@ -245,9 +260,6 @@ type ItemNode struct {
// SriovEnabled // SriovEnabled
SriovEnabled bool `json:"sriovEnabled"` SriovEnabled bool `json:"sriovEnabled"`
// StackID
StackID uint64 `json:"stackId"`
// Status // Status
Status string `json:"status"` Status string `json:"status"`
@@ -265,6 +277,37 @@ type ItemNode struct {
// Zone ID // Zone ID
ZoneID uint64 `json:"zoneId"` ZoneID uint64 `json:"zoneId"`
// OpenvSwitch Bridges
OpenvSwitchBridges []string `json:"openvswitch_bridges"`
// APIUrl
APIUrl string `json:"apiUrl"`
// Drivers
Drivers []string `json:"drivers"`
// Old Compat LVM ID
OldCompatLVMID uint64 `json:"old_compat_lvm_id"`
// CPU Allocation ratio
CPUAllocationRatio float64 `json:"cpu_allocation_ratio"`
// MemAllocationRatio
MemAllocationRatio float64 `json:"mem_allocation_ratio"`
// Packages
Packages map[string]PackageInfo `json:"packages"`
// CPU used by the node
UsableCPUs []string `json:"usable_cpus"`
}
type PackageInfo struct {
// Installed size
InstalledSize string `json:"installed_size"`
// Version
Ver string `json:"ver"`
} }
// Numa Topology Info // Numa Topology Info

View File

@@ -0,0 +1,36 @@
package node
import (
"context"
"net/http"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// SetCpuAllocationRatioRequest struct to set CPU allocation ratio
type SetCpuAllocationRatioRequest struct {
// Node ID
// Required: true
NodeID uint64 `url:"node_id" json:"node_id" validate:"required"`
// Allocation ratio (zero or positive value)
// Required: true
Ratio float64 `url:"ratio" json:"ratio" validate:"required"`
}
// SetCpuAllocationRatio set CPU allocation ratio
func (i Node) SetCpuAllocationRatio(ctx context.Context, req SetCpuAllocationRatioRequest) error {
err := validators.ValidateRequest(req)
if err != nil {
return validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/node/set_cpu_allocation_ratio"
_, err = i.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil {
return err
}
return nil
}

View File

@@ -0,0 +1,36 @@
package node
import (
"context"
"net/http"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
)
// SetMemAllocationRatioRequest struct to set memory allocation ratio
type SetMemAllocationRatioRequest struct {
// Node ID
// Required: true
NodeID uint64 `url:"node_id" json:"node_id" validate:"required"`
// Allocation ratio (zero or positive value)
// Required: true
Ratio float64 `url:"ratio" json:"ratio" validate:"required"`
}
// SetMemAllocationRatio set memory allocation ratio
func (i Node) SetMemAllocationRatio(ctx context.Context, req SetMemAllocationRatioRequest) error {
err := validators.ValidateRequest(req)
if err != nil {
return validators.ValidationErrors(validators.GetErrors(err))
}
url := "/cloudbroker/node/set_mem_allocation_ratio"
_, err = i.client.DecortApiCall(ctx, http.MethodPost, url, req)
if err != nil {
return err
}
return nil
}

View File

@@ -5,13 +5,14 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
) )
type VFParam struct { type VFParam struct {
// Number of VF to assign // ID of the FN
// Required: true // Required: true
VFNum uint64 `url:"vfNum" json:"vfNum" validate:"required"` FNID uint64 `url:"fnId" json:"fnId" validate:"required"`
// Trust // Trust
// Required: true // Required: true
@@ -46,7 +47,7 @@ func (n Node) SetVFsParams(ctx context.Context, req SetVFsParamsRequest) (bool,
url := "/cloudbroker/node/setVFsParams" url := "/cloudbroker/node/setVFsParams"
res, err := n.client.DecortApiCall(ctx, http.MethodPost, url, req) res, err := n.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
if err != nil { if err != nil {
return false, err return false, err

View File

@@ -3,15 +3,16 @@ package pcidevice
import ( import (
"context" "context"
"net/http" "net/http"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
"strconv" "strconv"
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
) )
// CreateRequest struct to creating PCI device // CreateRequest struct to creating PCI device
type CreateRequest struct { type CreateRequest struct {
// StackID // NodeID
// Required: true // Required: true
StackID uint64 `url:"stackId" json:"stackId" validate:"required"` NodeID uint64 `url:"node_id" json:"node_id" validate:"required"`
// Resource group ID // Resource group ID
// Required: true // Required: true

View File

@@ -29,8 +29,8 @@ type ItemPCIDevice struct {
// Resource group ID // Resource group ID
RGID uint64 `json:"rgId"` RGID uint64 `json:"rgId"`
// Stack ID // Node ID
StackID uint64 `json:"stackId"` NodeID uint64 `json:"nodeId"`
// Status // Status
Status string `json:"status"` Status string `json:"status"`
@@ -47,4 +47,3 @@ type ListPCIDevices struct {
// Entry count // Entry count
EntryCount uint64 `json:"entryCount"` EntryCount uint64 `json:"entryCount"`
} }

View File

@@ -8,10 +8,10 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
) )
type GetByStackRequest struct { type GetByNodeRequest struct {
// Stack ID // Node ID
// Required: true // Required: true
StackID uint64 `url:"stackId" json:"stackId" validate:"required"` NodeID uint64 `url:"nodeId" json:"nodeId" validate:"required"`
// Start of time period - unixtime // Start of time period - unixtime
// Required: false // Required: false
@@ -23,13 +23,13 @@ type GetByStackRequest struct {
} }
// Get a grid resource monitoring for the specified time period // Get a grid resource monitoring for the specified time period
func (r Resmon) GetByStack(ctx context.Context, req GetByStackRequest) (*GetByStackData, error) { func (r Resmon) GetByNode(ctx context.Context, req GetByNodeRequest) (*GetByNodeData, error) {
res, err := r.GetByStackRaw(ctx, req) res, err := r.GetByNodeRaw(ctx, req)
if err != nil { if err != nil {
return nil, err return nil, err
} }
info := GetByStackData{} info := GetByNodeData{}
err = json.Unmarshal(res, &info) err = json.Unmarshal(res, &info)
if err != nil { if err != nil {
@@ -40,13 +40,13 @@ func (r Resmon) GetByStack(ctx context.Context, req GetByStackRequest) (*GetBySt
} }
// GetRaw gets information about compute as an array of bytes // GetRaw gets information about compute as an array of bytes
func (r Resmon) GetByStackRaw(ctx context.Context, req GetByStackRequest) ([]byte, error) { func (r Resmon) GetByNodeRaw(ctx context.Context, req GetByNodeRequest) ([]byte, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {
return nil, validators.ValidationErrors(validators.GetErrors(err)) return nil, validators.ValidationErrors(validators.GetErrors(err))
} }
url := "/cloudbroker/resmon/getByStack" url := "/cloudbroker/resmon/get_by_node"
res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, req) res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, req)
return res, err return res, err

View File

@@ -8,7 +8,7 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators" "repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
) )
type GetByStacksRequest struct { type GetByNodesRequest struct {
// Start of time period - unixtime // Start of time period - unixtime
// Required: false // Required: false
StartTime uint64 `url:"starttime,omitempty" json:"starttime,omitempty"` StartTime uint64 `url:"starttime,omitempty" json:"starttime,omitempty"`
@@ -19,13 +19,13 @@ type GetByStacksRequest struct {
} }
// Get a grid resource monitoring for the specified time period // Get a grid resource monitoring for the specified time period
func (r Resmon) GetByStacks(ctx context.Context, req GetByStacksRequest) (*GetByStackData, error) { func (r Resmon) GetByNodes(ctx context.Context, req GetByNodesRequest) (*GetByNodeData, error) {
res, err := r.GetByStacksRaw(ctx, req) res, err := r.GetByNodesRaw(ctx, req)
if err != nil { if err != nil {
return nil, err return nil, err
} }
info := GetByStackData{} info := GetByNodeData{}
err = json.Unmarshal(res, &info) err = json.Unmarshal(res, &info)
if err != nil { if err != nil {
@@ -36,13 +36,13 @@ func (r Resmon) GetByStacks(ctx context.Context, req GetByStacksRequest) (*GetBy
} }
// GetRaw gets information about compute as an array of bytes // GetRaw gets information about compute as an array of bytes
func (r Resmon) GetByStacksRaw(ctx context.Context, req GetByStacksRequest) ([]byte, error) { func (r Resmon) GetByNodesRaw(ctx context.Context, req GetByNodesRequest) ([]byte, error) {
err := validators.ValidateRequest(req) err := validators.ValidateRequest(req)
if err != nil { if err != nil {
return nil, validators.ValidationErrors(validators.GetErrors(err)) return nil, validators.ValidationErrors(validators.GetErrors(err))
} }
url := "/cloudbroker/resmon/getByStacks" url := "/cloudbroker/resmon/get_by_nodes"
res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, req) res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, req)
return res, err return res, err

View File

@@ -12,7 +12,7 @@ type GetByComputePoint struct {
Usage ComputeUsage `json:"usage"` Usage ComputeUsage `json:"usage"`
Disks []ItemDisk `json:"disks"` Disks []ItemDisk `json:"disks"`
UID string `json:"uid"` UID string `json:"uid"`
StackID uint64 `json:"stackId"` NodeID uint64 `json:"nodeId"`
} }
type ComputeUsage struct { type ComputeUsage struct {
@@ -46,7 +46,7 @@ type GetByGRIDPoint struct {
} }
type ItemTotalByGRID struct { type ItemTotalByGRID struct {
StacksCPU uint64 `json:"stacksCPU"` NodesCPU uint64 `json:"nodesCPU"`
StorageCapacity uint64 `json:"storageCapacity"` StorageCapacity uint64 `json:"storageCapacity"`
CPUPower uint64 `json:"cpuPower"` CPUPower uint64 `json:"cpuPower"`
CPUUtil uint64 `json:"cpuUtil"` CPUUtil uint64 `json:"cpuUtil"`
@@ -64,17 +64,17 @@ type ItemStorage struct {
UID string `json:"uid"` UID string `json:"uid"`
} }
// GetByStackData represents an array of data points // GetByNodeData represents an array of data points
type GetByStackData []GetByStackPoint type GetByNodeData []GetByNodePoint
type GetByStackPoint struct { type GetByNodePoint struct {
Usage StackUsage `json:"usage"` Usage NodeUsage `json:"usage"`
CPUInfo CPUinfoByStack `json:"cpuInfo"` CPUInfo CPUinfoByNode `json:"cpuInfo"`
Name string `json:"name"` Name string `json:"name"`
ID uint64 `json:"id"` ID uint64 `json:"id"`
} }
type StackUsage struct { type NodeUsage struct {
CPUPower uint64 `json:"cpuPower"` CPUPower uint64 `json:"cpuPower"`
UsedVCPUs uint64 `json:"usedVcpus"` UsedVCPUs uint64 `json:"usedVcpus"`
PCPU uint64 `json:"pcpu"` PCPU uint64 `json:"pcpu"`
@@ -84,7 +84,7 @@ type StackUsage struct {
FreeMem uint64 `json:"freeMem"` FreeMem uint64 `json:"freeMem"`
} }
type CPUinfoByStack struct { type CPUinfoByNode struct {
ClockSpeed uint64 `json:"clockSpeed"` ClockSpeed uint64 `json:"clockSpeed"`
CoreCount uint64 `json:"coreCount"` CoreCount uint64 `json:"coreCount"`
PhysCount uint64 `json:"physCount"` PhysCount uint64 `json:"physCount"`

View File

@@ -39,10 +39,6 @@ type CreateRequest struct {
// Required: false // Required: false
MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"` MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
// Max sent/received network transfer peering
// Required: false
MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
// Max number of assigned public IPs // Max number of assigned public IPs
// Required: false // Required: false
MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"` MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`

Some files were not shown because too many files have changed in this diff Show More