Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ec34c6bfc | |||
| 80491ed643 | |||
| f1e0f7abb6 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -3,3 +3,7 @@ cmd/
|
|||||||
.vscode/
|
.vscode/
|
||||||
.fleet/
|
.fleet/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
tests/platform_upgrade/.env
|
||||||
|
tests/platform_upgrade/input.json
|
||||||
|
tests/platform_upgrade/*.txt
|
||||||
|
*.env
|
||||||
|
|||||||
19
CHANGELOG.md
19
CHANGELOG.md
@@ -1,5 +1,18 @@
|
|||||||
## Version 1.8.2
|
## Version 1.9.1
|
||||||
|
|
||||||
### Feature
|
### Исправлено
|
||||||
|
|
||||||
- Add universal client for connections
|
#### flipgroup
|
||||||
|
| Идентификатор<br>задачи | Описание |
|
||||||
|
| --- | --- |
|
||||||
|
| BGOS-194 | Изменен тип поля `ClientIDs` c []string на []uint64 в структуре `ListRequest` в cloudapi/flipgroup |
|
||||||
|
|
||||||
|
#### k8s
|
||||||
|
| Идентификатор<br>задачи | Описание |
|
||||||
|
| --- | --- |
|
||||||
|
| BGOS-193 | Изменен тип возвращаемых данных метода `WorkersGroupAdd` c uint64, error на string, error в cloudapi/k8s |
|
||||||
|
|
||||||
|
#### lb
|
||||||
|
| Идентификатор<br>задачи | Описание |
|
||||||
|
| --- | --- |
|
||||||
|
| BGOS-194 | Исправлена валидация полей `ExtNetID` и `VINSID` в структурах `CreateRequest` в cloudapi/lb и cloudbroker/lb |
|
||||||
2
LICENSE
2
LICENSE
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
|
|||||||
same "printed page" as the copyright notice for easier
|
same "printed page" as the copyright notice for easier
|
||||||
identification within third-party archives.
|
identification within third-party archives.
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner]
|
Copyright 2022 Basis LTD
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|||||||
28
README.md
28
README.md
@@ -1,6 +1,6 @@
|
|||||||
# Decort SDK
|
# Decort SDK
|
||||||
|
|
||||||
Decort SDK - это библиотека, написанная на языке GO, позволяющая взаимодействовать с API облачной платформы **DECORT**. Библиотека содеражит в себе структуры и методы, необходимые для отправки запросов. Decort SDK имеет встроенный http-клиент и поддерживает разные способы авторизации на платформе. Библиотека так же содержит в себе модели ответов от платформы.
|
Decort SDK - это библиотека, написанная на языке GO, позволяющая взаимодействовать с API облачной платформы **DECORT**. Библиотека содержит в себе структуры и методы, необходимые для отправки запросов. Decort SDK имеет встроенный http-клиент и поддерживает разные способы авторизации на платформе. Библиотека так же содержит в себе модели ответов от платформы.
|
||||||
|
|
||||||
## Версии
|
## Версии
|
||||||
|
|
||||||
@@ -13,6 +13,7 @@ Decort SDK - это библиотека, написанная на языке G
|
|||||||
- Версия 1.6.x Decort-SDK соответствует 3.8.8 версии платформы
|
- Версия 1.6.x Decort-SDK соответствует 3.8.8 версии платформы
|
||||||
- Версия 1.7.х Decort-SDK соответствует 3.8.9 версии платформы
|
- Версия 1.7.х Decort-SDK соответствует 3.8.9 версии платформы
|
||||||
- Версия 1.8.х Decort-SDK соответствует 4.0.0 версии платформы
|
- Версия 1.8.х Decort-SDK соответствует 4.0.0 версии платформы
|
||||||
|
- Версия 1.9.х Decort-SDK соответствует 4.1.0 версии платформы
|
||||||
|
|
||||||
## Оглавление
|
## Оглавление
|
||||||
|
|
||||||
@@ -98,20 +99,20 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
|
|||||||
Данная группа ручек позволяет выполнять следующие операции в платформе:
|
Данная группа ручек позволяет выполнять следующие операции в платформе:
|
||||||
|
|
||||||
- `Account` - управление аккаунтами - внутренними учетными записями платформы, которые являются владельцами вычислительных ресурсов;
|
- `Account` - управление аккаунтами - внутренними учетными записями платформы, которые являются владельцами вычислительных ресурсов;
|
||||||
|
- `Audit` - получение информации о событиях системы;
|
||||||
- `BService` - управление группами виртуальных машин (computes);
|
- `BService` - управление группами виртуальных машин (computes);
|
||||||
- `Compute` - управление виртуальными машинами (индивидуально);
|
- `Compute` - управление виртуальными машинами (индивидуально);
|
||||||
- `Disks` - управление виртуальными дисками;
|
- `Disks` - управление виртуальными дисками;
|
||||||
|
- `DPDK` - управление виртуальными сетями DPDK;
|
||||||
- `ExtNet` - управление виртуальными сетями, отвечающими за внешний доступ;
|
- `ExtNet` - управление виртуальными сетями, отвечающими за внешний доступ;
|
||||||
- `FLIPgroup` - управление группами "плавающими" ip - адресами;
|
- `FLIPgroup` - управление группами "плавающими" ip - адресами;
|
||||||
- `Image` - управление образами операционных систем;
|
- `Image` - управление образами операционных систем;
|
||||||
- `K8CI` - получение информации о конвейере для создания кластера;
|
- `K8CI` - получение информации о конвейере для создания кластера;
|
||||||
- `K8S` - управление кластерами kubernetes;
|
- `K8S` - управление кластерами kubernetes;
|
||||||
- `KVMPPC` - создание виртуальной машины Power PC (IBM);
|
|
||||||
- `KVMx86` - создание виртуальной машины x86;
|
- `KVMx86` - создание виртуальной машины x86;
|
||||||
- `LB` - управление балансировщиками нагрузки;
|
- `LB` - управление балансировщиками нагрузки;
|
||||||
- `Locations` - получение информации о grid площадки;
|
- `Locations` - получение информации о grid площадки;
|
||||||
- `RG` - управление ресурсными группами аккаунта;
|
- `RG` - управление ресурсными группами аккаунта;
|
||||||
- `Sizes` - получение информации о потребляемых ресурсах виртуальными машинами и дисками;
|
|
||||||
- `Stack` - получение информации о вычислительных узлах;
|
- `Stack` - получение информации о вычислительных узлах;
|
||||||
- `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
|
- `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
|
||||||
- `VFPool` - управление пулом виртуальных сетевых функций;
|
- `VFPool` - управление пулом виртуальных сетевых функций;
|
||||||
@@ -123,10 +124,12 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
|
|||||||
Данная группа ручек позволяет выполнять следующие операции в платформе:
|
Данная группа ручек позволяет выполнять следующие операции в платформе:
|
||||||
|
|
||||||
- `Account` - управление аккаунтами - внутренними учетными записями платформы, которые являются владельцами вычислительных ресурсов;
|
- `Account` - управление аккаунтами - внутренними учетными записями платформы, которые являются владельцами вычислительных ресурсов;
|
||||||
|
- `Audit` - получение информации о событиях системы;
|
||||||
- `APIAccess` - управление доступом к API и его объектам;
|
- `APIAccess` - управление доступом к API и его объектам;
|
||||||
- `Backup` - управление резервным копированием;
|
- `Backup` - управление резервным копированием;
|
||||||
- `Compute` - управление виртуальными машинами (индивидуально);
|
- `Compute` - управление виртуальными машинами (индивидуально);
|
||||||
- `Disks` - управление виртуальными дисками;
|
- `Disks` - управление виртуальными дисками;
|
||||||
|
- `DPDK` - управление виртуальными сетями DPDK;
|
||||||
- `ExtNet` - управление виртуальными сетями, отвечающими за внешний доступ;
|
- `ExtNet` - управление виртуальными сетями, отвечающими за внешний доступ;
|
||||||
- `FLIPGroup` - управление группами с «плавающими» ip адресами;
|
- `FLIPGroup` - управление группами с «плавающими» ip адресами;
|
||||||
- `Grid` - управление площадками;
|
- `Grid` - управление площадками;
|
||||||
@@ -134,7 +137,6 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
|
|||||||
- `Image` - управление образами операционных систем;
|
- `Image` - управление образами операционных систем;
|
||||||
- `K8CI` - управление конвейром для создания кластера;
|
- `K8CI` - управление конвейром для создания кластера;
|
||||||
- `K8S` - управление кластерами kubernetes;
|
- `K8S` - управление кластерами kubernetes;
|
||||||
- `KVMPPC` - создание виртуальной машины Power PC (IBM);
|
|
||||||
- `KVMx86` - создание виртуальной машины x86;
|
- `KVMx86` - создание виртуальной машины x86;
|
||||||
- `LB` - управление балансировщиками нагрузки;
|
- `LB` - управление балансировщиками нагрузки;
|
||||||
- `Node` - управление нодами платформы;
|
- `Node` - управление нодами платформы;
|
||||||
@@ -279,30 +281,32 @@ func main() {
|
|||||||
|
|
||||||
- **cloudapi**:
|
- **cloudapi**:
|
||||||
- `pkg/cloudapi/account` - для `Account`
|
- `pkg/cloudapi/account` - для `Account`
|
||||||
|
- `pkg/cloudapi/audit` - для `Audit`
|
||||||
- `pkg/cloudapi/bservice` - для `Basic Service`
|
- `pkg/cloudapi/bservice` - для `Basic Service`
|
||||||
- `pkg/cloudapi/compute` - для `Compute`
|
- `pkg/cloudapi/compute` - для `Compute`
|
||||||
- `pkg/cloudapi/disks` - для `Disks`
|
- `pkg/cloudapi/disks` - для `Disks`
|
||||||
|
- `pkg/cloudapi/dpdknet` - для `DPDK`
|
||||||
- `pkg/cloudapi/extnet` - для `ExtNet`
|
- `pkg/cloudapi/extnet` - для `ExtNet`
|
||||||
- `pkg/cloudapi/flipgroup` - для `FLIPGroup`
|
- `pkg/cloudapi/flipgroup` - для `FLIPGroup`
|
||||||
- `pkg/cloudapi/image` - для `Image`
|
- `pkg/cloudapi/image` - для `Image`
|
||||||
- `pkg/cloudapi/k8ci` - для `K8CI`
|
- `pkg/cloudapi/k8ci` - для `K8CI`
|
||||||
- `pkg/cloudapi/k8s` - для `K8S`
|
- `pkg/cloudapi/k8s` - для `K8S`
|
||||||
- `pkg/cloudapi/kvmppc` - для `KVMPPC`
|
|
||||||
- `pkg/cloudapi/kvmx86` - для `KVMX86`
|
- `pkg/cloudapi/kvmx86` - для `KVMX86`
|
||||||
- `pkg/cloudapi/lb` - для `LB`
|
- `pkg/cloudapi/lb` - для `LB`
|
||||||
- `pkg/cloudapi/locations` - для `Locations`
|
- `pkg/cloudapi/locations` - для `Locations`
|
||||||
- `pkg/cloudapi/rg` - для `RG`
|
- `pkg/cloudapi/rg` - для `RG`
|
||||||
- `pkg/cloudapi/sizes` - для `Sizes`
|
|
||||||
- `pkg/cloudapi/stack` - для `Stack`
|
- `pkg/cloudapi/stack` - для `Stack`
|
||||||
- `pkg/cloudapi/tasks` - для `Tasks`
|
- `pkg/cloudapi/tasks` - для `Tasks`
|
||||||
- `pkg/cloudapi/vfpool` - для `VFPool`
|
- `pkg/cloudapi/vfpool` - для `VFPool`
|
||||||
- `pkg/cloudapi/vins` - для `VINS`
|
- `pkg/cloudapi/vins` - для `VINS`
|
||||||
- **cloudbroker**:
|
- **cloudbroker**:
|
||||||
- `pkg/cloudbroker/account` - для `Account`
|
- `pkg/cloudbroker/account` - для `Account`
|
||||||
|
- `pkg/cloudbroker/audit` - для `Audit`
|
||||||
- `pkg/cloudbroker/apiaccess` - для `APIAccess`
|
- `pkg/cloudbroker/apiaccess` - для `APIAccess`
|
||||||
- `pkg/cloudbroker/backup` - для `Backup`
|
- `pkg/cloudbroker/backup` - для `Backup`
|
||||||
- `pkg/cloudbroker/compute` - для `Compute`
|
- `pkg/cloudbroker/compute` - для `Compute`
|
||||||
- `pkg/cloudbroker/disks` - для `Disks`
|
- `pkg/cloudbroker/disks` - для `Disks`
|
||||||
|
- `pkg/cloudbroker/dpdknet` - для `DPDK`
|
||||||
- `pkg/cloudbroker/extnet` - для `ExtNet`
|
- `pkg/cloudbroker/extnet` - для `ExtNet`
|
||||||
- `pkg/cloudbroker/flipgroup` - для `FLIPGroup`
|
- `pkg/cloudbroker/flipgroup` - для `FLIPGroup`
|
||||||
- `pkg/cloudbroker/grid` - для `Grid`
|
- `pkg/cloudbroker/grid` - для `Grid`
|
||||||
@@ -310,7 +314,6 @@ func main() {
|
|||||||
- `pkg/cloudbroker/image` - для `Image`
|
- `pkg/cloudbroker/image` - для `Image`
|
||||||
- `pkg/cloudbroker/k8ci` - для `K8CI`
|
- `pkg/cloudbroker/k8ci` - для `K8CI`
|
||||||
- `pkg/cloudbroker/k8s` - для `K8S`
|
- `pkg/cloudbroker/k8s` - для `K8S`
|
||||||
- `pkg/cloudbroker/kvmppc` - для `KVMPPC`
|
|
||||||
- `pkg/cloudbroker/kvmx86` - для `KVMX86`
|
- `pkg/cloudbroker/kvmx86` - для `KVMX86`
|
||||||
- `pkg/cloudbroker/lb` - для `LB`
|
- `pkg/cloudbroker/lb` - для `LB`
|
||||||
- `pkg/cloudbroker/node` - для `Node`
|
- `pkg/cloudbroker/node` - для `Node`
|
||||||
@@ -412,9 +415,7 @@ type CreateRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
|
IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -464,20 +465,20 @@ func main() {
|
|||||||
Доступные методы для `.CloudAPI()`:
|
Доступные методы для `.CloudAPI()`:
|
||||||
|
|
||||||
- `.Account()` - для работы с `Account`
|
- `.Account()` - для работы с `Account`
|
||||||
|
- `.Audit()` - для работы с `Audit`
|
||||||
- `.BService()` - для работы с `BService`
|
- `.BService()` - для работы с `BService`
|
||||||
- `.Compute()` - для работы с `Compute`
|
- `.Compute()` - для работы с `Compute`
|
||||||
- `.Disks()` - для работы с `Disks`
|
- `.Disks()` - для работы с `Disks`
|
||||||
|
- `.DPDKNet()` - для работы с `DPDK`
|
||||||
- `.ExtNet()` - для работы с `ExtNet`
|
- `.ExtNet()` - для работы с `ExtNet`
|
||||||
- `.FLIPgroup()` - для работы с `FLIPGroup`
|
- `.FLIPgroup()` - для работы с `FLIPGroup`
|
||||||
- `.Image()` - для работы с `Image`
|
- `.Image()` - для работы с `Image`
|
||||||
- `.K8CI()` - для работы с `K8CI`
|
- `.K8CI()` - для работы с `K8CI`
|
||||||
- `.K8S()` - для работы с `K8S`
|
- `.K8S()` - для работы с `K8S`
|
||||||
- `.KVMPPC()` - для работы с `KVMPPC`
|
|
||||||
- `.KVMx86()` - для работы с `KVMX86`
|
- `.KVMx86()` - для работы с `KVMX86`
|
||||||
- `.LB()` - для работы с `LB`
|
- `.LB()` - для работы с `LB`
|
||||||
- `.Locations()` - для работы с `Locations`
|
- `.Locations()` - для работы с `Locations`
|
||||||
- `.RG()` - для работы с `RG`
|
- `.RG()` - для работы с `RG`
|
||||||
- `.Sizes()` - для работы с `Sizes`
|
|
||||||
- `.Stack()` - для работы с `Stack`
|
- `.Stack()` - для работы с `Stack`
|
||||||
- `.Tasks()` - для работы с `Tasks`
|
- `.Tasks()` - для работы с `Tasks`
|
||||||
- `.VFPool()` - для работы с `VFPool`
|
- `.VFPool()` - для работы с `VFPool`
|
||||||
@@ -486,10 +487,12 @@ func main() {
|
|||||||
Доступные методы для `.CloudBroker()`:
|
Доступные методы для `.CloudBroker()`:
|
||||||
|
|
||||||
- `.Account()` - для работы с `Account`
|
- `.Account()` - для работы с `Account`
|
||||||
|
- `.Audit()` - для работы с `Audit`
|
||||||
- `.APIAccess()` - для работы с `APIAccess`
|
- `.APIAccess()` - для работы с `APIAccess`
|
||||||
- `.Backup()` - для работы с `Backup`
|
- `.Backup()` - для работы с `Backup`
|
||||||
- `.Compute()` - для работы с `Compute`
|
- `.Compute()` - для работы с `Compute`
|
||||||
- `.Disks()` - для работы с `Disks`
|
- `.Disks()` - для работы с `Disks`
|
||||||
|
- `.DPDKNet()` - для работы с `DPDK`
|
||||||
- `.ExtNet()` - для работы с `ExtNet`
|
- `.ExtNet()` - для работы с `ExtNet`
|
||||||
- `.FLIPGroup()` - для работы с `FLIPGroup`
|
- `.FLIPGroup()` - для работы с `FLIPGroup`
|
||||||
- `.Grid()` - для работы с `Grid`
|
- `.Grid()` - для работы с `Grid`
|
||||||
@@ -497,7 +500,6 @@ func main() {
|
|||||||
- `.Image()` - для работы с `Image`
|
- `.Image()` - для работы с `Image`
|
||||||
- `.K8CI()` - для работы с `K8CI`
|
- `.K8CI()` - для работы с `K8CI`
|
||||||
- `.K8S()` - для работы с `K8S`
|
- `.K8S()` - для работы с `K8S`
|
||||||
- `.KVMPPC()` - для работы с `KVMPPC`
|
|
||||||
- `.KVMx86()` - для работы с `KVMX86`
|
- `.KVMx86()` - для работы с `KVMX86`
|
||||||
- `.LB()` - для работы с `LB`
|
- `.LB()` - для работы с `LB`
|
||||||
- `.Node()` - для работы с `Node`
|
- `.Node()` - для работы с `Node`
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package validators
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/url"
|
||||||
"reflect"
|
"reflect"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -12,7 +13,7 @@ import (
|
|||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/multierror"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/multierror"
|
||||||
)
|
)
|
||||||
|
|
||||||
// computeDriverValidator is used to validate Driver field in kvmx86/kvmppc create.
|
// computeDriverValidator is used to validate Driver field in kvmx86 create.
|
||||||
func computeDriverValidator(fe validator.FieldLevel) bool {
|
func computeDriverValidator(fe validator.FieldLevel) bool {
|
||||||
fieldValue := fe.Field().String()
|
fieldValue := fe.Field().String()
|
||||||
|
|
||||||
@@ -270,6 +271,27 @@ func interfaceStateValidator(fe validator.FieldLevel) bool {
|
|||||||
return IsInSlice(fieldValue, interfaceStateValues)
|
return IsInSlice(fieldValue, interfaceStateValues)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func interfaceTXModelValidator(fe validator.FieldLevel) bool {
|
||||||
|
fieldValue := fe.Field().String()
|
||||||
|
fieldValue = strings.ToLower(fieldValue)
|
||||||
|
|
||||||
|
return IsInSlice(fieldValue, txModelValues)
|
||||||
|
}
|
||||||
|
|
||||||
|
func interfaceIOEventFDValidator(fe validator.FieldLevel) bool {
|
||||||
|
fieldValue := fe.Field().String()
|
||||||
|
fieldValue = strings.ToLower(fieldValue)
|
||||||
|
|
||||||
|
return IsInSlice(fieldValue, ioEventFDValues)
|
||||||
|
}
|
||||||
|
|
||||||
|
func interfaceEventIDxValidator(fe validator.FieldLevel) bool {
|
||||||
|
fieldValue := fe.Field().String()
|
||||||
|
fieldValue = strings.ToLower(fieldValue)
|
||||||
|
|
||||||
|
return IsInSlice(fieldValue, eventIDxValues)
|
||||||
|
}
|
||||||
|
|
||||||
func strictLooseValidator(fe validator.FieldLevel) bool {
|
func strictLooseValidator(fe validator.FieldLevel) bool {
|
||||||
fieldValue := fe.Field().String()
|
fieldValue := fe.Field().String()
|
||||||
fieldValue = strings.ToLower(fieldValue)
|
fieldValue = strings.ToLower(fieldValue)
|
||||||
@@ -304,6 +326,12 @@ func vmActionValidator(fe validator.FieldLevel) bool {
|
|||||||
return IsInSlice(fieldValue, vmActionValues)
|
return IsInSlice(fieldValue, vmActionValues)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func mtuValidator(fe validator.FieldLevel) bool {
|
||||||
|
fieldValue := fe.Field().Uint()
|
||||||
|
|
||||||
|
return fieldValue >= uint64(mtuMin) && fieldValue <= uint64(mtuMax)
|
||||||
|
}
|
||||||
|
|
||||||
func computeFeaturesValidator(fe validator.FieldLevel) bool {
|
func computeFeaturesValidator(fe validator.FieldLevel) bool {
|
||||||
field := fe.Field()
|
field := fe.Field()
|
||||||
slice, ok := field.Interface().([]string)
|
slice, ok := field.Interface().([]string)
|
||||||
@@ -337,6 +365,20 @@ func isBoolTypeValidator(fe validator.FieldLevel) bool {
|
|||||||
return fe.Field().CanConvert(reflect.TypeOf(true))
|
return fe.Field().CanConvert(reflect.TypeOf(true))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func urlValidartor(fl validator.FieldLevel) bool {
|
||||||
|
fieldValues := fl.Field().String()
|
||||||
|
|
||||||
|
_, err := url.ParseRequestURI(fieldValues)
|
||||||
|
return err == nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func chipsetValidator(fe validator.FieldLevel) bool {
|
||||||
|
fieldValue := fe.Field().String()
|
||||||
|
fieldValue = strings.ToLower(fieldValue)
|
||||||
|
|
||||||
|
return IsInSlice(fieldValue, chipsetValues)
|
||||||
|
}
|
||||||
|
|
||||||
// ValidateRAM checks if request contains RAM value that is positive integer divisible by divisibility passed.
|
// ValidateRAM checks if request contains RAM value that is positive integer divisible by divisibility passed.
|
||||||
// It is recommended to pass constants.RAM_DIVISIBILITY as divisility arguement
|
// It is recommended to pass constants.RAM_DIVISIBILITY as divisility arguement
|
||||||
func ValidateRAM(r interfaces.RequestWithRAM, divisibility uint64) error {
|
func ValidateRAM(r interfaces.RequestWithRAM, divisibility uint64) error {
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
return fmt.Sprintf("%s %s: unexpected URL format", prefix, fe.Field())
|
return fmt.Sprintf("%s %s: unexpected URL format", prefix, fe.Field())
|
||||||
case "email":
|
case "email":
|
||||||
return fmt.Sprintf("%s %s: unexpected E-Mail format", prefix, fe.Field())
|
return fmt.Sprintf("%s %s: unexpected E-Mail format", prefix, fe.Field())
|
||||||
|
case "isBool":
|
||||||
|
return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
|
||||||
|
|
||||||
case "driver":
|
case "driver":
|
||||||
return fmt.Sprintf("%s %s must be one of the following: %s",
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
@@ -89,11 +91,8 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
fe.Field(),
|
fe.Field(),
|
||||||
joinValues(computeDiskTypeValues))
|
joinValues(computeDiskTypeValues))
|
||||||
|
|
||||||
case "computeNetType":
|
case "mtu":
|
||||||
return fmt.Sprintf("%s %s must be one of the following: %s",
|
return fmt.Sprint(prefix, fe.Field(), "must be ", mtuMin, "-", mtuMax)
|
||||||
prefix,
|
|
||||||
fe.Field(),
|
|
||||||
joinValues(computeNetTypeValues))
|
|
||||||
|
|
||||||
case "computex86NetType":
|
case "computex86NetType":
|
||||||
return fmt.Sprintf("%s %s must be one of the following: %s",
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
@@ -101,6 +100,12 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
fe.Field(),
|
fe.Field(),
|
||||||
joinValues(computex86NetTypeValues))
|
joinValues(computex86NetTypeValues))
|
||||||
|
|
||||||
|
case "computeNetType":
|
||||||
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
|
prefix,
|
||||||
|
fe.Field(),
|
||||||
|
joinValues(computeNetTypeValues))
|
||||||
|
|
||||||
case "computeOrder":
|
case "computeOrder":
|
||||||
return fmt.Sprintf("%s %s can contain only the following values: %s",
|
return fmt.Sprintf("%s %s can contain only the following values: %s",
|
||||||
prefix,
|
prefix,
|
||||||
@@ -139,7 +144,7 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
prefix,
|
prefix,
|
||||||
fe.Field())
|
fe.Field())
|
||||||
|
|
||||||
// KVM_X86/KVM_PPC Validators
|
// KVM_X86 Validators
|
||||||
case "kvmNetType":
|
case "kvmNetType":
|
||||||
return fmt.Sprintf("%s %s must be one of the following: %s",
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
prefix,
|
prefix,
|
||||||
@@ -236,6 +241,24 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
fe.Field(),
|
fe.Field(),
|
||||||
joinValues(interfaceStateValues))
|
joinValues(interfaceStateValues))
|
||||||
|
|
||||||
|
case "interfaceTXModel":
|
||||||
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
|
prefix,
|
||||||
|
fe.Field(),
|
||||||
|
joinValues(txModelValues))
|
||||||
|
|
||||||
|
case "interfaceIOEventFD":
|
||||||
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
|
prefix,
|
||||||
|
fe.Field(),
|
||||||
|
joinValues(ioEventFDValues))
|
||||||
|
|
||||||
|
case "interfaceEventIDx":
|
||||||
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
|
prefix,
|
||||||
|
fe.Field(),
|
||||||
|
joinValues(eventIDxValues))
|
||||||
|
|
||||||
case "sortBy":
|
case "sortBy":
|
||||||
return fmt.Sprintf("%s %s must be in format +|-(field)",
|
return fmt.Sprintf("%s %s must be in format +|-(field)",
|
||||||
prefix,
|
prefix,
|
||||||
@@ -276,6 +299,12 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
prefix,
|
prefix,
|
||||||
fe.Field(),
|
fe.Field(),
|
||||||
joinValues(kvmx86NetTypeValues))
|
joinValues(kvmx86NetTypeValues))
|
||||||
|
|
||||||
|
case "chipset":
|
||||||
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
|
prefix,
|
||||||
|
fe.Field(),
|
||||||
|
joinValues(chipsetValues))
|
||||||
}
|
}
|
||||||
|
|
||||||
return fe.Error()
|
return fe.Error()
|
||||||
|
|||||||
@@ -186,6 +186,21 @@ func registerAllValidators(validate *validator.Validate) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = validate.RegisterValidation("interfaceTXModel", interfaceTXModelValidator)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = validate.RegisterValidation("interfaceIOEventFD", interfaceIOEventFDValidator)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = validate.RegisterValidation("interfaceEventIDx", interfaceEventIDxValidator)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
err = validate.RegisterValidation("workerGroupName", workerGroupNameValidator)
|
err = validate.RegisterValidation("workerGroupName", workerGroupNameValidator)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -206,6 +221,11 @@ func registerAllValidators(validate *validator.Validate) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = validate.RegisterValidation("mtu", mtuValidator)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
err = validate.RegisterValidation("computeFeatures", computeFeaturesValidator)
|
err = validate.RegisterValidation("computeFeatures", computeFeaturesValidator)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -231,5 +251,15 @@ func registerAllValidators(validate *validator.Validate) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = validate.RegisterValidation("url", urlValidartor)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = validate.RegisterValidation("chipset", chipsetValidator)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package validators
|
package validators
|
||||||
|
|
||||||
var (
|
var (
|
||||||
driverValues = []string{"KVM_X86", "KVM_PPC"}
|
driverValues = []string{"KVM_X86"}
|
||||||
accessTypeValues = []string{"R", "RCX", "ARCXDU"}
|
accessTypeValues = []string{"R", "RCX", "ARCXDU"}
|
||||||
resTypesValues = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
|
resTypesValues = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
|
||||||
protoValues = []string{"tcp", "udp"}
|
protoValues = []string{"tcp", "udp"}
|
||||||
@@ -15,7 +15,7 @@ var (
|
|||||||
computeModeValues = []string{"EQ", "EN", "ANY"}
|
computeModeValues = []string{"EQ", "EN", "ANY"}
|
||||||
computeDiskTypeValues = []string{"D", "B"}
|
computeDiskTypeValues = []string{"D", "B"}
|
||||||
computeNetTypeValues = []string{"EXTNET", "VINS"}
|
computeNetTypeValues = []string{"EXTNET", "VINS"}
|
||||||
computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC"}
|
computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK"}
|
||||||
computeOrderValues = []string{"cdrom", "network", "hd"}
|
computeOrderValues = []string{"cdrom", "network", "hd"}
|
||||||
computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
|
computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
|
||||||
computeDriverValues = []string{"KVM_X86", "SVA_KVM_X86"}
|
computeDriverValues = []string{"KVM_X86", "SVA_KVM_X86"}
|
||||||
@@ -25,19 +25,19 @@ var (
|
|||||||
flipgroupClientTypeValues = []string{"compute", "vins"}
|
flipgroupClientTypeValues = []string{"compute", "vins"}
|
||||||
|
|
||||||
kvmNetTypeValues = []string{"EXTNET", "VINS", "NONE"}
|
kvmNetTypeValues = []string{"EXTNET", "VINS", "NONE"}
|
||||||
kvmx86NetTypeValues = []string{"EXTNET", "VINS", "NONE", "VFNIC"}
|
kvmx86NetTypeValues = []string{"EXTNET", "VINS", "NONE", "VFNIC", "DPDK"}
|
||||||
|
|
||||||
lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
|
lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
|
||||||
|
|
||||||
rgDefNetValues = []string{"PRIVATE", "PUBLIC", "NONE"}
|
rgDefNetValues = []string{"PRIVATE", "PUBLIC", "NONE"}
|
||||||
rgNetTypeValues = []string{"PUBLIC", "PRIVATE"}
|
rgNetTypeValues = []string{"PUBLIC", "PRIVATE"}
|
||||||
|
|
||||||
vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDE"}
|
vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDED"}
|
||||||
|
|
||||||
imageBootTypeValues = []string{"uefi", "bios"}
|
imageBootTypeValues = []string{"uefi", "bios"}
|
||||||
imageTypeValues = []string{"windows", "linux", "other"}
|
imageTypeValues = []string{"windows", "linux", "other"}
|
||||||
imageDriversValues = []string{"KVM_X86"}
|
imageDriversValues = []string{"KVM_X86"}
|
||||||
imageArchitectureValues = []string{"X86_64", "PPC64_LE"}
|
imageArchitectureValues = []string{"X86_64"}
|
||||||
|
|
||||||
sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
|
sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
|
||||||
|
|
||||||
@@ -56,4 +56,18 @@ var (
|
|||||||
networkInterfaceNamingValues = []string{"eth", "ens"}
|
networkInterfaceNamingValues = []string{"eth", "ens"}
|
||||||
|
|
||||||
numaAffinityValues = []string{"none", "strict", "loose"}
|
numaAffinityValues = []string{"none", "strict", "loose"}
|
||||||
|
|
||||||
|
txModelValues = []string{"iothread", "timer", "selected by hypervisor"}
|
||||||
|
|
||||||
|
ioEventFDValues = []string{"on", "off", "selected by hypervisor"}
|
||||||
|
|
||||||
|
eventIDxValues = []string{"on", "off", "selected by hypervisor"}
|
||||||
|
|
||||||
|
chipsetValues = []string{"i440fx", "Q35"}
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
mtuMin = 1
|
||||||
|
|
||||||
|
mtuMax = 9216
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -17,10 +17,6 @@ type DeleteUserRequest struct {
|
|||||||
// ID or emailaddress of the user to remove
|
// ID or emailaddress of the user to remove
|
||||||
// Required: true
|
// Required: true
|
||||||
UserID string `url:"userId" json:"userId" validate:"required"`
|
UserID string `url:"userId" json:"userId" validate:"required"`
|
||||||
|
|
||||||
// Recursively revoke access rights from owned cloudspaces and vmachines
|
|
||||||
// Required: false
|
|
||||||
RecursiveDelete bool `url:"recursivedelete" json:"recursivedelete"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteUser revokes user access from the account
|
// DeleteUser revokes user access from the account
|
||||||
|
|||||||
@@ -1,58 +0,0 @@
|
|||||||
package account
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
|
||||||
)
|
|
||||||
|
|
||||||
// GetConsumptionRequest struct to download the resources tracking files for an account
|
|
||||||
type GetConsumptionRequest struct {
|
|
||||||
// ID an account
|
|
||||||
// Required: true
|
|
||||||
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
|
||||||
|
|
||||||
// Epoch represents the start time
|
|
||||||
// Required: true
|
|
||||||
Start float64 `url:"start" json:"start" validate:"required"`
|
|
||||||
|
|
||||||
// Epoch represents the end time
|
|
||||||
// Required: true
|
|
||||||
End float64 `url:"end" json:"end" validate:"required"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetConsumption downloads the resources tracking files for an account within a given period
|
|
||||||
func (a Account) GetConsumption(ctx context.Context, req GetConsumptionRequest) (string, error) {
|
|
||||||
err := validators.ValidateRequest(req)
|
|
||||||
if err != nil {
|
|
||||||
return "", validators.ValidationErrors(validators.GetErrors(err))
|
|
||||||
}
|
|
||||||
|
|
||||||
url := "/cloudapi/account/getConsumption"
|
|
||||||
|
|
||||||
res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return string(res), nil
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetConsumptionGet downloads the resources tracking files for an account within a given period
|
|
||||||
func (a Account) GetConsumptionGet(ctx context.Context, req GetConsumptionRequest) (string, error) {
|
|
||||||
err := validators.ValidateRequest(req)
|
|
||||||
if err != nil {
|
|
||||||
return "", validators.ValidationErrors(validators.GetErrors(err))
|
|
||||||
}
|
|
||||||
|
|
||||||
url := "/cloudapi/account/getConsumption"
|
|
||||||
|
|
||||||
res, err := a.client.DecortApiCall(ctx, http.MethodGet, url, req)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return string(res), nil
|
|
||||||
}
|
|
||||||
@@ -38,6 +38,10 @@ type ListFLIPGroupsRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
FLIPGroupID uint64 `url:"flipGroupId,omitempty" json:"flipGroupId,omitempty"`
|
FLIPGroupID uint64 `url:"flipGroupId,omitempty" json:"flipGroupId,omitempty"`
|
||||||
|
|
||||||
|
// Sort by one of supported fields, format +|-(field)
|
||||||
|
// Required: false
|
||||||
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|
||||||
// Page number
|
// Page number
|
||||||
// Required: false
|
// Required: false
|
||||||
Page uint64 `url:"page,omitempty" json:"page,omitempty"`
|
Page uint64 `url:"page,omitempty" json:"page,omitempty"`
|
||||||
|
|||||||
@@ -384,7 +384,7 @@ type ItemVINS struct {
|
|||||||
ExtnetId uint64 `json:"extnetId"`
|
ExtnetId uint64 `json:"extnetId"`
|
||||||
|
|
||||||
// Free IPs
|
// Free IPs
|
||||||
FreeIPs uint64 `json:"freeIPs"`
|
FreeIPs int64 `json:"freeIPs"`
|
||||||
|
|
||||||
// ID
|
// ID
|
||||||
ID uint64 `json:"id"`
|
ID uint64 `json:"id"`
|
||||||
|
|||||||
@@ -45,6 +45,11 @@ type UpdateRequest struct {
|
|||||||
// Limit (positive) or disable (0) GPU resources
|
// Limit (positive) or disable (0) GPU resources
|
||||||
// Required: false
|
// Required: false
|
||||||
GPUUnits int64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"`
|
GPUUnits int64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"`
|
||||||
|
|
||||||
|
// List of strings with pools
|
||||||
|
// i.e.: ["sep1_poolName1", "sep2_poolName2", etc]
|
||||||
|
// Required: false
|
||||||
|
UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update updates an account name and resource types and limits
|
// Update updates an account name and resource types and limits
|
||||||
|
|||||||
10
pkg/cloudapi/audit.go
Normal file
10
pkg/cloudapi/audit.go
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package cloudapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/audit"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Accessing the Stack method group
|
||||||
|
func (ca *CloudAPI) Audit() *audit.Audit {
|
||||||
|
return audit.New(ca.client)
|
||||||
|
}
|
||||||
15
pkg/cloudapi/audit/audit.go
Normal file
15
pkg/cloudapi/audit/audit.go
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
|
||||||
|
|
||||||
|
// Structure for creating request to audit
|
||||||
|
type Audit struct {
|
||||||
|
client interfaces.Caller
|
||||||
|
}
|
||||||
|
|
||||||
|
// Builder for audit endpoint
|
||||||
|
func New(client interfaces.Caller) *Audit{
|
||||||
|
return &Audit{
|
||||||
|
client: client,
|
||||||
|
}
|
||||||
|
}
|
||||||
46
pkg/cloudapi/audit/get.go
Normal file
46
pkg/cloudapi/audit/get.go
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetRequest struct to get information about account
|
||||||
|
type GetRequest struct {
|
||||||
|
// Audit GUID
|
||||||
|
// Required: true
|
||||||
|
AuditGuid string `url:"auditGuid" json:"auditGuid" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get gets information about audit as a RecordAudit struct
|
||||||
|
func (a Audit) Get(ctx context.Context, req GetRequest) (*RecordAudit, error) {
|
||||||
|
res, err := a.GetRaw(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
info := RecordAudit{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res, &info)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &info, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRaw gets information about audit as an array of bytes
|
||||||
|
func (a Audit) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/audit/get"
|
||||||
|
|
||||||
|
res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
41
pkg/cloudapi/audit/models.go
Normal file
41
pkg/cloudapi/audit/models.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
// Main info about audit
|
||||||
|
type RecordAudit struct {
|
||||||
|
|
||||||
|
// Arguments
|
||||||
|
Arguments string `json:"args"`
|
||||||
|
|
||||||
|
// Call
|
||||||
|
Call string `json:"call"`
|
||||||
|
|
||||||
|
// GUID
|
||||||
|
GUID string `json:"guid"`
|
||||||
|
|
||||||
|
// Kwargs
|
||||||
|
Kwargs string `json:"kwargs"`
|
||||||
|
|
||||||
|
// RemoteAddr
|
||||||
|
RemoteAddr string `json:"remote_addr"`
|
||||||
|
|
||||||
|
// Response time
|
||||||
|
ResponseTime float64 `json:"responsetime"`
|
||||||
|
|
||||||
|
// Result
|
||||||
|
Result string `json:"result"`
|
||||||
|
|
||||||
|
// Status code
|
||||||
|
StatusCode uint64 `json:"statuscode"`
|
||||||
|
|
||||||
|
// Tags
|
||||||
|
Tags string `json:"tags"`
|
||||||
|
|
||||||
|
// Timestamp
|
||||||
|
Timestamp float64 `json:"timestamp"`
|
||||||
|
|
||||||
|
// TimestampEnd
|
||||||
|
TimestampEnd float64 `json:"timestampEnd"`
|
||||||
|
|
||||||
|
// User
|
||||||
|
User string `json:"user"`
|
||||||
|
}
|
||||||
@@ -41,7 +41,6 @@ type GroupAddRequest struct {
|
|||||||
// Compute driver
|
// Compute driver
|
||||||
// should be one of:
|
// should be one of:
|
||||||
// - KVM_X86
|
// - KVM_X86
|
||||||
// - KVM_PPC
|
|
||||||
// Required: true
|
// Required: true
|
||||||
Driver string `url:"driver" json:"driver" validate:"driver"`
|
Driver string `url:"driver" json:"driver" validate:"driver"`
|
||||||
|
|
||||||
|
|||||||
54
pkg/cloudapi/compute/change_ip.go
Normal file
54
pkg/cloudapi/compute/change_ip.go
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
package compute
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ChangeIPRequest struct to change IP for network
|
||||||
|
type ChangeIPRequest struct {
|
||||||
|
// ID of compute instance
|
||||||
|
// Required: true
|
||||||
|
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
||||||
|
|
||||||
|
// Network type
|
||||||
|
// 'EXTNET' for connect to external network directly
|
||||||
|
// 'VINS' for connect to ViNS
|
||||||
|
// Required: true
|
||||||
|
NetType string `url:"netType" json:"netType" validate:"computeNetType"`
|
||||||
|
|
||||||
|
// Network ID for connect to
|
||||||
|
// For EXTNET - external network ID
|
||||||
|
// For VINS - VINS ID
|
||||||
|
// Required: true
|
||||||
|
NetID uint64 `url:"netId" json:"netId" validate:"required"`
|
||||||
|
|
||||||
|
// IP address to which we will change the existing one, it must be from the same subnet
|
||||||
|
// Required: true
|
||||||
|
IPAddr string `url:"ipAddr" json:"ipAddr" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChangeIP change reserved IP for compute instance
|
||||||
|
func (c Compute) ChangeIP(ctx context.Context, req ChangeIPRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/compute/changeIp"
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
@@ -25,6 +25,11 @@ type CloneRequest struct {
|
|||||||
// Name of the parent's snapshot to create clone from
|
// Name of the parent's snapshot to create clone from
|
||||||
// Required: false
|
// Required: false
|
||||||
SnapshotName string `url:"snapshotName,omitempty" json:"snapshotName,omitempty"`
|
SnapshotName string `url:"snapshotName,omitempty" json:"snapshotName,omitempty"`
|
||||||
|
|
||||||
|
// true ignore that the compute is running
|
||||||
|
// Default: false
|
||||||
|
// Required: false
|
||||||
|
Force bool `url:"force" json:"force"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clone clones compute instance
|
// Clone clones compute instance
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ type DiskMigrateRequest struct {
|
|||||||
|
|
||||||
// Migration mode. 1 - Data migration and domain update were already completed by third-party software.
|
// Migration mode. 1 - Data migration and domain update were already completed by third-party software.
|
||||||
// Use this if target disk already connected to compute and you only need to save changes for next reboot.
|
// Use this if target disk already connected to compute and you only need to save changes for next reboot.
|
||||||
// Required: true
|
// Required: false
|
||||||
Mode int64 `url:"mode" json:"mode" validate:"required"`
|
Mode int64 `url:"mode,omitempty" json:"mode,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskMigrate - migrate compute's disk to target disk. Source disk will be detached, target disk will be attached to the same PCI slot.
|
// DiskMigrate - migrate compute's disk to target disk. Source disk will be detached, target disk will be attached to the same PCI slot.
|
||||||
|
|||||||
@@ -214,6 +214,9 @@ type RecordNetAttach struct {
|
|||||||
|
|
||||||
// List VNF IDs
|
// List VNF IDs
|
||||||
VNFs []uint64 `json:"vnfs"`
|
VNFs []uint64 `json:"vnfs"`
|
||||||
|
|
||||||
|
// Maximum transmission unit
|
||||||
|
MTU uint64 `json:"mtu"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detailed information about audit
|
// Detailed information about audit
|
||||||
@@ -305,9 +308,12 @@ type RecordCompute struct {
|
|||||||
// Boot disk size
|
// Boot disk size
|
||||||
BootDiskSize uint64 `json:"bootdiskSize"`
|
BootDiskSize uint64 `json:"bootdiskSize"`
|
||||||
|
|
||||||
// cd Image Id
|
// CD Image Id
|
||||||
CdImageId uint64 `json:"cdImageId"`
|
CdImageId uint64 `json:"cdImageId"`
|
||||||
|
|
||||||
|
// Chipset
|
||||||
|
Chipset string `json:"chipset"`
|
||||||
|
|
||||||
// Clone reference
|
// Clone reference
|
||||||
CloneReference uint64 `json:"cloneReference"`
|
CloneReference uint64 `json:"cloneReference"`
|
||||||
|
|
||||||
@@ -480,6 +486,30 @@ type RecordCompute struct {
|
|||||||
VirtualImageName string `json:"virtualImageName"`
|
VirtualImageName string `json:"virtualImageName"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Information about libvirt settings
|
||||||
|
type LibvirtSettings struct {
|
||||||
|
// TX mode
|
||||||
|
TXMode string `json:"txmode"`
|
||||||
|
|
||||||
|
// IO event
|
||||||
|
IOEventFD string `json:"ioeventfd"`
|
||||||
|
|
||||||
|
// Event ID
|
||||||
|
EventIDx string `json:"event_idx"`
|
||||||
|
|
||||||
|
// Number of queues
|
||||||
|
Queues uint64 `json:"queues"`
|
||||||
|
|
||||||
|
// RX queue size
|
||||||
|
RXQueueSize uint64 `json:"rx_queue_size"`
|
||||||
|
|
||||||
|
// TX queue size
|
||||||
|
TXQueueSize uint64 `json:"tx_queue_size"`
|
||||||
|
|
||||||
|
// GUID
|
||||||
|
GUID string `json:"guid"`
|
||||||
|
}
|
||||||
|
|
||||||
// Main information about OS user
|
// Main information about OS user
|
||||||
type ItemOSUser struct {
|
type ItemOSUser struct {
|
||||||
// GUID
|
// GUID
|
||||||
@@ -518,6 +548,9 @@ type ListSnapSets []ItemSnapSet
|
|||||||
|
|
||||||
// Main information about VNF
|
// Main information about VNF
|
||||||
type ItemVNFInterface struct {
|
type ItemVNFInterface struct {
|
||||||
|
// Bus number
|
||||||
|
BusNumber uint64 `json:"bus_number"`
|
||||||
|
|
||||||
// Connection ID
|
// Connection ID
|
||||||
ConnID uint64 `json:"connId"`
|
ConnID uint64 `json:"connId"`
|
||||||
|
|
||||||
@@ -542,9 +575,15 @@ type ItemVNFInterface struct {
|
|||||||
// Listen SSH or not
|
// Listen SSH or not
|
||||||
ListenSSH bool `json:"listenSsh"`
|
ListenSSH bool `json:"listenSsh"`
|
||||||
|
|
||||||
|
// Libvirt Settings
|
||||||
|
LibvirtSettings LibvirtSettings `json:"libvirtSettings"`
|
||||||
|
|
||||||
// MAC
|
// MAC
|
||||||
MAC string `json:"mac"`
|
MAC string `json:"mac"`
|
||||||
|
|
||||||
|
// Maximum transmission unit
|
||||||
|
MTU uint64 `json:"mtu"`
|
||||||
|
|
||||||
// Name
|
// Name
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
|
|
||||||
@@ -603,6 +642,9 @@ type ItemComputeDisk struct {
|
|||||||
// Boot partition
|
// Boot partition
|
||||||
BootPartition uint64 `json:"bootPartition"`
|
BootPartition uint64 `json:"bootPartition"`
|
||||||
|
|
||||||
|
// Bus number
|
||||||
|
BusNumber uint64 `json:"bus_number"`
|
||||||
|
|
||||||
// Created time
|
// Created time
|
||||||
CreatedTime uint64 `json:"createdTime"`
|
CreatedTime uint64 `json:"createdTime"`
|
||||||
|
|
||||||
@@ -833,9 +875,12 @@ type ItemCompute struct {
|
|||||||
// Boot disk size
|
// Boot disk size
|
||||||
BootDiskSize uint64 `json:"bootdiskSize"`
|
BootDiskSize uint64 `json:"bootdiskSize"`
|
||||||
|
|
||||||
// cd Image Id
|
// CD Image Id
|
||||||
CdImageId uint64 `json:"cdImageId"`
|
CdImageId uint64 `json:"cdImageId"`
|
||||||
|
|
||||||
|
// Chipset
|
||||||
|
Chipset string `json:"chipset"`
|
||||||
|
|
||||||
// Clone reference
|
// Clone reference
|
||||||
CloneReference uint64 `json:"cloneReference"`
|
CloneReference uint64 `json:"cloneReference"`
|
||||||
|
|
||||||
@@ -997,6 +1042,9 @@ type InfoDisk struct {
|
|||||||
|
|
||||||
// PCISlot
|
// PCISlot
|
||||||
PCISlot int64 `json:"pciSlot"`
|
PCISlot int64 `json:"pciSlot"`
|
||||||
|
|
||||||
|
// Bus number
|
||||||
|
BusNumber uint64 `json:"bus_number"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// List information about computes
|
// List information about computes
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ type NetAttachRequest struct {
|
|||||||
// 'EXTNET' for connect to external network directly
|
// 'EXTNET' for connect to external network directly
|
||||||
// 'VINS' for connect to ViNS
|
// 'VINS' for connect to ViNS
|
||||||
// 'VFNIC' for connect to vfpool
|
// 'VFNIC' for connect to vfpool
|
||||||
|
// 'DPDK' for connect to DPDK
|
||||||
// Required: true
|
// Required: true
|
||||||
NetType string `url:"netType" json:"netType" validate:"computex86NetType"`
|
NetType string `url:"netType" json:"netType" validate:"computex86NetType"`
|
||||||
|
|
||||||
@@ -30,6 +31,10 @@ type NetAttachRequest struct {
|
|||||||
// Directly required IP address for new network interface
|
// Directly required IP address for new network interface
|
||||||
// Required: false
|
// Required: false
|
||||||
IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
|
IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
|
||||||
|
|
||||||
|
// Used only for DPDK type, must be 1-9216
|
||||||
|
// Required: false
|
||||||
|
MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// NetAttach attaches network to compute and gets info about network
|
// NetAttach attaches network to compute and gets info about network
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package compute
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
)
|
)
|
||||||
@@ -19,24 +18,52 @@ type SnapshotDeleteRequest struct {
|
|||||||
Label string `url:"label" json:"label" validate:"required"`
|
Label string `url:"label" json:"label" validate:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type wrapperSnapshotDeleteRequeststruct struct {
|
||||||
|
SnapshotDeleteRequest
|
||||||
|
|
||||||
|
AsyncMode bool `url:"asyncMode"`
|
||||||
|
}
|
||||||
|
|
||||||
// SnapshotDelete deletes specified compute snapshot
|
// SnapshotDelete deletes specified compute snapshot
|
||||||
func (c Compute) SnapshotDelete(ctx context.Context, req SnapshotDeleteRequest) (bool, error) {
|
func (c Compute) SnapshotDelete(ctx context.Context, req SnapshotDeleteRequest) (string, error) {
|
||||||
err := validators.ValidateRequest(req)
|
err := validators.ValidateRequest(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, validators.ValidationErrors(validators.GetErrors(err))
|
return "", validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
reqWrapped := wrapperSnapshotDeleteRequeststruct{
|
||||||
|
SnapshotDeleteRequest: req,
|
||||||
|
AsyncMode: false,
|
||||||
}
|
}
|
||||||
|
|
||||||
url := "/cloudapi/compute/snapshotDelete"
|
url := "/cloudapi/compute/snapshotDelete"
|
||||||
|
|
||||||
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := strconv.ParseBool(string(res))
|
return string(res), nil
|
||||||
if err != nil {
|
}
|
||||||
return false, err
|
|
||||||
}
|
// SnapshotDeleteAsync deletes specified compute snapshot
|
||||||
|
func (c Compute) SnapshotDeleteAsync(ctx context.Context, req SnapshotDeleteRequest) (string, error) {
|
||||||
return result, nil
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
reqWrapped := wrapperSnapshotDeleteRequeststruct{
|
||||||
|
SnapshotDeleteRequest: req,
|
||||||
|
AsyncMode: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/compute/snapshotDelete"
|
||||||
|
|
||||||
|
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return string(res), nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ type UpdateRequest struct {
|
|||||||
// Default: false
|
// Default: false
|
||||||
CPUPin bool `url:"cpupin" json:"cpupin"`
|
CPUPin bool `url:"cpupin" json:"cpupin"`
|
||||||
|
|
||||||
|
// Type of the emulated system, Q35 or i440fx
|
||||||
|
// Required: false
|
||||||
|
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
|
||||||
// Required: false
|
// Required: false
|
||||||
// Default: false
|
// Default: false
|
||||||
|
|||||||
@@ -21,10 +21,6 @@ type DeleteRequest struct {
|
|||||||
// Whether to completely delete the disk, works only with non attached disks
|
// Whether to completely delete the disk, works only with non attached disks
|
||||||
// Required: false
|
// Required: false
|
||||||
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
||||||
|
|
||||||
// Reason to delete
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete deletes disk by ID
|
// Delete deletes disk by ID
|
||||||
|
|||||||
@@ -14,10 +14,6 @@ type DisksDeleteRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
DisksIDs []uint64 `url:"diskIds" json:"diskIds" validate:"required"`
|
DisksIDs []uint64 `url:"diskIds" json:"diskIds" validate:"required"`
|
||||||
|
|
||||||
// Reason for deleting the disks
|
|
||||||
// Required: true
|
|
||||||
Reason string `url:"reason" json:"reason" validate:"required"`
|
|
||||||
|
|
||||||
// Whether to completely delete the disks, works only with non attached disks
|
// Whether to completely delete the disks, works only with non attached disks
|
||||||
// Required: false
|
// Required: false
|
||||||
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ type FromPlatformDiskRequest struct {
|
|||||||
// Binary architecture of this image
|
// Binary architecture of this image
|
||||||
// Should be:
|
// Should be:
|
||||||
// - X86_64
|
// - X86_64
|
||||||
// - PPC64_LE
|
|
||||||
// Required: true
|
// Required: true
|
||||||
Architecture string `url:"architecture" json:"architecture" validate:"imageArchitecture"`
|
Architecture string `url:"architecture" json:"architecture" validate:"imageArchitecture"`
|
||||||
|
|
||||||
@@ -56,8 +55,8 @@ type FromPlatformDiskRequest struct {
|
|||||||
|
|
||||||
// List of types of compute suitable for image
|
// List of types of compute suitable for image
|
||||||
// Example: [ "KVM_X86" ]
|
// Example: [ "KVM_X86" ]
|
||||||
// Required: false
|
// Required: true
|
||||||
Drivers []string `url:"drivers,omitempty" json:"drivers,omitempty"`
|
Drivers []string `url:"drivers" json:"drivers" validate:"required"`
|
||||||
|
|
||||||
// Does this machine supports hot resize
|
// Does this machine supports hot resize
|
||||||
// Required: false
|
// Required: false
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type RestoreRequest struct {
|
|||||||
// ID of the disk to restore
|
// ID of the disk to restore
|
||||||
// Required: true
|
// Required: true
|
||||||
DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
|
DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
|
||||||
|
|
||||||
// Reason for restoring the disk
|
|
||||||
// Required: true
|
|
||||||
Reason string `url:"reason" json:"reason" validate:"required"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Restore restores a deleted unattached disk from recycle bin
|
// Restore restores a deleted unattached disk from recycle bin
|
||||||
|
|||||||
8
pkg/cloudapi/dpdknet.go
Normal file
8
pkg/cloudapi/dpdknet.go
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
package cloudapi
|
||||||
|
|
||||||
|
import "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/dpdknet"
|
||||||
|
|
||||||
|
// Accessing the DPDKNet method group
|
||||||
|
func (ca *CloudAPI) DPDKNet() *dpdknet.DPDKNet {
|
||||||
|
return dpdknet.New(ca.client)
|
||||||
|
}
|
||||||
15
pkg/cloudapi/dpdknet/dpdknet.go
Normal file
15
pkg/cloudapi/dpdknet/dpdknet.go
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package dpdknet
|
||||||
|
|
||||||
|
import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
|
||||||
|
|
||||||
|
// Structure for creating request to DPDK network
|
||||||
|
type DPDKNet struct {
|
||||||
|
client interfaces.Caller
|
||||||
|
}
|
||||||
|
|
||||||
|
// Builder for dpdk endpoints
|
||||||
|
func New(client interfaces.Caller) *DPDKNet {
|
||||||
|
return &DPDKNet{
|
||||||
|
client,
|
||||||
|
}
|
||||||
|
}
|
||||||
46
pkg/cloudapi/dpdknet/get.go
Normal file
46
pkg/cloudapi/dpdknet/get.go
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
package dpdknet
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetRequest struct to get information about DPDK network
|
||||||
|
type GetRequest struct {
|
||||||
|
// ID of the DPDK network
|
||||||
|
// Required: true
|
||||||
|
DPDKID uint64 `url:"dpdkId" json:"dpdkId" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get DPDK network details as a RecordDPDKNet struct
|
||||||
|
func (d DPDKNet) Get(ctx context.Context, req GetRequest) (*RecordDPDKNet, error) {
|
||||||
|
res, err := d.GetRaw(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
info := RecordDPDKNet{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res, &info)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &info, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRaw gets DPDK network details as an array of bytes
|
||||||
|
func (d DPDKNet) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/dpdknet/get"
|
||||||
|
|
||||||
|
res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
79
pkg/cloudapi/dpdknet/list.go
Normal file
79
pkg/cloudapi/dpdknet/list.go
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
package dpdknet
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ListRequest struct to get list of DPDK networks
|
||||||
|
type ListRequest struct {
|
||||||
|
// Find by id
|
||||||
|
// Required: false
|
||||||
|
ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by gid
|
||||||
|
// Required: false
|
||||||
|
GID uint64 `url:"gid,omitempty" json:"gid,omitempty"`
|
||||||
|
|
||||||
|
// Find by name
|
||||||
|
// Required: false
|
||||||
|
Name string `url:"name,omitempty" json:"name,omitempty"`
|
||||||
|
|
||||||
|
// Find by description
|
||||||
|
// Required: false
|
||||||
|
Description string `url:"description,omitempty" json:"description,omitempty"`
|
||||||
|
|
||||||
|
// Find by status
|
||||||
|
// Required: false
|
||||||
|
Status string `url:"status,omitempty" json:"status,omitempty"`
|
||||||
|
|
||||||
|
// Find by computeIDs
|
||||||
|
// Required: false
|
||||||
|
ComputeIDs []uint64 `url:"computeIds,omitempty" json:"computeIds,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 the created DPDK networks belonging to an account as a ListDPDKNet struct
|
||||||
|
func (d DPDKNet) List(ctx context.Context, req ListRequest) (*ListDPDKNet, error) {
|
||||||
|
|
||||||
|
res, err := d.ListRaw(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
list := ListDPDKNet{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res, &list)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &list, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListRaw gets list of the created DPDK networks belonging to an account as an array of bytes
|
||||||
|
func (d DPDKNet) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
|
||||||
|
|
||||||
|
if err := validators.ValidateRequest(req); err != nil {
|
||||||
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/dpdknet/list"
|
||||||
|
|
||||||
|
res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
92
pkg/cloudapi/dpdknet/models.go
Normal file
92
pkg/cloudapi/dpdknet/models.go
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
package dpdknet
|
||||||
|
|
||||||
|
// Detailed information about DPDK network
|
||||||
|
type RecordDPDKNet struct {
|
||||||
|
// List of accounts with access
|
||||||
|
AccountAccess []uint64 `json:"accountAccess"`
|
||||||
|
|
||||||
|
// Created time
|
||||||
|
CreatedTime uint64 `json:"createdTime"`
|
||||||
|
|
||||||
|
// Updated time
|
||||||
|
UpdatedTime uint64 `json:"updatedTime"`
|
||||||
|
|
||||||
|
// Description
|
||||||
|
Description string `json:"description"`
|
||||||
|
|
||||||
|
// Grid ID
|
||||||
|
GID uint64 `json:"gid"`
|
||||||
|
|
||||||
|
// Guid ID
|
||||||
|
GUID uint64 `json:"guid"`
|
||||||
|
|
||||||
|
// ID
|
||||||
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
|
// Name
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// List of resource groups with access
|
||||||
|
RGAccess []uint64 `json:"rgAccess"`
|
||||||
|
|
||||||
|
// Status
|
||||||
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// OVS bridge
|
||||||
|
OVSBridge string `json:"ovsBridge"`
|
||||||
|
|
||||||
|
// Vlan ID
|
||||||
|
VlanID uint64 `json:"vlanId"`
|
||||||
|
|
||||||
|
// Compute IDs
|
||||||
|
ComputeIDs []uint64 `json:"computeIds"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ListDPDKNet struct {
|
||||||
|
// Data
|
||||||
|
Data []ItemDPDKNet `json:"data"`
|
||||||
|
|
||||||
|
// Entry count
|
||||||
|
EntryCount uint64 `json:"entryCount"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ItemDPDKNet struct {
|
||||||
|
// List of accounts with access
|
||||||
|
AccountAccess []uint64 `json:"accountAccess"`
|
||||||
|
|
||||||
|
// Created time
|
||||||
|
CreatedTime uint64 `json:"createdTime"`
|
||||||
|
|
||||||
|
// Updated time
|
||||||
|
UpdatedTime uint64 `json:"updatedTime"`
|
||||||
|
|
||||||
|
// Description
|
||||||
|
Description string `json:"description"`
|
||||||
|
|
||||||
|
// Grid ID
|
||||||
|
GID uint64 `json:"gid"`
|
||||||
|
|
||||||
|
// Guid ID
|
||||||
|
GUID uint64 `json:"guid"`
|
||||||
|
|
||||||
|
// ID
|
||||||
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
|
// Name
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// List of resource groups with access
|
||||||
|
RGAccess []uint64 `json:"rgAccess"`
|
||||||
|
|
||||||
|
// Status
|
||||||
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// OVS bridge
|
||||||
|
OVSBridge string `json:"ovsBridge"`
|
||||||
|
|
||||||
|
// Vlan ID
|
||||||
|
VlanID uint64 `json:"vlanId"`
|
||||||
|
|
||||||
|
// Compute IDs
|
||||||
|
ComputeIDs []uint64 `json:"computeIds"`
|
||||||
|
}
|
||||||
@@ -170,7 +170,7 @@ type RecordExtNet struct {
|
|||||||
Excluded []Excluded `json:"excluded"`
|
Excluded []Excluded `json:"excluded"`
|
||||||
|
|
||||||
// Free IPs
|
// Free IPs
|
||||||
FreeIPs uint64 `json:"free_ips"`
|
FreeIPs int64 `json:"free_ips"`
|
||||||
|
|
||||||
// Gateway
|
// Gateway
|
||||||
Gateway string `json:"gateway"`
|
Gateway string `json:"gateway"`
|
||||||
|
|||||||
@@ -72,7 +72,6 @@ type CreateRequest struct {
|
|||||||
// Binary architecture of this image
|
// Binary architecture of this image
|
||||||
// Should be:
|
// Should be:
|
||||||
// - X86_64
|
// - X86_64
|
||||||
// - PPC64_LE
|
|
||||||
// Required: false
|
// Required: false
|
||||||
Architecture string `url:"architecture,omitempty" json:"architecture,omitempty" validate:"omitempty,imageArchitecture"`
|
Architecture string `url:"architecture,omitempty" json:"architecture,omitempty" validate:"omitempty,imageArchitecture"`
|
||||||
|
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type DeleteRequest struct {
|
|||||||
// ID of the image to delete
|
// ID of the image to delete
|
||||||
// Required: true
|
// Required: true
|
||||||
ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
|
ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
|
||||||
|
|
||||||
// Whether to completely delete the image
|
|
||||||
// Required: false
|
|
||||||
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete deletes image by ID
|
// Delete deletes image by ID
|
||||||
|
|||||||
@@ -48,15 +48,15 @@ type ListRequest struct {
|
|||||||
|
|
||||||
// Find by public True or False
|
// Find by public True or False
|
||||||
// Required: false
|
// Required: false
|
||||||
Public interface{} `url:"public,omitempty" json:"public,omitempty" validate:"omitempty,sortBy"`
|
Public interface{} `url:"public,omitempty" json:"public,omitempty" validate:"omitempty,isBool"`
|
||||||
|
|
||||||
// Find by hot resize True or False
|
// Find by hot resize True or False
|
||||||
// Required: false
|
// Required: false
|
||||||
HotResize interface{} `url:"hotResize,omitempty" json:"hotResize,omitempty" validate:"omitempty,sortBy"`
|
HotResize interface{} `url:"hotResize,omitempty" json:"hotResize,omitempty" validate:"omitempty,isBool"`
|
||||||
|
|
||||||
// Find by bootable True or False
|
// Find by bootable True or False
|
||||||
// Required: false
|
// Required: false
|
||||||
Bootable interface{} `url:"bootable,omitempty" json:"bootable,omitempty" validate:"omitempty,sortBy"`
|
Bootable interface{} `url:"bootable,omitempty" json:"bootable,omitempty" validate:"omitempty,isBool"`
|
||||||
|
|
||||||
// Sort by one of supported fields, format +|-(field)
|
// Sort by one of supported fields, format +|-(field)
|
||||||
// Required: false
|
// Required: false
|
||||||
@@ -69,6 +69,10 @@ type ListRequest struct {
|
|||||||
// Page size
|
// Page size
|
||||||
// Required: false
|
// Required: false
|
||||||
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
|
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
|
||||||
|
|
||||||
|
// Find by enabled True or False
|
||||||
|
// Required: false
|
||||||
|
Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// List gets list of available images as a ListImages struct, optionally filtering by account ID
|
// List gets list of available images as a ListImages struct, optionally filtering by account ID
|
||||||
|
|||||||
@@ -162,6 +162,10 @@ type CreateRequest struct {
|
|||||||
// Insert ssl certificate in x509 pem format
|
// Insert ssl certificate in x509 pem format
|
||||||
// Required: false
|
// Required: false
|
||||||
OidcCertificate string `url:"oidcCertificate,omitempty" json:"oidcCertificate,omitempty"`
|
OidcCertificate string `url:"oidcCertificate,omitempty" json:"oidcCertificate,omitempty"`
|
||||||
|
|
||||||
|
// Type of the emulated system, Q35 or i440fx
|
||||||
|
// Required: false
|
||||||
|
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRAM returns RAM field values
|
// GetRAM returns RAM field values
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ type DeleteMasterFromGroupRequest struct {
|
|||||||
|
|
||||||
// List of Compute IDs of master nodes to delete
|
// List of Compute IDs of master nodes to delete
|
||||||
// Required: true
|
// Required: true
|
||||||
MasterIDs []string `url:"masterIds" json:"masterIds" validate:"min=1"`
|
MasterIDs []uint64 `url:"masterIds" json:"masterIds" validate:"min=1"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteMasterFromGroup deletes compute from masters group in selected Kubernetes cluster
|
// DeleteMasterFromGroup deletes compute from masters group in selected Kubernetes cluster
|
||||||
|
|||||||
@@ -89,6 +89,15 @@ type RecordK8S struct {
|
|||||||
// Deleted time
|
// Deleted time
|
||||||
DeletedTime uint64 `json:"deletedTime"`
|
DeletedTime uint64 `json:"deletedTime"`
|
||||||
|
|
||||||
|
// Only external network
|
||||||
|
ExtnetOnly bool `json:"extnetOnly"`
|
||||||
|
|
||||||
|
// Highly available LB
|
||||||
|
HighlyAvailableLB bool `json:"highlyAvailableLB"`
|
||||||
|
|
||||||
|
// Address Virtual Internet Protocol
|
||||||
|
AddressVIP K8SAddressVIP `json:"addressVip"`
|
||||||
|
|
||||||
// ID
|
// ID
|
||||||
ID uint64 `json:"id"`
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
@@ -124,6 +133,18 @@ type RecordK8S struct {
|
|||||||
|
|
||||||
// Updated time
|
// Updated time
|
||||||
UpdatedTime uint64 `json:"updatedTime"`
|
UpdatedTime uint64 `json:"updatedTime"`
|
||||||
|
|
||||||
|
// With LB
|
||||||
|
WithLB bool `json:"withLB"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Detailed information about address of the Virtual Internet Protocol
|
||||||
|
type K8SAddressVIP struct {
|
||||||
|
// Backend IP
|
||||||
|
BackendIP string `json:"backendIp"`
|
||||||
|
|
||||||
|
// Frontend IP
|
||||||
|
FrontendIP string `json:"frontendIp"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detailed information about kubernetes cluster groups
|
// Detailed information about kubernetes cluster groups
|
||||||
|
|||||||
@@ -21,6 +21,10 @@ type WorkerAddRequest struct {
|
|||||||
// How many worker nodes to add
|
// How many worker nodes to add
|
||||||
// Required: false
|
// Required: false
|
||||||
Num uint64 `url:"num,omitempty" json:"num,omitempty"`
|
Num uint64 `url:"num,omitempty" json:"num,omitempty"`
|
||||||
|
|
||||||
|
// Type of the emulated system, Q35 or i440fx
|
||||||
|
// Required: false
|
||||||
|
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// WorkerAdd adds worker nodes to a Kubernetes cluster
|
// WorkerAdd adds worker nodes to a Kubernetes cluster
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package k8s
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
)
|
)
|
||||||
@@ -60,6 +59,10 @@ type WorkersGroupAddRequest struct {
|
|||||||
// Meta data for working group computes, format YAML "user_data": 1111
|
// Meta data for working group computes, format YAML "user_data": 1111
|
||||||
// Required: false
|
// Required: false
|
||||||
UserData string `url:"userData,omitempty" json:"userData,omitempty"`
|
UserData string `url:"userData,omitempty" json:"userData,omitempty"`
|
||||||
|
|
||||||
|
// Type of the emulated system, Q35 or i440fx
|
||||||
|
// Required: false
|
||||||
|
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRAM returns RAM field values
|
// GetRAM returns RAM field values
|
||||||
@@ -73,23 +76,18 @@ func (r WorkersGroupAddRequest) GetRAM() map[string]uint64 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// WorkersGroupAdd adds workers group to Kubernetes cluster
|
// WorkersGroupAdd adds workers group to Kubernetes cluster
|
||||||
func (k8s K8S) WorkersGroupAdd(ctx context.Context, req WorkersGroupAddRequest) (uint64, error) {
|
func (k8s K8S) WorkersGroupAdd(ctx context.Context, req WorkersGroupAddRequest) (string, error) {
|
||||||
err := validators.ValidateRequest(req)
|
err := validators.ValidateRequest(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, validators.ValidationErrors(validators.GetErrors(err))
|
return "", validators.ValidationErrors(validators.GetErrors(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
url := "/cloudapi/k8s/workersGroupAdd"
|
url := "/cloudapi/k8s/workersGroupAdd"
|
||||||
|
|
||||||
res, err := k8s.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
res, err := k8s.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := strconv.ParseUint(string(res), 10, 64)
|
return string(res), nil
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
package cloudapi
|
|
||||||
|
|
||||||
import "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmppc"
|
|
||||||
|
|
||||||
// Accessing the KVMPPC method group
|
|
||||||
func (ca *CloudAPI) KVMPPC() *kvmppc.KVMPPC {
|
|
||||||
return kvmppc.New(ca.client)
|
|
||||||
}
|
|
||||||
@@ -1,202 +0,0 @@
|
|||||||
package kvmppc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Interface struct {
|
|
||||||
// Network type
|
|
||||||
// Should be one of:
|
|
||||||
// - VINS
|
|
||||||
// - EXTNET
|
|
||||||
NetType string `url:"netType" json:"netType" validate:"required,kvmNetType"`
|
|
||||||
|
|
||||||
// Network ID for connect to,
|
|
||||||
// for EXTNET - external network ID,
|
|
||||||
// for VINS - VINS ID,
|
|
||||||
NetID uint64 `url:"netId" json:"netId" validate:"required"`
|
|
||||||
|
|
||||||
// IP address to assign to this VM when connecting to the specified network
|
|
||||||
// Required: false
|
|
||||||
IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// DataDisk detailed struct for DataDisks field in CreateRequest and CreateBlankRequest
|
|
||||||
type DataDisk struct {
|
|
||||||
// Name for disk
|
|
||||||
// Required: true
|
|
||||||
DiskName string `url:"diskName" json:"diskName" validate:"required"`
|
|
||||||
|
|
||||||
// Disk size in GB
|
|
||||||
// Required: true
|
|
||||||
Size uint64 `url:"size" json:"size" validate:"required"`
|
|
||||||
|
|
||||||
// Storage endpoint provider ID
|
|
||||||
// By default the same with boot disk
|
|
||||||
// Required: false
|
|
||||||
SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
|
|
||||||
|
|
||||||
// Pool name
|
|
||||||
// By default will be chosen automatically
|
|
||||||
// Required: false
|
|
||||||
Pool string `url:"pool,omitempty" json:"pool,omitempty"`
|
|
||||||
|
|
||||||
// Optional description
|
|
||||||
// Required: false
|
|
||||||
Description string `url:"desc,omitempty" json:"desc,omitempty"`
|
|
||||||
|
|
||||||
// Specify image id for create disk from template
|
|
||||||
// Required: false
|
|
||||||
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// CreateRequest struct to create KVM PowerPC VM
|
|
||||||
type CreateRequest struct {
|
|
||||||
// ID of the resource group, which will own this VM
|
|
||||||
// Required: true
|
|
||||||
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
|
||||||
|
|
||||||
// Name of this VM.
|
|
||||||
// Must be unique among all VMs (including those in DELETED state) in target resource group
|
|
||||||
// Required: true
|
|
||||||
Name string `url:"name" json:"name" validate:"required"`
|
|
||||||
|
|
||||||
// Number CPUs to allocate to this VM
|
|
||||||
// Required: true
|
|
||||||
CPU uint64 `url:"cpu" json:"cpu" validate:"required"`
|
|
||||||
|
|
||||||
// Volume of RAM in MB to allocate to this VM
|
|
||||||
// Required: true
|
|
||||||
RAM uint64 `url:"ram" json:"ram" validate:"required"`
|
|
||||||
|
|
||||||
// ID of the OS image to base this VM on;
|
|
||||||
// Could be boot disk image or CD-ROM image
|
|
||||||
// Required: true
|
|
||||||
ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
|
|
||||||
|
|
||||||
// Size of the boot disk in GB
|
|
||||||
// Required: false
|
|
||||||
BootDisk uint64 `url:"bootDisk,omitempty" json:"bootDisk,omitempty"`
|
|
||||||
|
|
||||||
// ID of SEP to create boot disk on.
|
|
||||||
// Uses images SEP ID if not set
|
|
||||||
// Required: false
|
|
||||||
SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
|
|
||||||
|
|
||||||
// Pool to use if sepId is set, can be also empty if needed to be chosen by system
|
|
||||||
// Required: false
|
|
||||||
Pool string `url:"pool,omitempty" json:"pool,omitempty"`
|
|
||||||
|
|
||||||
// Slice of structs with data disk description. Each disk has parameters: required - diskName, size; optional - sepId, pool, desc and imageId.
|
|
||||||
// If not specified, compute will be created without disks.
|
|
||||||
// To create compute without disks, pass initialized empty slice .
|
|
||||||
// Required: false
|
|
||||||
DataDisks []DataDisk `url:"-" json:"dataDisks,omitempty" validate:"omitempty,dive"`
|
|
||||||
|
|
||||||
// Slice of structs with net interface description.
|
|
||||||
// If not specified, compute will be created with default interface from RG.
|
|
||||||
// To create compute without interfaces, pass initialized empty slice .
|
|
||||||
// Required: false
|
|
||||||
Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
|
|
||||||
|
|
||||||
// Input data for cloud-init facility
|
|
||||||
// Required: false
|
|
||||||
Userdata string `url:"userdata,omitempty" json:"userdata,omitempty"`
|
|
||||||
|
|
||||||
// Text description of this VM
|
|
||||||
// Required: false
|
|
||||||
Description string `url:"desc,omitempty" json:"desc,omitempty"`
|
|
||||||
|
|
||||||
// Start VM upon success
|
|
||||||
// Required: false
|
|
||||||
Start bool `url:"start" json:"start"`
|
|
||||||
|
|
||||||
// System name
|
|
||||||
// Required: false
|
|
||||||
IS string `url:"IS,omitempty" json:"IS,omitempty"`
|
|
||||||
|
|
||||||
// Compute purpose
|
|
||||||
// Required: false
|
|
||||||
IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetRAM returns RAM field values
|
|
||||||
func (r CreateRequest) GetRAM() map[string]uint64 {
|
|
||||||
|
|
||||||
res := make(map[string]uint64, 1)
|
|
||||||
|
|
||||||
res["RAM"] = r.RAM
|
|
||||||
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
type wrapperCreateRequest struct {
|
|
||||||
CreateRequest
|
|
||||||
Interfaces []string `url:"interfaces,omitempty"`
|
|
||||||
DataDisks []string `url:"dataDisks,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create creates KVM PowerPC VM based on specified OS image
|
|
||||||
func (k KVMPPC) Create(ctx context.Context, req CreateRequest) (uint64, error) {
|
|
||||||
err := validators.ValidateRequest(req)
|
|
||||||
if err != nil {
|
|
||||||
return 0, validators.ValidationErrors(validators.GetErrors(err))
|
|
||||||
}
|
|
||||||
|
|
||||||
var interfaces []string
|
|
||||||
|
|
||||||
if req.Interfaces != nil && len(req.Interfaces) != 0 {
|
|
||||||
interfaces = make([]string, 0, len(req.Interfaces))
|
|
||||||
|
|
||||||
for i := range req.Interfaces {
|
|
||||||
b, err := json.Marshal(req.Interfaces[i])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
interfaces = append(interfaces, string(b))
|
|
||||||
}
|
|
||||||
} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
|
|
||||||
interfaces = []string{"[]"}
|
|
||||||
}
|
|
||||||
|
|
||||||
var dataDisks []string
|
|
||||||
|
|
||||||
if req.DataDisks != nil && len(req.DataDisks) != 0 {
|
|
||||||
dataDisks = make([]string, 0, len(req.DataDisks))
|
|
||||||
|
|
||||||
for i := range req.DataDisks {
|
|
||||||
b, err := json.Marshal(req.DataDisks[i])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
dataDisks = append(dataDisks, string(b))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
reqWrapped := wrapperCreateRequest{
|
|
||||||
CreateRequest: req,
|
|
||||||
Interfaces: interfaces,
|
|
||||||
DataDisks: dataDisks,
|
|
||||||
}
|
|
||||||
|
|
||||||
url := "/cloudapi/kvmppc/create"
|
|
||||||
|
|
||||||
res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
result, err := strconv.ParseUint(string(res), 10, 64)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
@@ -1,135 +0,0 @@
|
|||||||
package kvmppc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
|
||||||
)
|
|
||||||
|
|
||||||
// CreateBlankRequest struct to create KVM PowerPC VM from scratch
|
|
||||||
type CreateBlankRequest struct {
|
|
||||||
// ID of the resource group, which will own this VM
|
|
||||||
// Required: true
|
|
||||||
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
|
||||||
|
|
||||||
// Name of this VM.
|
|
||||||
// Must be unique among all VMs (including those in DELETED state) in target resource group
|
|
||||||
// Required: true
|
|
||||||
Name string `url:"name" json:"name" validate:"required"`
|
|
||||||
|
|
||||||
// Number CPUs to allocate to this VM
|
|
||||||
// Required: true
|
|
||||||
CPU uint64 `url:"cpu" json:"cpu" validate:"required"`
|
|
||||||
|
|
||||||
// Volume of RAM in MB to allocate to this VM
|
|
||||||
// Required: true
|
|
||||||
RAM uint64 `url:"ram" json:"ram" validate:"required"`
|
|
||||||
|
|
||||||
// Size of the boot disk in GB
|
|
||||||
// Required: true
|
|
||||||
BootDisk uint64 `url:"bootDisk" json:"bootDisk" validate:"required"`
|
|
||||||
|
|
||||||
// ID of SEP to create boot disk on
|
|
||||||
// Uses images SEP ID if not set
|
|
||||||
// Required: true
|
|
||||||
SEPID uint64 `url:"sepId" json:"sepId" validate:"required"`
|
|
||||||
|
|
||||||
// Pool to use if SEP ID is set, can be also empty if needed to be chosen by system
|
|
||||||
// Required: true
|
|
||||||
Pool string `url:"pool" json:"pool" validate:"required"`
|
|
||||||
|
|
||||||
// Slice of structs with data disk description. Each disk has parameters: required - diskName, size; optional - sepId, pool, desc and imageId.
|
|
||||||
// If not specified, compute will be created without disks.
|
|
||||||
// To create compute without disks, pass initialized empty slice .
|
|
||||||
// Required: false
|
|
||||||
DataDisks []DataDisk `url:"-" json:"dataDisks,omitempty" validate:"omitempty,dive"`
|
|
||||||
|
|
||||||
// Slice of structs with net interface description.
|
|
||||||
// If not specified, compute will be created with default interface from RG.
|
|
||||||
// To create compute without interfaces, pass initialized empty slice .
|
|
||||||
// Required: false
|
|
||||||
Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
|
|
||||||
|
|
||||||
// Text description of this VM
|
|
||||||
// Required: false
|
|
||||||
Description string `url:"desc,omitempty" json:"desc,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetRAM returns RAM field values
|
|
||||||
func (r CreateBlankRequest) GetRAM() map[string]uint64 {
|
|
||||||
|
|
||||||
res := make(map[string]uint64, 1)
|
|
||||||
|
|
||||||
res["RAM"] = r.RAM
|
|
||||||
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
type wrapperCreateBlankRequest struct {
|
|
||||||
CreateBlankRequest
|
|
||||||
Interfaces []string `url:"interfaces,omitempty"`
|
|
||||||
DataDisks []string `url:"dataDisks,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// CreateBlank creates KVM PowerPC VM from scratch
|
|
||||||
func (k KVMPPC) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64, error) {
|
|
||||||
err := validators.ValidateRequest(req)
|
|
||||||
if err != nil {
|
|
||||||
return 0, validators.ValidationErrors(validators.GetErrors(err))
|
|
||||||
}
|
|
||||||
|
|
||||||
var interfaces []string
|
|
||||||
|
|
||||||
if req.Interfaces != nil && len(req.Interfaces) != 0 {
|
|
||||||
interfaces = make([]string, 0, len(req.Interfaces))
|
|
||||||
|
|
||||||
for i := range req.Interfaces {
|
|
||||||
b, err := json.Marshal(req.Interfaces[i])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
interfaces = append(interfaces, string(b))
|
|
||||||
}
|
|
||||||
} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
|
|
||||||
interfaces = []string{"[]"}
|
|
||||||
}
|
|
||||||
|
|
||||||
var dataDisks []string
|
|
||||||
|
|
||||||
if req.DataDisks != nil && len(req.DataDisks) != 0 {
|
|
||||||
dataDisks = make([]string, 0, len(req.DataDisks))
|
|
||||||
|
|
||||||
for i := range req.DataDisks {
|
|
||||||
b, err := json.Marshal(req.DataDisks[i])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
dataDisks = append(dataDisks, string(b))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
reqWrapped := wrapperCreateBlankRequest{
|
|
||||||
CreateBlankRequest: req,
|
|
||||||
Interfaces: interfaces,
|
|
||||||
DataDisks: dataDisks,
|
|
||||||
}
|
|
||||||
|
|
||||||
url := "/cloudapi/kvmppc/createBlank"
|
|
||||||
|
|
||||||
res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
result, err := strconv.ParseUint(string(res), 10, 64)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
// API to manage KVM PowerPC compute instances (PPC VMs)
|
|
||||||
package kvmppc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Structure for creating request to KVMPPC
|
|
||||||
type KVMPPC struct {
|
|
||||||
client interfaces.Caller
|
|
||||||
}
|
|
||||||
|
|
||||||
// Builder for KVMPPC endpoints
|
|
||||||
func New(client interfaces.Caller) *KVMPPC {
|
|
||||||
return &KVMPPC{
|
|
||||||
client,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -15,6 +15,7 @@ type Interface struct {
|
|||||||
// - VINS
|
// - VINS
|
||||||
// - EXTNET
|
// - EXTNET
|
||||||
// - VFNIC
|
// - VFNIC
|
||||||
|
// - DPDK
|
||||||
NetType string `url:"netType" json:"netType" validate:"required,kvmx86NetType"`
|
NetType string `url:"netType" json:"netType" validate:"required,kvmx86NetType"`
|
||||||
|
|
||||||
// Network ID for connect to,
|
// Network ID for connect to,
|
||||||
@@ -150,6 +151,10 @@ type CreateRequest struct {
|
|||||||
// Default: false
|
// Default: false
|
||||||
CPUPin bool `url:"cpupin" json:"cpupin"`
|
CPUPin bool `url:"cpupin" json:"cpupin"`
|
||||||
|
|
||||||
|
// Type of the emulated system, Q35 or i440fx
|
||||||
|
// Required: false
|
||||||
|
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
|
||||||
// Required: false
|
// Required: false
|
||||||
// Default: false
|
// Default: false
|
||||||
|
|||||||
@@ -61,6 +61,10 @@ type CreateBlankRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
Driver string `url:"driver,omitempty" json:"driver,omitempty" validate:"omitempty,computeDriver"`
|
Driver string `url:"driver,omitempty" json:"driver,omitempty" validate:"omitempty,computeDriver"`
|
||||||
|
|
||||||
|
// Type of the emulated system, Q35 or i440fx
|
||||||
|
// Required: false
|
||||||
|
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
|
||||||
|
|
||||||
// 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"`
|
||||||
|
|||||||
@@ -22,11 +22,11 @@ type CreateRequest struct {
|
|||||||
Name string `url:"name" json:"name" validate:"required"`
|
Name string `url:"name" json:"name" validate:"required"`
|
||||||
|
|
||||||
// External network to connect this load balancer to
|
// External network to connect this load balancer to
|
||||||
// Required: false
|
// Required: true, can be 0
|
||||||
ExtNetID uint64 `url:"extnetId" json:"extnetId"`
|
ExtNetID uint64 `url:"extnetId" json:"extnetId"`
|
||||||
|
|
||||||
// Internal network (VINS) to connect this load balancer to
|
// Internal network (VINS) to connect this load balancer to
|
||||||
// Required: false
|
// Required: true, can be 0
|
||||||
VINSID uint64 `url:"vinsId" json:"vinsId"`
|
VINSID uint64 `url:"vinsId" json:"vinsId"`
|
||||||
|
|
||||||
// Custom sysctl values for Load Balancer instance. Applied on boot
|
// Custom sysctl values for Load Balancer instance. Applied on boot
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ func (ll ListLB) FilterByName(name string) ListLB {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FilterByExtNetID returns ListLB with specified ExtNetID.
|
// FilterByExtNetID returns ListLB with specified ExtNetID.
|
||||||
func (ll ListLB) FilterByExtNetID(extNetID uint64) ListLB {
|
func (ll ListLB) FilterByExtNetID(extNetID int64) ListLB {
|
||||||
predicate := func(ill ItemLoadBalancer) bool {
|
predicate := func(ill ItemLoadBalancer) bool {
|
||||||
return ill.ExtNetID == extNetID
|
return ill.ExtNetID == extNetID
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ type RecordLB struct {
|
|||||||
DPAPIUser string `json:"dpApiUser"`
|
DPAPIUser string `json:"dpApiUser"`
|
||||||
|
|
||||||
// External network ID
|
// External network ID
|
||||||
ExtNetID uint64 `json:"extnetId"`
|
ExtNetID int64 `json:"extnetId"`
|
||||||
|
|
||||||
// FrontendHAIP
|
// FrontendHAIP
|
||||||
FrontendHAIP string `json:"frontendHAIP"`
|
FrontendHAIP string `json:"frontendHAIP"`
|
||||||
|
|||||||
@@ -24,10 +24,6 @@ type AccessGrantRequest struct {
|
|||||||
// - "ARCXDU"
|
// - "ARCXDU"
|
||||||
// Required: true
|
// Required: true
|
||||||
Right string `url:"right" json:"right" validate:"accessType"`
|
Right string `url:"right" json:"right" validate:"accessType"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AccessGrant grants user or group access to the resource group as specified
|
// AccessGrant grants user or group access to the resource group as specified
|
||||||
|
|||||||
@@ -17,10 +17,6 @@ type AccessRevokeRequest struct {
|
|||||||
// User or group name to revoke access
|
// User or group name to revoke access
|
||||||
// Required: true
|
// Required: true
|
||||||
User string `url:"user" json:"user" validate:"required"`
|
User string `url:"user" json:"user" validate:"required"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AccessRevoke revokes specified user or group access from the resource group
|
// AccessRevoke revokes specified user or group access from the resource group
|
||||||
|
|||||||
@@ -64,10 +64,6 @@ type CreateRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
Description string `url:"desc,omitempty" json:"desc,omitempty"`
|
Description string `url:"desc,omitempty" json:"desc,omitempty"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
|
|
||||||
// External network ID
|
// External network ID
|
||||||
// Required: false
|
// Required: false
|
||||||
ExtNetID uint64 `url:"extNetId,omitempty" json:"extNetId,omitempty"`
|
ExtNetID uint64 `url:"extNetId,omitempty" json:"extNetId,omitempty"`
|
||||||
|
|||||||
@@ -22,10 +22,6 @@ type DeleteRequest struct {
|
|||||||
// Otherwise, they will be placed into recycle bin and could be restored later within recycle bin's purge period
|
// Otherwise, they will be placed into recycle bin and could be restored later within recycle bin's purge period
|
||||||
// Required: false
|
// Required: false
|
||||||
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete deletes resource group
|
// Delete deletes resource group
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type DisableRequest struct {
|
|||||||
// Resource group ID
|
// Resource group ID
|
||||||
// Required: true
|
// Required: true
|
||||||
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable disables resource group
|
// Disable disables resource group
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type EnableRequest struct {
|
|||||||
// Resource group ID
|
// Resource group ID
|
||||||
// Required: true
|
// Required: true
|
||||||
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enable enables resource group
|
// Enable enables resource group
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type GetRequest struct {
|
|||||||
// Resource group ID
|
// Resource group ID
|
||||||
// Required: true
|
// Required: true
|
||||||
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get gets current configuration of the resource group as a RecordResourceGroup struct
|
// Get gets current configuration of the resource group as a RecordResourceGroup struct
|
||||||
|
|||||||
@@ -787,7 +787,7 @@ type ItemVINS struct {
|
|||||||
ExtnetId uint64 `json:"extnetId"`
|
ExtnetId uint64 `json:"extnetId"`
|
||||||
|
|
||||||
// Free IPs
|
// Free IPs
|
||||||
FreeIPs uint64 `json:"freeIPs"`
|
FreeIPs int64 `json:"freeIPs"`
|
||||||
|
|
||||||
// ID
|
// ID
|
||||||
ID uint64 `json:"id"`
|
ID uint64 `json:"id"`
|
||||||
|
|||||||
38
pkg/cloudapi/rg/remove_def_net.go
Normal file
38
pkg/cloudapi/rg/remove_def_net.go
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
package rg
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RemoveDefNetRequest struct to remove default network
|
||||||
|
type RemoveDefNetRequest struct {
|
||||||
|
// Resource group ID
|
||||||
|
// Required: true
|
||||||
|
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// RemoveDefNet removes default network from resource group
|
||||||
|
func (r RG) RemoveDefNet(ctx context.Context, req RemoveDefNetRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/rg/removeDefNet"
|
||||||
|
|
||||||
|
res, err := r.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
|
||||||
|
}
|
||||||
@@ -13,10 +13,6 @@ type RestoreRequest struct {
|
|||||||
// Resource group ID
|
// Resource group ID
|
||||||
// Required: true
|
// Required: true
|
||||||
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Restore restores resource group from recycle bin
|
// Restore restores resource group from recycle bin
|
||||||
|
|||||||
@@ -24,10 +24,6 @@ type SetDefNetRequest struct {
|
|||||||
// Network ID
|
// Network ID
|
||||||
// Required: false
|
// Required: false
|
||||||
NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
|
NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetDefNet sets default network for attach associated virtual machines
|
// SetDefNet sets default network for attach associated virtual machines
|
||||||
|
|||||||
@@ -46,9 +46,14 @@ type UpdateRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
RegisterComputes bool `url:"registerComputes,omitempty" json:"registerComputes,omitempty"`
|
RegisterComputes bool `url:"registerComputes,omitempty" json:"registerComputes,omitempty"`
|
||||||
|
|
||||||
// Reason for action
|
// List of strings with pools i.e.: ["sep1_poolName1", "sep2_poolName2", etc]
|
||||||
// Required: false
|
// Required: false
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
|
||||||
|
|
||||||
|
// if True the field will be cleared
|
||||||
|
// Default: false
|
||||||
|
// Required: false
|
||||||
|
ClearUniqPools bool `url:"clearUniqPools" json:"clearUniqPools"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update updates resource group
|
// Update updates resource group
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type UsageRequest struct {
|
|||||||
// Resource group ID
|
// Resource group ID
|
||||||
// Required: true
|
// Required: true
|
||||||
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Usage gets report resource usage on the resource group
|
// Usage gets report resource usage on the resource group
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
package cloudapi
|
|
||||||
|
|
||||||
import (
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/sizes"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Accessing the Sizes method group
|
|
||||||
func (ca *CloudAPI) Sizes() *sizes.Sizes {
|
|
||||||
return sizes.New(ca.client)
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
package sizes
|
|
||||||
|
|
||||||
// FilterByID returns ListSizes with specified ID.
|
|
||||||
func (ls ListSizes) FilterByID(id uint64) ListSizes {
|
|
||||||
predicate := func(is ItemSize) bool {
|
|
||||||
return is.ID == id
|
|
||||||
}
|
|
||||||
|
|
||||||
return ls.FilterFunc(predicate)
|
|
||||||
}
|
|
||||||
|
|
||||||
// FilterByName returns ListSizes with specified Name.
|
|
||||||
func (ls ListSizes) FilterByName(name string) ListSizes {
|
|
||||||
predicate := func(is ItemSize) bool {
|
|
||||||
return is.Name == name
|
|
||||||
}
|
|
||||||
|
|
||||||
return ls.FilterFunc(predicate)
|
|
||||||
}
|
|
||||||
|
|
||||||
// FilterFunc allows filtering ListSizes based on a user-specified predicate.
|
|
||||||
func (ls ListSizes) FilterFunc(predicate func(ItemSize) bool) ListSizes {
|
|
||||||
var result ListSizes
|
|
||||||
|
|
||||||
for _, item := range ls.Data {
|
|
||||||
if predicate(item) {
|
|
||||||
result.Data = append(result.Data, item)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
result.EntryCount = uint64(len(result.Data))
|
|
||||||
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
// FindOne returns first found ItemSize
|
|
||||||
// If none was found, returns an empty struct.
|
|
||||||
func (ls ListSizes) FindOne() ItemSize {
|
|
||||||
if len(ls.Data) == 0 {
|
|
||||||
return ItemSize{}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ls.Data[0]
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
package sizes
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
var sizeItems = ListSizes{
|
|
||||||
Data: []ItemSize{
|
|
||||||
{
|
|
||||||
Description: "",
|
|
||||||
Disks: []uint64{},
|
|
||||||
ID: 1,
|
|
||||||
Memory: 512,
|
|
||||||
Name: "size_1",
|
|
||||||
VCPUs: 2,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Description: "",
|
|
||||||
Disks: []uint64{},
|
|
||||||
ID: 2,
|
|
||||||
Memory: 1024,
|
|
||||||
Name: "size_2",
|
|
||||||
VCPUs: 4,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Description: "",
|
|
||||||
Disks: []uint64{},
|
|
||||||
ID: 2,
|
|
||||||
Memory: 2048,
|
|
||||||
Name: "size_3",
|
|
||||||
VCPUs: 6,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
EntryCount: 3,
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFilterByID(t *testing.T) {
|
|
||||||
actual := sizeItems.FilterByID(1).FindOne()
|
|
||||||
|
|
||||||
if actual.ID != 1 {
|
|
||||||
t.Fatal("expected ID 1, found: ", actual.ID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFilterByName(t *testing.T) {
|
|
||||||
actual := sizeItems.FilterByName("size_2").FindOne()
|
|
||||||
|
|
||||||
if actual.Name != "size_2" {
|
|
||||||
t.Fatal("expected Name 'size_2', found: ", actual.Name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFilterFunc(t *testing.T) {
|
|
||||||
actual := sizeItems.FilterFunc(func(is ItemSize) bool {
|
|
||||||
return is.Memory > 512
|
|
||||||
})
|
|
||||||
|
|
||||||
if len(actual.Data) != 2 {
|
|
||||||
t.Fatal("expected 2 found, actual: ", len(actual.Data))
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, item := range actual.Data {
|
|
||||||
if item.Memory <= 512 {
|
|
||||||
t.Fatal("expected Memory greater than 512, found: ", item.Memory)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package sizes
|
|
||||||
|
|
||||||
// IDs gets array of configured available flavours IDs from ListSizes struct
|
|
||||||
func (ls ListSizes) IDs() []uint64 {
|
|
||||||
res := make([]uint64, 0, len(ls.Data))
|
|
||||||
for _, s := range ls.Data {
|
|
||||||
res = append(res, s.ID)
|
|
||||||
}
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
package sizes
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ListRequest struct for list of the available flavors
|
|
||||||
type ListRequest struct {
|
|
||||||
// ID of the cloudspace
|
|
||||||
// Required: false
|
|
||||||
CloudspaceID uint64 `url:"cloudspaceId,omitempty" json:"cloudspaceId,omitempty"`
|
|
||||||
|
|
||||||
// Location code for the sizes
|
|
||||||
// Required: false
|
|
||||||
Location string `url:"location,omitempty" json:"location,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 the available flavors as a ListSizes struct, filtering can be based on the user which is doing the request
|
|
||||||
func (s Sizes) List(ctx context.Context, req ListRequest) (*ListSizes, error) {
|
|
||||||
|
|
||||||
res, err := s.ListRaw(ctx, req)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
list := &ListSizes{}
|
|
||||||
|
|
||||||
err = json.Unmarshal(res, &list)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return list, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListRaw gets list of the available flavors as an array of bytes
|
|
||||||
func (s Sizes) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
|
|
||||||
|
|
||||||
if err := validators.ValidateRequest(req); err != nil {
|
|
||||||
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
|
||||||
}
|
|
||||||
|
|
||||||
url := "/cloudapi/sizes/list"
|
|
||||||
|
|
||||||
res, err := s.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
|
||||||
return res, err
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
package sizes
|
|
||||||
|
|
||||||
// Main onformation about configured available flavors
|
|
||||||
type ItemSize struct {
|
|
||||||
// Description
|
|
||||||
Description string `json:"desc"`
|
|
||||||
|
|
||||||
// List of disk IDs
|
|
||||||
Disks []uint64 `json:"disks"`
|
|
||||||
|
|
||||||
// ID
|
|
||||||
ID uint64 `json:"id"`
|
|
||||||
|
|
||||||
// Memory
|
|
||||||
Memory uint64 `json:"memory"`
|
|
||||||
|
|
||||||
// Name
|
|
||||||
Name string `json:"name"`
|
|
||||||
|
|
||||||
// VCPUs
|
|
||||||
VCPUs uint64 `json:"vcpus"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// List of configured available flavors
|
|
||||||
type ListSizes struct {
|
|
||||||
// Data
|
|
||||||
Data []ItemSize `json:"data"`
|
|
||||||
|
|
||||||
// Entry count
|
|
||||||
EntryCount uint64 `json:"entryCount"`
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
package sizes
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/serialization"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Serialize returns JSON-serialized []byte. Used as a wrapper over json.Marshal and json.MarshalIndent functions.
|
|
||||||
//
|
|
||||||
// In order to serialize with indent make sure to follow these guidelines:
|
|
||||||
// - First argument -> prefix
|
|
||||||
// - Second argument -> indent
|
|
||||||
func (ls ListSizes) Serialize(params ...string) (serialization.Serialized, error) {
|
|
||||||
if len(ls.Data) == 0 {
|
|
||||||
return []byte{}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(params) > 1 {
|
|
||||||
prefix := params[0]
|
|
||||||
indent := params[1]
|
|
||||||
|
|
||||||
return json.MarshalIndent(ls, prefix, indent)
|
|
||||||
}
|
|
||||||
|
|
||||||
return json.Marshal(ls)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Serialize returns JSON-serialized []byte. Used as a wrapper over json.Marshal and json.MarshalIndent functions.
|
|
||||||
//
|
|
||||||
// In order to serialize with indent make sure to follow these guidelines:
|
|
||||||
// - First argument -> prefix
|
|
||||||
// - Second argument -> indent
|
|
||||||
func (is ItemSize) Serialize(params ...string) (serialization.Serialized, error) {
|
|
||||||
if len(params) > 1 {
|
|
||||||
prefix := params[0]
|
|
||||||
indent := params[1]
|
|
||||||
|
|
||||||
return json.MarshalIndent(is, prefix, indent)
|
|
||||||
}
|
|
||||||
|
|
||||||
return json.Marshal(is)
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
// Lists all the configured flavors available.
|
|
||||||
// A flavor is a combination of amount of compute capacity(CU) and disk capacity(GB).
|
|
||||||
package sizes
|
|
||||||
|
|
||||||
import (
|
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Structure for creatig request to sizes
|
|
||||||
type Sizes struct {
|
|
||||||
client interfaces.Caller
|
|
||||||
}
|
|
||||||
|
|
||||||
// Builder for sizes endpoints
|
|
||||||
func New(client interfaces.Caller) *Sizes {
|
|
||||||
return &Sizes{
|
|
||||||
client,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -12,10 +12,6 @@ type GetAuditRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
Call string `url:"call,omitempty" json:"call,omitempty"`
|
Call string `url:"call,omitempty" json:"call,omitempty"`
|
||||||
|
|
||||||
// Find by HTTP status code
|
|
||||||
// Required: false
|
|
||||||
StatusCode uint64 `url:"statuscode,omitempty" json:"statuscode,omitempty"`
|
|
||||||
|
|
||||||
// Find all audits after point in time (unixtime)
|
// Find all audits after point in time (unixtime)
|
||||||
// Required: false
|
// Required: false
|
||||||
TimestampAt uint64 `url:"timestampAt,omitempty" json:"timestampAt,omitempty"`
|
TimestampAt uint64 `url:"timestampAt,omitempty" json:"timestampAt,omitempty"`
|
||||||
@@ -24,6 +20,14 @@ type GetAuditRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
TimestampTo uint64 `url:"timestampTo,omitempty" json:"timestampTo,omitempty"`
|
TimestampTo uint64 `url:"timestampTo,omitempty" json:"timestampTo,omitempty"`
|
||||||
|
|
||||||
|
// find by HTTP max status code
|
||||||
|
// Required: false
|
||||||
|
MaxStatusCode uint64 `url:"maxStatusCode,omitempty" json:"maxStatusCode,omitempty"`
|
||||||
|
|
||||||
|
// find by HTTP min status code
|
||||||
|
// Required: false
|
||||||
|
MinStatusCode uint64 `url:"minStatusCode,omitempty" json:"minStatusCode,omitempty"`
|
||||||
|
|
||||||
// Page number.
|
// Page number.
|
||||||
// Required: false
|
// Required: false
|
||||||
Page uint64 `url:"page,omitempty" json:"page,omitempty"`
|
Page uint64 `url:"page,omitempty" json:"page,omitempty"`
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ type ItemAudit struct {
|
|||||||
// StatusCode
|
// StatusCode
|
||||||
StatusCode StatusCode `json:"Status Code"`
|
StatusCode StatusCode `json:"Status Code"`
|
||||||
|
|
||||||
|
// Guid
|
||||||
|
GUID string `json:"Guid"`
|
||||||
|
|
||||||
// Time
|
// Time
|
||||||
Time float64 `json:"Time"`
|
Time float64 `json:"Time"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,10 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
ExtIP string `url:"extIp,omitempty" json:"extIp,omitempty"`
|
ExtIP string `url:"extIp,omitempty" json:"extIp,omitempty"`
|
||||||
|
|
||||||
|
// Find by VNF Device id
|
||||||
|
// Required: false
|
||||||
|
VNFDevId uint64 `url:"vnfdevId,omitempty" json:"vnfdevId,omitempty"`
|
||||||
|
|
||||||
// Include deleted
|
// Include deleted
|
||||||
// Required: false
|
// Required: false
|
||||||
IncludeDeleted bool `url:"includeDeleted,omitempty" json:"includeDeleted,omitempty"`
|
IncludeDeleted bool `url:"includeDeleted,omitempty" json:"includeDeleted,omitempty"`
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ type ItemVINS struct {
|
|||||||
ExtnetId uint64 `json:"extnetId"`
|
ExtnetId uint64 `json:"extnetId"`
|
||||||
|
|
||||||
// Free IPs
|
// Free IPs
|
||||||
FreeIPs uint64 `json:"freeIPs"`
|
FreeIPs int64 `json:"freeIPs"`
|
||||||
|
|
||||||
// ID
|
// ID
|
||||||
ID uint64 `json:"id"`
|
ID uint64 `json:"id"`
|
||||||
@@ -251,6 +251,9 @@ type RecordResources struct {
|
|||||||
|
|
||||||
// Main information about VNF interface
|
// Main information about VNF interface
|
||||||
type ItemVNFInterface struct {
|
type ItemVNFInterface struct {
|
||||||
|
// Bus number
|
||||||
|
BusNumber uint64 `json:"bus_number"`
|
||||||
|
|
||||||
// Connection ID
|
// Connection ID
|
||||||
ConnID uint64 `json:"connId"`
|
ConnID uint64 `json:"connId"`
|
||||||
|
|
||||||
@@ -278,6 +281,12 @@ type ItemVNFInterface struct {
|
|||||||
// MAC
|
// MAC
|
||||||
MAC string `json:"mac"`
|
MAC string `json:"mac"`
|
||||||
|
|
||||||
|
// Maximum transmission unit
|
||||||
|
MTU uint64 `json:"mtu"`
|
||||||
|
|
||||||
|
// Libvirt Settings
|
||||||
|
LibvirtSettings LibvirtSettings `json:"libvirtSettings"`
|
||||||
|
|
||||||
// Name
|
// Name
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
|
|
||||||
@@ -722,6 +731,30 @@ type RecordVINS struct {
|
|||||||
VXLANID uint64 `json:"vxlanId"`
|
VXLANID uint64 `json:"vxlanId"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Information about libvirt settings
|
||||||
|
type LibvirtSettings struct {
|
||||||
|
// TX mode
|
||||||
|
TXMode string `json:"txmode"`
|
||||||
|
|
||||||
|
// IO event
|
||||||
|
IOEventFD string `json:"ioeventfd"`
|
||||||
|
|
||||||
|
// Event ID
|
||||||
|
EventIDx string `json:"event_idx"`
|
||||||
|
|
||||||
|
// Number of queues
|
||||||
|
Queues uint64 `json:"queues"`
|
||||||
|
|
||||||
|
// RX queue size
|
||||||
|
RXQueueSize uint64 `json:"rx_queue_size"`
|
||||||
|
|
||||||
|
// TX queue size
|
||||||
|
TXQueueSize uint64 `json:"tx_queue_size"`
|
||||||
|
|
||||||
|
// GUID
|
||||||
|
GUID string `json:"guid"`
|
||||||
|
}
|
||||||
|
|
||||||
// Main information about NAT rule
|
// Main information about NAT rule
|
||||||
type ItemNATRule struct {
|
type ItemNATRule struct {
|
||||||
// ID
|
// ID
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type DeleteRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
||||||
|
|
||||||
// Reason to delete
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
|
|
||||||
// Whether to completely delete the account
|
// Whether to completely delete the account
|
||||||
// Required: false
|
// Required: false
|
||||||
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type DeleteAccountsRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
AccountsIDs []uint64 `url:"accountIds" json:"accountIds" validate:"min=1"`
|
AccountsIDs []uint64 `url:"accountIds" json:"accountIds" validate:"min=1"`
|
||||||
|
|
||||||
// Reason for deletion
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
|
|
||||||
// Whether to completely destroy accounts or not
|
// Whether to completely destroy accounts or not
|
||||||
// Required: false
|
// Required: false
|
||||||
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
|
||||||
|
|||||||
@@ -17,10 +17,6 @@ type DeleteUserRequest struct {
|
|||||||
// ID or emailaddress of the user to remove
|
// ID or emailaddress of the user to remove
|
||||||
// Required: true
|
// Required: true
|
||||||
UserName string `url:"username" json:"username" validate:"required"`
|
UserName string `url:"username" json:"username" validate:"required"`
|
||||||
|
|
||||||
// Recursively revoke access rights from owned cloudspaces and vmachines
|
|
||||||
// Required: false
|
|
||||||
RecursiveDelete bool `url:"recursivedelete" json:"recursivedelete"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteUser revokes user access from the account
|
// DeleteUser revokes user access from the account
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type DisableRequest struct {
|
|||||||
// ID of account
|
// ID of account
|
||||||
// Required: true
|
// Required: true
|
||||||
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
||||||
|
|
||||||
// Reason to disable
|
|
||||||
// Required: true
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable disables an account
|
// Disable disables an account
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type EnableRequest struct {
|
|||||||
// ID of account
|
// ID of account
|
||||||
// Required: true
|
// Required: true
|
||||||
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
||||||
|
|
||||||
// Reason to enable
|
|
||||||
// Required: true
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enable enables an account
|
// Enable enables an account
|
||||||
|
|||||||
@@ -537,7 +537,7 @@ type ItemVINS struct {
|
|||||||
ExtnetId uint64 `json:"extnetId"`
|
ExtnetId uint64 `json:"extnetId"`
|
||||||
|
|
||||||
// Free IPs
|
// Free IPs
|
||||||
FreeIPs uint64 `json:"freeIPs"`
|
FreeIPs int64 `json:"freeIPs"`
|
||||||
|
|
||||||
// ID
|
// ID
|
||||||
ID uint64 `json:"id"`
|
ID uint64 `json:"id"`
|
||||||
|
|||||||
@@ -12,10 +12,6 @@ type RestoreRequest struct {
|
|||||||
// ID an account
|
// ID an account
|
||||||
// Required: true
|
// Required: true
|
||||||
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
||||||
|
|
||||||
// Reason to restore
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Restore restores a deleted account
|
// Restore restores a deleted account
|
||||||
|
|||||||
@@ -3,8 +3,9 @@ package account
|
|||||||
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"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SetCPUAllocationRatioRequest struct for setting CPU allocation ratio
|
// SetCPUAllocationRatioRequest struct for setting CPU allocation ratio
|
||||||
@@ -14,9 +15,8 @@ type SetCPUAllocationRatioRequest struct {
|
|||||||
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
||||||
|
|
||||||
// CPU allocation ratio, i.e. one pCPU = ratio*vCPU
|
// CPU allocation ratio, i.e. one pCPU = ratio*vCPU
|
||||||
// if don't set, default value = 0
|
// Required: true
|
||||||
// Required: false
|
Ratio float64 `url:"ratio" json:"ratio" validate:"required"`
|
||||||
Ratio float64 `url:"ratio" json:"ratio"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetCPUAllocationRatio sets CPU allocation ratio
|
// SetCPUAllocationRatio sets CPU allocation ratio
|
||||||
|
|||||||
@@ -50,6 +50,11 @@ type UpdateRequest struct {
|
|||||||
// i.e.: ["sep1_poolName1", "sep2_poolName2", etc]
|
// i.e.: ["sep1_poolName1", "sep2_poolName2", etc]
|
||||||
// Required: false
|
// Required: false
|
||||||
UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
|
UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
|
||||||
|
|
||||||
|
// if True the field will be cleared
|
||||||
|
// Default: false
|
||||||
|
// Required: false
|
||||||
|
ClearUniqPools bool `url:"clearUniqPools" json:"clearUniqPools"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update updates an account name and resource types and limits
|
// Update updates an account name and resource types and limits
|
||||||
|
|||||||
@@ -83,7 +83,6 @@ type CloudAPIEndpoints struct {
|
|||||||
Image []string `json:"image,omitempty"`
|
Image []string `json:"image,omitempty"`
|
||||||
K8CI []string `json:"k8ci,omitempty"`
|
K8CI []string `json:"k8ci,omitempty"`
|
||||||
K8S []string `json:"k8s,omitempty"`
|
K8S []string `json:"k8s,omitempty"`
|
||||||
KVMPPC []string `json:"kvmppc,omitempty"`
|
|
||||||
KVMX86 []string `json:"kvmx86,omitempty"`
|
KVMX86 []string `json:"kvmx86,omitempty"`
|
||||||
LB []string `json:"lb,omitempty"`
|
LB []string `json:"lb,omitempty"`
|
||||||
Loactions []string `json:"locations,omitempty"`
|
Loactions []string `json:"locations,omitempty"`
|
||||||
@@ -127,7 +126,6 @@ type CloudBrokerEndpoints struct {
|
|||||||
Job interface{} `json:"job,omitempty"`
|
Job interface{} `json:"job,omitempty"`
|
||||||
K8CI []string `json:"k8ci,omitempty"`
|
K8CI []string `json:"k8ci,omitempty"`
|
||||||
K8S []string `json:"k8s,omitempty"`
|
K8S []string `json:"k8s,omitempty"`
|
||||||
KVMPPC []string `json:"kvmppc,omitempty"`
|
|
||||||
KVMX86 []string `json:"kvmx86,omitempty"`
|
KVMX86 []string `json:"kvmx86,omitempty"`
|
||||||
LB []string `json:"lb,omitempty"`
|
LB []string `json:"lb,omitempty"`
|
||||||
Machine []string `json:"machine,omitempty"`
|
Machine []string `json:"machine,omitempty"`
|
||||||
|
|||||||
18
pkg/cloudbroker/audit/export_audits_to_file.go
Normal file
18
pkg/cloudbroker/audit/export_audits_to_file.go
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ExportAuditsToFile Get audits in csv file, return []byte which should be written to a file *tar.gz
|
||||||
|
func (a Audit) ExportAuditsToFile(ctx context.Context) ([]byte, error) {
|
||||||
|
url := "/cloudbroker/audit/exportAuditsToFile"
|
||||||
|
|
||||||
|
res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
@@ -33,9 +33,6 @@ type ListAudits struct {
|
|||||||
// Main info about audit
|
// Main info about audit
|
||||||
type RecordAudit struct {
|
type RecordAudit struct {
|
||||||
|
|
||||||
// Apitask
|
|
||||||
Apitask string `json:"apitask"`
|
|
||||||
|
|
||||||
// Arguments
|
// Arguments
|
||||||
Arguments string `json:"args"`
|
Arguments string `json:"args"`
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ type RestoreDisksFromBackupRequest struct {
|
|||||||
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
||||||
|
|
||||||
//Backup files
|
//Backup files
|
||||||
BackupFiles []BackupFile `url:"backupFiles" json:"backupFiles" validate:"required,dive"`
|
BackupFiles []BackupFile `url:"disks" json:"disks" validate:"required,dive"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type wrapperRestoreDisksFromBackupRequest struct {
|
type wrapperRestoreDisksFromBackupRequest struct {
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type CDEjectRequest struct {
|
|||||||
// ID of compute instance
|
// ID of compute instance
|
||||||
// Required: true
|
// Required: true
|
||||||
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
||||||
|
|
||||||
// Reason to eject
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CDEject ejects CD image to compute's CD-ROM
|
// CDEject ejects CD image to compute's CD-ROM
|
||||||
|
|||||||
@@ -16,10 +16,6 @@ type CDInsertRequest struct {
|
|||||||
// ID of CD-ROM image
|
// ID of CD-ROM image
|
||||||
// Required: true
|
// Required: true
|
||||||
CDROMID uint64 `url:"cdromId" json:"cdromId" validate:"required"`
|
CDROMID uint64 `url:"cdromId" json:"cdromId" validate:"required"`
|
||||||
|
|
||||||
// Reason to insert
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CDInsert inserts new CD image to compute's CD-ROM
|
// CDInsert inserts new CD image to compute's CD-ROM
|
||||||
|
|||||||
54
pkg/cloudbroker/compute/change_ip.go
Normal file
54
pkg/cloudbroker/compute/change_ip.go
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
package compute
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ChangeIPRequest struct to change IP for network
|
||||||
|
type ChangeIPRequest struct {
|
||||||
|
// ID of compute instance
|
||||||
|
// Required: true
|
||||||
|
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
||||||
|
|
||||||
|
// Network type
|
||||||
|
// 'EXTNET' for connect to external network directly
|
||||||
|
// 'VINS' for connect to ViNS
|
||||||
|
// Required: true
|
||||||
|
NetType string `url:"netType" json:"netType" validate:"computeNetType"`
|
||||||
|
|
||||||
|
// Network ID for connect to
|
||||||
|
// For EXTNET - external network ID
|
||||||
|
// For VINS - VINS ID
|
||||||
|
// Required: true
|
||||||
|
NetID uint64 `url:"netId" json:"netId" validate:"required"`
|
||||||
|
|
||||||
|
// IP address to which we will change the existing one, it must be from the same subnet
|
||||||
|
// Required: true
|
||||||
|
IPAddr string `url:"ipAddr" json:"ipAddr" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChangeIP change reserved IP for compute instance
|
||||||
|
func (c Compute) ChangeIP(ctx context.Context, req ChangeIPRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudbroker/compute/changeIp"
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
@@ -26,9 +26,10 @@ type CloneRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SnapshotName string `url:"snapshotName" json:"snapshotName"`
|
SnapshotName string `url:"snapshotName" json:"snapshotName"`
|
||||||
|
|
||||||
// Reason to clone
|
// true ignore that the compute is running
|
||||||
|
// Default: false
|
||||||
// Required: false
|
// Required: false
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
Force bool `url:"force" json:"force"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clone clones compute instance
|
// Clone clones compute instance
|
||||||
|
|||||||
@@ -18,10 +18,6 @@ type CreateTemplateRequest struct {
|
|||||||
// Name to assign to the template being created
|
// Name to assign to the template being created
|
||||||
// Required: true
|
// Required: true
|
||||||
Name string `url:"name" json:"name" validate:"required"`
|
Name string `url:"name" json:"name" validate:"required"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type wrapperCreateTemplateRequest struct {
|
type wrapperCreateTemplateRequest struct {
|
||||||
|
|||||||
@@ -21,10 +21,6 @@ type DeleteRequest struct {
|
|||||||
// Set True if you want to detach data disks (if any) from the compute before its deletion
|
// Set True if you want to detach data disks (if any) from the compute before its deletion
|
||||||
// Required: false
|
// Required: false
|
||||||
DetachDisks bool `url:"detachDisks,omitempty" json:"detachDisks,omitempty"`
|
DetachDisks bool `url:"detachDisks,omitempty" json:"detachDisks,omitempty"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete deletes compute
|
// Delete deletes compute
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ type DisableRequest struct {
|
|||||||
// ID of compute instance
|
// ID of compute instance
|
||||||
// Required: true
|
// Required: true
|
||||||
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable disables compute
|
// Disable disables compute
|
||||||
|
|||||||
@@ -21,10 +21,6 @@ type DiskAttachRequest struct {
|
|||||||
// Type of the disk B;D
|
// Type of the disk B;D
|
||||||
// Required: false
|
// Required: false
|
||||||
DiskType string `url:"diskType,omitempty" json:"diskType,omitempty"`
|
DiskType string `url:"diskType,omitempty" json:"diskType,omitempty"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskAttach attach disk to compute
|
// DiskAttach attach disk to compute
|
||||||
|
|||||||
@@ -21,10 +21,6 @@ type DiskDelRequest struct {
|
|||||||
// False if disk is to be deleted to recycle bin
|
// False if disk is to be deleted to recycle bin
|
||||||
// Required: true
|
// Required: true
|
||||||
Permanently bool `url:"permanently" json:"permanently"`
|
Permanently bool `url:"permanently" json:"permanently"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskDel deletes disk and detaches it from compute
|
// DiskDel deletes disk and detaches it from compute
|
||||||
|
|||||||
@@ -17,10 +17,6 @@ type DiskDetachRequest struct {
|
|||||||
// ID of the disk to detach
|
// ID of the disk to detach
|
||||||
// Required: true
|
// Required: true
|
||||||
DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
|
DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
|
||||||
|
|
||||||
// Reason for action
|
|
||||||
// Required: false
|
|
||||||
Reason string `url:"reason,omitempty" json:"reason,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskDetach detaches disk from compute
|
// DiskDetach detaches disk from compute
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user