Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 823dfb49bc | |||
| e6440bc4a3 | |||
| 84c0248019 |
25
CHANGELOG.md
25
CHANGELOG.md
@@ -1,20 +1,9 @@
|
||||
## Version 1.6.7
|
||||
## Version 1.7.0
|
||||
|
||||
## Feature
|
||||
- Added support for authorization using the Basis.Virtual Security system. Add client and config
|
||||
|
||||
## Bugfix
|
||||
- Refactoring client and legacy-client
|
||||
- Delete tag "required" in RecursiveDelete field model DeleteUserRequest in cloudbroker/account/delete_user
|
||||
- Delete tag "omitempty" in RecursiveDelete field model DeleteUserRequest in cloudapi/account/delete_user
|
||||
- Delete tag "required" in Ratio field model SetCPUAllocationRatioRequest in cloudbroker/account/set_cpu_allocation_ratio
|
||||
- Change tag from "requireD" to "required" in K8SID field model WorkerRestartRequest in cloudbroker/k8s/worker_restart
|
||||
- Add tag "required" in UserIDs field model DeleteUsersRequest in cloudbroker/users/delete_users
|
||||
- Change tag "validate" in ComputeID field model SnapshotEvictDiskRequest in cloudbroker/compute/snapshot_evict_disk
|
||||
- Delete unnecessary validation in ListRaw method in cloudbroker/apiaccess/list
|
||||
- Delete unnecessary validation in ListDeleted method in cloudbroker/apiaccess/list_deleted
|
||||
- Delete unnecessary validation in GetAudit method in cloudbroker/user/get_audit
|
||||
- Delete unnecessary validation in ListRaw method in cloudbroker/user/list
|
||||
- Delete unnecessary validation in ListTypes method in cloudbroker/disks/list_types
|
||||
- Delete tag "required" in Active field model ListRequest in cloudbroker/group/list
|
||||
- Delete unnecessary validation in List method in cloudbroker/group/list
|
||||
- Change type from "APIsEndpoints" to "APIString" in APIs field in APIsIncludeRequest model in cloudbroker/apiaccess/apis_include
|
||||
- Change type from "APIsEndpoints" to "APIString" in APIs field in APIsExcludeRequest model in cloudbroker/apiaccess/apis_exclude
|
||||
- Refactoring multiple errors out put after validation in all cloudapi and cloudbroker groups, in client and legacy-client
|
||||
- Add model ListInfoSnapshots in cloudapi/bservice/models
|
||||
- Fix func SnapshotList for work with new model cloudapi/bservice/snapshot_list
|
||||
- Add models ItemAffinityGroup, ListAffinityGroup in cloudapi/rg/models
|
||||
221
README.md
221
README.md
@@ -11,6 +11,7 @@ Decort SDK - это библиотека, написанная на языке G
|
||||
- Версия 1.4.x Decort-SDK соответствует 3.8.6 версии платформы
|
||||
- Версия 1.5.x Decort-SDK соответствует 3.8.7 версии платформы
|
||||
- Версия 1.6.x Decort-SDK соответствует 3.8.8 версии платформы
|
||||
- Версия 1.7.х Decort-SDK соответствует 3.8.9 версии платформы
|
||||
|
||||
## Оглавление
|
||||
|
||||
@@ -766,6 +767,52 @@ func main() {
|
||||
|
||||
```
|
||||
|
||||
### Получение списка уникальных идентификаторов (ID) объекта
|
||||
|
||||
Для всех структур, имеющих поля со списками объектов с уникальными числовыми идентификаторами (ID), добавлены методы IDs(), возвращающие массивы уникальных идентификаторов объектов в этих списках.
|
||||
|
||||
```go
|
||||
package main
|
||||
|
||||
import (
|
||||
"log"
|
||||
"fmt"
|
||||
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/config"
|
||||
decort "repository.basistech.ru/BASIS/decort-golang-sdk"
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
|
||||
)
|
||||
|
||||
func main() {
|
||||
// Настройка конфигурации
|
||||
cfg := config.Config{
|
||||
AppID: "<APPID>",
|
||||
AppSecret: "<APPSECRET>",
|
||||
SSOURL: "https://sso.digitalenergy.online",
|
||||
DecortURL: "https://mr4.digitalenergy.online",
|
||||
Retries: 5,
|
||||
}
|
||||
|
||||
// Создание клиента
|
||||
client := decort.New(cfg)
|
||||
|
||||
// Создание структуры запроса GetRequest на получение информации о сервисе и выполнение запроса с помощью конвейера
|
||||
req := bservice.GetRequest{
|
||||
ServiceID: 123,
|
||||
}
|
||||
res, err := client.CloudAPI().BService().Get(context.Background(), req)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
// Получение списков ID ComputeIDs и GroupIDs экземпляра res типа RecordBasicService по полям Computes и Groups, соответственно
|
||||
computeIDs := res.Computes.IDs()
|
||||
groupIDs := res.Groups.IDs()
|
||||
fmt.Println(computeIDs)
|
||||
fmt.Println(groupIDs)
|
||||
}
|
||||
```
|
||||
|
||||
## Работа с legacy клиентом
|
||||
|
||||
Работа с legacy клиентом применяется для пользователей, которые не используют для авторизации decs3o.
|
||||
@@ -890,6 +937,7 @@ func main() {
|
||||
legacyCfg := config.LegacyConfig{
|
||||
Username: "<USERNAME>",
|
||||
Password: "<PASSWORD>",
|
||||
Domain: "dynamix",
|
||||
DecortURL: "https://mr4.digitalenergy.online",
|
||||
Retries: 5,
|
||||
}
|
||||
@@ -915,3 +963,176 @@ func main() {
|
||||
|
||||
fmt.Println(res)
|
||||
}
|
||||
```
|
||||
|
||||
## Работа с BVS клиентом
|
||||
|
||||
Работа с BVS клиентом применяется для пользователей, которые используют для авторизации BVS.
|
||||
|
||||
### Настройка конфигурации BVS клиента
|
||||
|
||||
Сначала, необходимо создать переменную конфигурации клиента. Конфигурация состоит как из обязательных, так и необязательных полей.
|
||||
|
||||
| Поле | Тип | Обязательный | Описание |
|
||||
| ------------- | ------ | ------------ | ------------------------------------------------------------------ |
|
||||
| Username | string | Да | username legacy пользователя |
|
||||
| Password | string | Да | пароль legacy пользователя |
|
||||
| DecortURL | string | Да | URL адрес платформы, с которой будет осуществляться взаимодействие |
|
||||
| SSOURL | string | Да | URL адрес сервиса аутентификации и авторизации |
|
||||
| Domain | string | Да | Имя домена |
|
||||
| Retries | uint | Нет | Кол-во неудачных попыток выполнения запроса, по умолчанию - 5 |
|
||||
| Timeout | config.Duration | Нет | Таймаут HTTP клиента, по умолчанию - без ограничений |
|
||||
| SSLSkipVerify | bool | Нет | Пропуск проверки подлинности сертификата |
|
||||
|
||||
|
||||
#### Пример конфигурации BVS клиента
|
||||
|
||||
```go
|
||||
import (
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/config"
|
||||
)
|
||||
|
||||
func main(){
|
||||
// Настройка конфигурации
|
||||
BvsCfg := config.BVSConfig{
|
||||
AppID: "<APP_ID>",
|
||||
AppSecret: "<APP_SECRET>",
|
||||
Username: "<USERNAME>",
|
||||
Password: "<PASSWORD>",
|
||||
SSOURL: "https://bvs-delta.qa.loc:8443"
|
||||
DecortURL: "https://delta.qa.loc",
|
||||
Domain: "dynamix"
|
||||
Retries: 5,
|
||||
}
|
||||
|
||||
BvsCfg.SetTimeout(5 * time.Minute)
|
||||
}
|
||||
```
|
||||
|
||||
#### Парсинг BVS конфигурации из файла
|
||||
|
||||
Также возможно создать переменную конфигурации из JSON или YAML файла, используя функцию `ParseConfigBVSJSON` (или `ParseConfigBVSYAML`) из пакета config.
|
||||
<br>
|
||||
*См. пример файлов конфигурации ниже и в директории `samples/`.*
|
||||
|
||||
```go
|
||||
import (
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/config"
|
||||
)
|
||||
|
||||
func main() {
|
||||
// Парсинг конфигурации из YAML-файла
|
||||
BVSCfg := config.ParseConfigBVSYAML("<PATH>")
|
||||
}
|
||||
```
|
||||
|
||||
#### Пример BVS JSON конфигурации
|
||||
|
||||
```json
|
||||
{
|
||||
"username": "<USERNAME>",
|
||||
"password": "<PASSWORD>",
|
||||
"appId": "<APP_ID>",
|
||||
"appSecret": "<APP_SECRET>",
|
||||
"ssoUrl": "https://bvs-delta.qa.loc:8443",
|
||||
"decortUrl": "https://delta.qa.loc",
|
||||
"domain": "dynamix",
|
||||
"retries": 5,
|
||||
"timeout": "5m",
|
||||
"sslSkipVerify": false
|
||||
}
|
||||
```
|
||||
|
||||
#### Пример BVS YAML конфигурации
|
||||
```yaml
|
||||
username: <USERNAME>
|
||||
password: <PASSWORD>
|
||||
appId: <APP_ID>
|
||||
appSecret: <APP_SECRET>
|
||||
ssoUrl: https://bvs-delta.qa.loc:8443
|
||||
decortUrl: https://delta.qa.loc
|
||||
domain: dynamix,
|
||||
retries: 5
|
||||
timeout: 5m
|
||||
sslSkipVerify: false
|
||||
```
|
||||
### Создание BVS клиента
|
||||
|
||||
Создание клиента происходит с помощью функции-строителя `NewBVS` из основного пакета `decort-sdk`, для избежания проблем с именами, пакету можно присвоить алиас `decort`. Функция принимает конфигурацию, возвращает структуру `DecortClient`, с помощью которой можно взаимодействовать с платформой.
|
||||
|
||||
#### Пример создания BVS клиента
|
||||
|
||||
```go
|
||||
package main
|
||||
|
||||
import (
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/config"
|
||||
decort "repository.basistech.ru/BASIS/decort-golang-sdk"
|
||||
)
|
||||
|
||||
func main() {
|
||||
// Настройка конфигурации
|
||||
BVSCfg := config.BVSConfig{
|
||||
Username: "<USERNAME>",
|
||||
Password: "<PASSWORD>",
|
||||
AppID: "<APPID>",
|
||||
AppSecret: "<APPSECRET>",
|
||||
SSOURL: "https://bvs-delta.qa.loc:8443"
|
||||
DecortURL: "https://mr4.digitalenergy.online",
|
||||
Domain: "dynamix",
|
||||
Retries: 5,
|
||||
}
|
||||
|
||||
BVSCfg.SetTimeout(5 * time.Minute)
|
||||
|
||||
// Создание клиента
|
||||
BVSClient := decort.NewBVS(cfg)
|
||||
}
|
||||
```
|
||||
|
||||
#### Пример выполнения запроса
|
||||
|
||||
```go
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/config"
|
||||
decort "repository.basistech.ru/BASIS/decort-golang-sdk"
|
||||
)
|
||||
|
||||
func main() {
|
||||
// Настройка конфигурации
|
||||
BVSCfg := config.config.BVSConfig{
|
||||
Username: "<USERNAME>",
|
||||
Password: "<PASSWORD>",
|
||||
AppID: "<APPID>",
|
||||
AppSecret: "<APPSECRET>",
|
||||
SSOURL: "https://bvs-delta.qa.loc:8443"
|
||||
DecortURL: "https://mr4.digitalenergy.online",
|
||||
Domain: "dynamix",
|
||||
Retries: 5,
|
||||
}
|
||||
|
||||
// Создание клиента
|
||||
BVSClient := decort.NewBVS(cfg)
|
||||
|
||||
// Создание структуры запроса
|
||||
// CreateRequest - реквест на создание виртуальной машины
|
||||
req := kvmx86.CreateRequest{
|
||||
RGID: 123,
|
||||
Name: "compute",
|
||||
CPU: 4,
|
||||
RAM: 4096,
|
||||
ImageID: 321,
|
||||
}
|
||||
|
||||
// Выполнение запроса
|
||||
res, err := client.CloudAPI().KVMX86().Create(context.Background(), req)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
fmt.Println(res)
|
||||
}
|
||||
@@ -22,6 +22,8 @@ import (
|
||||
k8s_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
|
||||
)
|
||||
|
||||
const restmachine = "/restmachine"
|
||||
|
||||
// HTTP-client for platform
|
||||
type DecortClient struct {
|
||||
decortURL string
|
||||
@@ -88,7 +90,7 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
|
||||
body = bytes.NewBufferString(values.Encode())
|
||||
}
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/restmachine"+url, body)
|
||||
req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+restmachine+url, body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
401
client_bvs.go
Normal file
401
client_bvs.go
Normal file
@@ -0,0 +1,401 @@
|
||||
package decortsdk
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"mime/multipart"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/google/go-querystring/query"
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/config"
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
|
||||
k8s_ca "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
|
||||
k8s_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
|
||||
)
|
||||
|
||||
// HTTP-client for platform
|
||||
type BVSDecortClient struct {
|
||||
client *http.Client
|
||||
cfg config.BVSConfig
|
||||
mutex *sync.Mutex
|
||||
decortURL string
|
||||
}
|
||||
|
||||
// Сlient builder
|
||||
func NewBVS(cfg config.BVSConfig) *BVSDecortClient {
|
||||
if cfg.Retries == 0 {
|
||||
cfg.Retries = 5
|
||||
}
|
||||
|
||||
return &BVSDecortClient{
|
||||
decortURL: cfg.DecortURL,
|
||||
client: &http.Client{
|
||||
Transport: &http.Transport{
|
||||
TLSClientConfig: &tls.Config{
|
||||
//nolint:gosec
|
||||
InsecureSkipVerify: cfg.SSLSkipVerify,
|
||||
},
|
||||
},
|
||||
},
|
||||
cfg: cfg,
|
||||
mutex: &sync.Mutex{},
|
||||
}
|
||||
}
|
||||
|
||||
// CloudAPI builder
|
||||
func (bdc *BVSDecortClient) CloudAPI() *cloudapi.CloudAPI {
|
||||
return cloudapi.New(bdc)
|
||||
}
|
||||
|
||||
// CloudBroker builder
|
||||
func (bdc *BVSDecortClient) CloudBroker() *cloudbroker.CloudBroker {
|
||||
return cloudbroker.New(bdc)
|
||||
}
|
||||
|
||||
// DecortApiCall method for sending requests to the platform
|
||||
func (bdc *BVSDecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
|
||||
k8sCaCreateReq, okCa := params.(k8s_ca.CreateRequest)
|
||||
k8sCbCreateReq, okCb := params.(k8s_cb.CreateRequest)
|
||||
var body *bytes.Buffer
|
||||
var ctype string
|
||||
|
||||
if okCa {
|
||||
body, ctype = createK8sCloudApiBVS(k8sCaCreateReq)
|
||||
} else if okCb {
|
||||
body, ctype = createK8sCloudBrokerBVS(k8sCbCreateReq)
|
||||
} else {
|
||||
values, err := query.Values(params)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
body = bytes.NewBufferString(values.Encode())
|
||||
}
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, method, bdc.decortURL+restmachine+url, body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if err = bdc.getToken(ctx); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
resp, err := bdc.do(req, ctype)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
respBytes, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if resp.StatusCode != 200 {
|
||||
return nil, errors.New(string(respBytes))
|
||||
}
|
||||
|
||||
return respBytes, nil
|
||||
}
|
||||
|
||||
func (bdc *BVSDecortClient) getToken(ctx context.Context) error {
|
||||
bdc.mutex.Lock()
|
||||
defer bdc.mutex.Unlock()
|
||||
|
||||
if !bdc.cfg.Token.Valid() {
|
||||
|
||||
body := fmt.Sprintf("grant_type=password&client_id=%s&client_secret=%s&username=%s&password=%s&response_type=token&scope=openid", bdc.cfg.AppID, bdc.cfg.AppSecret, bdc.cfg.Username, bdc.cfg.Password)
|
||||
bodyReader := strings.NewReader(body)
|
||||
|
||||
bdc.cfg.SSOURL = strings.TrimSuffix(bdc.cfg.SSOURL, "/")
|
||||
|
||||
req, _ := http.NewRequestWithContext(ctx, "POST", bdc.cfg.SSOURL+"/realms/"+bdc.cfg.Domain+"/protocol/openid-connect/token", bodyReader)
|
||||
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
|
||||
|
||||
resp, err := bdc.client.Do(req)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot get token: %w", err)
|
||||
}
|
||||
|
||||
tokenBytes, _ := io.ReadAll(resp.Body)
|
||||
resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != 200 {
|
||||
return fmt.Errorf("cannot get token: %s", tokenBytes)
|
||||
}
|
||||
|
||||
err = json.Unmarshal(tokenBytes, &bdc.cfg.Token)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot unmarshal token: %s", tokenBytes)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (bdc *BVSDecortClient) do(req *http.Request, ctype string) (*http.Response, error) {
|
||||
if ctype != "" {
|
||||
req.Header.Add("Content-Type", ctype)
|
||||
} else {
|
||||
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
|
||||
}
|
||||
bdc.cfg.Token.SetAuthHeader(req)
|
||||
req.Header.Set("Accept", "application/json")
|
||||
|
||||
// var resp *http.Response
|
||||
// var err error
|
||||
buf, _ := io.ReadAll(req.Body)
|
||||
// req = req.Clone(req.Context())
|
||||
|
||||
// for i := uint64(0); i < dc.cfg.Retries; i++ {
|
||||
req.Body = io.NopCloser(bytes.NewBuffer(buf))
|
||||
resp, err := bdc.client.Do(req)
|
||||
// if err == nil {
|
||||
if resp.StatusCode == 200 {
|
||||
return resp, err
|
||||
}
|
||||
respBytes, _ := io.ReadAll(resp.Body)
|
||||
err = fmt.Errorf("%s", respBytes)
|
||||
resp.Body.Close()
|
||||
// }
|
||||
// }
|
||||
|
||||
return nil, fmt.Errorf("could not execute request: %w", err)
|
||||
}
|
||||
|
||||
func createK8sCloudApiBVS(req k8s_ca.CreateRequest) (*bytes.Buffer, string) {
|
||||
reqBody := &bytes.Buffer{}
|
||||
writer := multipart.NewWriter(reqBody)
|
||||
if req.OidcCertificate != "" {
|
||||
part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
|
||||
_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
|
||||
}
|
||||
|
||||
_ = writer.WriteField("name", req.Name)
|
||||
_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
|
||||
_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8SCIID, 10))
|
||||
_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
|
||||
_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
|
||||
|
||||
if req.MasterSEPID != 0 {
|
||||
_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
|
||||
}
|
||||
if req.MasterSEPPool != "" {
|
||||
_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
|
||||
}
|
||||
if req.WorkerSEPID != 0 {
|
||||
_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
|
||||
}
|
||||
if req.WorkerSEPPool != "" {
|
||||
_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
|
||||
}
|
||||
|
||||
if req.Labels != nil {
|
||||
for _, v := range req.Labels {
|
||||
_ = writer.WriteField("labels", v)
|
||||
}
|
||||
}
|
||||
if req.Taints != nil {
|
||||
for _, v := range req.Taints {
|
||||
_ = writer.WriteField("taints", v)
|
||||
}
|
||||
}
|
||||
if req.Annotations != nil {
|
||||
for _, v := range req.Annotations {
|
||||
_ = writer.WriteField("annotations", v)
|
||||
}
|
||||
}
|
||||
|
||||
if req.MasterCPU != 0 {
|
||||
_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(req.MasterCPU), 10))
|
||||
}
|
||||
if req.MasterNum != 0 {
|
||||
_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(req.MasterNum), 10))
|
||||
}
|
||||
if req.MasterRAM != 0 {
|
||||
_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(req.MasterRAM), 10))
|
||||
}
|
||||
if req.MasterDisk != 0 {
|
||||
_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(req.MasterDisk), 10))
|
||||
}
|
||||
if req.WorkerCPU != 0 {
|
||||
_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(req.WorkerCPU), 10))
|
||||
}
|
||||
if req.WorkerNum != 0 {
|
||||
_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(req.WorkerNum), 10))
|
||||
}
|
||||
if req.WorkerRAM != 0 {
|
||||
_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(req.WorkerRAM), 10))
|
||||
}
|
||||
if req.WorkerDisk != 0 {
|
||||
_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(req.WorkerDisk), 10))
|
||||
}
|
||||
if req.ExtNetID != 0 {
|
||||
_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
|
||||
}
|
||||
if req.VinsId != 0 {
|
||||
_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
|
||||
}
|
||||
if !req.WithLB {
|
||||
_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
|
||||
}
|
||||
|
||||
_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
|
||||
|
||||
if req.AdditionalSANs != nil {
|
||||
for _, v := range req.AdditionalSANs {
|
||||
_ = writer.WriteField("additionalSANs", v)
|
||||
}
|
||||
}
|
||||
if req.InitConfiguration != "" {
|
||||
_ = writer.WriteField("initConfiguration", req.InitConfiguration)
|
||||
}
|
||||
if req.ClusterConfiguration != "" {
|
||||
_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
|
||||
}
|
||||
if req.KubeletConfiguration != "" {
|
||||
_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
|
||||
}
|
||||
if req.KubeProxyConfiguration != "" {
|
||||
_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
|
||||
}
|
||||
if req.JoinConfiguration != "" {
|
||||
_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
|
||||
}
|
||||
if req.Description != "" {
|
||||
_ = writer.WriteField("desc", req.Description)
|
||||
}
|
||||
if req.UserData != "" {
|
||||
_ = writer.WriteField("userData", req.UserData)
|
||||
}
|
||||
|
||||
_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
|
||||
|
||||
ct := writer.FormDataContentType()
|
||||
writer.Close()
|
||||
|
||||
return reqBody, ct
|
||||
}
|
||||
|
||||
func createK8sCloudBrokerBVS(req k8s_cb.CreateRequest) (*bytes.Buffer, string) {
|
||||
reqBody := &bytes.Buffer{}
|
||||
writer := multipart.NewWriter(reqBody)
|
||||
if req.OidcCertificate != "" {
|
||||
part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
|
||||
_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
|
||||
}
|
||||
|
||||
_ = writer.WriteField("name", req.Name)
|
||||
_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
|
||||
_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8CIID, 10))
|
||||
_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
|
||||
_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
|
||||
|
||||
if req.MasterSEPID != 0 {
|
||||
_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
|
||||
}
|
||||
if req.MasterSEPPool != "" {
|
||||
_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
|
||||
}
|
||||
if req.WorkerSEPID != 0 {
|
||||
_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
|
||||
}
|
||||
if req.WorkerSEPPool != "" {
|
||||
_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
|
||||
}
|
||||
|
||||
if req.Labels != nil {
|
||||
for _, v := range req.Labels {
|
||||
_ = writer.WriteField("labels", v)
|
||||
}
|
||||
}
|
||||
if req.Taints != nil {
|
||||
for _, v := range req.Taints {
|
||||
_ = writer.WriteField("taints", v)
|
||||
}
|
||||
}
|
||||
if req.Annotations != nil {
|
||||
for _, v := range req.Annotations {
|
||||
_ = writer.WriteField("annotations", v)
|
||||
}
|
||||
}
|
||||
|
||||
if req.MasterCPU != 0 {
|
||||
_ = writer.WriteField("masterCpu", strconv.FormatUint(req.MasterCPU, 10))
|
||||
}
|
||||
if req.MasterNum != 0 {
|
||||
_ = writer.WriteField("masterNum", strconv.FormatUint(req.MasterNum, 10))
|
||||
}
|
||||
if req.MasterRAM != 0 {
|
||||
_ = writer.WriteField("masterRam", strconv.FormatUint(req.MasterRAM, 10))
|
||||
}
|
||||
if req.MasterDisk != 0 {
|
||||
_ = writer.WriteField("masterDisk", strconv.FormatUint(req.MasterDisk, 10))
|
||||
}
|
||||
if req.WorkerCPU != 0 {
|
||||
_ = writer.WriteField("workerCpu", strconv.FormatUint(req.WorkerCPU, 10))
|
||||
}
|
||||
if req.WorkerNum != 0 {
|
||||
_ = writer.WriteField("workerNum", strconv.FormatUint(req.WorkerNum, 10))
|
||||
}
|
||||
if req.WorkerRAM != 0 {
|
||||
_ = writer.WriteField("workerRam", strconv.FormatUint(req.WorkerRAM, 10))
|
||||
}
|
||||
if req.WorkerDisk != 0 {
|
||||
_ = writer.WriteField("workerDisk", strconv.FormatUint(req.WorkerDisk, 10))
|
||||
}
|
||||
if req.ExtNetID != 0 {
|
||||
_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
|
||||
}
|
||||
if req.VinsId != 0 {
|
||||
_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
|
||||
}
|
||||
if !req.WithLB {
|
||||
_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
|
||||
}
|
||||
|
||||
_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
|
||||
|
||||
if req.AdditionalSANs != nil {
|
||||
for _, v := range req.AdditionalSANs {
|
||||
_ = writer.WriteField("additionalSANs", v)
|
||||
}
|
||||
}
|
||||
if req.InitConfiguration != "" {
|
||||
_ = writer.WriteField("initConfiguration", req.InitConfiguration)
|
||||
}
|
||||
if req.ClusterConfiguration != "" {
|
||||
_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
|
||||
}
|
||||
if req.KubeletConfiguration != "" {
|
||||
_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
|
||||
}
|
||||
if req.KubeProxyConfiguration != "" {
|
||||
_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
|
||||
}
|
||||
if req.JoinConfiguration != "" {
|
||||
_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
|
||||
}
|
||||
if req.Description != "" {
|
||||
_ = writer.WriteField("desc", req.Description)
|
||||
}
|
||||
if req.UserData != "" {
|
||||
_ = writer.WriteField("userData", req.UserData)
|
||||
}
|
||||
|
||||
_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
|
||||
|
||||
ct := writer.FormDataContentType()
|
||||
|
||||
writer.Close()
|
||||
return reqBody, ct
|
||||
}
|
||||
116
config/config_bvs.go
Normal file
116
config/config_bvs.go
Normal file
@@ -0,0 +1,116 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"golang.org/x/oauth2"
|
||||
"gopkg.in/yaml.v3"
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||
)
|
||||
|
||||
type BVSConfig struct {
|
||||
// ServiceAccount username
|
||||
// Required: true
|
||||
// Example : "osh_mikoev"
|
||||
Username string `json:"username" yaml:"username" validate:"required"`
|
||||
|
||||
// ServiceAccount password
|
||||
// Required: true
|
||||
// Example: "[1o>hYkjnJr)HI78q7t&#%8Lm"
|
||||
Password string `json:"password" yaml:"password" validate:"required"`
|
||||
|
||||
// Domain name
|
||||
// Required: true
|
||||
// Example: "dynamix"
|
||||
Domain string `json:"domain" yaml:"domain"`
|
||||
|
||||
// Application (client) identifier for authorization
|
||||
// in the cloud platform controller in oauth2 mode.
|
||||
// Required: true
|
||||
// Example: "ewqfrvea7s890avw804389qwguf234h0otfi3w4eiu"
|
||||
AppID string `json:"appId" yaml:"appId" validate:"required"`
|
||||
|
||||
// Application (client) secret code for authorization
|
||||
// in the cloud platform controller in oauth2 mode.
|
||||
// Example: "frvet09rvesfis0c9erv9fsov0vsdfi09ovds0f"
|
||||
AppSecret string `json:"appSecret" yaml:"appSecret" validate:"required"`
|
||||
|
||||
// Platform authentication service address
|
||||
// Required: true
|
||||
// Example: "https://sso.digitalenergy.online"
|
||||
SSOURL string `json:"ssoUrl" yaml:"ssoUrl" validate:"url"`
|
||||
|
||||
// The address of the platform on which the actions are planned
|
||||
// Required: true
|
||||
// Example: "https://mr4.digitalenergy.online"
|
||||
DecortURL string `json:"decortUrl" yaml:"decortUrl" validate:"url"`
|
||||
|
||||
// JWT platform token
|
||||
// Required: false
|
||||
// Example: "qwqwdfwv68979we0q9bfv7e9sbvd89798qrwv97ff"
|
||||
Token oauth2.Token `json:"token" yaml:"token"`
|
||||
|
||||
// Amount platform request attempts
|
||||
// Default value: 5
|
||||
// Required: false
|
||||
Retries uint64 `json:"retries" yaml:"retries"`
|
||||
|
||||
// Skip verify
|
||||
// Required: false
|
||||
SSLSkipVerify bool `json:"sslSkipVerify" yaml:"sslSkipVerify"`
|
||||
|
||||
// HTTP client timeout, unlimited if left empty
|
||||
// Required: false
|
||||
Timeout Duration `json:"timeout" yaml:"timeout"`
|
||||
}
|
||||
|
||||
// SetTimeout is used to set HTTP client timeout.
|
||||
func (c *BVSConfig) SetTimeout(dur time.Duration) {
|
||||
c.Timeout = Duration(dur)
|
||||
}
|
||||
|
||||
// ParseConfigJSON parses Config from specified JSON-formatted file.
|
||||
func ParseConfigBVSJSON(path string) (BVSConfig, error) {
|
||||
file, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return BVSConfig{}, err
|
||||
}
|
||||
|
||||
var config BVSConfig
|
||||
|
||||
err = json.Unmarshal(file, &config)
|
||||
if err != nil {
|
||||
return BVSConfig{}, err
|
||||
}
|
||||
|
||||
err = validators.ValidateConfig(config)
|
||||
if err != nil {
|
||||
return BVSConfig{}, validators.ValidationErrors(validators.GetErrors(err))
|
||||
}
|
||||
|
||||
return config, nil
|
||||
}
|
||||
|
||||
// ParseConfigYAML parses Config from specified YAML-formatted file.
|
||||
func ParseConfigBVSYAML(path string) (BVSConfig, error) {
|
||||
file, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return BVSConfig{}, err
|
||||
}
|
||||
|
||||
var config BVSConfig
|
||||
|
||||
err = yaml.Unmarshal(file, &config)
|
||||
if err != nil {
|
||||
return BVSConfig{}, err
|
||||
}
|
||||
|
||||
err = validators.ValidateConfig(config)
|
||||
if err != nil {
|
||||
return BVSConfig{}, validators.ValidationErrors(validators.GetErrors(err))
|
||||
}
|
||||
|
||||
return config, nil
|
||||
}
|
||||
11
go.mod
11
go.mod
@@ -5,15 +5,20 @@ go 1.20
|
||||
require (
|
||||
github.com/go-playground/validator/v10 v10.11.2
|
||||
github.com/google/go-querystring v1.1.0
|
||||
golang.org/x/oauth2 v0.13.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||
github.com/golang/protobuf v1.5.3 // indirect
|
||||
github.com/kr/text v0.2.0 // indirect
|
||||
github.com/leodido/go-urn v1.2.1 // indirect
|
||||
golang.org/x/crypto v0.5.0 // indirect
|
||||
golang.org/x/sys v0.4.0 // indirect
|
||||
golang.org/x/text v0.6.0 // indirect
|
||||
golang.org/x/crypto v0.14.0 // indirect
|
||||
golang.org/x/net v0.16.0 // indirect
|
||||
golang.org/x/sys v0.13.0 // indirect
|
||||
golang.org/x/text v0.13.0 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
google.golang.org/protobuf v1.31.0 // indirect
|
||||
)
|
||||
|
||||
35
go.sum
35
go.sum
@@ -8,8 +8,13 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
|
||||
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
||||
github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
|
||||
github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
|
||||
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
|
||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
||||
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
|
||||
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
|
||||
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
|
||||
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
|
||||
@@ -23,13 +28,29 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
||||
golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
|
||||
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
|
||||
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
|
||||
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
|
||||
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
|
||||
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
|
||||
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
||||
golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
|
||||
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
||||
golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
|
||||
golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
|
||||
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
|
||||
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
|
||||
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
|
||||
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
||||
@@ -94,7 +94,7 @@ func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url st
|
||||
body = bytes.NewBufferString(values.Encode() + fmt.Sprintf("&authkey=%s", ldc.cfg.Token))
|
||||
}
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/restmachine"+url, body)
|
||||
req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+restmachine+url, body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
73
pkg/cloudapi/account/ids.go
Normal file
73
pkg/cloudapi/account/ids.go
Normal file
@@ -0,0 +1,73 @@
|
||||
package account
|
||||
|
||||
// IDs gets array of AccountIDs from ListAccounts struct
|
||||
func (la ListAccounts) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(la.Data))
|
||||
for _, acc := range la.Data {
|
||||
res = append(res, acc.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ComputeIDs from ListComputes struct
|
||||
func (lc ListComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lc.Data))
|
||||
for _, c := range lc.Data {
|
||||
res = append(res, c.ComputeID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of DiskIDs from ListDisks struct
|
||||
func (ld ListDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ld.Data))
|
||||
for _, d := range ld.Data {
|
||||
res = append(res, d.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of FLIPGroupIDs from ListFLIPGroups struct
|
||||
func (fg ListFLIPGroups) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(fg.Data))
|
||||
for _, g := range fg.Data {
|
||||
res = append(res, g.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of AccountIDs from ListResourceConsumption struct
|
||||
func (rc ListResourceConsumption) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(rc.Data))
|
||||
for _, r := range rc.Data {
|
||||
res = append(res, r.AccountID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of RGIDs from ListRG struct
|
||||
func (rg ListRG) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(rg.Data))
|
||||
for _, g := range rg.Data {
|
||||
res = append(res, g.RGID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of TemplateIDs from ListTemplates struct
|
||||
func (lt ListTemplates) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lt.Data))
|
||||
for _, t := range lt.Data {
|
||||
res = append(res, t.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of VINSIDs from ListVINS struct
|
||||
func (lv ListVINS) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lv.Data))
|
||||
for _, v := range lv.Data {
|
||||
res = append(res, v.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
37
pkg/cloudapi/bservice/ids.go
Normal file
37
pkg/cloudapi/bservice/ids.go
Normal file
@@ -0,0 +1,37 @@
|
||||
package bservice
|
||||
|
||||
// IDs gets array of BasicServiceIDs from ListBasicServices struct
|
||||
func (lbs ListBasicServices) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lbs.Data))
|
||||
for _, bs := range lbs.Data {
|
||||
res = append(res, bs.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ComputeIDs from ListComputes struct
|
||||
func (lc ListComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lc))
|
||||
for _, c := range lc {
|
||||
res = append(res, c.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of GroupIDs from ListGroups struct
|
||||
func (lg ListGroups) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lg))
|
||||
for _, g := range lg {
|
||||
res = append(res, g.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of GroupComputeIDs from ListGroupComputes struct
|
||||
func (lgc ListGroupComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lgc))
|
||||
for _, gc := range lgc {
|
||||
res = append(res, gc.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
@@ -168,9 +168,18 @@ type ItemSnapshot struct {
|
||||
Valid bool `json:"valid"`
|
||||
}
|
||||
|
||||
// List of Snapshots
|
||||
// List of Snapshot
|
||||
type ListSnapshots []ItemSnapshot
|
||||
|
||||
// List of Snapshots
|
||||
type ListInfoSnapshots struct {
|
||||
// Data
|
||||
Data ListSnapshots `json:"data"`
|
||||
|
||||
// EntryCount
|
||||
EntryCount uint64 `json:"entryCount"`
|
||||
}
|
||||
|
||||
// Main information about Group
|
||||
type RecordGroup struct {
|
||||
// Account ID
|
||||
|
||||
@@ -16,7 +16,7 @@ type SnapshotListRequest struct {
|
||||
}
|
||||
|
||||
// SnapshotList gets list existing snapshots of the Basic Service
|
||||
func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (ListSnapshots, error) {
|
||||
func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (*ListInfoSnapshots, error) {
|
||||
err := validators.ValidateRequest(req)
|
||||
if err != nil {
|
||||
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||
@@ -29,12 +29,12 @@ func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (Li
|
||||
return nil, err
|
||||
}
|
||||
|
||||
list := ListSnapshots{}
|
||||
list := ListInfoSnapshots{}
|
||||
|
||||
err = json.Unmarshal(res, &list)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return list, nil
|
||||
return &list, nil
|
||||
}
|
||||
|
||||
37
pkg/cloudapi/compute/ids.go
Normal file
37
pkg/cloudapi/compute/ids.go
Normal file
@@ -0,0 +1,37 @@
|
||||
package compute
|
||||
|
||||
// IDs gets array of ComputeIDs from ListComputes struct
|
||||
func (lc ListComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lc.Data))
|
||||
for _, c := range lc.Data {
|
||||
res = append(res, c.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of DiskIDs from ListInfoDisks struct
|
||||
func (li ListInfoDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(li))
|
||||
for _, i := range li {
|
||||
res = append(res, i.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of PFWsIDs from ListPFWs struct
|
||||
func (lp ListPFWs) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lp.Data))
|
||||
for _, p := range lp.Data {
|
||||
res = append(res, p.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of DiskIDs from ListComputeDisks struct
|
||||
func (lcd ListComputeDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lcd))
|
||||
for _, cd := range lcd {
|
||||
res = append(res, cd.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
@@ -819,7 +819,7 @@ type ItemCompute struct {
|
||||
Devices interface{} `json:"devices"`
|
||||
|
||||
// List disk items
|
||||
Disks []InfoDisk `json:"disks"`
|
||||
Disks ListInfoDisks `json:"disks"`
|
||||
|
||||
// Driver
|
||||
Driver string `json:"driver"`
|
||||
@@ -918,6 +918,9 @@ type ItemCompute struct {
|
||||
VirtualImageID uint64 `json:"virtualImageId"`
|
||||
}
|
||||
|
||||
// ListInfoDisks
|
||||
type ListInfoDisks []InfoDisk
|
||||
|
||||
// Information Disk
|
||||
type InfoDisk struct {
|
||||
// ID
|
||||
|
||||
28
pkg/cloudapi/disks/ids.go
Normal file
28
pkg/cloudapi/disks/ids.go
Normal file
@@ -0,0 +1,28 @@
|
||||
package disks
|
||||
|
||||
// IDs gets array of DiskIDs from ListDisks struct
|
||||
func (ld ListDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ld.Data))
|
||||
for _, d := range ld.Data {
|
||||
res = append(res, d.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of DiskIDs from ListDisksUnattached struct
|
||||
func (ldu ListDisksUnattached) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ldu.Data))
|
||||
for _, d := range ldu.Data {
|
||||
res = append(res, d.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of DiskIDs from ListSearchDisks struct
|
||||
func (lsd ListSearchDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lsd))
|
||||
for _, d := range lsd {
|
||||
res = append(res, d.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
19
pkg/cloudapi/extnet/ids.go
Normal file
19
pkg/cloudapi/extnet/ids.go
Normal file
@@ -0,0 +1,19 @@
|
||||
package extnet
|
||||
|
||||
// IDs gets array of ExtNetIDs from ListExtNets struct
|
||||
func (le ListExtNets) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(le.Data))
|
||||
for _, e := range le.Data {
|
||||
res = append(res, e.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ComputeIDs from ListExtNetComputes struct
|
||||
func (le ListExtNetComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(le.Data))
|
||||
for _, e := range le.Data {
|
||||
res = append(res, e.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudapi/flipgroup/ids.go
Normal file
10
pkg/cloudapi/flipgroup/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package flipgroup
|
||||
|
||||
// IDs gets array of FLIPGroupIDs from ListFLIPGroups struct
|
||||
func (le ListFLIPGroups) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(le.Data))
|
||||
for _, e := range le.Data {
|
||||
res = append(res, e.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
19
pkg/cloudapi/image/ids.go
Normal file
19
pkg/cloudapi/image/ids.go
Normal file
@@ -0,0 +1,19 @@
|
||||
package image
|
||||
|
||||
// IDs gets array of ImageIDs from ListImages struct
|
||||
func (li ListImages) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(li.Data))
|
||||
for _, i := range li.Data {
|
||||
res = append(res, i.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of HistoryIDs from ListHistories struct
|
||||
func (lh ListHistories) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lh))
|
||||
for _, h := range lh {
|
||||
res = append(res, h.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
@@ -66,7 +66,10 @@ type ListImages struct {
|
||||
EntryCount uint64 `json:"entryCount"`
|
||||
}
|
||||
|
||||
// History
|
||||
// ListHistories of record image
|
||||
type ListHistories []History
|
||||
|
||||
// History of record image
|
||||
type History struct {
|
||||
// GUID
|
||||
GUID string `json:"guid"`
|
||||
@@ -123,7 +126,7 @@ type RecordImage struct {
|
||||
GUID uint64 `json:"guid"`
|
||||
|
||||
// History
|
||||
History []History `json:"history"`
|
||||
History ListHistories `json:"history"`
|
||||
|
||||
// HotResize
|
||||
HotResize bool `json:"hotResize"`
|
||||
|
||||
10
pkg/cloudapi/k8ci/ids.go
Normal file
10
pkg/cloudapi/k8ci/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package k8ci
|
||||
|
||||
// IDs gets array of K8CIIDs from ListK8CI struct
|
||||
func (lk ListK8CI) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lk.Data))
|
||||
for _, k := range lk.Data {
|
||||
res = append(res, k.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
28
pkg/cloudapi/k8s/ids.go
Normal file
28
pkg/cloudapi/k8s/ids.go
Normal file
@@ -0,0 +1,28 @@
|
||||
package k8s
|
||||
|
||||
// IDs gets array of K8SIDs from ListK8SClusters struct
|
||||
func (lk ListK8SClusters) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lk.Data))
|
||||
for _, k := range lk.Data {
|
||||
res = append(res, k.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of K8SWorkerGroupIDs from ListK8SGroups struct
|
||||
func (lwg ListK8SGroups) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lwg))
|
||||
for _, wg := range lwg {
|
||||
res = append(res, wg.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of Worker or Master ComputesIDs from ListDetailedInfo struct
|
||||
func (ldi ListDetailedInfo) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ldi))
|
||||
for _, di := range ldi {
|
||||
res = append(res, di.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudapi/lb/ids.go
Normal file
10
pkg/cloudapi/lb/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package lb
|
||||
|
||||
// IDs gets array of LBIDs from ListLB struct
|
||||
func (llb ListLB) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(llb.Data))
|
||||
for _, lb := range llb.Data {
|
||||
res = append(res, lb.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudapi/locations/ids.go
Normal file
10
pkg/cloudapi/locations/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package locations
|
||||
|
||||
// IDs gets array of LocationIDs from ListLocations struct
|
||||
func (ll ListLocations) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ll.Data))
|
||||
for _, l := range ll.Data {
|
||||
res = append(res, l.GID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
64
pkg/cloudapi/rg/ids.go
Normal file
64
pkg/cloudapi/rg/ids.go
Normal file
@@ -0,0 +1,64 @@
|
||||
package rg
|
||||
|
||||
// IDs gets array of ResourceGroupIDs from ListResourceGroups struct
|
||||
func (lrg ListResourceGroups) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lrg.Data))
|
||||
for _, rg := range lrg.Data {
|
||||
res = append(res, rg.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ComputeIDs from ListAffinityGroupsComputes struct
|
||||
func (lag ListAffinityGroupsComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lag))
|
||||
for _, ag := range lag {
|
||||
res = append(res, ag.ComputeID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ComputeIDs from ListComputes struct
|
||||
func (lc ListComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lc.Data))
|
||||
for _, c := range lc.Data {
|
||||
res = append(res, c.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of LBIDs from ListLB struct
|
||||
func (llb ListLB) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(llb.Data))
|
||||
for _, lb := range llb.Data {
|
||||
res = append(res, lb.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of VINSIDs from ListVINS struct
|
||||
func (llb ListVINS) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(llb.Data))
|
||||
for _, lb := range llb.Data {
|
||||
res = append(res, lb.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ResourceGroupIDs from ListResourceConsumption struct
|
||||
func (lrc ListResourceConsumption) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lrc.Data))
|
||||
for _, rc := range lrc.Data {
|
||||
res = append(res, rc.RGID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ResourceGroupIDs from ListAffinityGroup struct
|
||||
func (lag ListAffinityGroup) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lag))
|
||||
for _, ag := range lag {
|
||||
res = append(res, ag.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
@@ -331,9 +331,19 @@ type ItemAffinityGroupComputes struct {
|
||||
// List of affinity groups
|
||||
type ListAffinityGroupsComputes []ItemAffinityGroupComputes
|
||||
|
||||
// Main information about
|
||||
type ItemAffinityGroup struct {
|
||||
ID uint64 `json:"id"`
|
||||
NodeID uint64 `json:"node_id"`
|
||||
}
|
||||
|
||||
// List of affinity group
|
||||
type ListAffinityGroup []ItemAffinityGroup
|
||||
|
||||
// List of affinity groups
|
||||
type ListAffinityGroups struct {
|
||||
// Data
|
||||
Data []map[string][]uint64 `json:"data"`
|
||||
Data []map[string]ListAffinityGroup `json:"data"`
|
||||
|
||||
// Entry count
|
||||
EntryCount uint64 `json:"entryCount"`
|
||||
|
||||
10
pkg/cloudapi/sizes/ids.go
Normal file
10
pkg/cloudapi/sizes/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
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
|
||||
}
|
||||
10
pkg/cloudapi/stack/ids.go
Normal file
10
pkg/cloudapi/stack/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package stack
|
||||
|
||||
// IDs gets array of StackIDs from ListStacks struct
|
||||
func (ls ListStacks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ls.Data))
|
||||
for _, s := range ls.Data {
|
||||
res = append(res, s.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
64
pkg/cloudapi/vins/ids.go
Normal file
64
pkg/cloudapi/vins/ids.go
Normal file
@@ -0,0 +1,64 @@
|
||||
package vins
|
||||
|
||||
// IDs gets array of VINSIDs from ListVINS struct
|
||||
func (lv ListVINS) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lv.Data))
|
||||
for _, v := range lv.Data {
|
||||
res = append(res, v.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ExtNetIDs from ListExtNets struct
|
||||
func (le ListExtNets) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(le.Data))
|
||||
for _, e := range le.Data {
|
||||
res = append(res, e.ExtNetID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ComputeIDs from ListVINSComputes struct
|
||||
func (lvc ListVINSComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lvc))
|
||||
for _, vc := range lvc {
|
||||
res = append(res, vc.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of NATRuleConfigIDs from ListNATRulesConfig struct
|
||||
func (lnrc ListNATRulesConfig) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lnrc))
|
||||
for _, nrc := range lnrc {
|
||||
res = append(res, nrc.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of NATRuleIDs from ListNATRules struct
|
||||
func (lnr ListNATRules) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lnr.Data))
|
||||
for _, nr := range lnr.Data {
|
||||
res = append(res, nr.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of StaticRouteIDs from ListStaticRoutes struct
|
||||
func (lsr ListStaticRoutes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lsr.Data))
|
||||
for _, sr := range lsr.Data {
|
||||
res = append(res, sr.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of RouteIDs from ListRoutes struct
|
||||
func (lr ListRoutes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lr))
|
||||
for _, r := range lr {
|
||||
res = append(res, r.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
64
pkg/cloudbroker/account/ids.go
Normal file
64
pkg/cloudbroker/account/ids.go
Normal file
@@ -0,0 +1,64 @@
|
||||
package account
|
||||
|
||||
// IDs gets array of AccountIDs from ListAccounts struct
|
||||
func (la ListAccounts) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(la.Data))
|
||||
for _, acc := range la.Data {
|
||||
res = append(res, acc.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ComputeIDs from ListComputes struct
|
||||
func (lc ListComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lc.Data))
|
||||
for _, c := range lc.Data {
|
||||
res = append(res, c.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of DiskIDs from ListDisks struct
|
||||
func (ld ListDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ld.Data))
|
||||
for _, d := range ld.Data {
|
||||
res = append(res, d.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of FLIPGroupIDs from ListFLIPGroups struct
|
||||
func (fg ListFLIPGroups) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(fg.Data))
|
||||
for _, g := range fg.Data {
|
||||
res = append(res, g.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of AccountIDs from ListResourceConsumption struct
|
||||
func (rc ListResources) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(rc.Data))
|
||||
for _, r := range rc.Data {
|
||||
res = append(res, r.AccountID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of RGIDs from ListRG struct
|
||||
func (rg ListRG) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(rg.Data))
|
||||
for _, g := range rg.Data {
|
||||
res = append(res, g.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of VINSIDs from ListVINS struct
|
||||
func (lv ListVINS) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lv.Data))
|
||||
for _, v := range lv.Data {
|
||||
res = append(res, v.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudbroker/apiaccess/ids.go
Normal file
10
pkg/cloudbroker/apiaccess/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package apiaccess
|
||||
|
||||
// IDs gets array of APIAccessId from ListAPIAccess struct
|
||||
func (laa ListAPIAccess) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(laa.Data))
|
||||
for _, apiaccess := range laa.Data {
|
||||
res = append(res, apiaccess.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
@@ -105,7 +105,7 @@ type CloudAPIEndpoints struct {
|
||||
type CloudBrokerEndpoints struct {
|
||||
Account []string `json:"account,omitempty"`
|
||||
APIAccess []string `json:"apiaccess,omitempty"`
|
||||
Audit []string `json:"audit,omitempty"`
|
||||
Audit interface{} `json:"audit,omitempty"`
|
||||
AuditBeat []string `json:"auditbeat,omitempty"`
|
||||
AuditCollector []string `json:"auditcollector,omitempty"`
|
||||
BackupCreator []string `json:"backupcreator,omitempty"`
|
||||
|
||||
46
pkg/cloudbroker/compute/ids.go
Normal file
46
pkg/cloudbroker/compute/ids.go
Normal file
@@ -0,0 +1,46 @@
|
||||
package compute
|
||||
|
||||
// IDs gets array of ComputeIDs from ListComputes struct
|
||||
func (lc ListComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lc.Data))
|
||||
for _, c := range lc.Data {
|
||||
res = append(res, c.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of DiskIDs from ListInfoDisks struct
|
||||
func (lid ListInfoDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lid))
|
||||
for _, d := range lid {
|
||||
res = append(res, d.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of PFWsIDs from ListPFW struct
|
||||
func (lp ListPFW) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lp))
|
||||
for _, p := range lp {
|
||||
res = append(res, p.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of DiskIDs from ListDisks struct
|
||||
func (ld ListDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ld))
|
||||
for _, d := range ld {
|
||||
res = append(res, d.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of PCIDeviceIDs from ListPCIDevices struct
|
||||
func (lpd ListPCIDevices) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lpd.Data))
|
||||
for _, pd := range lpd.Data {
|
||||
res = append(res, pd.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
@@ -720,10 +720,13 @@ type RecordCompute struct {
|
||||
InfoCompute
|
||||
}
|
||||
|
||||
// Information about of disk IDs
|
||||
type ListInfoDisks []InfoDisk
|
||||
|
||||
// Main information about compute for list
|
||||
type ItemCompute struct {
|
||||
// List of disk IDs
|
||||
Disks []InfoDisk `json:"disks"`
|
||||
Disks ListInfoDisks `json:"disks"`
|
||||
|
||||
// Main information about compute
|
||||
InfoCompute
|
||||
|
||||
20
pkg/cloudbroker/disks/ids.go
Normal file
20
pkg/cloudbroker/disks/ids.go
Normal file
@@ -0,0 +1,20 @@
|
||||
package disks
|
||||
|
||||
// IDs gets array of DiskIDs from ListDisks struct
|
||||
func (ld ListDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ld.Data))
|
||||
for _, d := range ld.Data {
|
||||
res = append(res, d.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of DiskIDs from ListUnattachedDisks struct
|
||||
func (ldu ListUnattachedDisks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ldu.Data))
|
||||
for _, d := range ldu.Data {
|
||||
res = append(res, d.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
19
pkg/cloudbroker/extnet/ids.go
Normal file
19
pkg/cloudbroker/extnet/ids.go
Normal file
@@ -0,0 +1,19 @@
|
||||
package extnet
|
||||
|
||||
// IDs gets array of ExtNetIDs from ListExtNet struct
|
||||
func (le ListExtNet) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(le.Data))
|
||||
for _, e := range le.Data {
|
||||
res = append(res, e.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of StaticRouteIDs from ListStaticRoutes struct
|
||||
func (lsr ListStaticRoutes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lsr.Data))
|
||||
for _, sr := range lsr.Data {
|
||||
res = append(res, sr.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudbroker/flipgroup/ids.go
Normal file
10
pkg/cloudbroker/flipgroup/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package flipgroup
|
||||
|
||||
// IDs gets array of FLIPGroupIDs from ListFLIPGroups struct
|
||||
func (le ListFLIPGroups) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(le.Data))
|
||||
for _, e := range le.Data {
|
||||
res = append(res, e.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
19
pkg/cloudbroker/grid/ids.go
Normal file
19
pkg/cloudbroker/grid/ids.go
Normal file
@@ -0,0 +1,19 @@
|
||||
package grid
|
||||
|
||||
// IDs gets array of GRIDID from ListGrids struct
|
||||
func (lg ListGrids) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lg.Data))
|
||||
for _, e := range lg.Data {
|
||||
res = append(res, e.GID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of GRIDID from ListResourceConsumption struct
|
||||
func (lg ListResourceConsumption) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lg.Data))
|
||||
for _, e := range lg.Data {
|
||||
res = append(res, e.GID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
28
pkg/cloudbroker/image/ids.go
Normal file
28
pkg/cloudbroker/image/ids.go
Normal file
@@ -0,0 +1,28 @@
|
||||
package image
|
||||
|
||||
// IDs gets array of ImageIDs from ListImages struct
|
||||
func (li ListImages) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(li.Data))
|
||||
for _, i := range li.Data {
|
||||
res = append(res, i.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of StackIDs from ListStacks struct
|
||||
func (ls ListStacks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ls.Data))
|
||||
for _, h := range ls.Data {
|
||||
res = append(res, h.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of HistoryIDs from ListHistory struct
|
||||
func (lh ListHistory) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lh))
|
||||
for _, h := range lh {
|
||||
res = append(res, h.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudbroker/k8ci/ids.go
Normal file
10
pkg/cloudbroker/k8ci/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package k8ci
|
||||
|
||||
// IDs gets array of K8CIIDs from ListK8CI struct
|
||||
func (lk8ci ListK8CI) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lk8ci.Data))
|
||||
for _, i := range lk8ci.Data {
|
||||
res = append(res, i.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
30
pkg/cloudbroker/k8s/ids.go
Normal file
30
pkg/cloudbroker/k8s/ids.go
Normal file
@@ -0,0 +1,30 @@
|
||||
package k8s
|
||||
|
||||
// IDs gets array of K8SIDs from ListK8S struct
|
||||
func (lk ListK8S) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lk.Data))
|
||||
for _, k := range lk.Data {
|
||||
res = append(res, k.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of K8SWorkerGroupIDs from ListK8SGroups struct
|
||||
func (lwg ListK8SGroup) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lwg))
|
||||
for _, wg := range lwg {
|
||||
res = append(res, wg.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of Worker or Master ComputesIDs from ListDetailedInfo struct
|
||||
func (ldi ListDetailedInfo) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ldi))
|
||||
for _, di := range ldi {
|
||||
res = append(res, di.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
|
||||
10
pkg/cloudbroker/lb/ids.go
Normal file
10
pkg/cloudbroker/lb/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package lb
|
||||
|
||||
// IDs gets array of LBIDs from ListLB struct
|
||||
func (llb ListLB) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(llb.Data))
|
||||
for _, lb := range llb.Data {
|
||||
res = append(res, lb.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudbroker/pcidevice/ids.go
Normal file
10
pkg/cloudbroker/pcidevice/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package pcidevice
|
||||
|
||||
// IDs gets array of PCIDeviceIDs from ListPCIDevices struct
|
||||
func (lpd ListPCIDevices) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lpd.Data))
|
||||
for _, lb := range lpd.Data {
|
||||
res = append(res, lb.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
55
pkg/cloudbroker/rg/ids.go
Normal file
55
pkg/cloudbroker/rg/ids.go
Normal file
@@ -0,0 +1,55 @@
|
||||
package rg
|
||||
|
||||
// IDs gets array of ResourceGroupIDs from ListRG struct
|
||||
func (lrg ListRG) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lrg.Data))
|
||||
for _, rg := range lrg.Data {
|
||||
res = append(res, rg.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ComputeIDs from ListComputes struct
|
||||
func (lc ListComputes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lc.Data))
|
||||
for _, c := range lc.Data {
|
||||
res = append(res, c.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of LBIDs from ListLB struct
|
||||
func (llb ListLB) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(llb.Data))
|
||||
for _, lb := range llb.Data {
|
||||
res = append(res, lb.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of VINSIDs from ListVINS struct
|
||||
func (llb ListVINS) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(llb.Data))
|
||||
for _, vi := range llb.Data {
|
||||
res = append(res, vi.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ResourceGroupIDs from ListResourceConsumption struct
|
||||
func (lrc ListResourceConsumption) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lrc.Data))
|
||||
for _, rg := range lrc.Data {
|
||||
res = append(res, rg.RGID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of VINSIDs from ListPFW struct
|
||||
func (lpfw ListPFW) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lpfw.Data))
|
||||
for _, pfw := range lpfw.Data {
|
||||
res = append(res, pfw.VINSID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudbroker/sep/ids.go
Normal file
10
pkg/cloudbroker/sep/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package sep
|
||||
|
||||
// IDs gets array of SEPIDs from ListSEP struct
|
||||
func (ls ListSEP) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ls.Data))
|
||||
for _, s := range ls.Data {
|
||||
res = append(res, s.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudbroker/stack/ids.go
Normal file
10
pkg/cloudbroker/stack/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package stack
|
||||
|
||||
// IDs gets array of StackIDs from ListStacks struct
|
||||
func (ls ListStacks) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(ls.Data))
|
||||
for _, s := range ls.Data {
|
||||
res = append(res, s.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudbroker/user/ids.go
Normal file
10
pkg/cloudbroker/user/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package user
|
||||
|
||||
// IDs gets array of UserIDs from ListAPIAccess struct
|
||||
func (us ListAPIAccess) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(us))
|
||||
for _, us := range us {
|
||||
res = append(res, us.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
10
pkg/cloudbroker/vgpu/ids.go
Normal file
10
pkg/cloudbroker/vgpu/ids.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package vgpu
|
||||
|
||||
// IDs gets array of VGPUIDs from ListVGPU struct
|
||||
func (lvg ListVGPU) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lvg.Data))
|
||||
for _, s := range lvg.Data {
|
||||
res = append(res, s.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
55
pkg/cloudbroker/vins/ids.go
Normal file
55
pkg/cloudbroker/vins/ids.go
Normal file
@@ -0,0 +1,55 @@
|
||||
package vins
|
||||
|
||||
// IDs gets array of VINSIDs from ListVINS struct
|
||||
func (lv ListVINS) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lv.Data))
|
||||
for _, v := range lv.Data {
|
||||
res = append(res, v.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of ExtNetIDs from ListExtNets struct
|
||||
func (le ListExtNets) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(le.Data))
|
||||
for _, e := range le.Data {
|
||||
res = append(res, e.ExtNetID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of NATRuleIDs from ListNATRules struct
|
||||
func (lnr ListNATRules) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lnr.Data))
|
||||
for _, nrc := range lnr.Data {
|
||||
res = append(res, nrc.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of StaticRouteIDs from ListStaticRoutes struct
|
||||
func (lsr ListStaticRoutes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lsr.Data))
|
||||
for _, sr := range lsr.Data {
|
||||
res = append(res, sr.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of RouteIDs from ListRoutes struct
|
||||
func (lr ListRoutes) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lr))
|
||||
for _, r := range lr {
|
||||
res = append(res, r.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// IDs gets array of NATRuleConfigIDs from ListNatRule struct
|
||||
func (lnrc ListNatRule) IDs() []uint64 {
|
||||
res := make([]uint64, 0, len(lnrc))
|
||||
for _, nrc := range lnrc {
|
||||
res = append(res, nrc.ID)
|
||||
}
|
||||
return res
|
||||
}
|
||||
@@ -336,6 +336,9 @@ type RecordGW struct {
|
||||
InfoVNF
|
||||
}
|
||||
|
||||
// List NATRules
|
||||
type ListNatRule []ItemNATRule
|
||||
|
||||
// NAT config
|
||||
type NATConfig struct {
|
||||
// Network mask
|
||||
@@ -345,7 +348,7 @@ type NATConfig struct {
|
||||
Network string `json:"network"`
|
||||
|
||||
// Rules
|
||||
Rules []ItemNATRule `json:"rules"`
|
||||
Rules ListNatRule `json:"rules"`
|
||||
}
|
||||
|
||||
// Main information about NAT
|
||||
|
||||
12
samples/config/bvs-config.json
Normal file
12
samples/config/bvs-config.json
Normal file
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"username": "<USERNAME>",
|
||||
"password": "<PASSWORD>",
|
||||
"appId": "<APP_ID>",
|
||||
"appSecret": "<APP_SECRET>",
|
||||
"ssoUrl": "https://bvs-delta.qa.loc:8443",
|
||||
"decortUrl": "https://delta.qa.loc",
|
||||
"domain": "dynamix",
|
||||
"retries": 5,
|
||||
"timeout": "5m",
|
||||
"sslSkipVerify": false
|
||||
}
|
||||
10
samples/config/bvs-config.yml
Normal file
10
samples/config/bvs-config.yml
Normal file
@@ -0,0 +1,10 @@
|
||||
username: <USERNAME>
|
||||
password: <PASSWORD>
|
||||
appId: <APP_ID>
|
||||
appSecret: <APP_SECRET>
|
||||
ssoUrl: https://bvs-delta.qa.loc:8443
|
||||
decortUrl: https://delta.qa.loc
|
||||
domain: dynamix,
|
||||
retries: 5
|
||||
timeout: 5m
|
||||
sslSkipVerify: false
|
||||
Reference in New Issue
Block a user