Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| befff7acd9 | |||
|
|
abd35f858c | ||
|
|
825b1a0a00 | ||
|
|
e10ee7f801 |
211
CHANGELOG.md
211
CHANGELOG.md
@@ -1,225 +1,58 @@
|
|||||||
## Version 1.12.0
|
## Version 1.12.4
|
||||||
|
|
||||||
### Удалено
|
Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами
|
||||||
|
|
||||||
#### account
|
### Добавлено
|
||||||
|
|
||||||
|
#### audit
|
||||||
| Идентификатор<br>задачи | Описание |
|
| Идентификатор<br>задачи | Описание |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| BGOS-450 | Метод `AddZone` и структура запроса `AddZoneRequest` в cloudbroker/account |
|
| BGOS-621 | Метод `List` в структура запроса `ListRequest` в cloudapi/audit |
|
||||||
| BGOS-451 | Метод `RemoveZone` и структура запроса `RemoveZoneRequest` в cloudbroker/account |
|
| BGOS-621 | Опциональные поля `RGID`, `ComputeID`, `AccountID`, `VINSID`, `ServiceID`, `K8SID`, `FLIPGroupID`, `LBID`, `SEPID`, `NodeID`, `ExcludeAuditLines` в структуру запроса `ListRequest` в cloudbroker/audit |
|
||||||
| BGOS-459 | Опциональные поля `ZoneIDs` и `DefaultZoneID` в структуру ответа `RecordAccount` в cloudapi/account и в структуру ответа `InfoAccount` в cloudbroker/account, опциональное поле `DefaultZoneID` в структуру запроса `UpdateRequest` в cloudapi/account и cloudbroker/account и опциональные поля `ZoneIDs` и `DefaultZoneID` в структуру запроса `CreateRequest` в cloudbroker/account |
|
|
||||||
| BGOS-478 | Опциональное поле `Emails` в структуру `ACL` входящую в структуру ответа `RecordAccount` в cloudbroker/account |
|
|
||||||
| BGOS-495 | Поле `AccountID` в структуру ответа `RecordLB` в cloudapi/lb и cloudbroker/lb |
|
|
||||||
| BGOS-528 | Значение `trunk` для поля `ComputeFeatures` в cloudbroker/account |
|
|
||||||
|
|
||||||
#### bservice
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-361 | Добавлена группа ручек `bservice` в cloudbroker |
|
|
||||||
| BGOS-448 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/bservice |
|
|
||||||
| BGOS-456 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/bservice |
|
|
||||||
| BGOS-460 | Опциональное поле `ZoneId` в структуру запроса `CreateRequest` и в структуры ответа `RecordBasicService` и `ItemBasicService` в cloudapi/bservice и опциональное поле `ZoneID` в структуру запроса `CreateRequest` и в структуры ответа `RecordBasicService` и `ItemBasicService` в cloudbroker/bservice |
|
|
||||||
|
|
||||||
#### compute
|
#### compute
|
||||||
| Идентификатор<br>задачи | Описание |
|
| Идентификатор<br>задачи | Описание |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| BGOS-445 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/compute |
|
| BGOS-613 | Поля `UpdatedTime`, `DeletedBy`, `DeviceName`, `CreatedBy` в структуру ответа `ItemComputeDisk` в cloudapi/compute и в структуру ответа `ItemDisk` в cloudbroker/compute |
|
||||||
| BGOS-453 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/compute |
|
| BGOS-613 | Поле `LoaderMetaIso` в структуру ответа `RecordCompute` и структура `LoaderMetaIso` в cloudapi/compute и в cloudbroker/compute |
|
||||||
| BGOS-461 | Поле `ZoneID` в структуры ответа `RecordCompute` и `ItemComputeDisk` в cloudapi/compute и поле `ZoneID` в структуры ответа `RecordCompute` и `InfoCompute` в cloudbroker/compute |
|
| BGOS-616 | Опциональные поля `PCISlot` и `BusNumber` в структуры запросов `DiskAdd` и `DiskAttach` в cloudapi/compute и cloudbroker/compute |
|
||||||
| BGOS-491 | Методы `AbortSharedSnapshotMerge` и `SharedSnapshotMergeStatus` и структуры запроса `AbortSharedSnapshotMergeRequest` и `SharedSnapshotMergeStatusRequest` в cloudapi/compute и cloudbroker/compute |
|
| BGOS-619 | Методы `StartMigrationOut` и `StopMigrationOut` и структуры запросов `StartMigrationOutRequest` и `StopMigrationOutRequest` в cloudbroker/compute |
|
||||||
| BGOS-493 | Метод `GuestAgentDisable` и структура запроса `GuestAgentDisableRequest` в cloudapi/compute и в cloudbroker/compute|
|
| BGOS-619 | Структура `OSUser` в структуру запроса `StopMigrationINRequest` в cloudbroker/compute |
|
||||||
| BGOS-493 | Метод `GuestAgentEnable` и структура запроса `GuestAgentEnableRequest` в cloudapi/compute и в cloudbroker/compute|
|
|
||||||
| BGOS-493 | Метод `GuestAgentExecuteRequest` и структура запроса `GuestAgentExecuteRequest` в cloudapi/compute и в cloudbroker/compute|
|
|
||||||
| BGOS-493 | Метод `GuestAgentFeatureUpdateRequest` и структура запроса `GuestAgentFeatureUpdateRequest` в cloudapi/compute и в cloudbroker/compute|
|
|
||||||
| BGOS-493 | Метод `GuestAgentFeatureGetRequest` и структура запроса `GuestAgentFeatureGetRequest` в cloudapi/compute и в cloudbroker/compute|
|
|
||||||
| BGOS-497 | Метод `AsyncMigrate` в cloudbroker/compute |
|
|
||||||
| BGOS-505 | Поддержка NetType `SDN` и `TRUNK` структурах запросов `Interface` и `NetAttachRequest` в cloudapi/compute и cloudbroker/compute |
|
|
||||||
| BGOS-505 | Опциональное поле `SDNInterfaceID` в структуру запроса `Interface` в cloudapi/compute и cloudbroker/compute |
|
|
||||||
| BGOS-506 | Поле `SDNInterfaceID` в структуру ответа `ItemVNFInterface` в cloudapi/compute|
|
|
||||||
| BGOS-506 | Поле `SDNInterfaceID` в структуру ответа `ItemInterface` в cloudbroker/compute |
|
|
||||||
| BGOS-510 | Поддержка NetType `EMPTY` структурах запросов `NetAttachRequest` в cloudapi/compute и cloudbroker/compute |
|
|
||||||
| BGOS-535 | Метод `ChangeMTU` и структура запроса `ChangeMTURequest` в cloudapi/compute и cloudbroker/compute |
|
|
||||||
| BGOS-509 | Опциональное поле `SDNInterfaceID` в структуру запроса `NetAttachRequest` в cloudapi/compute и cloudbroker/compute |
|
|
||||||
| BGOS-543 | Поля `LiveMigrationJobID` и `QemuQuest` и структура ответа `QemuQuest` в структуры ответа `ItemCompute`, `RecordCompute` в cloudapi/compute и `RecordCompute`, `InfoCompute` в cloudbroker/compute |
|
|
||||||
|
|
||||||
#### extnet
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-452 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/extnet |
|
|
||||||
| BGOS-462 | Поле `ZoneID` в структуру ответа `RecordExtNet` в cloudapi/extnet и поле `ZoneID` в структуры ответа `RecordExtNet` и `ItemExtNet` в cloudbroker/extnet |
|
|
||||||
| BGOS-462 | Опциональное поле `ZoneID` в структуру запроса `CreateRequest` в cloudbroker/extnet |
|
|
||||||
| BGOS-534 | Опциональное поле `MTU` в структуры запроса `CreateRequest` и `UpdateRequest` в cloudbroker/extnet |
|
|
||||||
| BGOS-534 | Поле `MTU` в структуру ответа `RecordExtNet` в cloudapi/extnet и в структуры ответа `ItemExtNet` и `RecordExtNet` в cloudbroker/extnet |
|
|
||||||
| BGOS-530 | Метод `SetHAMode` и структура запроса `SetHAModeRequest` в cloudbroker/extnet |
|
|
||||||
| BGOS-531 | Опциональные поля `PriVNFDevIP`, `SecVNFDevIP` и `HAMode` в структуру запроса `CreateRequest` в cloudbroker/extnet |
|
|
||||||
| BGOS-531 | Опциональное поле `Device` в структуру запроса `DeviceMigrateRequest` в cloudbroker/extnet |
|
|
||||||
| BGOS-531 | Поля `SecVNFDevID` и `Redundant` в структуры ответа `ItemExtNet` и `RecordExtNet` в cloudbroker/extnet |
|
|
||||||
| BGOS-531 | Поля `SecVNFDevID` и `Redundant` в структуру ответа `RecordExtNet` в cloudapi/extnet |
|
|
||||||
| BGOS-544 | Поле `PreReservations` в структуру ответа `RecordExtNet` в cloudapi/extnet и cloudbroker/extnet |
|
|
||||||
|
|
||||||
#### grid
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-549 | Поля `NetworkModes`, `SDNSupport` в структуры ответа `ItemGridList` и `RecordGrid` в cloudbroker/grid |
|
|
||||||
|
|
||||||
#### image
|
#### image
|
||||||
| Идентификатор<br>задачи | Описание |
|
| Идентификатор<br>задачи | Описание |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| BGOS-481 | Метод `AsyncCreate` в cloudapi/image |
|
| BGOS-614 | Поле `StoragePolicyID` в структуру ответа `ItemImage` в cloudapi/image |
|
||||||
|
| BGOS-617 | Опциональное поле `StoragePolicyID` в структуры запроса `ListRequest` в cloudapi/image и cloudbroker/image |
|
||||||
#### k8s
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-449 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/k8s |
|
|
||||||
| BGOS-463 | Поле `ZoneID` в структуры ответа `RecordK8S` и `ItemK8SCluster` в cloudapi/k8s и поле `ZoneID` в структуры ответа `RecordK8S` и `ItemK8S` в cloudbroker/k8s |
|
|
||||||
| BGOS-463 | Опциональное поле `ZoneID` в структуру запроса `CreateRequest` в cloudapi/k8s и в cloudbroker/k8s |
|
|
||||||
| BGOS-457 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/k8s |
|
|
||||||
|
|
||||||
#### kvmx86
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-466 | Опциональное поле `ZoneID` в структуры запроса `CreateRequest` и `CreateBlankRequest` в cloudapi/kvmx86 и в структуры запроса `CreateRequest`, `CreateBlankRequest` и `MassCreateRequest` в cloudbroker/kvmx86 |
|
|
||||||
|
|
||||||
#### lb
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-447 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/lb |
|
|
||||||
| BGOS-455 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/lb |
|
|
||||||
| BGOS-464 | Поле `ZoneID` в структуру ответа `RecordLB` в cloudapi/lb и поле `ZoneID` в структуры ответа `RecordLB` и `ItemLBList` в cloudbroker/lb |
|
|
||||||
| BGOS-464 | Опциональное поле `ZoneID` в структуру запроса `CreateRequest` в cloudapi/lb и в cloudbroker/lb |
|
|
||||||
|
|
||||||
#### locations
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-546 | Поле `NetworkModes` в структуре ответа `ItemLocation` в cloudapi/locations |
|
|
||||||
| BGOS-546 | Метод `ListGet` в cloudapi/locations |
|
|
||||||
|
|
||||||
#### node
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-484 | Новое значение `is_powered` в поле `action` в структуре запроса `ApplyIpmiActionRequest` в cloudbroker/node |
|
|
||||||
| BGOS-547 | Поля `SDNHypervisorName` и `ZoneID` в структуру ответа `ItemNode` и поле `ZoneID` в структуру ответа `RecordNode` в cloudbroker/node |
|
|
||||||
|
|
||||||
#### rg
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-504 | Поле `SDNAccessGroupID` в структуру запроса `CreateRequest` в cloudapi/rg и cloudbroker/rg |
|
|
||||||
| BGOS-504 | Поле `SDNAccessGroupID` в структуры ответа `RecordResourceGroup`, `ItemResourceGroup` в cloudapi/rg и в структуру ответа `ItemRG` в cloudbroker/rg |
|
|
||||||
| BGOS-528 | Значение `trunk` для поля `ComputeFeatures` в cloudbroker/rg |
|
|
||||||
|
|
||||||
#### trunk
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-527 | Группа ручек `trunk` в cloudapi и в cloudbroker |
|
|
||||||
|
|
||||||
#### vins
|
#### vins
|
||||||
| Идентификатор<br>задачи | Описание |
|
| Идентификатор<br>задачи | Описание |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| BGOS-446 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudapi/vins |
|
| BGOS-615 | Поле `ZoneID` в структуры ответа `RecordDHCP`, `RecordGW`, `RecordNAT`, `RecordVNFDev` в cloudapi/vins и `InfoVNF` и `VNFDev` в cloudbroker/vins |
|
||||||
| BGOS-454 | Метод `MigrateToZone` и структура запроса `MigrateToZoneRequest` в cloudbroker/vins |
|
| BGOS-615 | Поля `SecGroups`, `EnableSecGroups` в структуру ответа `ItemVNFInterface` в cloudapi/vins и `ItemInterface` в cloudbroker/vins |
|
||||||
| BGOS-465 | Поле `ZoneID` в структуру ответа `RecordVINS` в cloudapi/vins и в структуры ответа `RecordVINS` и `ItemVINS` в cloudbroker/vins |
|
|
||||||
| BGOS-465 | Опциональное поле `ZoneID` в структуры запроса `CreateInRGRequest` и `CreateInAccountRequest` в cloudapi/vins и в cloudbroker/vins |
|
|
||||||
| BGOS-550 | Поле `SDNAccessGroupID` в структуру ответа `ItemVNFInterface` в cloudapi/vins и в структуру ответа `ItemInterface` в cloudbroker/vins |
|
|
||||||
|
|
||||||
#### zone
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-435 | Добавлена группа ручек zone в cloudapi и в cloudbroker |
|
|
||||||
|
|
||||||
#### user
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-494 | Опциональное поле `Provider` в структурe запроса `CreateRequest` в cloudbroker/user |
|
|
||||||
| BGOS-526 | Опциональное поле `Email` в структуру запроса `ListRequest` в cloudbroker/user |
|
|
||||||
| BGOS-502 | Поле `Blocked` в структуру ответа `ItemUser`, методы `Block` и `Unblock` и структуры запроса `BlockRequest` и `UnblockRequest` в cloudbroker/user |
|
|
||||||
|
|
||||||
### Исправлено
|
### Исправлено
|
||||||
|
|
||||||
#### account
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-512 | Исправлено возвращаемое значение с bool на string в методах `Delete` и `Restore` в cloudapi/account и в методах `Delete`, `Restore`, `DeleteAccounts`, `DisableAccounts` и `EnableAccounts` в cloudbroker/account |
|
|
||||||
|
|
||||||
#### bservice
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-483 | Изменен тип параметра `Permanently` на опциональный в структуре `DeleteRequest` в cloudbroker/bservice |
|
|
||||||
|
|
||||||
#### compute
|
#### compute
|
||||||
| Идентификатор<br>задачи | Описание |
|
| Идентификатор<br>задачи | Описание |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| BGOS-433 | Исправлена ошибка валидации поля LoaderType для всех структур в cloudapi/compute и в cloudbroker/compute |
|
| BGOS-619 | Ошибка работы фильтра `SortBy` в методе `MigrateStorageList` в cloudbroker/compute |
|
||||||
| BGOS-458 | Изменен тип параметров `CPUPin`, `HPBacked`, `AutoStart`, `HotResize` с bool на interface в структуре `UpdateRequest` cloudapi/compute и в cloudbroker/compute |
|
|
||||||
| BGOS-503 | Исправлен тип поля `Explicit` cо string на bool в структурах ответа `ItemComputeACL` в cloudbroker/compute |
|
|
||||||
| BGOS-537 | В методе `GetLog` вызов api осуществляется с методом get в cloudapi/compute и в cloudbroker/compute |
|
|
||||||
|
|
||||||
#### disk
|
#### storage policy
|
||||||
| Идентификатор<br>задачи | Описание |
|
| Идентификатор<br>задачи | Описание |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| BGOS-468 | Исправлен тип поля `UpdatedBy` c uint64 на string в структурах ответа `ItemComputeDisk` в cloudapi/compute и `ItemDisk` в cloudbroker/compute |
|
| BGOS-620 | Поле `AccountID` в структуре запроса `ListRequest` стало опциональным в cloudapi/stpolicy |
|
||||||
|
|
||||||
#### extnet
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-548 | В структурах ответа `RecordExtNet` в cloudapi/extnet и cloudbroker/extnet и `ItemExtNet` в cloudbroker/extnet поле `networkID` заменено на поле `networkIDs` |
|
|
||||||
|
|
||||||
#### flipgroup
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-482 | Изменен тип параметра `ClientType` на опциональный в структуре `CreateRequest` в cloudapi/bservice и cloudbroker/bservice |
|
|
||||||
|
|
||||||
#### image
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-481 | Метод `SyncCreate` заменен на метод `AsyncCreateImage` со структурой запроса `CreateRequest` в cloudbroker/image |
|
|
||||||
|
|
||||||
#### lb
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-538 | Изменен тип поля `SysctlParams` в структурах ответа `RecordLB` и `ItemLBList` в cloudapi/lb и cloudbroker/lb |
|
|
||||||
|
|
||||||
#### rg
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-540 | Тип возвращаемого значения методов `MassEnable`, `MassDisable`, `MassDelete` с bool на string в cloudbroker/rg |
|
|
||||||
|
|
||||||
### Удалено
|
### Удалено
|
||||||
|
|
||||||
#### account
|
#### audit
|
||||||
| Идентификатор<br>задачи | Описание |
|
| Идентификатор<br>задачи | Описание |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| BGOS-541 | Опциональное поле `Reason` в структуре запроса `DisableEnableRequest` в cloudapi/account |
|
| BGOS-621 | Поле `Tags` в структуре ответа `ItemAudit` в cloudbroker/audit |
|
||||||
| BGOS-541 | Опциональное поле `Reason` в структурах запроса `DeleteRequest`, `DisableRequest`, `DisableAccountsRequest`, `RestoreRequest` в cloudbroker/account |
|
|
||||||
|
|
||||||
#### compute
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-536 | Поля `Order` и `VMID` в структуре ответа `ItemComputeDisk` в cloudapi/compute и в структуре ответа `ItemDisk` в cloudbroker/compute |
|
|
||||||
| BGOS-551 | Значение `SVA_KVM_X86` в поле `Driver` в структурах запроса `CreateRequest` и `CreateBlankRequest` в cloudapi/compute |
|
|
||||||
|
|
||||||
#### disks
|
#### disks
|
||||||
| Идентификатор<br>задачи | Описание |
|
| Идентификатор<br>задачи | Описание |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| BGOS-480 | Опциональное поле `Architecture` в структурах запроса `FromPlatformDiskRequest` в cloudapi/disks и в cloudbroker/disks |
|
| BGOS-618 | Поле `IOPS` из структуры запроса `CreateRequest` в cloudapi/disks и в cloudbroker/disks |
|
||||||
|
|
||||||
#### extnet
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-531 | Опциональное поле `VNFDevIP` в структуре запроса `CreateRequest` в cloudbroker/extnet |
|
|
||||||
|
|
||||||
#### image
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-480 | Опциональное поле `Architecture` в структурах запроса `CreateRequest`, `ListRequest` в cloudapi/image и `CreateRequest`, `ListRequest`, `CreateCDROMImageRequest` в cloudbroker/image |
|
|
||||||
| BGOS-489 | Поле `Meta` в структуре ответа `ItemListStacks` в cloudbroker/image |
|
|
||||||
|
|
||||||
#### tasks
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-500 | Опциональное поле `GUID` в структурах ответа `ItemAsyncTask` в cloudapi/tasks и `ItemTask` в cloudbroker/tasks |
|
|
||||||
|
|
||||||
#### user
|
|
||||||
| Идентификатор<br>задачи | Описание |
|
|
||||||
| --- | --- |
|
|
||||||
| BGOS-494 | Опциональное поле `Groups` в структурe запроса `CreateRequest` в cloudbroker/user |
|
|
||||||
|
|
||||||
|
|||||||
33
README.md
33
README.md
@@ -97,6 +97,7 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
|
|||||||
|
|
||||||
- `cloudapi` - пользовательская группа, которая позволяет воспользоваться всем стардартным функционалом платформы;
|
- `cloudapi` - пользовательская группа, которая позволяет воспользоваться всем стардартным функционалом платформы;
|
||||||
- `cloudbroker` - административная группа, которая позволяет воспользоваться всем стандартным функционалом платформы и расширенными возможностями, включающими в себя управление пользователями, ресурсами, платформами размещения ресурсов и т.д.
|
- `cloudbroker` - административная группа, которая позволяет воспользоваться всем стандартным функционалом платформы и расширенными возможностями, включающими в себя управление пользователями, ресурсами, платформами размещения ресурсов и т.д.
|
||||||
|
- `sdn` - группа для работы с SDN;
|
||||||
|
|
||||||
### Cloudapi
|
### Cloudapi
|
||||||
|
|
||||||
@@ -119,9 +120,12 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
|
|||||||
- `Locations` - получение информации о grid площадки;
|
- `Locations` - получение информации о grid площадки;
|
||||||
- `Prometheus` - получение статистики prometheus;
|
- `Prometheus` - получение статистики prometheus;
|
||||||
- `RG` - управление ресурсными группами аккаунта;
|
- `RG` - управление ресурсными группами аккаунта;
|
||||||
|
- `Security group` – управление группами безопасности;
|
||||||
- `SEP` - управление storage endpoint (sep);
|
- `SEP` - управление storage endpoint (sep);
|
||||||
- `Stack` - получение информации о вычислительных узлах;
|
- `Stack` - получение информации о вычислительных узлах;
|
||||||
|
- `Storage policy` – получение информации о политиках хранения;
|
||||||
- `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
|
- `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
|
||||||
|
- `Trunk` - получение информации о транковых портах;
|
||||||
- `VFPool` - управление пулом виртуальных сетевых функций;
|
- `VFPool` - управление пулом виртуальных сетевых функций;
|
||||||
- `VINS` - управление виртуальными изолированными сетями;
|
- `VINS` - управление виртуальными изолированными сетями;
|
||||||
- `Zone` - управление зонами.
|
- `Zone` - управление зонами.
|
||||||
@@ -153,15 +157,25 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
|
|||||||
- `Prometheus` - получение статистики prometheus;
|
- `Prometheus` - получение статистики prometheus;
|
||||||
- `Resmon` - получение статистики resource monitoring;
|
- `Resmon` - получение статистики resource monitoring;
|
||||||
- `RG` - управление ресурсными группами аккаунта;
|
- `RG` - управление ресурсными группами аккаунта;
|
||||||
|
- `Security group` – управление группами безопасности;
|
||||||
- `SEP` - управление storage endpoint (sep);
|
- `SEP` - управление storage endpoint (sep);
|
||||||
- `Stack` - получение информации о вычислительных узлах;
|
- `Stack` - получение информации о вычислительных узлах;
|
||||||
|
- `Storage policy` – управление политиками хранения;
|
||||||
- `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
|
- `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
|
||||||
|
- `Trunk` - управление транковыми портами;
|
||||||
- `User` - управление пользователями (индивидуально);
|
- `User` - управление пользователями (индивидуально);
|
||||||
- `VGPU` - управление виртуальными графическими процессорами;
|
- `VGPU` - управление виртуальными графическими процессорами;
|
||||||
- `VFPool` - управление пулом виртуальных сетевых функций;
|
- `VFPool` - управление пулом виртуальных сетевых функций;
|
||||||
- `VINS` - управление виртуальными изолированными сетями.
|
- `VINS` - управление виртуальными изолированными сетями.
|
||||||
- `Zone` - управление зонами.
|
- `Zone` - управление зонами.
|
||||||
|
|
||||||
|
### SDN
|
||||||
|
|
||||||
|
`SDN` позволяет выполнять запросы к группе пользовательских конечных точек
|
||||||
|
Данная группа ручек позволяет выполнять следующие операции в платформе:
|
||||||
|
|
||||||
|
- `AccessGroup` - управление группами доступа
|
||||||
|
|
||||||
## Работа с библиотекой
|
## Работа с библиотекой
|
||||||
|
|
||||||
Алгоритм работы с библиотекой выглядит следующим образом:
|
Алгоритм работы с библиотекой выглядит следующим образом:
|
||||||
@@ -288,6 +302,7 @@ func main() {
|
|||||||
|
|
||||||
- `pkg/cloudapi` - для `cloudapi`
|
- `pkg/cloudapi` - для `cloudapi`
|
||||||
- `pkg/cloudbroker` - для `cloudbroker`
|
- `pkg/cloudbroker` - для `cloudbroker`
|
||||||
|
- `pkg/sdn` - для `sdn`
|
||||||
|
|
||||||
В каждом пакете находятся пакеты групп API:
|
В каждом пакете находятся пакеты групп API:
|
||||||
|
|
||||||
@@ -308,8 +323,10 @@ func main() {
|
|||||||
- `pkg/cloudapi/locations` - для `Locations`
|
- `pkg/cloudapi/locations` - для `Locations`
|
||||||
- `pkg/cloudapi/prometheus` - для `Prometheus`
|
- `pkg/cloudapi/prometheus` - для `Prometheus`
|
||||||
- `pkg/cloudapi/rg` - для `RG`
|
- `pkg/cloudapi/rg` - для `RG`
|
||||||
|
- `pkg/cloudapi/secgroup` - для `Security group`
|
||||||
- `pkg/cloudapi/sep` - для `SEP`
|
- `pkg/cloudapi/sep` - для `SEP`
|
||||||
- `pkg/cloudapi/stack` - для `Stack`
|
- `pkg/cloudapi/stack` - для `Stack`
|
||||||
|
- `pkg/cloudapi/stpolicy` - для `Storage policy`
|
||||||
- `pkg/cloudapi/tasks` - для `Tasks`
|
- `pkg/cloudapi/tasks` - для `Tasks`
|
||||||
- `pkg/cloudapi/trunk` - для `Trunk`
|
- `pkg/cloudapi/trunk` - для `Trunk`
|
||||||
- `pkg/cloudapi/vfpool` - для `VFPool`
|
- `pkg/cloudapi/vfpool` - для `VFPool`
|
||||||
@@ -338,15 +355,19 @@ func main() {
|
|||||||
- `pkg/cloudbroker/prometheus` - для `Prometheus`
|
- `pkg/cloudbroker/prometheus` - для `Prometheus`
|
||||||
- `pkg/cloudbroker/resmon` - для `Resmon`
|
- `pkg/cloudbroker/resmon` - для `Resmon`
|
||||||
- `pkg/cloudbroker/rg` - для `RG`
|
- `pkg/cloudbroker/rg` - для `RG`
|
||||||
|
- `pkg/cloudbroker/secgroup` - для `Security group`
|
||||||
- `pkg/cloudbroker/sep` - для `SEP`
|
- `pkg/cloudbroker/sep` - для `SEP`
|
||||||
- `pkg/cloudbroker/stack` - для `Stack`
|
- `pkg/cloudbroker/stack` - для `Stack`
|
||||||
|
- `pkg/cloudbroker/stpolicy` - для `Storage policy`
|
||||||
- `pkg/cloudbroker/tasks` - для `Tasks`
|
- `pkg/cloudbroker/tasks` - для `Tasks`
|
||||||
- `pkg/cloudbroker/trunk` - для `Trunk`
|
- `pkg/cloudbroker/trunk` - для `Trunk`
|
||||||
- `pkg/cloudbroker/user` - для `User`
|
- `pkg/cloudbroker/user` - для `User`
|
||||||
- `pkg/cloudbroker/vgpu` - для `VGPU`
|
- `pkg/cloudbroker/vgpu` - для `VGPU`
|
||||||
- `pkg/cloudbroker/vfpool` - для `VFPool`
|
- `pkg/cloudbroker/vfpool` - для `VFPool`
|
||||||
- `pkg/cloudbroker/vins` - для `VINS`
|
- `pkg/cloudbroker/vins` - для `VINS`
|
||||||
- `pkg/cloudapi/zone` - для `Zone`
|
- `pkg/cloudbroker/zone` - для `Zone`
|
||||||
|
- **sdn**:
|
||||||
|
- `pkg/sdn/access_groups` - для `AccessGroups`
|
||||||
|
|
||||||
Все поля структуры имеют описание, в которых содержится:
|
Все поля структуры имеют описание, в которых содержится:
|
||||||
|
|
||||||
@@ -480,7 +501,7 @@ func main() {
|
|||||||
|
|
||||||
Чтобы выполнить запрос, необходимо:
|
Чтобы выполнить запрос, необходимо:
|
||||||
|
|
||||||
1. Вызвать у клиента метод, отвечаеющий за определение группы API для взаимодействия, это может быть `.CloudAPI()`, либо `.CloudBroker()`. Данные методы возвращаеют соответствующие структуры, с помощью которых можно совершать запросы.
|
1. Вызвать у клиента метод, отвечающий за определение группы API для взаимодействия, это может быть `.CloudAPI()`, `.CloudBroker()` или `.SDN()`. Данные методы возвращают соответствующие структуры, с помощью которых можно совершать запросы.
|
||||||
2. Вызвать у возвращенной структуры метод, определяющий группу ручек для взаимодействия.
|
2. Вызвать у возвращенной структуры метод, определяющий группу ручек для взаимодействия.
|
||||||
|
|
||||||
Доступные методы для `.CloudAPI()`:
|
Доступные методы для `.CloudAPI()`:
|
||||||
@@ -501,8 +522,10 @@ func main() {
|
|||||||
- `.Locations()` - для работы с `Locations`
|
- `.Locations()` - для работы с `Locations`
|
||||||
- `.Prometheus()` - для работы с `Prometheus`
|
- `.Prometheus()` - для работы с `Prometheus`
|
||||||
- `.RG()` - для работы с `RG`
|
- `.RG()` - для работы с `RG`
|
||||||
|
- `.SecurityGroup()` - для работы с `Security Group`
|
||||||
- `.SEP()` - для работы с `SEP`
|
- `.SEP()` - для работы с `SEP`
|
||||||
- `.Stack()` - для работы с `Stack`
|
- `.Stack()` - для работы с `Stack`
|
||||||
|
- `.StPolicy()` - для работы с `Storage Policy`
|
||||||
- `.Tasks()` - для работы с `Tasks`
|
- `.Tasks()` - для работы с `Tasks`
|
||||||
- `.Trunk()` - для работы с `Trunk`
|
- `.Trunk()` - для работы с `Trunk`
|
||||||
- `.VFPool()` - для работы с `VFPool`
|
- `.VFPool()` - для работы с `VFPool`
|
||||||
@@ -533,8 +556,10 @@ func main() {
|
|||||||
- `.Prometheus()` - для работы с `Prometheus`
|
- `.Prometheus()` - для работы с `Prometheus`
|
||||||
- `.Resmon()` - для работы с `Resmon`
|
- `.Resmon()` - для работы с `Resmon`
|
||||||
- `.RG()` - для работы с `RG`
|
- `.RG()` - для работы с `RG`
|
||||||
|
- `.SecurityGroup()` - для работы с `Security Group`
|
||||||
- `.SEP()` - для работы с `SEP`
|
- `.SEP()` - для работы с `SEP`
|
||||||
- `.Stack()` - для работы с `Stack`
|
- `.Stack()` - для работы с `Stack`
|
||||||
|
- `.StPolicy()` - для работы с `Storage Policy`
|
||||||
- `.Tasks()` - для работы с `Tasks`
|
- `.Tasks()` - для работы с `Tasks`
|
||||||
- `.Trunk()` - для работы с `Trunk`
|
- `.Trunk()` - для работы с `Trunk`
|
||||||
- `.User()` - для работы с `User`
|
- `.User()` - для работы с `User`
|
||||||
@@ -543,6 +568,10 @@ func main() {
|
|||||||
- `.VINS()` - для работы с `VINS`
|
- `.VINS()` - для работы с `VINS`
|
||||||
- `.Zone()` - для работы с `Zone`
|
- `.Zone()` - для работы с `Zone`
|
||||||
|
|
||||||
|
Доступные методы для `.SDN()`:
|
||||||
|
|
||||||
|
- `.AccessGroup()` - для работы с `AccessGroup`
|
||||||
|
|
||||||
3. Вызвать метод, отвечающий за выполнение запроса и передать в него:
|
3. Вызвать метод, отвечающий за выполнение запроса и передать в него:
|
||||||
|
|
||||||
- контекст;
|
- контекст;
|
||||||
|
|||||||
92
client.go
92
client.go
@@ -4,6 +4,7 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
@@ -21,6 +22,7 @@ import (
|
|||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
|
||||||
)
|
)
|
||||||
|
|
||||||
// DecortClient is HTTP-client for platform
|
// DecortClient is HTTP-client for platform
|
||||||
@@ -38,12 +40,6 @@ func New(cfg config.Config) *DecortClient {
|
|||||||
cfg.Retries = 5
|
cfg.Retries = 5
|
||||||
}
|
}
|
||||||
|
|
||||||
var expiryTime time.Time
|
|
||||||
|
|
||||||
if cfg.Token != "" {
|
|
||||||
expiryTime = time.Now().AddDate(0, 0, 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
return &DecortClient{
|
return &DecortClient{
|
||||||
decortURL: cfg.DecortURL,
|
decortURL: cfg.DecortURL,
|
||||||
client: &http.Client{
|
client: &http.Client{
|
||||||
@@ -54,9 +50,8 @@ func New(cfg config.Config) *DecortClient {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
cfg: trimConfig(&cfg),
|
cfg: trimConfig(&cfg),
|
||||||
expiryTime: expiryTime,
|
mutex: &sync.Mutex{},
|
||||||
mutex: &sync.Mutex{},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,6 +65,11 @@ func (dc *DecortClient) CloudBroker() *cloudbroker.CloudBroker {
|
|||||||
return cloudbroker.New(dc)
|
return cloudbroker.New(dc)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SDN builder
|
||||||
|
func (dc *DecortClient) SDN() *sdn.SDN {
|
||||||
|
return sdn.New(dc)
|
||||||
|
}
|
||||||
|
|
||||||
// DecortApiCall method for sending requests to the platform
|
// DecortApiCall method for sending requests to the platform
|
||||||
func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
|
func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
|
||||||
|
|
||||||
@@ -107,6 +107,47 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
|
|||||||
return respBytes, err
|
return respBytes, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DecortApiCallCtype method for sending requests to the platform with content type
|
||||||
|
func (dc *DecortClient) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error) {
|
||||||
|
|
||||||
|
var body *bytes.Buffer
|
||||||
|
|
||||||
|
switch ctype {
|
||||||
|
case constants.MIMESTREAM:
|
||||||
|
body = bytes.NewBuffer(params.([]byte))
|
||||||
|
case constants.MIMEJSON:
|
||||||
|
jsonBody, err := json.Marshal(params)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
body = bytes.NewBuffer(jsonBody)
|
||||||
|
default:
|
||||||
|
ctype = constants.MIMEPOSTForm
|
||||||
|
values, err := query.Values(params)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
body = bytes.NewBufferString(values.Encode())
|
||||||
|
}
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+constants.RESTMACHINE+url, body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// get token
|
||||||
|
if err = dc.getToken(ctx); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// perform request
|
||||||
|
respBytes, err := dc.do(req, ctype)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return respBytes, err
|
||||||
|
}
|
||||||
|
|
||||||
// DecortApiCallMP method for sending requests to the platform
|
// DecortApiCallMP method for sending requests to the platform
|
||||||
func (dc *DecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
|
func (dc *DecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
|
||||||
body, ctype, err := multiPartReq(params)
|
body, ctype, err := multiPartReq(params)
|
||||||
@@ -170,8 +211,13 @@ func (dc *DecortClient) getToken(ctx context.Context) error {
|
|||||||
|
|
||||||
// save token in config
|
// save token in config
|
||||||
token := string(tokenBytes)
|
token := string(tokenBytes)
|
||||||
|
expiryTime, err := getTokenExp(token)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("cannot get expiry time: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
dc.cfg.Token = token
|
dc.cfg.Token = token
|
||||||
dc.expiryTime = time.Now().AddDate(0, 0, 1)
|
dc.expiryTime = expiryTime
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -375,3 +421,29 @@ func trimConfig(cfg *config.Config) config.Config {
|
|||||||
cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
|
cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
|
||||||
return *cfg
|
return *cfg
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getTokenExp(token string) (time.Time, error) {
|
||||||
|
parts := strings.Split(token, ".")
|
||||||
|
if len(parts) != 3 {
|
||||||
|
return time.Time{}, fmt.Errorf("invalid token format")
|
||||||
|
}
|
||||||
|
|
||||||
|
payload, err := base64.RawURLEncoding.DecodeString(parts[1])
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}, fmt.Errorf("error decode payload from token: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var claims map[string]interface{}
|
||||||
|
if err := json.Unmarshal(payload, &claims); err != nil {
|
||||||
|
return time.Time{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
exp, ok := claims["exp"]
|
||||||
|
if !ok {
|
||||||
|
return time.Time{}, fmt.Errorf("exp time bot found")
|
||||||
|
}
|
||||||
|
|
||||||
|
expTime := time.Unix(int64(exp.(float64)), 0)
|
||||||
|
|
||||||
|
return expTime, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -131,6 +131,72 @@ func (bdc *BVSDecortClient) DecortApiCall(ctx context.Context, method, url strin
|
|||||||
return respBytes, err
|
return respBytes, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DecortApiCallCtype method for sending requests to the platform with content type
|
||||||
|
func (bdc *BVSDecortClient) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error) {
|
||||||
|
var body *bytes.Buffer
|
||||||
|
|
||||||
|
switch ctype {
|
||||||
|
case constants.MIMESTREAM:
|
||||||
|
body = bytes.NewBuffer(params.([]byte))
|
||||||
|
case constants.MIMEJSON:
|
||||||
|
jsonBody, err := json.Marshal(params)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
body = bytes.NewBuffer(jsonBody)
|
||||||
|
default:
|
||||||
|
ctype = constants.MIMEPOSTForm
|
||||||
|
values, err := query.Values(params)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
body = bytes.NewBufferString(values.Encode())
|
||||||
|
}
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, method, bdc.decortURL+constants.RESTMACHINE+url, body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// get token
|
||||||
|
if bdc.cfg.Token.AccessToken == "" {
|
||||||
|
if _, err = bdc.GetToken(ctx); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// refresh token
|
||||||
|
if bdc.cfg.Token.RefreshToken != "" && bdc.cfg.Token.Expiry.Add(-time.Duration(bdc.cfg.TimeToRefresh)*time.Minute).Before(time.Now()) {
|
||||||
|
if _, err := bdc.RefreshToken(ctx); err != nil {
|
||||||
|
if _, err = bdc.GetToken(ctx); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// perform request
|
||||||
|
reqCopy := req.Clone(ctx)
|
||||||
|
respBytes, err := bdc.do(req, ctype)
|
||||||
|
if err == nil {
|
||||||
|
return respBytes, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// get token and retry in case of access denied
|
||||||
|
if err.Error() == "access is denied" {
|
||||||
|
_, err = bdc.GetToken(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
respBytes, err = bdc.do(reqCopy, "")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return respBytes, err
|
||||||
|
}
|
||||||
|
|
||||||
func (bdc *BVSDecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
|
func (bdc *BVSDecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
|
||||||
body, ctype, err := multiPartReq(params)
|
body, ctype, err := multiPartReq(params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -7,6 +7,9 @@ type Caller interface {
|
|||||||
// DecortApiCall method for sending requests to the platform
|
// DecortApiCall method for sending requests to the platform
|
||||||
DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error)
|
DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error)
|
||||||
|
|
||||||
|
// DecortApiCallCtype method for sending requests to the platform
|
||||||
|
DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error)
|
||||||
|
|
||||||
// DecortApiCallMP method for sending requests to the platform
|
// DecortApiCallMP method for sending requests to the platform
|
||||||
DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error)
|
DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,9 +2,23 @@ package constants
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
RESTMACHINE = "/restmachine"
|
RESTMACHINE = "/restmachine"
|
||||||
|
)
|
||||||
|
|
||||||
// RAM_DIVISIBILITY sets divisibility of RAM value
|
const (
|
||||||
RAM_DIVISIBILITY uint64 = 128
|
MIMEJSON = "application/json"
|
||||||
|
MIMEHTML = "text/html"
|
||||||
|
MIMEXML = "application/xml"
|
||||||
|
MIMEXML2 = "text/xml"
|
||||||
|
MIMEPlain = "text/plain"
|
||||||
|
MIMEPOSTForm = "application/x-www-form-urlencoded"
|
||||||
|
MIMEMultipartPOSTForm = "multipart/form-data"
|
||||||
|
MIMEPROTOBUF = "application/x-protobuf"
|
||||||
|
MIMEMSGPACK = "application/x-msgpack"
|
||||||
|
MIMEMSGPACK2 = "application/msgpack"
|
||||||
|
MIMEYAML = "application/x-yaml"
|
||||||
|
MIMEYAML2 = "application/yaml"
|
||||||
|
MIMETOML = "application/toml"
|
||||||
|
MIMESTREAM = "application/octet-stream"
|
||||||
)
|
)
|
||||||
|
|
||||||
var FileName = map[string]string{
|
var FileName = map[string]string{
|
||||||
|
|||||||
@@ -14,13 +14,6 @@ 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 create.
|
|
||||||
func computeDriverValidator(fe validator.FieldLevel) bool {
|
|
||||||
fieldValue := fe.Field().String()
|
|
||||||
|
|
||||||
return IsInSlice(fieldValue, computeDriverValues)
|
|
||||||
}
|
|
||||||
|
|
||||||
// protoValidator is used to validate Proto fields.
|
// protoValidator is used to validate Proto fields.
|
||||||
func protoValidator(fe validator.FieldLevel) bool {
|
func protoValidator(fe validator.FieldLevel) bool {
|
||||||
fieldValue := fe.Field().String()
|
fieldValue := fe.Field().String()
|
||||||
@@ -58,13 +51,6 @@ func resTypesValidator(fe validator.FieldLevel) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// driverValidator is used to validate Driver fields.
|
|
||||||
func driverValidator(fe validator.FieldLevel) bool {
|
|
||||||
fieldValue := fe.Field().String()
|
|
||||||
|
|
||||||
return IsInSlice(fieldValue, driverValues)
|
|
||||||
}
|
|
||||||
|
|
||||||
// accountCUTypeValidator is used to validate CUType field.
|
// accountCUTypeValidator is used to validate CUType field.
|
||||||
func accountCUTypeValidator(fe validator.FieldLevel) bool {
|
func accountCUTypeValidator(fe validator.FieldLevel) bool {
|
||||||
fieldValue := fe.Field().String()
|
fieldValue := fe.Field().String()
|
||||||
@@ -121,6 +107,27 @@ func computex86NetTypeValidator(fe validator.FieldLevel) bool {
|
|||||||
return IsInSlice(fieldValue, computex86NetTypeValues)
|
return IsInSlice(fieldValue, computex86NetTypeValues)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// securityGroupDirectionValidator is used to validate Direction field
|
||||||
|
func securityGroupDirectionValidator(fe validator.FieldLevel) bool {
|
||||||
|
fieldValue := fe.Field().String()
|
||||||
|
|
||||||
|
return IsInSlice(fieldValue, securityGroupDirectionValues)
|
||||||
|
}
|
||||||
|
|
||||||
|
// securityGroupEthertypeValidator is used to validate Ethertype field
|
||||||
|
func securityGroupEthertypeValidator(fe validator.FieldLevel) bool {
|
||||||
|
fieldValue := fe.Field().String()
|
||||||
|
|
||||||
|
return IsInSlice(fieldValue, securityGroupEthertypeValues)
|
||||||
|
}
|
||||||
|
|
||||||
|
// securityGroupProtocolValidator is used to validate Protocol field
|
||||||
|
func securityGroupProtocolValidator(fe validator.FieldLevel) bool {
|
||||||
|
fieldValue := fe.Field().String()
|
||||||
|
|
||||||
|
return IsInSlice(fieldValue, securityGroupProtocolValues)
|
||||||
|
}
|
||||||
|
|
||||||
// computeOrderValidator is used to validate Order field.
|
// computeOrderValidator is used to validate Order field.
|
||||||
func computeOrderValidator(fe validator.FieldLevel) bool {
|
func computeOrderValidator(fe validator.FieldLevel) bool {
|
||||||
fieldSlice, ok := fe.Field().Interface().([]string)
|
fieldSlice, ok := fe.Field().Interface().([]string)
|
||||||
@@ -207,22 +214,6 @@ func imageTypeValidator(fe validator.FieldLevel) bool {
|
|||||||
return IsInSlice(fieldValue, imageTypeValues)
|
return IsInSlice(fieldValue, imageTypeValues)
|
||||||
}
|
}
|
||||||
|
|
||||||
// imageDriversValidator is used to validate Drivers field.
|
|
||||||
func imageDriversValidator(fe validator.FieldLevel) bool {
|
|
||||||
fieldSlice, ok := fe.Field().Interface().([]string)
|
|
||||||
if !ok {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, item := range fieldSlice {
|
|
||||||
if !IsInSlice(item, imageDriversValues) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// imageArchitectureValidator is used to validate Architecture field.
|
// imageArchitectureValidator is used to validate Architecture field.
|
||||||
func imageArchitectureValidator(fe validator.FieldLevel) bool {
|
func imageArchitectureValidator(fe validator.FieldLevel) bool {
|
||||||
fieldValue := fe.Field().String()
|
fieldValue := fe.Field().String()
|
||||||
|
|||||||
@@ -28,12 +28,6 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
case "isBool":
|
case "isBool":
|
||||||
return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
|
return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
|
||||||
|
|
||||||
case "driver":
|
|
||||||
return fmt.Sprintf("%s %s must be one of the following: %s",
|
|
||||||
prefix,
|
|
||||||
fe.Field(),
|
|
||||||
joinValues(driverValues))
|
|
||||||
|
|
||||||
case "accessType":
|
case "accessType":
|
||||||
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,
|
||||||
@@ -128,12 +122,6 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
fe.Field(),
|
fe.Field(),
|
||||||
joinValues(computeDataDisksValues))
|
joinValues(computeDataDisksValues))
|
||||||
|
|
||||||
case "computeDriver":
|
|
||||||
return fmt.Sprintf("%s %s must be one of the following: %s",
|
|
||||||
prefix,
|
|
||||||
fe.Field(),
|
|
||||||
joinValues(computeDriverValues))
|
|
||||||
|
|
||||||
// Disk Validators
|
// Disk Validators
|
||||||
case "diskType":
|
case "diskType":
|
||||||
return fmt.Sprintf("%s %s must be one of the following: %s",
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
@@ -201,12 +189,6 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
fe.Field(),
|
fe.Field(),
|
||||||
joinValues(imageTypeValues))
|
joinValues(imageTypeValues))
|
||||||
|
|
||||||
case "imageDrivers":
|
|
||||||
return fmt.Sprintf("%s %s must contain only the following: %s",
|
|
||||||
prefix,
|
|
||||||
fe.Field(),
|
|
||||||
joinValues(imageDriversValues))
|
|
||||||
|
|
||||||
case "imageArchitecture":
|
case "imageArchitecture":
|
||||||
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,
|
||||||
@@ -341,6 +323,25 @@ func errorMessage(fe validator.FieldError) string {
|
|||||||
fe.Field(),
|
fe.Field(),
|
||||||
joinValues(userProviders))
|
joinValues(userProviders))
|
||||||
|
|
||||||
|
// security group validators
|
||||||
|
case "securityGroupDirection":
|
||||||
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
|
prefix,
|
||||||
|
fe.Field(),
|
||||||
|
joinValues(securityGroupDirectionValues))
|
||||||
|
|
||||||
|
case "securityGroupEthertype":
|
||||||
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
|
prefix,
|
||||||
|
fe.Field(),
|
||||||
|
joinValues(securityGroupEthertypeValues))
|
||||||
|
|
||||||
|
case "securityGroupProtocol":
|
||||||
|
return fmt.Sprintf("%s %s must be one of the following: %s",
|
||||||
|
prefix,
|
||||||
|
fe.Field(),
|
||||||
|
joinValues(securityGroupProtocolValues))
|
||||||
|
|
||||||
// trunk tags validator
|
// trunk tags validator
|
||||||
case "trunkTags":
|
case "trunkTags":
|
||||||
return fmt.Sprintf("%s %s must be in range from 1 to 4095",
|
return fmt.Sprintf("%s %s must be in range from 1 to 4095",
|
||||||
|
|||||||
@@ -31,11 +31,6 @@ func registerAllValidators(validate *validator.Validate) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = validate.RegisterValidation("computeDriver", computeDriverValidator)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = validate.RegisterValidation("apiGroup", apiGroupValidator)
|
err = validate.RegisterValidation("apiGroup", apiGroupValidator)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -51,11 +46,6 @@ func registerAllValidators(validate *validator.Validate) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = validate.RegisterValidation("driver", driverValidator)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = validate.RegisterValidation("imageBootType", imageBootTypeValidator)
|
err = validate.RegisterValidation("imageBootType", imageBootTypeValidator)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -66,11 +56,6 @@ func registerAllValidators(validate *validator.Validate) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = validate.RegisterValidation("imageDrivers", imageDriversValidator)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = validate.RegisterValidation("imageArchitecture", imageArchitectureValidator)
|
err = validate.RegisterValidation("imageArchitecture", imageArchitectureValidator)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -301,5 +286,20 @@ func registerAllValidators(validate *validator.Validate) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = validate.RegisterValidation("securityGroupDirection", securityGroupDirectionValidator)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = validate.RegisterValidation("securityGroupEthertype", securityGroupEthertypeValidator)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = validate.RegisterValidation("securityGroupProtocol", securityGroupProtocolValidator)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package validators
|
|||||||
var (
|
var (
|
||||||
apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
|
apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
|
||||||
|
|
||||||
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"}
|
||||||
@@ -20,7 +19,6 @@ var (
|
|||||||
computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK", "SDN", "EMPTY", "TRUNK"}
|
computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK", "SDN", "EMPTY", "TRUNK"}
|
||||||
computeOrderValues = []string{"cdrom", "network", "hd"}
|
computeOrderValues = []string{"cdrom", "network", "hd"}
|
||||||
computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
|
computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
|
||||||
computeDriverValues = []string{"KVM_X86"}
|
|
||||||
|
|
||||||
diskTypeValues = []string{"B", "T", "D"}
|
diskTypeValues = []string{"B", "T", "D"}
|
||||||
|
|
||||||
@@ -38,7 +36,6 @@ var (
|
|||||||
|
|
||||||
imageBootTypeValues = []string{"uefi", "bios"}
|
imageBootTypeValues = []string{"uefi", "bios"}
|
||||||
imageTypeValues = []string{"windows", "linux", "unknown"}
|
imageTypeValues = []string{"windows", "linux", "unknown"}
|
||||||
imageDriversValues = []string{"KVM_X86"}
|
|
||||||
imageArchitectureValues = []string{"X86_64"}
|
imageArchitectureValues = []string{"X86_64"}
|
||||||
|
|
||||||
sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
|
sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
|
||||||
@@ -76,6 +73,10 @@ var (
|
|||||||
userProviders = []string{"bvs", "decs3o"}
|
userProviders = []string{"bvs", "decs3o"}
|
||||||
|
|
||||||
deviceValues = []string{"primary", "secondary"}
|
deviceValues = []string{"primary", "secondary"}
|
||||||
|
|
||||||
|
securityGroupDirectionValues = []string{"inbound", "outbound"}
|
||||||
|
securityGroupEthertypeValues = []string{"IPv4", "IPv6"}
|
||||||
|
securityGroupProtocolValues = []string{"icmp", "tcp", "udp"}
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -102,6 +103,47 @@ func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url st
|
|||||||
return respBytes, err
|
return respBytes, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DecortApiCallCtype method for sending requests to the platform with content type
|
||||||
|
func (ldc *LegacyDecortClient) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error) {
|
||||||
|
// get token
|
||||||
|
if err := ldc.getToken(ctx); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var body *bytes.Buffer
|
||||||
|
|
||||||
|
switch ctype {
|
||||||
|
case constants.MIMESTREAM:
|
||||||
|
body = bytes.NewBuffer(params.([]byte))
|
||||||
|
case constants.MIMEJSON:
|
||||||
|
jsonBody, err := json.Marshal(params)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
body = bytes.NewBuffer(jsonBody)
|
||||||
|
default:
|
||||||
|
ctype = constants.MIMEPOSTForm
|
||||||
|
values, err := query.Values(params)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
body = bytes.NewBufferString(values.Encode() + fmt.Sprintf("&authkey=%s", ldc.cfg.Token))
|
||||||
|
}
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+constants.RESTMACHINE+url, body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// perform request
|
||||||
|
respBytes, err := ldc.do(req, ctype)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return respBytes, err
|
||||||
|
}
|
||||||
|
|
||||||
func (ldc *LegacyDecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
|
func (ldc *LegacyDecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
|
||||||
body, ctype, err := multiPartReq(params)
|
body, ctype, err := multiPartReq(params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
var accounts = ListAccounts{
|
var accounts = ListAccounts{
|
||||||
Data: []ItemAccount{
|
Data: []ItemAccount{
|
||||||
{
|
{
|
||||||
ACL: []RecordACL{
|
ACL: []ListRecordACL{
|
||||||
{
|
{
|
||||||
IsExplicit: true,
|
IsExplicit: true,
|
||||||
GUID: "",
|
GUID: "",
|
||||||
@@ -25,7 +25,7 @@ var accounts = ListAccounts{
|
|||||||
UpdatedTime: 1676645275,
|
UpdatedTime: 1676645275,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ACL: []RecordACL{
|
ACL: []ListRecordACL{
|
||||||
{
|
{
|
||||||
IsExplicit: true,
|
IsExplicit: true,
|
||||||
GUID: "",
|
GUID: "",
|
||||||
@@ -43,7 +43,7 @@ var accounts = ListAccounts{
|
|||||||
UpdatedTime: 1676645275,
|
UpdatedTime: 1676645275,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ACL: []RecordACL{
|
ACL: []ListRecordACL{
|
||||||
{
|
{
|
||||||
IsExplicit: true,
|
IsExplicit: true,
|
||||||
GUID: "",
|
GUID: "",
|
||||||
|
|||||||
@@ -30,6 +30,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,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"`
|
||||||
|
|||||||
@@ -1,7 +1,34 @@
|
|||||||
package account
|
package account
|
||||||
|
|
||||||
|
// Access Control List
|
||||||
|
type ListRecordACL struct {
|
||||||
|
// Whether access is explicitly specified
|
||||||
|
IsExplicit bool `json:"explicit"`
|
||||||
|
|
||||||
|
// GUID
|
||||||
|
GUID string `json:"guid"`
|
||||||
|
|
||||||
|
// Access rights
|
||||||
|
Rights string `json:"right"`
|
||||||
|
|
||||||
|
// Status
|
||||||
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Account Type
|
||||||
|
Type string `json:"type"`
|
||||||
|
|
||||||
|
// Account owner ID
|
||||||
|
UgroupID string `json:"userGroupId"`
|
||||||
|
|
||||||
|
// Is it possible to remove
|
||||||
|
CanBeDeleted bool `json:"canBeDeleted"`
|
||||||
|
}
|
||||||
|
|
||||||
// Access Control List
|
// Access Control List
|
||||||
type RecordACL struct {
|
type RecordACL struct {
|
||||||
|
// Emails
|
||||||
|
Emails []string `json:"emails"`
|
||||||
|
|
||||||
// Whether access is explicitly specified
|
// Whether access is explicitly specified
|
||||||
IsExplicit bool `json:"explicit"`
|
IsExplicit bool `json:"explicit"`
|
||||||
|
|
||||||
@@ -46,12 +73,21 @@ type ResourceLimits struct {
|
|||||||
|
|
||||||
// Number of graphics cores
|
// Number of graphics cores
|
||||||
GPUUnits float64 `json:"gpu_units"`
|
GPUUnits float64 `json:"gpu_units"`
|
||||||
|
|
||||||
|
// Storage policy
|
||||||
|
StoragePolicy []StoragePolicyItem `json:"storage_policy"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type StoragePolicyItem struct {
|
||||||
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
|
Limit int `json:"limit"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main information in one of if the list of accounts
|
// Main information in one of if the list of accounts
|
||||||
type ItemAccount struct {
|
type ItemAccount struct {
|
||||||
// Access Control List
|
// Access Control List
|
||||||
ACL []RecordACL `json:"acl"`
|
ACL []ListRecordACL `json:"acl"`
|
||||||
|
|
||||||
// Compute Features
|
// Compute Features
|
||||||
ComputeFeatures []string `json:"computeFeatures"`
|
ComputeFeatures []string `json:"computeFeatures"`
|
||||||
@@ -76,6 +112,9 @@ type ItemAccount struct {
|
|||||||
|
|
||||||
// Updated time
|
// Updated time
|
||||||
UpdatedTime uint64 `json:"updatedTime"`
|
UpdatedTime uint64 `json:"updatedTime"`
|
||||||
|
|
||||||
|
// Zones
|
||||||
|
ZoneIDs []uint64 `json:"zoneIds"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// List of accounts
|
// List of accounts
|
||||||
@@ -85,6 +124,18 @@ type ListAccounts struct {
|
|||||||
EntryCount uint64 `json:"entryCount"`
|
EntryCount uint64 `json:"entryCount"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Policy
|
||||||
|
type Policy struct {
|
||||||
|
// Size of the disk
|
||||||
|
DiskSize float64 `json:"disksize"`
|
||||||
|
|
||||||
|
// Max size of the disk
|
||||||
|
DiskSizeMax float64 `json:"disksizemax"`
|
||||||
|
|
||||||
|
// SEPs used
|
||||||
|
SEPs map[string]map[string]DiskUsage `json:"seps"`
|
||||||
|
}
|
||||||
|
|
||||||
// Resources used
|
// Resources used
|
||||||
type Resource struct {
|
type Resource struct {
|
||||||
// Number of cores
|
// Number of cores
|
||||||
@@ -105,6 +156,9 @@ type Resource struct {
|
|||||||
// Number of grafic cores
|
// Number of grafic cores
|
||||||
GPU int64 `json:"gpu"`
|
GPU int64 `json:"gpu"`
|
||||||
|
|
||||||
|
// Policies
|
||||||
|
Policies map[string]Policy `json:"policies"`
|
||||||
|
|
||||||
// Number of RAM
|
// Number of RAM
|
||||||
RAM int64 `json:"ram"`
|
RAM int64 `json:"ram"`
|
||||||
|
|
||||||
@@ -179,9 +233,6 @@ type RecordAccount struct {
|
|||||||
// DCLocation
|
// DCLocation
|
||||||
DCLocation string `json:"DCLocation"`
|
DCLocation string `json:"DCLocation"`
|
||||||
|
|
||||||
// CKey
|
|
||||||
CKey string `json:"_ckey"`
|
|
||||||
|
|
||||||
// Access control list
|
// Access control list
|
||||||
ACL []RecordACL `json:"acl"`
|
ACL []RecordACL `json:"acl"`
|
||||||
|
|
||||||
@@ -248,6 +299,9 @@ type RecordAccount struct {
|
|||||||
// Status
|
// Status
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Storage policy ids
|
||||||
|
StoragePolicyIDs []uint64 `json:"storage_policy_ids"`
|
||||||
|
|
||||||
// UniqPools
|
// UniqPools
|
||||||
UniqPools []interface{} `json:"uniqPools"`
|
UniqPools []interface{} `json:"uniqPools"`
|
||||||
|
|
||||||
@@ -264,7 +318,7 @@ type RecordAccount struct {
|
|||||||
VINSes uint64 `json:"vinses"`
|
VINSes uint64 `json:"vinses"`
|
||||||
|
|
||||||
// Zone
|
// Zone
|
||||||
ZoneIDs []ZoneID
|
ZoneIDs []ZoneID `json:"zoneIds"`
|
||||||
|
|
||||||
// Zones
|
// Zones
|
||||||
DefaultZoneID uint64 `json:"defaultZoneId"`
|
DefaultZoneID uint64 `json:"defaultZoneId"`
|
||||||
|
|||||||
81
pkg/cloudapi/audit/filter.go
Normal file
81
pkg/cloudapi/audit/filter.go
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
// FilterByID returns ListAudits with specified ID.
|
||||||
|
func (la ListAudits) FilterByID(guid string) ListAudits {
|
||||||
|
predicate := func(ia ItemAudit) bool {
|
||||||
|
return ia.GUID == guid
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByCall returns ListAudits with specified call.
|
||||||
|
func (la ListAudits) FilterByCall(call string) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.Call == call
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByCorrelationID returns ListAudits with specified correlation id.
|
||||||
|
func (la ListAudits) FilterByCorrelationID(correlationID string) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.CorrelationID == correlationID
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByRemoteAddr returns ListAudits with specified remote address.
|
||||||
|
func (la ListAudits) FilterByRemoteAddr(remoteAddr string) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.RemoteAddr == remoteAddr
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByUser returns ListAudits with specified user name.
|
||||||
|
func (la ListAudits) FilterByUser(user string) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.User == user
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByStatusCode return ListAudits with specified status code.
|
||||||
|
func (la ListAudits) FilterByStatusCode(statusCode uint64) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.StatusCode == statusCode
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterFunc allows filtering ListAudits based on a user-specified predicate.
|
||||||
|
func (la ListAudits) FilterFunc(predicate func(ItemAudit) bool) ListAudits {
|
||||||
|
var result ListAudits
|
||||||
|
|
||||||
|
for _, item := range la.Data {
|
||||||
|
if predicate(item) {
|
||||||
|
result.Data = append(result.Data, item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result.EntryCount = uint64(len(result.Data))
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// FindOne returns first found ItemAudit
|
||||||
|
// If none was found, returns an empty struct.
|
||||||
|
func (la ListAudits) FindOne() ItemAudit {
|
||||||
|
if len(la.Data) == 0 {
|
||||||
|
return ItemAudit{}
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.Data[0]
|
||||||
|
}
|
||||||
115
pkg/cloudapi/audit/filter_test.go
Normal file
115
pkg/cloudapi/audit/filter_test.go
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
var audits = ListAudits{
|
||||||
|
Data: []ItemAudit{
|
||||||
|
{
|
||||||
|
Args: "[]",
|
||||||
|
Call: "/restmachine/cloudapi/audit/linkedJobs",
|
||||||
|
GUID: "550e8400-e29b-41d4-a716-446655440001",
|
||||||
|
CorrelationID: "550e8400-e29b-41d4-a716-446655440001",
|
||||||
|
Kwargs: `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
|
||||||
|
RemoteAddr: "192.168.1.100",
|
||||||
|
ResponseTime: 1,
|
||||||
|
Result: `[]`,
|
||||||
|
StatusCode: 200,
|
||||||
|
Timestamp: 1640995200,
|
||||||
|
TimestampEnd: 1640995201,
|
||||||
|
User: "test@example.com",
|
||||||
|
TTL: "2025-07-31T14:22:57.028000",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Args: "[]",
|
||||||
|
Call: "/restmachine/cloudapi/audit/test",
|
||||||
|
GUID: "550e8400-e29b-41d4-a716-446655440002",
|
||||||
|
CorrelationID: "550e8400-e29b-41d4-a716-446655440002",
|
||||||
|
Kwargs: `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
|
||||||
|
RemoteAddr: "192.168.1.105",
|
||||||
|
ResponseTime: 5,
|
||||||
|
Result: `[]`,
|
||||||
|
StatusCode: 400,
|
||||||
|
Timestamp: 1640995200,
|
||||||
|
TimestampEnd: 1640995201,
|
||||||
|
User: "test2@example.com",
|
||||||
|
TTL: "2025-07-31T14:22:57.028000",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
EntryCount: 2,
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByID(t *testing.T) {
|
||||||
|
actual := audits.FilterByID("550e8400-e29b-41d4-a716-446655440002").FindOne()
|
||||||
|
|
||||||
|
if actual.GUID != "550e8400-e29b-41d4-a716-446655440002" {
|
||||||
|
t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.GUID)
|
||||||
|
}
|
||||||
|
|
||||||
|
actualEmpty := audits.FilterByID("")
|
||||||
|
|
||||||
|
if len(actualEmpty.Data) != 0 {
|
||||||
|
t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByCorrelationID(t *testing.T) {
|
||||||
|
actual := audits.FilterByCorrelationID("550e8400-e29b-41d4-a716-446655440002").FindOne()
|
||||||
|
|
||||||
|
if actual.CorrelationID != "550e8400-e29b-41d4-a716-446655440002" {
|
||||||
|
t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.CorrelationID)
|
||||||
|
}
|
||||||
|
|
||||||
|
actualEmpty := audits.FilterByCorrelationID("")
|
||||||
|
|
||||||
|
if len(actualEmpty.Data) != 0 {
|
||||||
|
t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByRemoteAddr(t *testing.T) {
|
||||||
|
actual := audits.FilterByRemoteAddr("192.168.1.100").FindOne()
|
||||||
|
|
||||||
|
if actual.RemoteAddr != "192.168.1.100" {
|
||||||
|
t.Fatal("expected remote address 192.168.1.100, found: ", actual.RemoteAddr)
|
||||||
|
}
|
||||||
|
|
||||||
|
actualEmpty := audits.FilterByRemoteAddr("")
|
||||||
|
|
||||||
|
if len(actualEmpty.Data) != 0 {
|
||||||
|
t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByUser(t *testing.T) {
|
||||||
|
actual := audits.FilterByUser("test@example.com").FindOne()
|
||||||
|
|
||||||
|
if actual.User != "test@example.com" {
|
||||||
|
t.Fatal("expected user test@example.com, found: ", actual.RemoteAddr)
|
||||||
|
}
|
||||||
|
|
||||||
|
actualEmpty := audits.FilterByUser("")
|
||||||
|
|
||||||
|
if len(actualEmpty.Data) != 0 {
|
||||||
|
t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByCall(t *testing.T) {
|
||||||
|
actual := audits.FilterByCall("/restmachine/cloudapi/audit/test").FindOne()
|
||||||
|
|
||||||
|
if actual.Call != "/restmachine/cloudapi/audit/test" {
|
||||||
|
t.Fatal("expected call /restmachine/cloudapi/audit/test, found: ", actual.Call)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByStatusCode(t *testing.T) {
|
||||||
|
actual := audits.FilterByStatusCode(200)
|
||||||
|
|
||||||
|
for _, item := range actual.Data {
|
||||||
|
if item.StatusCode != 200 {
|
||||||
|
t.Fatal("expected 200 status code, found: ", item.StatusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
124
pkg/cloudapi/audit/list.go
Normal file
124
pkg/cloudapi/audit/list.go
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ListRequest struct to give list of account audits
|
||||||
|
type ListRequest struct {
|
||||||
|
|
||||||
|
// Find all audits after point in time (unixtime)
|
||||||
|
// Required: false
|
||||||
|
TimestampAt uint64 `url:"timestamp_at,omitempty" json:"timestamp_at,omitempty"`
|
||||||
|
|
||||||
|
// Find all audits before point in time (unixtime)
|
||||||
|
// Required: false
|
||||||
|
TimestampTo uint64 `url:"timestamp_to,omitempty" json:"timestamp_to,omitempty"`
|
||||||
|
|
||||||
|
// Find by user (Mongo RegExp supported)
|
||||||
|
// Required: false
|
||||||
|
User string `url:"user,omitempty" json:"user,omitempty"`
|
||||||
|
|
||||||
|
// Find by api endpoint (Mongo RegExp supported)
|
||||||
|
// Required: false
|
||||||
|
Call string `url:"call,omitempty" json:"call,omitempty"`
|
||||||
|
|
||||||
|
// Find by request id
|
||||||
|
// Required: false
|
||||||
|
RequestID string `url:"request_id,omitempty" json:"request_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by HTTP min status code
|
||||||
|
// Required: false
|
||||||
|
MinStatusCode uint64 `url:"min_status_code,omitempty" json:"min_status_code,omitempty"`
|
||||||
|
|
||||||
|
// Find by HTTP max status code
|
||||||
|
// Required: false
|
||||||
|
MaxStatusCode uint64 `url:"max_status_code,omitempty" json:"max_status_code,omitempty"`
|
||||||
|
|
||||||
|
// Sort by one of supported fields, format +|-(field)
|
||||||
|
// Required: false
|
||||||
|
SortBy string `url:"sort_by,omitempty" json:"sort_by,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"`
|
||||||
|
|
||||||
|
// Find by resource group id
|
||||||
|
// Required: false
|
||||||
|
RGID uint64 `url:"resgroup_id,omitempty" json:"resgroup_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by compute id
|
||||||
|
// Required: false
|
||||||
|
ComputeID uint64 `url:"compute_id,omitempty" json:"compute_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by account id
|
||||||
|
// Required: false
|
||||||
|
AccountID uint64 `url:"account_id,omitempty" json:"account_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by vins id
|
||||||
|
// Required: false
|
||||||
|
VINSID uint64 `url:"vins_id,omitempty" json:"vins_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by service id
|
||||||
|
// Required: false
|
||||||
|
ServiceID uint64 `url:"service_id,omitempty" json:"service_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by k8s id
|
||||||
|
// Required: false
|
||||||
|
K8SID uint64 `url:"k8s_id,omitempty" json:"k8s_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by flipgroup id
|
||||||
|
// Required: false
|
||||||
|
FLIPGroupID uint64 `url:"flipgroup_id,omitempty" json:"flipgroup_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by load balancer id
|
||||||
|
// Required: false
|
||||||
|
LBID uint64 `url:"lb_id,omitempty" json:"lb_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by sep id
|
||||||
|
// Required: false
|
||||||
|
SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`
|
||||||
|
|
||||||
|
// Exclude audit lines from response
|
||||||
|
// Required: false
|
||||||
|
ExcludeAuditLines bool `url:"exclude_audit_lines,omitempty" json:"exclude_audit_lines,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// List gets audit records for the specified account object
|
||||||
|
func (a Audit) List(ctx context.Context, req ListRequest) (*ListAudits, error) {
|
||||||
|
|
||||||
|
res, err := a.ListRaw(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
list := ListAudits{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res, &list)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &list, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListRaw gets list of audit records an array of bytes
|
||||||
|
func (a Audit) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
|
||||||
|
|
||||||
|
if err := validators.ValidateRequest(req); err != nil {
|
||||||
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/audit/list"
|
||||||
|
|
||||||
|
res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
@@ -12,6 +12,9 @@ type RecordAudit struct {
|
|||||||
// GUID
|
// GUID
|
||||||
GUID string `json:"guid"`
|
GUID string `json:"guid"`
|
||||||
|
|
||||||
|
// Correlation ID
|
||||||
|
CorrelationID string `json:"correlation_id"`
|
||||||
|
|
||||||
// Kwargs
|
// Kwargs
|
||||||
Kwargs string `json:"kwargs"`
|
Kwargs string `json:"kwargs"`
|
||||||
|
|
||||||
@@ -39,3 +42,54 @@ type RecordAudit struct {
|
|||||||
// User
|
// User
|
||||||
User string `json:"user"`
|
User string `json:"user"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Main info about audit
|
||||||
|
type ItemAudit struct {
|
||||||
|
// Args
|
||||||
|
Args string `json:"args"`
|
||||||
|
|
||||||
|
// Call
|
||||||
|
Call string `json:"call"`
|
||||||
|
|
||||||
|
// GUID
|
||||||
|
GUID string `json:"guid"`
|
||||||
|
|
||||||
|
// Correlation ID
|
||||||
|
CorrelationID string `json:"correlation_id"`
|
||||||
|
|
||||||
|
// 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"`
|
||||||
|
|
||||||
|
// Timestamp
|
||||||
|
Timestamp float64 `json:"timestamp"`
|
||||||
|
|
||||||
|
// Timestamp End
|
||||||
|
TimestampEnd float64 `json:"timestampEnd"`
|
||||||
|
|
||||||
|
// User
|
||||||
|
User string `json:"user"`
|
||||||
|
|
||||||
|
// TTL
|
||||||
|
TTL string `json:"_ttl"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// List of audits
|
||||||
|
type ListAudits struct {
|
||||||
|
// Data
|
||||||
|
Data []ItemAudit `json:"data"`
|
||||||
|
|
||||||
|
// EntryCount
|
||||||
|
EntryCount uint64 `json:"entryCount"`
|
||||||
|
}
|
||||||
|
|||||||
@@ -38,11 +38,9 @@ type GroupAddRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
|
ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
|
||||||
|
|
||||||
// Compute driver
|
// Compute driver like a KVM_X86, etc.
|
||||||
// should be one of:
|
|
||||||
// - KVM_X86
|
|
||||||
// Required: true
|
// Required: true
|
||||||
Driver string `url:"driver" json:"driver" validate:"driver"`
|
Driver string `url:"driver" json:"driver" validate:"required"`
|
||||||
|
|
||||||
// Storage endpoint provider ID
|
// Storage endpoint provider ID
|
||||||
// Required: false
|
// Required: false
|
||||||
@@ -75,6 +73,10 @@ type GroupAddRequest struct {
|
|||||||
//Chipset "i440fx" or "Q35
|
//Chipset "i440fx" or "Q35
|
||||||
//Required: false
|
//Required: false
|
||||||
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset,omitempty"`
|
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset,omitempty"`
|
||||||
|
|
||||||
|
// ID of the chosen storage policy
|
||||||
|
// Required: false
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRAM returns RAM field values
|
// GetRAM returns RAM field values
|
||||||
|
|||||||
@@ -46,6 +46,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,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"`
|
||||||
|
|||||||
@@ -12,11 +12,47 @@ import (
|
|||||||
type AuditsRequest struct {
|
type AuditsRequest struct {
|
||||||
// ID of the compute
|
// ID of the compute
|
||||||
// Required: true
|
// Required: true
|
||||||
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
|
||||||
|
|
||||||
|
// Find all audits after point in time
|
||||||
|
// Required: false
|
||||||
|
TimestampAT uint64 `url:"timestamp_at,omitempty" json:"timestamp_at,omitempty"`
|
||||||
|
|
||||||
|
// Find all audits before point in time
|
||||||
|
// Required: false
|
||||||
|
TimestampTO uint64 `url:"timestamp_to,omitempty" json:"timestamp_to,omitempty"`
|
||||||
|
|
||||||
|
// Find by user
|
||||||
|
// Required: false
|
||||||
|
User string `url:"user,omitempty" json:"user,omitempty"`
|
||||||
|
|
||||||
|
// Find by api endpoints
|
||||||
|
// Required: false
|
||||||
|
Call string `url:"call,omitempty" json:"call,omitempty"`
|
||||||
|
|
||||||
|
// Sort by one of supported fields, format ±<field>
|
||||||
|
// Required: false
|
||||||
|
SortBy string `url:"sort_by,omitempty" json:"sort_by,omitempty"`
|
||||||
|
|
||||||
|
// Page number
|
||||||
|
// Required: false
|
||||||
|
Page uint64 `url:"page,omitempty" json:"page,omitempty"`
|
||||||
|
|
||||||
|
// Page size
|
||||||
|
// Required: false
|
||||||
|
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
|
||||||
|
|
||||||
|
// Find by HTTP min status code
|
||||||
|
// Required: false
|
||||||
|
MinStatusCode uint64 `url:"min_status_code,omitempty" json:"min_status_code,omitempty"`
|
||||||
|
|
||||||
|
// Find by HTTP max status code
|
||||||
|
// Required: false
|
||||||
|
MaxStatusCode uint64 `url:"max_status_code,omitempty" json:"max_status_code,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Audits gets audit records for the specified compute object
|
// Audits gets audit records for the specified compute object
|
||||||
func (c Compute) Audits(ctx context.Context, req AuditsRequest) (ListAudits, error) {
|
func (c Compute) Audits(ctx context.Context, req AuditsRequest) (*ListAudits, error) {
|
||||||
err := validators.ValidateRequest(req)
|
err := validators.ValidateRequest(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
@@ -24,7 +60,7 @@ func (c Compute) Audits(ctx context.Context, req AuditsRequest) (ListAudits, err
|
|||||||
|
|
||||||
url := "/cloudapi/compute/audits"
|
url := "/cloudapi/compute/audits"
|
||||||
|
|
||||||
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -36,5 +72,5 @@ func (c Compute) Audits(ctx context.Context, req AuditsRequest) (ListAudits, err
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return list, nil
|
return &list, nil
|
||||||
}
|
}
|
||||||
|
|||||||
50
pkg/cloudapi/compute/change_secutity_group.go
Normal file
50
pkg/cloudapi/compute/change_secutity_group.go
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
package compute
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ChangeSecGroupsRequest struct to change security groups for compute
|
||||||
|
type ChangeSecGroupsRequest struct {
|
||||||
|
// Identifier compute
|
||||||
|
// Required: true
|
||||||
|
ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
|
||||||
|
|
||||||
|
// Interface name or MAC address
|
||||||
|
// Required: true
|
||||||
|
Interface string `url:"interface" json:"interface" validate:"required"`
|
||||||
|
|
||||||
|
// List of security group IDs to assign to this interface
|
||||||
|
// Required: false
|
||||||
|
SecGroups []uint64 `url:"security_groups,omitempty" json:"security_groups,omitempty"`
|
||||||
|
|
||||||
|
// Flag indicating whether security groups are enabled for this interface
|
||||||
|
// Required: false
|
||||||
|
EnableSecGroups bool `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChangeSecGroups changes security groups for compute
|
||||||
|
func (c Compute) ChangeSecGroups(ctx context.Context, req ChangeSecGroupsRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/compute/change_security_groups"
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
@@ -27,6 +27,10 @@ type CreateTemplateFromBlankRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
ImageType string `url:"imagetype" json:"imagetype" validate:"imageType"`
|
ImageType string `url:"imagetype" json:"imagetype" validate:"imageType"`
|
||||||
|
|
||||||
|
// Storage policy id of disk. The rules of the specified storage policy will be used.
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// Username for the image
|
// Username for the image
|
||||||
// Required: false
|
// Required: false
|
||||||
Username string `url:"username,omitempty" json:"username,omitempty"`
|
Username string `url:"username,omitempty" json:"username,omitempty"`
|
||||||
|
|||||||
@@ -22,6 +22,10 @@ type DiskAddRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
Size uint64 `url:"size" json:"size" validate:"required"`
|
Size uint64 `url:"size" json:"size" validate:"required"`
|
||||||
|
|
||||||
|
// Storage policy id of disk. The rules of the specified storage policy will be used.
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// Type of the disk
|
// Type of the disk
|
||||||
// Should be one of:
|
// Should be one of:
|
||||||
// - D
|
// - D
|
||||||
@@ -46,6 +50,14 @@ type DiskAddRequest struct {
|
|||||||
// Specify image id for create disk from template
|
// Specify image id for create disk from template
|
||||||
// Required: false
|
// Required: false
|
||||||
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
||||||
|
|
||||||
|
// Desired PCI slot (hex string, e.g. "0x1A")
|
||||||
|
// Required: false
|
||||||
|
PCISlot string `url:"pci_slot,omitempty" json:"pci_slot,omitempty"`
|
||||||
|
|
||||||
|
// Desired bus number (hex string, e.g. "0x03")
|
||||||
|
// Required: false
|
||||||
|
BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskAdd creates new disk and attach to compute
|
// DiskAdd creates new disk and attach to compute
|
||||||
|
|||||||
@@ -21,6 +21,14 @@ 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" validate:"omitempty,computeDiskType"`
|
DiskType string `url:"diskType,omitempty" json:"diskType,omitempty" validate:"omitempty,computeDiskType"`
|
||||||
|
|
||||||
|
// Desired PCI slot (hex string, e.g. "0x1A")
|
||||||
|
// Required: false
|
||||||
|
PCISlot string `url:"pci_slot,omitempty" json:"pci_slot,omitempty"`
|
||||||
|
|
||||||
|
// Desired bus number (hex string, e.g. "0x03")
|
||||||
|
// Required: false
|
||||||
|
BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskAttach attach disk to compute
|
// DiskAttach attach disk to compute
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ var computes = ListComputes{
|
|||||||
GID: 212,
|
GID: 212,
|
||||||
GUID: 48500,
|
GUID: 48500,
|
||||||
ID: 48500,
|
ID: 48500,
|
||||||
ImageID: 9884,
|
|
||||||
Interfaces: []ItemVNFInterface{},
|
Interfaces: []ItemVNFInterface{},
|
||||||
LockStatus: "UNLOCKED",
|
LockStatus: "UNLOCKED",
|
||||||
ManagerID: 0,
|
ManagerID: 0,
|
||||||
@@ -82,7 +81,7 @@ var computes = ListComputes{
|
|||||||
UserManaged: true,
|
UserManaged: true,
|
||||||
VGPUs: []uint64{},
|
VGPUs: []uint64{},
|
||||||
VINSConnected: 0,
|
VINSConnected: 0,
|
||||||
VirtualImageID: 0,
|
ZoneID: 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ACL: ListACL{},
|
ACL: ListACL{},
|
||||||
@@ -117,7 +116,6 @@ var computes = ListComputes{
|
|||||||
GID: 212,
|
GID: 212,
|
||||||
GUID: 48556,
|
GUID: 48556,
|
||||||
ID: 48556,
|
ID: 48556,
|
||||||
ImageID: 9884,
|
|
||||||
Interfaces: []ItemVNFInterface{},
|
Interfaces: []ItemVNFInterface{},
|
||||||
LockStatus: "UNLOCKED",
|
LockStatus: "UNLOCKED",
|
||||||
ManagerID: 0,
|
ManagerID: 0,
|
||||||
@@ -144,7 +142,7 @@ var computes = ListComputes{
|
|||||||
UserManaged: true,
|
UserManaged: true,
|
||||||
VGPUs: []uint64{},
|
VGPUs: []uint64{},
|
||||||
VINSConnected: 0,
|
VINSConnected: 0,
|
||||||
VirtualImageID: 0,
|
ZoneID: 5,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
EntryCount: 2,
|
EntryCount: 2,
|
||||||
|
|||||||
@@ -58,6 +58,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,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"`
|
||||||
|
|||||||
@@ -238,7 +238,13 @@ type ItemAudit struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// List Detailed audits
|
// List Detailed audits
|
||||||
type ListAudits []ItemAudit
|
type ListAudits struct {
|
||||||
|
// Data
|
||||||
|
Data []ItemAudit `json:"data"`
|
||||||
|
|
||||||
|
// Entry count
|
||||||
|
EntryCount uint64 `json:"entryCount"`
|
||||||
|
}
|
||||||
|
|
||||||
// Short information about audit
|
// Short information about audit
|
||||||
type ItemShortAudit struct {
|
type ItemShortAudit struct {
|
||||||
@@ -386,6 +392,9 @@ type RecordCompute struct {
|
|||||||
// List interfaces
|
// List interfaces
|
||||||
Interfaces ListInterfaces `json:"interfaces"`
|
Interfaces ListInterfaces `json:"interfaces"`
|
||||||
|
|
||||||
|
// Loader meta iso information
|
||||||
|
LoaderMetaIso LoaderMetaIso `json:"loaderMetaIso"`
|
||||||
|
|
||||||
// Live migration job ID
|
// Live migration job ID
|
||||||
LiveMigrationJobID uint64 `json:"live_migration_job_id"`
|
LiveMigrationJobID uint64 `json:"live_migration_job_id"`
|
||||||
|
|
||||||
@@ -437,6 +446,9 @@ type RecordCompute struct {
|
|||||||
// Natable VINS network name
|
// Natable VINS network name
|
||||||
NatableVINSNetworkName string `json:"natableVinsNetworkName"`
|
NatableVINSNetworkName string `json:"natableVinsNetworkName"`
|
||||||
|
|
||||||
|
// Name of OS
|
||||||
|
OSVersion string `json:"os_version"`
|
||||||
|
|
||||||
// List OS Users
|
// List OS Users
|
||||||
OSUsers ListOSUser `json:"osUsers"`
|
OSUsers ListOSUser `json:"osUsers"`
|
||||||
|
|
||||||
@@ -503,12 +515,6 @@ type RecordCompute struct {
|
|||||||
// vGPUs list
|
// vGPUs list
|
||||||
VGPUs []VGPUItem `json:"vgpus"`
|
VGPUs []VGPUItem `json:"vgpus"`
|
||||||
|
|
||||||
// Virtual image ID
|
|
||||||
VirtualImageID uint64 `json:"virtualImageId"`
|
|
||||||
|
|
||||||
// Virtual image name
|
|
||||||
VirtualImageName string `json:"virtualImageName"`
|
|
||||||
|
|
||||||
// VNC password
|
// VNC password
|
||||||
VNCPassword string `json:"vncPasswd"`
|
VNCPassword string `json:"vncPasswd"`
|
||||||
|
|
||||||
@@ -516,6 +522,13 @@ type RecordCompute struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
ZoneID uint64 `json:"zoneId"`
|
ZoneID uint64 `json:"zoneId"`
|
||||||
}
|
}
|
||||||
|
type LoaderMetaIso struct {
|
||||||
|
// Name
|
||||||
|
DeviceName string `json:"devicename"`
|
||||||
|
|
||||||
|
// Path
|
||||||
|
Path string `json:"path"`
|
||||||
|
}
|
||||||
|
|
||||||
type QemuQuest struct {
|
type QemuQuest struct {
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
@@ -661,6 +674,9 @@ type ItemVNFInterface struct {
|
|||||||
// Enabled
|
// Enabled
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
|
|
||||||
|
// Enable security groups
|
||||||
|
EnableSecGroups bool `json:"enable_secgroups"`
|
||||||
|
|
||||||
// FLIPGroup ID
|
// FLIPGroup ID
|
||||||
FLIPGroupID uint64 `json:"flipgroupId"`
|
FLIPGroupID uint64 `json:"flipgroupId"`
|
||||||
|
|
||||||
@@ -703,12 +719,18 @@ type ItemVNFInterface struct {
|
|||||||
// QOS
|
// QOS
|
||||||
QOS QOS `json:"qos"`
|
QOS QOS `json:"qos"`
|
||||||
|
|
||||||
|
// List of security groups
|
||||||
|
SecGroups []uint64 `json:"security_groups"`
|
||||||
|
|
||||||
// SDN interface ID
|
// SDN interface ID
|
||||||
SDNInterfaceID string `json:"sdn_interface_id"`
|
SDNInterfaceID string `json:"sdn_interface_id"`
|
||||||
|
|
||||||
// Target
|
// Target
|
||||||
Target string `json:"target"`
|
Target string `json:"target"`
|
||||||
|
|
||||||
|
// Trunk tags
|
||||||
|
TrunkTags string `json:"trunk_tags"`
|
||||||
|
|
||||||
// Type
|
// Type
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
|
||||||
@@ -746,9 +768,18 @@ type ItemComputeDisk struct {
|
|||||||
// Bus number
|
// Bus number
|
||||||
BusNumber uint64 `json:"bus_number"`
|
BusNumber uint64 `json:"bus_number"`
|
||||||
|
|
||||||
|
// Created by
|
||||||
|
CreatedBy string `json:"createdBy"`
|
||||||
|
|
||||||
// Created time
|
// Created time
|
||||||
CreatedTime uint64 `json:"createdTime"`
|
CreatedTime uint64 `json:"createdTime"`
|
||||||
|
|
||||||
|
// Device name
|
||||||
|
DeviceName string `json:"devicename"`
|
||||||
|
|
||||||
|
// Deleted by
|
||||||
|
DeletedBy string `json:"deletedBy"`
|
||||||
|
|
||||||
// Deleted time
|
// Deleted time
|
||||||
DeletedTime uint64 `json:"deletedTime"`
|
DeletedTime uint64 `json:"deletedTime"`
|
||||||
|
|
||||||
@@ -845,17 +876,23 @@ type ItemComputeDisk struct {
|
|||||||
// Status
|
// Status
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Storage policy id of compute.
|
||||||
|
StoragePolicyID uint64 `json:"storage_policy_id"`
|
||||||
|
|
||||||
// Tech status
|
// Tech status
|
||||||
TechStatus string `json:"techStatus"`
|
TechStatus string `json:"techStatus"`
|
||||||
|
|
||||||
|
// Need to clean before destroy
|
||||||
|
ToClean bool `json:"to_clean"`
|
||||||
|
|
||||||
// Type
|
// Type
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
|
||||||
// Updated by
|
// Updated by
|
||||||
UpdatedBy string `json:"updatedBy"`
|
UpdatedBy string `json:"updatedBy"`
|
||||||
|
|
||||||
// Zone ID
|
// UpdatedTime
|
||||||
ZoneID uint64 `json:"zoneId"`
|
UpdatedTime uint64 `json:"updatedTime"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ItemReplication struct {
|
type ItemReplication struct {
|
||||||
@@ -1048,9 +1085,6 @@ type ItemCompute struct {
|
|||||||
// ID
|
// ID
|
||||||
ID uint64 `json:"id"`
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
// Image ID
|
|
||||||
ImageID uint64 `json:"imageId"`
|
|
||||||
|
|
||||||
// List interfaces
|
// List interfaces
|
||||||
Interfaces ListInterfaces `json:"interfaces"`
|
Interfaces ListInterfaces `json:"interfaces"`
|
||||||
|
|
||||||
@@ -1099,6 +1133,9 @@ type ItemCompute struct {
|
|||||||
// Number of RAM
|
// Number of RAM
|
||||||
RAM uint64 `json:"ram"`
|
RAM uint64 `json:"ram"`
|
||||||
|
|
||||||
|
// Name of OS
|
||||||
|
OSVersion string `json:"os_version"`
|
||||||
|
|
||||||
// Qemu_quest
|
// Qemu_quest
|
||||||
QemuQuest QemuQuest `json:"qemu_guest"`
|
QemuQuest QemuQuest `json:"qemu_guest"`
|
||||||
|
|
||||||
@@ -1156,8 +1193,8 @@ type ItemCompute struct {
|
|||||||
// VINS connected
|
// VINS connected
|
||||||
VINSConnected uint64 `json:"vinsConnected"`
|
VINSConnected uint64 `json:"vinsConnected"`
|
||||||
|
|
||||||
// Virtual image ID
|
// Zone ID
|
||||||
VirtualImageID uint64 `json:"virtualImageId"`
|
ZoneID uint64 `json:"zoneId"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListInfoDisks
|
// ListInfoDisks
|
||||||
|
|||||||
@@ -42,12 +42,24 @@ type NetAttachRequest struct {
|
|||||||
// Used only for EXTNET and DPDK
|
// Used only for EXTNET and DPDK
|
||||||
// For DPDK must be 1-9216
|
// For DPDK must be 1-9216
|
||||||
// For EXTNET must be 1500-9216
|
// For EXTNET must be 1500-9216
|
||||||
// Required: false
|
// Required: false
|
||||||
MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
|
MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
|
||||||
|
|
||||||
// Unique identifier of logical port on SDN side
|
// Unique identifier of logical port on SDN side
|
||||||
// Required: false
|
// Required: false
|
||||||
SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty" validate:"omitempty"`
|
SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty" validate:"omitempty"`
|
||||||
|
|
||||||
|
// List of security group IDs to assign to this interface
|
||||||
|
// Required: false
|
||||||
|
SecGroups []uint64 `url:"security_groups,omitempty" json:"security_groups,omitempty"`
|
||||||
|
|
||||||
|
// Flag indicating whether security groups are enabled for this interface
|
||||||
|
// Required: false
|
||||||
|
EnableSecGroups bool `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty"`
|
||||||
|
|
||||||
|
// Flag indicating whether this interface is enabled (only for VINS, EXTNET, DPDK, SDN, TRUNK)
|
||||||
|
// Required: false
|
||||||
|
Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// NetAttach attaches network to compute and gets info about network
|
// NetAttach attaches network to compute and gets info about network
|
||||||
|
|||||||
@@ -14,10 +14,18 @@ type RedeployRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
||||||
|
|
||||||
|
// Storage policy id of compute. The rules of the specified storage policy will be used.
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// ID of the new OS image, if image change is required
|
// ID of the new OS image, if image change is required
|
||||||
// Required: false
|
// Required: false
|
||||||
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
||||||
|
|
||||||
|
// The OS version that will be installed on the virtual machine
|
||||||
|
// Required: false
|
||||||
|
OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
|
||||||
|
|
||||||
// new size for the boot disk in GB, if boot disk size change is required
|
// new size for the boot disk in GB, if boot disk size change is required
|
||||||
// Required: false
|
// Required: false
|
||||||
DiskSize uint64 `url:"diskSize,omitempty" json:"diskSize,omitempty"`
|
DiskSize uint64 `url:"diskSize,omitempty" json:"diskSize,omitempty"`
|
||||||
|
|||||||
@@ -65,6 +65,10 @@ type UpdateRequest struct {
|
|||||||
// Does this machine supports hot resize, true or false
|
// Does this machine supports hot resize, true or false
|
||||||
// Required: false
|
// Required: false
|
||||||
HotResize interface{} `url:"hotResize,omitempty" json:"hotResize,omitempty" validate:"omitempty,isBool"`
|
HotResize interface{} `url:"hotResize,omitempty" json:"hotResize,omitempty" validate:"omitempty,isBool"`
|
||||||
|
|
||||||
|
// The OS version that will be installed on the virtual machine
|
||||||
|
// Required: false
|
||||||
|
OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update updates some properties of the compute
|
// Update updates some properties of the compute
|
||||||
|
|||||||
42
pkg/cloudapi/disks/change_disk_storage_policy.go
Normal file
42
pkg/cloudapi/disks/change_disk_storage_policy.go
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
package disks
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ChangeDiskStoragePolicyRequest struct to change storage policy for disk
|
||||||
|
type ChangeDiskStoragePolicyRequest struct {
|
||||||
|
// ID of the disk
|
||||||
|
// Required: true
|
||||||
|
DiskID uint64 `url:"disk_id" json:"disk_id" validate:"required"`
|
||||||
|
|
||||||
|
// ID of the storage policy to which to connect for disk
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChangeDiskStoragePolicy changes storage policy for disk
|
||||||
|
func (d Disks) ChangeDiskStoragePolicy(ctx context.Context, req ChangeDiskStoragePolicyRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/disks/change_disk_storage_policy"
|
||||||
|
|
||||||
|
res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := strconv.ParseBool(string(res))
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
@@ -18,6 +18,10 @@ type CreateRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
Name string `url:"name" json:"name" validate:"required"`
|
Name string `url:"name" json:"name" validate:"required"`
|
||||||
|
|
||||||
|
// ID of the storage policy under the disk will be created
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// Description of disk
|
// Description of disk
|
||||||
// Required: false
|
// Required: false
|
||||||
Description string `url:"description,omitempty" json:"description,omitempty"`
|
Description string `url:"description,omitempty" json:"description,omitempty"`
|
||||||
@@ -26,10 +30,6 @@ type CreateRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
|
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
|
||||||
|
|
||||||
// Max IOPS disk can perform defaults to 2000
|
|
||||||
// Required: false
|
|
||||||
IOPS uint64 `url:"iops,omitempty" json:"iops,omitempty"`
|
|
||||||
|
|
||||||
// Storage endpoint provider ID to create disk
|
// Storage endpoint provider ID to create disk
|
||||||
// Required: false
|
// Required: false
|
||||||
SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`
|
SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`
|
||||||
|
|||||||
@@ -43,11 +43,6 @@ type FromPlatformDiskRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"`
|
PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"`
|
||||||
|
|
||||||
// List of types of compute suitable for image
|
|
||||||
// Example: [ "KVM_X86" ]
|
|
||||||
// Required: true
|
|
||||||
Drivers []string `url:"drivers" json:"drivers" validate:"required"`
|
|
||||||
|
|
||||||
// Does this machine supports hot resize
|
// Does this machine supports hot resize
|
||||||
// Required: false
|
// Required: false
|
||||||
HotResize bool `url:"hotresize" json:"hotresize"`
|
HotResize bool `url:"hotresize" json:"hotresize"`
|
||||||
|
|||||||
@@ -46,6 +46,10 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
|
SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
|
||||||
|
|
||||||
|
// Find by storage policy id
|
||||||
|
// Required: false
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
|
||||||
|
|
||||||
// Find by pool name
|
// Find by pool name
|
||||||
// Required: false
|
// Required: false
|
||||||
Pool string `url:"pool,omitempty" json:"pool,omitempty"`
|
Pool string `url:"pool,omitempty" json:"pool,omitempty"`
|
||||||
|
|||||||
@@ -38,6 +38,10 @@ type ListUnattachedRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
|
SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
|
||||||
|
|
||||||
|
// Find by storage policy id
|
||||||
|
// Required: false
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
|
||||||
|
|
||||||
// Find by pool name
|
// Find by pool name
|
||||||
// Required: false
|
// Required: false
|
||||||
Pool string `url:"pool,omitempty" json:"pool,omitempty"`
|
Pool string `url:"pool,omitempty" json:"pool,omitempty"`
|
||||||
|
|||||||
@@ -119,9 +119,15 @@ type ItemDisk struct {
|
|||||||
// Status
|
// Status
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Storage policy ID
|
||||||
|
StoragePolicyID uint64 `json:"storage_policy_id"`
|
||||||
|
|
||||||
// Tech status
|
// Tech status
|
||||||
TechStatus string `json:"techStatus"`
|
TechStatus string `json:"techStatus"`
|
||||||
|
|
||||||
|
// Need to clean before destroy
|
||||||
|
ToClean bool `json:"to_clean"`
|
||||||
|
|
||||||
// Type
|
// Type
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
|
||||||
@@ -477,9 +483,15 @@ type RecordDisk struct {
|
|||||||
// Status
|
// Status
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Storage policy ID
|
||||||
|
StoragePolicyID uint64 `json:"storage_policy_id"`
|
||||||
|
|
||||||
// Tech status
|
// Tech status
|
||||||
TechStatus string `json:"techStatus"`
|
TechStatus string `json:"techStatus"`
|
||||||
|
|
||||||
|
// Need to clean before destroy
|
||||||
|
ToClean bool `json:"to_clean"`
|
||||||
|
|
||||||
// Type
|
// Type
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
|
||||||
|
|||||||
@@ -25,9 +25,13 @@ type ReplicateRequest struct {
|
|||||||
// Pool name to create slave disk in
|
// Pool name to create slave disk in
|
||||||
// Required: true
|
// Required: true
|
||||||
PoolName string `url:"poolName" json:"poolName" validate:"required"`
|
PoolName string `url:"poolName" json:"poolName" validate:"required"`
|
||||||
|
|
||||||
|
// ID of the storage policy under the disk will be created
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create an empty disk in chosen SEP and pool combination.
|
// Replicate create an empty disk in chosen SEP and pool combination.
|
||||||
// Starts replication between chosen disk and newly created disk
|
// Starts replication between chosen disk and newly created disk
|
||||||
// Note: only TATLIN type SEP are supported for replications between
|
// Note: only TATLIN type SEP are supported for replications between
|
||||||
func (d Disks) Replicate(ctx context.Context, req ReplicateRequest) (uint64, error) {
|
func (d Disks) Replicate(ctx context.Context, req ReplicateRequest) (uint64, error) {
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ type RecordDPDKNet struct {
|
|||||||
// Description
|
// Description
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
|
|
||||||
|
// Enable Security Groups
|
||||||
|
EnableSecGroups bool `json:"enable_secgroups"`
|
||||||
|
|
||||||
// Grid ID
|
// Grid ID
|
||||||
GID uint64 `json:"gid"`
|
GID uint64 `json:"gid"`
|
||||||
|
|
||||||
@@ -63,6 +66,9 @@ type ItemDPDKNet struct {
|
|||||||
// Description
|
// Description
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
|
|
||||||
|
// Enable Security Groups
|
||||||
|
EnableSecGroups bool `json:"enable_secgroups"`
|
||||||
|
|
||||||
// Grid ID
|
// Grid ID
|
||||||
GID uint64 `json:"gid"`
|
GID uint64 `json:"gid"`
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,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"`
|
||||||
|
|||||||
@@ -172,6 +172,9 @@ type RecordExtNet struct {
|
|||||||
// Excluded
|
// Excluded
|
||||||
Excluded []Excluded `json:"excluded"`
|
Excluded []Excluded `json:"excluded"`
|
||||||
|
|
||||||
|
// Enable Security Groups
|
||||||
|
EnableSecGroups bool `json:"enable_secgroups"`
|
||||||
|
|
||||||
// Free IPs
|
// Free IPs
|
||||||
FreeIPs int64 `json:"free_ips"`
|
FreeIPs int64 `json:"free_ips"`
|
||||||
|
|
||||||
|
|||||||
41
pkg/cloudapi/image/change_storage_policy.go
Normal file
41
pkg/cloudapi/image/change_storage_policy.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
package image
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ChangeStoragePolicyRequest struct {
|
||||||
|
// ID of the image to change the storage policy
|
||||||
|
// Required: true
|
||||||
|
ImageID uint64 `url:"image_id" json:"image_id" validate:"required"`
|
||||||
|
|
||||||
|
// ID of the storage policy to move the image to
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChangeStoragePolicy changes the storage policy of the image chosen
|
||||||
|
func (i Image) ChangeStoragePolicy(ctx context.Context, req ChangeStoragePolicyRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/image/change_storage_policy"
|
||||||
|
|
||||||
|
res, err := i.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
|
||||||
|
}
|
||||||
@@ -35,6 +35,10 @@ type CreateRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
|
||||||
|
|
||||||
|
// ID of the chosen storage policy
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// Select a network interface naming pattern for your Linux machine. eth - onboard, ens - pci slot naming
|
// Select a network interface naming pattern for your Linux machine. eth - onboard, ens - pci slot naming
|
||||||
// Should be:
|
// Should be:
|
||||||
// - eth
|
// - eth
|
||||||
@@ -69,11 +73,6 @@ type CreateRequest struct {
|
|||||||
// Pool for image create
|
// Pool for image create
|
||||||
// Required: false
|
// Required: false
|
||||||
Pool string `url:"poolName,omitempty" json:"poolName,omitempty"`
|
Pool string `url:"poolName,omitempty" json:"poolName,omitempty"`
|
||||||
|
|
||||||
// List of types of compute suitable for image
|
|
||||||
// Example: [ "KVM_X86" ]
|
|
||||||
// Required: true
|
|
||||||
Drivers []string `url:"drivers" json:"drivers" validate:"min=1,max=2,imageDrivers"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type asyncWrapperCreateRequest struct {
|
type asyncWrapperCreateRequest struct {
|
||||||
|
|||||||
@@ -17,6 +17,11 @@ type CreateVirtualRequest struct {
|
|||||||
// ID of real image to link this virtual image to upon creation
|
// ID of real image to link this virtual image to upon creation
|
||||||
// Required: true
|
// Required: true
|
||||||
TargetID uint64 `url:"targetId" json:"targetId" validate:"required"`
|
TargetID uint64 `url:"targetId" json:"targetId" validate:"required"`
|
||||||
|
|
||||||
|
// AccountID to make the virtual image exclusive
|
||||||
|
// Required: false
|
||||||
|
// Default: 0
|
||||||
|
AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// CreateVirtual creates virtual image
|
// CreateVirtual creates virtual image
|
||||||
|
|||||||
@@ -69,6 +69,10 @@ type ListRequest struct {
|
|||||||
// Find by enabled True or False
|
// Find by enabled True or False
|
||||||
// Required: false
|
// Required: false
|
||||||
Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
|
Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
|
||||||
|
|
||||||
|
// Find by storage policy id
|
||||||
|
// Required: false
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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
|
||||||
|
|||||||
@@ -50,6 +50,9 @@ type ItemImage struct {
|
|||||||
// Status
|
// Status
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Storage policy ID
|
||||||
|
StoragePolicyID uint64 `json:"storage_policy_id"`
|
||||||
|
|
||||||
// Type
|
// Type
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
|
||||||
@@ -191,6 +194,9 @@ type RecordImage struct {
|
|||||||
// Status
|
// Status
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Storage policy ID
|
||||||
|
StoragePolicyID uint64 `json:"storage_policy_id"`
|
||||||
|
|
||||||
// Tech status
|
// Tech status
|
||||||
TechStatus string `json:"techStatus"`
|
TechStatus string `json:"techStatus"`
|
||||||
|
|
||||||
|
|||||||
@@ -22,14 +22,6 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
Status string `url:"status,omitempty" json:"status,omitempty"`
|
Status string `url:"status,omitempty" json:"status,omitempty"`
|
||||||
|
|
||||||
// Find by worker driver
|
|
||||||
// Required: false
|
|
||||||
WorkerDriver string `url:"workerDriver,omitempty" json:"workerDriver,omitempty"`
|
|
||||||
|
|
||||||
// Find by master driver
|
|
||||||
// Required: false
|
|
||||||
MasterDriver string `url:"masterDriver,omitempty" json:"masterDriver,omitempty"`
|
|
||||||
|
|
||||||
// Find by network plugin
|
// Find by network plugin
|
||||||
// Required: false
|
// Required: false
|
||||||
NetworkPlugins string `url:"netPlugins,omitempty" json:"netPlugins,omitempty"`
|
NetworkPlugins string `url:"netPlugins,omitempty" json:"netPlugins,omitempty"`
|
||||||
|
|||||||
@@ -18,14 +18,6 @@ type ListDeletedRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
Name string `url:"name,omitempty" json:"name,omitempty"`
|
Name string `url:"name,omitempty" json:"name,omitempty"`
|
||||||
|
|
||||||
// Find by worker driver
|
|
||||||
// Required: false
|
|
||||||
WorkerDriver string `url:"workerDriver,omitempty" json:"workerDriver,omitempty"`
|
|
||||||
|
|
||||||
// Find by master driver
|
|
||||||
// Required: false
|
|
||||||
MasterDriver string `url:"masterDriver,omitempty" json:"masterDriver,omitempty"`
|
|
||||||
|
|
||||||
// Find by network plugin
|
// Find by network plugin
|
||||||
// Required: false
|
// Required: false
|
||||||
NetworkPlugins string `url:"netPlugins,omitempty" json:"netPlugins,omitempty"`
|
NetworkPlugins string `url:"netPlugins,omitempty" json:"netPlugins,omitempty"`
|
||||||
|
|||||||
@@ -31,6 +31,10 @@ type CreateRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
NetworkPlugin string `url:"networkPlugin" json:"networkPlugin" validate:"required,networkPlugin"`
|
NetworkPlugin string `url:"networkPlugin" json:"networkPlugin" validate:"required,networkPlugin"`
|
||||||
|
|
||||||
|
// ID of the chosen storage policy
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// ID of SEP to create boot disks for master nodes. Uses images SEP ID if not set
|
// ID of SEP to create boot disks for master nodes. Uses images SEP ID if not set
|
||||||
// Required: false
|
// Required: false
|
||||||
MasterSEPID uint64 `url:"masterSepId,omitempty" json:"masterSepId,omitempty"`
|
MasterSEPID uint64 `url:"masterSepId,omitempty" json:"masterSepId,omitempty"`
|
||||||
|
|||||||
@@ -46,6 +46,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
|
IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
|
||||||
|
|
||||||
// Sort by one of supported fields, format +|-(field)
|
// Sort by one of supported fields, format +|-(field)
|
||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ type WorkersGroupAddRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
Name string `url:"name" json:"name" validate:"required"`
|
Name string `url:"name" json:"name" validate:"required"`
|
||||||
|
|
||||||
|
// ID of the chosen storage policy
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// ID of SEP to create boot disks for default worker nodes group. Uses images SEP ID if not set
|
// ID of SEP to create boot disks for default worker nodes group. Uses images SEP ID if not set
|
||||||
// Required: false
|
// Required: false
|
||||||
WorkerSEPID uint64 `url:"workerSepId,omitempty" json:"workerSepId,omitempty"`
|
WorkerSEPID uint64 `url:"workerSepId,omitempty" json:"workerSepId,omitempty"`
|
||||||
|
|||||||
@@ -42,6 +42,18 @@ type Interface struct {
|
|||||||
// SDN interface id
|
// SDN interface id
|
||||||
// Required: false
|
// Required: false
|
||||||
SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty"`
|
SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty"`
|
||||||
|
|
||||||
|
// List of security group IDs to assign to this interface
|
||||||
|
// Required: false
|
||||||
|
SecGroups []uint64 `url:"security_groups,omitempty" json:"security_groups,omitempty"`
|
||||||
|
|
||||||
|
// Flag indicating whether security groups are enabled for this interface
|
||||||
|
// Required: false
|
||||||
|
EnableSecGroups bool `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty"`
|
||||||
|
|
||||||
|
// Flag indicating whether this interface is enabled (only for VINS, EXTNET, DPDK, SDN, TRUNK)
|
||||||
|
// Required: false
|
||||||
|
Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// DataDisk detailed struct for DataDisks field in CreateRequest and CreateBlankRequest
|
// DataDisk detailed struct for DataDisks field in CreateRequest and CreateBlankRequest
|
||||||
@@ -54,6 +66,10 @@ type DataDisk struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
Size uint64 `url:"size" json:"size" validate:"required"`
|
Size uint64 `url:"size" json:"size" validate:"required"`
|
||||||
|
|
||||||
|
// Storage policy id of disk. The rules of the specified storage policy will be used.
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// Storage endpoint provider ID
|
// Storage endpoint provider ID
|
||||||
// By default the same with boot disk
|
// By default the same with boot disk
|
||||||
// Required: false
|
// Required: false
|
||||||
@@ -92,6 +108,10 @@ type CreateRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
RAM uint64 `url:"ram" json:"ram" validate:"required"`
|
RAM uint64 `url:"ram" json:"ram" validate:"required"`
|
||||||
|
|
||||||
|
// Storage policy id of сompute. The rules of the specified storage policy will be used.
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// If True, the imageId, bootDisk, sepId, pool parameters are ignored and the compute is created without a boot disk in the stopped state
|
// If True, the imageId, bootDisk, sepId, pool parameters are ignored and the compute is created without a boot disk in the stopped state
|
||||||
// Required: false
|
// Required: false
|
||||||
WithoutBootDisk bool `url:"withoutBootDisk" json:"withoutBootDisk"`
|
WithoutBootDisk bool `url:"withoutBootDisk" json:"withoutBootDisk"`
|
||||||
@@ -101,6 +121,10 @@ type CreateRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
||||||
|
|
||||||
|
// The OS version that will be installed on the virtual machine
|
||||||
|
// Required: false
|
||||||
|
OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
|
||||||
|
|
||||||
// Size of the boot disk in GB
|
// Size of the boot disk in GB
|
||||||
// Required: false
|
// Required: false
|
||||||
BootDisk uint64 `url:"bootDisk,omitempty" json:"bootDisk,omitempty"`
|
BootDisk uint64 `url:"bootDisk,omitempty" json:"bootDisk,omitempty"`
|
||||||
@@ -150,10 +174,6 @@ type CreateRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
CustomFields string `url:"customFields,omitempty" json:"customFields,omitempty"`
|
CustomFields string `url:"customFields,omitempty" json:"customFields,omitempty"`
|
||||||
|
|
||||||
// Type of compute Stateful (KVM_X86) or Stateless (SVA_KVM_X86)
|
|
||||||
// Required: false
|
|
||||||
Driver string `url:"driver,omitempty" json:"driver,omitempty" validate:"omitempty,computeDriver"`
|
|
||||||
|
|
||||||
// Rule for VM placement with NUMA affinity.
|
// Rule for VM placement with NUMA affinity.
|
||||||
// Possible values - none (placement without NUMA affinity),
|
// Possible values - none (placement without NUMA affinity),
|
||||||
// strict (strictly with NUMA affinity, if not possible - do not start VM),
|
// strict (strictly with NUMA affinity, if not possible - do not start VM),
|
||||||
|
|||||||
@@ -28,6 +28,10 @@ type CreateBlankRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
RAM uint64 `url:"ram" json:"ram" validate:"required"`
|
RAM uint64 `url:"ram" json:"ram" validate:"required"`
|
||||||
|
|
||||||
|
// Storage policy id of compute. The rules of the specified storage policy will be used.
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// If True, the imageId, bootDisk, sepId, pool parameters are ignored and the compute is created without a boot disk in the stopped state
|
// If True, the imageId, bootDisk, sepId, pool parameters are ignored and the compute is created without a boot disk in the stopped state
|
||||||
// Required: false
|
// Required: false
|
||||||
WithoutBootDisk bool `url:"withoutBootDisk" json:"withoutBootDisk"`
|
WithoutBootDisk bool `url:"withoutBootDisk" json:"withoutBootDisk"`
|
||||||
@@ -57,10 +61,6 @@ type CreateBlankRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
|
Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
|
||||||
|
|
||||||
// Type of compute Stateful (KVM_X86) or Stateless (SVA_KVM_X86)
|
|
||||||
// Required: false
|
|
||||||
Driver string `url:"driver,omitempty" json:"driver,omitempty" validate:"omitempty,computeDriver"`
|
|
||||||
|
|
||||||
// Type of the emulated system, Q35 or i440fx
|
// Type of the emulated system, Q35 or i440fx
|
||||||
// Required: false
|
// Required: false
|
||||||
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
|
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
|
||||||
@@ -92,6 +92,10 @@ type CreateBlankRequest struct {
|
|||||||
// Zone ID
|
// Zone ID
|
||||||
// Required: false
|
// Required: false
|
||||||
ZoneID uint64 `url:"zoneId,omitempty" json:"zoneId,omitempty"`
|
ZoneID uint64 `url:"zoneId,omitempty" json:"zoneId,omitempty"`
|
||||||
|
|
||||||
|
// The OS version that will be installed on the virtual machine
|
||||||
|
// Required: false
|
||||||
|
OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRAM returns RAM field values
|
// GetRAM returns RAM field values
|
||||||
|
|||||||
@@ -50,6 +50,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,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"`
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -22,6 +23,10 @@ type CreateRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
Name string `url:"name" json:"name" validate:"required,min=2"`
|
Name string `url:"name" json:"name" validate:"required,min=2"`
|
||||||
|
|
||||||
|
// Storage policies
|
||||||
|
// Required: false
|
||||||
|
StoragePolicies []StoragePolicy `url:"storage_policies" json:"storage_policies"`
|
||||||
|
|
||||||
// Max size of memory in MB
|
// Max size of memory in MB
|
||||||
// Required: false
|
// Required: false
|
||||||
MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
|
MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
|
||||||
@@ -77,6 +82,11 @@ type CreateRequest struct {
|
|||||||
SDNAccessGroupID string `url:"sdn_access_group_id,omitempty" json:"sdn_access_group_id,omitempty"`
|
SDNAccessGroupID string `url:"sdn_access_group_id,omitempty" json:"sdn_access_group_id,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type StoragePolicy struct {
|
||||||
|
ID uint64 `url:"id" json:"id"`
|
||||||
|
Limit int `url:"limit" json:"limit"`
|
||||||
|
}
|
||||||
|
|
||||||
// Create creates resource group
|
// Create creates resource group
|
||||||
func (r RG) Create(ctx context.Context, req CreateRequest) (uint64, error) {
|
func (r RG) Create(ctx context.Context, req CreateRequest) (uint64, error) {
|
||||||
err := validators.ValidateRequest(req)
|
err := validators.ValidateRequest(req)
|
||||||
@@ -86,7 +96,7 @@ func (r RG) Create(ctx context.Context, req CreateRequest) (uint64, error) {
|
|||||||
|
|
||||||
url := "/cloudapi/rg/create"
|
url := "/cloudapi/rg/create"
|
||||||
|
|
||||||
res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
res, err := r.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -134,6 +134,9 @@ type RecordResourceGroup struct {
|
|||||||
// List of resource types
|
// List of resource types
|
||||||
ResTypes []string `json:"resourceTypes"`
|
ResTypes []string `json:"resourceTypes"`
|
||||||
|
|
||||||
|
// Storage policy ids
|
||||||
|
StoragePolicyIDs []uint64 `json:"storage_policy_ids"`
|
||||||
|
|
||||||
// SDN access group id
|
// SDN access group id
|
||||||
SDNAccessGroupID string `json:"sdn_access_group_id"`
|
SDNAccessGroupID string `json:"sdn_access_group_id"`
|
||||||
|
|
||||||
@@ -233,6 +236,9 @@ type ItemResourceGroup struct {
|
|||||||
// SDN access group id
|
// SDN access group id
|
||||||
SDNAccessGroupID string `json:"sdn_access_group_id"`
|
SDNAccessGroupID string `json:"sdn_access_group_id"`
|
||||||
|
|
||||||
|
// Storage policy ids
|
||||||
|
StoragePolicyIDs []uint64 `json:"storage_policy_ids"`
|
||||||
|
|
||||||
// Secret
|
// Secret
|
||||||
Secret string `json:"secret"`
|
Secret string `json:"secret"`
|
||||||
|
|
||||||
@@ -308,6 +314,9 @@ type ResourceLimits struct {
|
|||||||
|
|
||||||
// GPU units
|
// GPU units
|
||||||
GPUUnits float64 `json:"gpu_units"`
|
GPUUnits float64 `json:"gpu_units"`
|
||||||
|
|
||||||
|
// Storage policies
|
||||||
|
StoragePolicies []StoragePolicy `json:"storage_policy"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main information about affinity group
|
// Main information about affinity group
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -50,6 +51,10 @@ type UpdateRequest struct {
|
|||||||
// Default: false
|
// Default: false
|
||||||
// Required: false
|
// Required: false
|
||||||
ClearUniqPools bool `url:"clearUniqPools" json:"clearUniqPools"`
|
ClearUniqPools bool `url:"clearUniqPools" json:"clearUniqPools"`
|
||||||
|
|
||||||
|
// Storage policies
|
||||||
|
// Required: false
|
||||||
|
StoragePolicies []StoragePolicy `url:"-" json:"storage_policies,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update updates resource group
|
// Update updates resource group
|
||||||
@@ -61,7 +66,7 @@ func (r RG) Update(ctx context.Context, req UpdateRequest) (bool, error) {
|
|||||||
|
|
||||||
url := "/cloudapi/rg/update"
|
url := "/cloudapi/rg/update"
|
||||||
|
|
||||||
res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
res, err := r.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|||||||
46
pkg/cloudapi/secgroup/create.go
Normal file
46
pkg/cloudapi/secgroup/create.go
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type CreateRequest struct {
|
||||||
|
// Account ID that owns security group
|
||||||
|
// Required: true
|
||||||
|
AccountID uint64 `url:"account_id" json:"account_id" validate:"required"`
|
||||||
|
|
||||||
|
// Security group name
|
||||||
|
// Required: true
|
||||||
|
Name string `url:"name" json:"name" validate:"required"`
|
||||||
|
|
||||||
|
// Security group description
|
||||||
|
// Required: false
|
||||||
|
Description string `url:"description,omitempty" json:"description,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sg SecurityGroup) Create(ctx context.Context, req CreateRequest) (uint64, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return 0, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/security_group/create"
|
||||||
|
|
||||||
|
res, err := sg.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := strconv.ParseUint(string(res), 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
|
||||||
|
}
|
||||||
63
pkg/cloudapi/secgroup/create_rule.go
Normal file
63
pkg/cloudapi/secgroup/create_rule.go
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type CreateRuleRequest struct {
|
||||||
|
// Security group ID
|
||||||
|
// Required: true
|
||||||
|
SecurityGroupID uint64 `url:"security_group_id" json:"security_group_id" validate:"required"`
|
||||||
|
|
||||||
|
// Traffic direction (inbound/outbound)
|
||||||
|
// Required: true
|
||||||
|
Direction string `url:"direction" json:"direction" validate:"required,securityGroupDirection"`
|
||||||
|
|
||||||
|
// IP protocol version
|
||||||
|
// Default: IPv4
|
||||||
|
// Required: false
|
||||||
|
Ethertype string `url:"ethertype,omitempty" json:"ethertype,omitempty" validate:"omitempty,securityGroupEthertype"`
|
||||||
|
|
||||||
|
// Network protocol, available values : icmp, tcp, udp
|
||||||
|
// Required: false
|
||||||
|
Protocol string `url:"protocol,omitempty" json:"protocol,omitempty" validate:"omitempty,securityGroupProtocol"`
|
||||||
|
|
||||||
|
// Start port number (for TCP/UDP)
|
||||||
|
// Required: false
|
||||||
|
PortRangeMin uint64 `url:"port_range_min,omitempty" json:"port_range_min,omitempty"`
|
||||||
|
|
||||||
|
// End port number (for TCP/UDP)
|
||||||
|
// Required: false
|
||||||
|
PortRangeMax uint64 `url:"port_range_max,omitempty" json:"port_range_max,omitempty"`
|
||||||
|
|
||||||
|
// Remote IP prefix in CIDR notation
|
||||||
|
// Required: false
|
||||||
|
RemoteIPPrefix string `url:"remote_ip_prefix,omitempty" json:"remote_ip_prefix,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sg SecurityGroup) CreateRule(ctx context.Context, req CreateRuleRequest) (uint64, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return 0, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/security_group/create_rule"
|
||||||
|
|
||||||
|
res, err := sg.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := strconv.ParseUint(string(res), 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
|
||||||
|
}
|
||||||
36
pkg/cloudapi/secgroup/delete.go
Normal file
36
pkg/cloudapi/secgroup/delete.go
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DeleteRequest struct {
|
||||||
|
// Security group ID
|
||||||
|
// Required: true
|
||||||
|
SecurityGroupID uint64 `url:"security_group_id" json:"security_group_id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sg SecurityGroup) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/security_group/delete"
|
||||||
|
|
||||||
|
res, err := sg.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
|
||||||
|
}
|
||||||
40
pkg/cloudapi/secgroup/delete_rule.go
Normal file
40
pkg/cloudapi/secgroup/delete_rule.go
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DeleteRuleRequest struct {
|
||||||
|
// Security group ID
|
||||||
|
// Required: true
|
||||||
|
SecurityGroupID uint64 `url:"security_group_id" json:"security_group_id" validate:"required"`
|
||||||
|
|
||||||
|
// Rule ID
|
||||||
|
// Required: true
|
||||||
|
RuleID uint64 `url:"rule_id" json:"rule_id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sg SecurityGroup) DeleteRule(ctx context.Context, req DeleteRuleRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/security_group/delete_rule"
|
||||||
|
|
||||||
|
res, err := sg.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
|
||||||
|
}
|
||||||
80
pkg/cloudapi/secgroup/filter.go
Normal file
80
pkg/cloudapi/secgroup/filter.go
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
// FilterByID returns ListSecurityGroups with specified ID.
|
||||||
|
func (lsg ListSecurityGroups) FilterByID(id uint64) ListSecurityGroups {
|
||||||
|
predicate := func(isg ItemSecurityGroup) bool {
|
||||||
|
return isg.ID == id
|
||||||
|
}
|
||||||
|
|
||||||
|
return lsg.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByID returns ListSecurityGroups with specified Name.
|
||||||
|
func (lsg ListSecurityGroups) FilterByName(name string) ListSecurityGroups {
|
||||||
|
predicate := func(isg ItemSecurityGroup) bool {
|
||||||
|
return isg.Name == name
|
||||||
|
}
|
||||||
|
|
||||||
|
return lsg.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByCreatedBy returns ListSecurityGroups with specified CreatedBy.
|
||||||
|
func (lsg ListSecurityGroups) FilterByCreatedBy(createdBy string) ListSecurityGroups {
|
||||||
|
predicate := func(isg ItemSecurityGroup) bool {
|
||||||
|
return isg.CreatedBy == createdBy
|
||||||
|
}
|
||||||
|
|
||||||
|
return lsg.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByDescription returns ListSecurityGroups with specified Description.
|
||||||
|
func (lsg ListSecurityGroups) FilterByDescription(description string) ListSecurityGroups {
|
||||||
|
predicate := func(isg ItemSecurityGroup) bool {
|
||||||
|
return isg.Description == description
|
||||||
|
}
|
||||||
|
|
||||||
|
return lsg.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByUpdatedBy returns ListSecurityGroups with specified UpdatedBy.
|
||||||
|
func (lsg ListSecurityGroups) FilterByUpdatedBy(updatedBy string) ListSecurityGroups {
|
||||||
|
predicate := func(isg ItemSecurityGroup) bool {
|
||||||
|
return isg.UpdatedBy == updatedBy
|
||||||
|
}
|
||||||
|
|
||||||
|
return lsg.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByAccountID returns ListSecurityGroups with specified AccountID.
|
||||||
|
func (lsg ListSecurityGroups) FilterByAccountID(accountID uint64) ListSecurityGroups {
|
||||||
|
predicate := func(isg ItemSecurityGroup) bool {
|
||||||
|
return isg.AccountID == accountID
|
||||||
|
}
|
||||||
|
|
||||||
|
return lsg.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterFunc allows filtering ListSecurityGroups based on a user-specified predicate.
|
||||||
|
func (lsg ListSecurityGroups) FilterFunc(predicate func(ItemSecurityGroup) bool) ListSecurityGroups {
|
||||||
|
var result ListSecurityGroups
|
||||||
|
|
||||||
|
for _, item := range lsg.Data {
|
||||||
|
if predicate(item) {
|
||||||
|
result.Data = append(result.Data, item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result.EntryCount = uint64(len(result.Data))
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// FindOne returns first found ItemSecurityGroup
|
||||||
|
// If none was found, returns an empty struct.
|
||||||
|
func (lsg ListSecurityGroups) FindOne() ItemSecurityGroup {
|
||||||
|
if len(lsg.Data) == 0 {
|
||||||
|
return ItemSecurityGroup{}
|
||||||
|
}
|
||||||
|
|
||||||
|
return lsg.Data[0]
|
||||||
|
}
|
||||||
87
pkg/cloudapi/secgroup/filter_test.go
Normal file
87
pkg/cloudapi/secgroup/filter_test.go
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
var securityGroups = ListSecurityGroups{
|
||||||
|
Data: []ItemSecurityGroup{
|
||||||
|
{
|
||||||
|
ID: 1,
|
||||||
|
AccountID: 1,
|
||||||
|
Name: "sg1",
|
||||||
|
Description: "some desc",
|
||||||
|
CreatedBy: "user",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ID: 3,
|
||||||
|
AccountID: 3,
|
||||||
|
Name: "sg3",
|
||||||
|
Description: "some desc",
|
||||||
|
CreatedBy: "anotheruser",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
ID: 5,
|
||||||
|
AccountID: 3,
|
||||||
|
Name: "sg5",
|
||||||
|
Description: "some other desc",
|
||||||
|
CreatedBy: "anotheruser",
|
||||||
|
UpdatedBy: "user",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
EntryCount: 3,
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByID(t *testing.T) {
|
||||||
|
actual := securityGroups.FilterByID(1).FindOne()
|
||||||
|
if actual.ID != 1 {
|
||||||
|
t.Fatal("expected ID 1, found: ", actual.ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByName(t *testing.T) {
|
||||||
|
actual := securityGroups.FilterByName("sg3").FindOne()
|
||||||
|
if actual.Name != "sg3" {
|
||||||
|
t.Fatal("expected Name sg3, found: ", actual.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByDescription(t *testing.T) {
|
||||||
|
actual := securityGroups.FilterByDescription("some desc")
|
||||||
|
|
||||||
|
if len(actual.Data) != 2 {
|
||||||
|
t.Fatal("expected 2 found, actual: ", len(actual.Data))
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, item := range actual.Data {
|
||||||
|
if item.Description != "some desc" {
|
||||||
|
t.Fatal("expected Description 'some desc', found: ", item.Description)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByAccountID(t *testing.T) {
|
||||||
|
actual := securityGroups.FilterByAccountID(1).FindOne()
|
||||||
|
if actual.AccountID != 1 {
|
||||||
|
t.Fatal("expected AccountID 1, found: ", actual.AccountID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByCreatedBy(t *testing.T) {
|
||||||
|
actual := securityGroups.FilterByCreatedBy("anotheruser")
|
||||||
|
|
||||||
|
if len(actual.Data) != 2 {
|
||||||
|
t.Fatal("expected 2 found, actual: ", len(actual.Data))
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, item := range actual.Data {
|
||||||
|
if item.CreatedBy != "anotheruser" {
|
||||||
|
t.Fatal("expected CreatedBy 'anotheruser', found: ", item.CreatedBy)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByUpdatedBy(t *testing.T) {
|
||||||
|
actual := securityGroups.FilterByUpdatedBy("user").FindOne()
|
||||||
|
if actual.UpdatedBy != "user" {
|
||||||
|
t.Fatal("expected UpdatedBy 'user', found: ", actual.UpdatedBy)
|
||||||
|
}
|
||||||
|
}
|
||||||
43
pkg/cloudapi/secgroup/get.go
Normal file
43
pkg/cloudapi/secgroup/get.go
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type GetRequest struct {
|
||||||
|
// ID of security group
|
||||||
|
// Required: true
|
||||||
|
SecurityGroupID uint64 `url:"security_group_id" json:"security_group_id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sg SecurityGroup) Get(ctx context.Context, req GetRequest) (*RecordSecurityGroup, error) {
|
||||||
|
res, err := sg.GetRaw(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
info := RecordSecurityGroup{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res, &info)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &info, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sg SecurityGroup) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/security_group/get"
|
||||||
|
|
||||||
|
res, err := sg.client.DecortApiCall(ctx, http.MethodGet, url, req)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
86
pkg/cloudapi/secgroup/list.go
Normal file
86
pkg/cloudapi/secgroup/list.go
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ListRequest struct {
|
||||||
|
// Search by security group id
|
||||||
|
// Required: false
|
||||||
|
ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
|
||||||
|
|
||||||
|
// Search by account id
|
||||||
|
// Required: false
|
||||||
|
AccountID uint64 `url:"account_id,omitempty" json:"account_id,omitempty"`
|
||||||
|
|
||||||
|
// Search by security group name
|
||||||
|
// Required: false
|
||||||
|
Name string `url:"name,omitempty" json:"name,omitempty"`
|
||||||
|
|
||||||
|
// Search by security group description
|
||||||
|
// Required: false
|
||||||
|
Description string `url:"description,omitempty" json:"description,omitempty"`
|
||||||
|
|
||||||
|
// Search by created after time (unix timestamp)
|
||||||
|
// Required: false
|
||||||
|
CreatedMin uint64 `url:"created_min,omitempty" json:"created_min,omitempty"`
|
||||||
|
|
||||||
|
// Search by created before time (unix timestamp)
|
||||||
|
// Required: false
|
||||||
|
CreatedMax uint64 `url:"created_max,omitempty" json:"created_max,omitempty"`
|
||||||
|
|
||||||
|
// Search by updated after time (unix timestamp)
|
||||||
|
// Required: false
|
||||||
|
UpdatedMin uint64 `url:"updated_min,omitempty" json:"updated_min,omitempty"`
|
||||||
|
|
||||||
|
// Search by updated before time (unix timestamp)
|
||||||
|
// Required: false
|
||||||
|
UpdatedMax uint64 `url:"updated_max,omitempty" json:"updated_max,omitempty"`
|
||||||
|
|
||||||
|
// Sort by one of supported fields, format ±<field>
|
||||||
|
// Required: false
|
||||||
|
SortBy string `url:"sort_by,omitempty" json:"sort_by,omitempty"`
|
||||||
|
|
||||||
|
// 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 security groups as a ListSecurityGroups struct
|
||||||
|
func (sg SecurityGroup) List(ctx context.Context, req ListRequest) (*ListSecurityGroups, error) {
|
||||||
|
|
||||||
|
res, err := sg.ListRaw(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
list := ListSecurityGroups{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res, &list)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &list, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListRaw gets list of security groups as an array of bytes
|
||||||
|
func (sg SecurityGroup) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
|
||||||
|
|
||||||
|
if err := validators.ValidateRequest(req); err != nil {
|
||||||
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/security_group/list"
|
||||||
|
|
||||||
|
res, err := sg.client.DecortApiCall(ctx, http.MethodGet, url, req)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
94
pkg/cloudapi/secgroup/models.go
Normal file
94
pkg/cloudapi/secgroup/models.go
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
type ListSecurityGroups struct {
|
||||||
|
// List
|
||||||
|
Data []ItemSecurityGroup `json:"data"`
|
||||||
|
|
||||||
|
// Entry count
|
||||||
|
EntryCount uint64 `json:"entryCount"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ItemSecurityGroup struct {
|
||||||
|
// ID of the security group
|
||||||
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
|
// Account ID that owns the security group
|
||||||
|
AccountID uint64 `json:"account_id"`
|
||||||
|
|
||||||
|
// Name of the security group
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// Description of the security group
|
||||||
|
Description string `json:"description"`
|
||||||
|
|
||||||
|
// List of rules
|
||||||
|
Rules Rules `json:"rules"`
|
||||||
|
|
||||||
|
// Created at
|
||||||
|
CreatedAt uint64 `json:"created_at"`
|
||||||
|
|
||||||
|
// Updated at
|
||||||
|
UpdatedAt uint64 `json:"updated_at"`
|
||||||
|
|
||||||
|
// Created by
|
||||||
|
CreatedBy string `json:"created_by"`
|
||||||
|
|
||||||
|
// Updated by
|
||||||
|
UpdatedBy string `json:"updated_by"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type RecordSecurityGroup struct {
|
||||||
|
// ID of the security group
|
||||||
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
|
// Account ID that owns the security group
|
||||||
|
AccountID uint64 `json:"account_id"`
|
||||||
|
|
||||||
|
// Name of the security group
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// Description of the security group
|
||||||
|
Description string `json:"description"`
|
||||||
|
|
||||||
|
// List of rules
|
||||||
|
Rules Rules `json:"rules"`
|
||||||
|
|
||||||
|
// Created at
|
||||||
|
CreatedAt uint64 `json:"created_at"`
|
||||||
|
|
||||||
|
// Updated at
|
||||||
|
UpdatedAt uint64 `json:"updated_at"`
|
||||||
|
|
||||||
|
// Created by
|
||||||
|
CreatedBy string `json:"created_by"`
|
||||||
|
|
||||||
|
// Updated by
|
||||||
|
UpdatedBy string `json:"updated_by"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Rules []Rule
|
||||||
|
|
||||||
|
type Rule struct {
|
||||||
|
// ID of the rule
|
||||||
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
|
// Traffic direction (inbound/outbound)
|
||||||
|
Direction string `json:"direction"`
|
||||||
|
|
||||||
|
// IP protocol version
|
||||||
|
Ethertype string `json:"ethertype"`
|
||||||
|
|
||||||
|
// Network protocol
|
||||||
|
Protocol string `json:"protocol"`
|
||||||
|
|
||||||
|
// Start port number (for TCP/UDP)
|
||||||
|
PortRangeMin uint64 `json:"port_range_min"`
|
||||||
|
|
||||||
|
// End port number (for TCP/UDP)
|
||||||
|
PortRangeMax uint64 `json:"port_range_max"`
|
||||||
|
|
||||||
|
// Remote IP prefix in CIDR notation
|
||||||
|
RemoteIPPrefix string `json:"remote_ip_prefix"`
|
||||||
|
|
||||||
|
RemoteGroupID uint64 `json:"remote_group_id"`
|
||||||
|
}
|
||||||
15
pkg/cloudapi/secgroup/security_group.go
Normal file
15
pkg/cloudapi/secgroup/security_group.go
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
|
||||||
|
|
||||||
|
// Structure for creating request to storage policy
|
||||||
|
type SecurityGroup struct {
|
||||||
|
client interfaces.Caller
|
||||||
|
}
|
||||||
|
|
||||||
|
// Builder for stack endpoint
|
||||||
|
func New(client interfaces.Caller) *SecurityGroup {
|
||||||
|
return &SecurityGroup{
|
||||||
|
client: client,
|
||||||
|
}
|
||||||
|
}
|
||||||
41
pkg/cloudapi/secgroup/sorting.go
Normal file
41
pkg/cloudapi/secgroup/sorting.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import "sort"
|
||||||
|
|
||||||
|
// SortByCreatedAt sorts ListSecurityGroups by the CreatedAt field in ascending order.
|
||||||
|
//
|
||||||
|
// If inverse param is set to true, the order is reversed.
|
||||||
|
func (lsg ListSecurityGroups) SortByCreatedAt(inverse bool) ListSecurityGroups {
|
||||||
|
if len(lsg.Data) < 2 {
|
||||||
|
return lsg
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Slice(lsg.Data, func(i, j int) bool {
|
||||||
|
if inverse {
|
||||||
|
return lsg.Data[i].CreatedAt > lsg.Data[j].CreatedAt
|
||||||
|
}
|
||||||
|
|
||||||
|
return lsg.Data[i].CreatedAt < lsg.Data[j].CreatedAt
|
||||||
|
})
|
||||||
|
|
||||||
|
return lsg
|
||||||
|
}
|
||||||
|
|
||||||
|
// SortByUpdatedAt sorts ListSecurityGroups by the UpdatedAt field in ascending order.
|
||||||
|
//
|
||||||
|
// If inverse param is set to true, the order is reversed.
|
||||||
|
func (lsg ListSecurityGroups) SortByUpdatedAt(inverse bool) ListSecurityGroups {
|
||||||
|
if len(lsg.Data) < 2 {
|
||||||
|
return lsg
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Slice(lsg.Data, func(i, j int) bool {
|
||||||
|
if inverse {
|
||||||
|
return lsg.Data[i].UpdatedAt > lsg.Data[j].UpdatedAt
|
||||||
|
}
|
||||||
|
|
||||||
|
return lsg.Data[i].UpdatedAt < lsg.Data[j].UpdatedAt
|
||||||
|
})
|
||||||
|
|
||||||
|
return lsg
|
||||||
|
}
|
||||||
51
pkg/cloudapi/secgroup/update.go
Normal file
51
pkg/cloudapi/secgroup/update.go
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
package secgroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type UpdateRequest struct {
|
||||||
|
// Security group ID
|
||||||
|
// Required: true
|
||||||
|
SecurityGroupID uint64 `url:"security_group_id" json:"security_group_id" validate:"required"`
|
||||||
|
|
||||||
|
// New security group name
|
||||||
|
// Required: false
|
||||||
|
Name string `url:"name,omitempty" json:"name,omitempty"`
|
||||||
|
|
||||||
|
// New security group description
|
||||||
|
// Required: false
|
||||||
|
Description string `url:"description,omitempty" json:"description,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sg SecurityGroup) Update(ctx context.Context, req UpdateRequest) (*RecordSecurityGroup, error) {
|
||||||
|
res, err := sg.UpdateRaw(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
info := RecordSecurityGroup{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res, &info)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &info, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sg SecurityGroup) UpdateRaw(ctx context.Context, req UpdateRequest) ([]byte, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/security_group/update"
|
||||||
|
|
||||||
|
res, err := sg.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
10
pkg/cloudapi/securitygroup.go
Normal file
10
pkg/cloudapi/securitygroup.go
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package cloudapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
secgroup "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/secgroup"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Accessing the Security Group method group
|
||||||
|
func (ca *CloudAPI) SecurityGroup() *secgroup.SecurityGroup {
|
||||||
|
return secgroup.New(ca.client)
|
||||||
|
}
|
||||||
10
pkg/cloudapi/storage_policy.go
Normal file
10
pkg/cloudapi/storage_policy.go
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package cloudapi
|
||||||
|
|
||||||
|
import (
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stpolicy"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Accessing the Storage Policy method group
|
||||||
|
func (ca *CloudAPI) StPolicy() *stpolicy.StPolicy {
|
||||||
|
return stpolicy.New(ca.client)
|
||||||
|
}
|
||||||
43
pkg/cloudapi/stpolicy/get.go
Normal file
43
pkg/cloudapi/stpolicy/get.go
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
package stpolicy
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type GetRequest struct {
|
||||||
|
// ID of storage policy
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sp StPolicy) Get(ctx context.Context, req GetRequest) (*InfoStoragePolicy, error) {
|
||||||
|
res, err := sp.GetRaw(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
info := InfoStoragePolicy{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res, &info)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &info, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sp StPolicy) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/storage_policy/get"
|
||||||
|
|
||||||
|
res, err := sp.client.DecortApiCall(ctx, http.MethodGet, url, req)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
90
pkg/cloudapi/stpolicy/list.go
Normal file
90
pkg/cloudapi/stpolicy/list.go
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
package stpolicy
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ListRequest struct {
|
||||||
|
// Page number
|
||||||
|
// Required: false
|
||||||
|
Page uint64 `url:"page,omitempty" json:"page,omitempty"`
|
||||||
|
|
||||||
|
// Page size
|
||||||
|
// Required: false
|
||||||
|
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
|
||||||
|
|
||||||
|
// Search by storage policy ID
|
||||||
|
// Required: false
|
||||||
|
ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
|
||||||
|
|
||||||
|
// Search by storage policy name
|
||||||
|
// Required: false
|
||||||
|
Name string `url:"name,omitempty" json:"name,omitempty"`
|
||||||
|
|
||||||
|
// Search by storage policy status
|
||||||
|
// Required: false
|
||||||
|
Status string `url:"status,omitempty" json:"status,omitempty"`
|
||||||
|
|
||||||
|
// Search by storage policy desc
|
||||||
|
// Required: false
|
||||||
|
Desc string `url:"desc,omitempty" json:"desc,omitempty"`
|
||||||
|
|
||||||
|
// Search by storage policy iops limit
|
||||||
|
// Required: false
|
||||||
|
LimitIOPS uint64 `url:"limit_iops,omitempty" json:"limit_iops,omitempty"`
|
||||||
|
|
||||||
|
// Sort by one of supported fields, format ±<field>
|
||||||
|
// Required: false
|
||||||
|
SortBy string `url:"sort_by,omitempty" json:"sort_by,omitempty"`
|
||||||
|
|
||||||
|
// ID of account ID
|
||||||
|
// Required: false
|
||||||
|
AccountID uint64 `url:"account_id,omitempty" json:"account_id,omitempty"`
|
||||||
|
|
||||||
|
// Search by resgroup id
|
||||||
|
// Required: false
|
||||||
|
ResgroupID uint64 `url:"resgroup_id,omitempty" json:"resgroup_id,omitempty"`
|
||||||
|
|
||||||
|
// Search by sep id
|
||||||
|
// Required: false
|
||||||
|
SepID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`
|
||||||
|
|
||||||
|
// Search by pool name
|
||||||
|
// Required: false
|
||||||
|
PoolName string `url:"pool_name,omitempty" json:"pool_name,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// List gets list of storage policies as a ListStoragePolicies struct
|
||||||
|
func (sp StPolicy) List(ctx context.Context, req ListRequest) (*ListStoragePolicies, error) {
|
||||||
|
|
||||||
|
res, err := sp.ListRaw(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
list := ListStoragePolicies{}
|
||||||
|
|
||||||
|
err = json.Unmarshal(res, &list)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &list, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListRaw gets list of storage policies as an array of bytes
|
||||||
|
func (sp StPolicy) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
|
||||||
|
|
||||||
|
if err := validators.ValidateRequest(req); err != nil {
|
||||||
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudapi/storage_policy/list"
|
||||||
|
|
||||||
|
res, err := sp.client.DecortApiCall(ctx, http.MethodGet, url, req)
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
82
pkg/cloudapi/stpolicy/models.go
Normal file
82
pkg/cloudapi/stpolicy/models.go
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
package stpolicy
|
||||||
|
|
||||||
|
type ListStoragePolicies struct {
|
||||||
|
// List
|
||||||
|
Data []ItemStoragePolicy `json:"data"`
|
||||||
|
|
||||||
|
// Entry Count
|
||||||
|
EntryCount uint64 `json:"entryCount"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ItemStoragePolicy struct {
|
||||||
|
// ID of the storage policy
|
||||||
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
|
// GUID
|
||||||
|
GUID uint64 `json:"guid"`
|
||||||
|
|
||||||
|
// Name of the storage policy
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// Description of the storage policy
|
||||||
|
Description string `json:"description"`
|
||||||
|
|
||||||
|
// List of pools in SEP for storage policy
|
||||||
|
AccessSEPPools ListAccessSEPPools `json:"access_seps_pools"`
|
||||||
|
|
||||||
|
// Status of the storage policy
|
||||||
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Max IOPS for the sotrage policy
|
||||||
|
LimitIOPS uint64 `json:"limit_iops"`
|
||||||
|
|
||||||
|
// Which accounts and resource groups use the storage policy
|
||||||
|
Usage Usage `json:"usage"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type InfoStoragePolicy struct {
|
||||||
|
// ID of the storage policy
|
||||||
|
ID uint64 `json:"id"`
|
||||||
|
|
||||||
|
// GUID
|
||||||
|
GUID uint64 `json:"guid"`
|
||||||
|
|
||||||
|
// Name of the storage policy
|
||||||
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// Description of the storage policy
|
||||||
|
Description string `json:"description"`
|
||||||
|
|
||||||
|
// List of pools in SEP for storage policy
|
||||||
|
AccessSEPPools ListAccessSEPPools `json:"access_seps_pools"`
|
||||||
|
|
||||||
|
// Status of the storage policy
|
||||||
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Max IOPS for the sotrage policy
|
||||||
|
LimitIOPS uint64 `json:"limit_iops"`
|
||||||
|
|
||||||
|
// Which accounts and resource groups use the storage policy
|
||||||
|
Usage Usage `json:"usage"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ListAccessSEPPools []AccessSEPPool
|
||||||
|
|
||||||
|
type AccessSEPPool struct {
|
||||||
|
// SEP ID
|
||||||
|
SEPID uint64 `json:"sep_id"`
|
||||||
|
|
||||||
|
// SEP name
|
||||||
|
Name string `json:"sep_name"`
|
||||||
|
|
||||||
|
// Pool names
|
||||||
|
PoolNames []string `json:"pool_names"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Usage struct {
|
||||||
|
// List of accounts
|
||||||
|
Accounts []uint64 `json:"accounts"`
|
||||||
|
|
||||||
|
// List of resource groups
|
||||||
|
Resgroups []uint64 `json:"resgroups"`
|
||||||
|
}
|
||||||
15
pkg/cloudapi/stpolicy/storage_policy.go
Normal file
15
pkg/cloudapi/stpolicy/storage_policy.go
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package stpolicy
|
||||||
|
|
||||||
|
import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
|
||||||
|
|
||||||
|
// Structure for creating request to storage policy
|
||||||
|
type StPolicy struct {
|
||||||
|
client interfaces.Caller
|
||||||
|
}
|
||||||
|
|
||||||
|
// Builder for stack endpoint
|
||||||
|
func New(client interfaces.Caller) *StPolicy {
|
||||||
|
return &StPolicy{
|
||||||
|
client: client,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -27,6 +27,9 @@ type ListRequest struct {
|
|||||||
|
|
||||||
// Page size
|
// Page size
|
||||||
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
|
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
|
||||||
|
|
||||||
|
// Status
|
||||||
|
Status string `url:"status,omitempty" json:"status,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// List gets list of all trunks as a ListTrunks struct
|
// List gets list of all trunks as a ListTrunks struct
|
||||||
|
|||||||
@@ -46,6 +46,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,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"`
|
||||||
|
|||||||
@@ -211,6 +211,9 @@ type RecordVNFDev struct {
|
|||||||
|
|
||||||
// VNC password
|
// VNC password
|
||||||
VNCPassword string `json:"vncPasswd"`
|
VNCPassword string `json:"vncPasswd"`
|
||||||
|
|
||||||
|
// Zone ID
|
||||||
|
ZoneID uint64 `json:"zoneId"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// VNF config
|
// VNF config
|
||||||
@@ -269,6 +272,9 @@ type ItemVNFInterface struct {
|
|||||||
// Enabled
|
// Enabled
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
|
|
||||||
|
// Enable security groups
|
||||||
|
EnableSecGroups bool `json:"enable_secgroups"`
|
||||||
|
|
||||||
// FLIPGroup ID
|
// FLIPGroup ID
|
||||||
FLIPGroupID uint64 `json:"flipgroupId"`
|
FLIPGroupID uint64 `json:"flipgroupId"`
|
||||||
|
|
||||||
@@ -305,6 +311,9 @@ type ItemVNFInterface struct {
|
|||||||
// NodeID
|
// NodeID
|
||||||
NodeID int64 `json:"nodeId"`
|
NodeID int64 `json:"nodeId"`
|
||||||
|
|
||||||
|
// List of security groups
|
||||||
|
SecGroups []uint64 `json:"security_groups"`
|
||||||
|
|
||||||
// SDNInterfaceID
|
// SDNInterfaceID
|
||||||
SDNInterfaceID string `json:"sdn_interface_id"`
|
SDNInterfaceID string `json:"sdn_interface_id"`
|
||||||
|
|
||||||
@@ -418,6 +427,9 @@ type RecordNAT struct {
|
|||||||
|
|
||||||
// Type
|
// Type
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
|
||||||
|
// Zone ID
|
||||||
|
ZoneID uint64 `json:"zoneId"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// NAT configuration
|
// NAT configuration
|
||||||
@@ -486,6 +498,9 @@ type RecordGW struct {
|
|||||||
|
|
||||||
// Type
|
// Type
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
|
||||||
|
// Zone ID
|
||||||
|
ZoneID uint64 `json:"zoneId"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GW configuration
|
// GW configuration
|
||||||
@@ -576,6 +591,9 @@ type RecordDHCP struct {
|
|||||||
|
|
||||||
// Type
|
// Type
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
|
|
||||||
|
// Zone ID
|
||||||
|
ZoneID uint64 `json:"zoneId"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// DHCP configuration
|
// DHCP configuration
|
||||||
@@ -673,6 +691,9 @@ type RecordVINS struct {
|
|||||||
// Description
|
// Description
|
||||||
Description string `json:"desc"`
|
Description string `json:"desc"`
|
||||||
|
|
||||||
|
// Enable Security Groups
|
||||||
|
EnableSecGroups bool `json:"enable_secgroups"`
|
||||||
|
|
||||||
// Grid ID
|
// Grid ID
|
||||||
GID uint64 `json:"gid"`
|
GID uint64 `json:"gid"`
|
||||||
|
|
||||||
|
|||||||
@@ -22,12 +22,30 @@ type RecordZone struct {
|
|||||||
// Name
|
// Name
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
|
|
||||||
|
// List of associated account IDs
|
||||||
|
AccountIDs []uint64 `json:"accountIds"`
|
||||||
|
|
||||||
|
// List of associated bservice IDs
|
||||||
|
BserviceIDs []uint64 `json:"bserviceIds"`
|
||||||
|
|
||||||
|
// List of associated compute IDs
|
||||||
|
ComputeIDs []uint64 `json:"computeIds"`
|
||||||
|
|
||||||
// Description
|
// Description
|
||||||
Description string `json:"description"`
|
Description string `json:"description"`
|
||||||
|
|
||||||
// Deletable flag
|
// Deletable flag
|
||||||
Deletable bool `json:"deletable"`
|
Deletable bool `json:"deletable"`
|
||||||
|
|
||||||
|
// List of associated ExtNet IDs
|
||||||
|
ExtnetIDs []uint64 `json:"extnetIds"`
|
||||||
|
|
||||||
|
// List of associated K8s IDs
|
||||||
|
K8SIDs []uint64 `json:"k8sIds"`
|
||||||
|
|
||||||
|
// List of associated LB IDs
|
||||||
|
LBIDs []uint64 `json:"lbIds"`
|
||||||
|
|
||||||
// Status
|
// Status
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
||||||
@@ -39,4 +57,7 @@ type RecordZone struct {
|
|||||||
|
|
||||||
// List of associated Node IDs
|
// List of associated Node IDs
|
||||||
NodeIDs []uint64 `json:"nodeIds"`
|
NodeIDs []uint64 `json:"nodeIds"`
|
||||||
|
|
||||||
|
// List of associated VINS IDs
|
||||||
|
VinsIDs []uint64 `json:"vinsIds"`
|
||||||
}
|
}
|
||||||
|
|||||||
46
pkg/cloudbroker/account/add_storage_policy.go
Normal file
46
pkg/cloudbroker/account/add_storage_policy.go
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
package account
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AddStoragePolicyRequest struct for adding storage policy to the account
|
||||||
|
type AddStoragePolicyRequest struct {
|
||||||
|
// ID of account to add to
|
||||||
|
// Required: true
|
||||||
|
AccountID uint64 `url:"account_id" json:"account_id" validate:"required"`
|
||||||
|
|
||||||
|
// ID of the storage policy to which to connect account
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
|
// Limit storage resources GB. Or -1 unlimit
|
||||||
|
// Required: false
|
||||||
|
Limit int `url:"limit,omitempty" json:"limit,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddStoragePolicy add storage policy to the account.
|
||||||
|
func (a Account) AddStoragePolicy(ctx context.Context, req AddStoragePolicyRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudbroker/account/add_storage_policy"
|
||||||
|
|
||||||
|
res, err := a.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
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -26,6 +27,10 @@ type CreateRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
EmailAddress string `url:"emailaddress,omitempty" json:"emailaddress,omitempty" validate:"omitempty,email"`
|
EmailAddress string `url:"emailaddress,omitempty" json:"emailaddress,omitempty" validate:"omitempty,email"`
|
||||||
|
|
||||||
|
// Storage policies
|
||||||
|
// Required: false
|
||||||
|
StoragePolicies []StoragePolicy `url:"-" json:"storage_policies,omitempty"`
|
||||||
|
|
||||||
// Max size of memory in MB
|
// Max size of memory in MB
|
||||||
// Required: false
|
// Required: false
|
||||||
MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
|
MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
|
||||||
@@ -73,6 +78,11 @@ type CreateRequest struct {
|
|||||||
ZoneIDs []uint64 `url:"zoneIds,omitempty" json:"zoneIds,omitempty"`
|
ZoneIDs []uint64 `url:"zoneIds,omitempty" json:"zoneIds,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type StoragePolicy struct {
|
||||||
|
ID uint64 `url:"id" json:"id"`
|
||||||
|
Limit int `url:"limit" json:"limit"`
|
||||||
|
}
|
||||||
|
|
||||||
// Create creates account
|
// Create creates account
|
||||||
// Setting a cloud unit maximum to -1 or empty will not put any restrictions on the resource
|
// Setting a cloud unit maximum to -1 or empty will not put any restrictions on the resource
|
||||||
func (a Account) Create(ctx context.Context, req CreateRequest) (uint64, error) {
|
func (a Account) Create(ctx context.Context, req CreateRequest) (uint64, error) {
|
||||||
@@ -83,7 +93,7 @@ func (a Account) Create(ctx context.Context, req CreateRequest) (uint64, error)
|
|||||||
|
|
||||||
url := "/cloudbroker/account/create"
|
url := "/cloudbroker/account/create"
|
||||||
|
|
||||||
res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
res, err := a.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|||||||
42
pkg/cloudbroker/account/del_storage_policy.go
Normal file
42
pkg/cloudbroker/account/del_storage_policy.go
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
package account
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DelStoragePolicyRequest struct for deleting storage policy to the account
|
||||||
|
type DelStoragePolicyRequest struct {
|
||||||
|
// ID of account
|
||||||
|
// Required: true
|
||||||
|
AccountID uint64 `url:"account_id" json:"account_id" validate:"required"`
|
||||||
|
|
||||||
|
// ID of the storage policy to which to disconnect account
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DelStoragePolicy delete storage policy to the account.
|
||||||
|
func (a Account) DelStoragePolicy(ctx context.Context, req DelStoragePolicyRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudbroker/account/del_storage_policy"
|
||||||
|
|
||||||
|
res, err := a.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
|
||||||
|
}
|
||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
var accounts = ListAccounts{
|
var accounts = ListAccounts{
|
||||||
Data: []ItemAccount{
|
Data: []ItemAccount{
|
||||||
{
|
{
|
||||||
Meta: []interface{}{},
|
|
||||||
InfoAccount: InfoAccount{
|
InfoAccount: InfoAccount{
|
||||||
CreatedTime: 1676878820,
|
CreatedTime: 1676878820,
|
||||||
DeletedTime: 0,
|
DeletedTime: 0,
|
||||||
@@ -28,7 +27,6 @@ var accounts = ListAccounts{
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Meta: []interface{}{},
|
|
||||||
InfoAccount: InfoAccount{
|
InfoAccount: InfoAccount{
|
||||||
CreatedTime: 1676645275,
|
CreatedTime: 1676645275,
|
||||||
DeletedTime: 1677723401,
|
DeletedTime: 1677723401,
|
||||||
@@ -49,7 +47,6 @@ var accounts = ListAccounts{
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Meta: []interface{}{},
|
|
||||||
InfoAccount: InfoAccount{
|
InfoAccount: InfoAccount{
|
||||||
CreatedTime: 1676883850,
|
CreatedTime: 1676883850,
|
||||||
DeletedTime: 1676883899,
|
DeletedTime: 1676883899,
|
||||||
|
|||||||
@@ -30,6 +30,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,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"`
|
||||||
|
|||||||
@@ -46,6 +46,18 @@ type ListResources struct {
|
|||||||
EntryCount uint64 `json:"entryCount"`
|
EntryCount uint64 `json:"entryCount"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Policy
|
||||||
|
type Policy struct {
|
||||||
|
// Size of the disk
|
||||||
|
DiskSize float64 `json:"disksize"`
|
||||||
|
|
||||||
|
// Max size of the disk
|
||||||
|
DiskSizeMax float64 `json:"disksizemax"`
|
||||||
|
|
||||||
|
// SEPs used
|
||||||
|
SEPs map[string]map[string]DiskUsage `json:"seps"`
|
||||||
|
}
|
||||||
|
|
||||||
type Resource struct {
|
type Resource struct {
|
||||||
// Number of cores
|
// Number of cores
|
||||||
CPU int64 `json:"cpu"`
|
CPU int64 `json:"cpu"`
|
||||||
@@ -70,6 +82,9 @@ type Resource struct {
|
|||||||
|
|
||||||
// SEPs
|
// SEPs
|
||||||
SEPs map[string]map[string]DiskUsage `json:"seps"`
|
SEPs map[string]map[string]DiskUsage `json:"seps"`
|
||||||
|
|
||||||
|
// Policies
|
||||||
|
Policies map[string]Policy `json:"policies"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disk usage
|
// Disk usage
|
||||||
@@ -133,6 +148,9 @@ type ResourceLimits struct {
|
|||||||
|
|
||||||
// GPUUnits
|
// GPUUnits
|
||||||
GPUUnits float64 `json:"gpu_units"`
|
GPUUnits float64 `json:"gpu_units"`
|
||||||
|
|
||||||
|
// Storage policies
|
||||||
|
StoragePolicies []StoragePolicy `json:"storage_policy"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main information about account
|
// Main information about account
|
||||||
@@ -140,9 +158,6 @@ type InfoAccount struct {
|
|||||||
// DCLocation
|
// DCLocation
|
||||||
DCLocation string `json:"DCLocation"`
|
DCLocation string `json:"DCLocation"`
|
||||||
|
|
||||||
// CKey
|
|
||||||
CKey string `json:"_ckey"`
|
|
||||||
|
|
||||||
// Company
|
// Company
|
||||||
Company string `json:"company"`
|
Company string `json:"company"`
|
||||||
|
|
||||||
@@ -200,6 +215,9 @@ type InfoAccount struct {
|
|||||||
// Status
|
// Status
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
||||||
|
// Storage policy ids
|
||||||
|
StoragePolicyIDs []uint64 `json:"storage_policy_ids"`
|
||||||
|
|
||||||
// UniqPools
|
// UniqPools
|
||||||
UniqPools []string `json:"uniqPools"`
|
UniqPools []string `json:"uniqPools"`
|
||||||
|
|
||||||
@@ -234,13 +252,11 @@ type RecordAccount struct {
|
|||||||
ACL []ACLWithEmails `json:"acl"`
|
ACL []ACLWithEmails `json:"acl"`
|
||||||
|
|
||||||
// Zones IDs
|
// Zones IDs
|
||||||
ZoneIDs []ZoneID
|
ZoneIDs []ZoneID `json:"zoneIds"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// More information about account
|
// More information about account
|
||||||
type ItemAccount struct {
|
type ItemAccount struct {
|
||||||
// Meta
|
|
||||||
Meta []interface{} `json:"_meta"`
|
|
||||||
|
|
||||||
// Access Control List
|
// Access Control List
|
||||||
ACL []ACL `json:"acl"`
|
ACL []ACL `json:"acl"`
|
||||||
@@ -249,7 +265,7 @@ type ItemAccount struct {
|
|||||||
InfoAccount
|
InfoAccount
|
||||||
|
|
||||||
// Zones
|
// Zones
|
||||||
ZoneIDs []uint64
|
ZoneIDs []uint64 `json:"zoneIds"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// List of accounts
|
// List of accounts
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
|
||||||
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -46,6 +47,10 @@ type UpdateRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"`
|
SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"`
|
||||||
|
|
||||||
|
// Storage policies
|
||||||
|
// Required: false
|
||||||
|
StoragePolicies []StoragePolicy `url:"-" json:"storage_policies,omitempty"`
|
||||||
|
|
||||||
// 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"`
|
||||||
@@ -74,7 +79,7 @@ func (a Account) Update(ctx context.Context, req UpdateRequest) (bool, error) {
|
|||||||
|
|
||||||
url := "/cloudbroker/account/update"
|
url := "/cloudbroker/account/update"
|
||||||
|
|
||||||
res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
res, err := a.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|||||||
81
pkg/cloudbroker/audit/filter.go
Normal file
81
pkg/cloudbroker/audit/filter.go
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
// FilterByID returns ListAudits with specified ID.
|
||||||
|
func (la ListAudits) FilterByID(guid string) ListAudits {
|
||||||
|
predicate := func(ia ItemAudit) bool {
|
||||||
|
return ia.GUID == guid
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByCall returns ListAudits with specified call.
|
||||||
|
func (la ListAudits) FilterByCall(call string) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.Call == call
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByCorrelationID returns ListAudits with specified correlation id.
|
||||||
|
func (la ListAudits) FilterByCorrelationID(correlationID string) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.CorrelationID == correlationID
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByRemoteAddr returns ListAudits with specified remote address.
|
||||||
|
func (la ListAudits) FilterByRemoteAddr(remoteAddr string) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.RemoteAddr == remoteAddr
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByUser returns ListAudits with specified user name.
|
||||||
|
func (la ListAudits) FilterByUser(user string) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.User == user
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterByStatusCode return ListAudits with specified status code.
|
||||||
|
func (la ListAudits) FilterByStatusCode(statusCode uint64) ListAudits {
|
||||||
|
predicate := func(ic ItemAudit) bool {
|
||||||
|
return ic.StatusCode == statusCode
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.FilterFunc(predicate)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilterFunc allows filtering ListAudits based on a user-specified predicate.
|
||||||
|
func (la ListAudits) FilterFunc(predicate func(ItemAudit) bool) ListAudits {
|
||||||
|
var result ListAudits
|
||||||
|
|
||||||
|
for _, item := range la.Data {
|
||||||
|
if predicate(item) {
|
||||||
|
result.Data = append(result.Data, item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result.EntryCount = uint64(len(result.Data))
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// FindOne returns first found ItemAudit
|
||||||
|
// If none was found, returns an empty struct.
|
||||||
|
func (la ListAudits) FindOne() ItemAudit {
|
||||||
|
if len(la.Data) == 0 {
|
||||||
|
return ItemAudit{}
|
||||||
|
}
|
||||||
|
|
||||||
|
return la.Data[0]
|
||||||
|
}
|
||||||
115
pkg/cloudbroker/audit/filter_test.go
Normal file
115
pkg/cloudbroker/audit/filter_test.go
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
package audit
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
var audits = ListAudits{
|
||||||
|
Data: []ItemAudit{
|
||||||
|
{
|
||||||
|
Args: "[]",
|
||||||
|
Call: "/restmachine/cloudapi/audit/linkedJobs",
|
||||||
|
GUID: "550e8400-e29b-41d4-a716-446655440001",
|
||||||
|
CorrelationID: "550e8400-e29b-41d4-a716-446655440001",
|
||||||
|
Kwargs: `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
|
||||||
|
RemoteAddr: "192.168.1.100",
|
||||||
|
ResponseTime: 1,
|
||||||
|
Result: `[]`,
|
||||||
|
StatusCode: 200,
|
||||||
|
Timestamp: 1640995200,
|
||||||
|
TimestampEnd: 1640995201,
|
||||||
|
User: "test@example.com",
|
||||||
|
TTL: "2025-07-31T14:22:57.028000",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Args: "[]",
|
||||||
|
Call: "/restmachine/cloudapi/audit/test",
|
||||||
|
GUID: "550e8400-e29b-41d4-a716-446655440002",
|
||||||
|
CorrelationID: "550e8400-e29b-41d4-a716-446655440002",
|
||||||
|
Kwargs: `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
|
||||||
|
RemoteAddr: "192.168.1.105",
|
||||||
|
ResponseTime: 5,
|
||||||
|
Result: `[]`,
|
||||||
|
StatusCode: 400,
|
||||||
|
Timestamp: 1640995200,
|
||||||
|
TimestampEnd: 1640995201,
|
||||||
|
User: "test2@example.com",
|
||||||
|
TTL: "2025-07-31T14:22:57.028000",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
EntryCount: 2,
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByID(t *testing.T) {
|
||||||
|
actual := audits.FilterByID("550e8400-e29b-41d4-a716-446655440002").FindOne()
|
||||||
|
|
||||||
|
if actual.GUID != "550e8400-e29b-41d4-a716-446655440002" {
|
||||||
|
t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.GUID)
|
||||||
|
}
|
||||||
|
|
||||||
|
actualEmpty := audits.FilterByID("")
|
||||||
|
|
||||||
|
if len(actualEmpty.Data) != 0 {
|
||||||
|
t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByCorrelationID(t *testing.T) {
|
||||||
|
actual := audits.FilterByCorrelationID("550e8400-e29b-41d4-a716-446655440002").FindOne()
|
||||||
|
|
||||||
|
if actual.CorrelationID != "550e8400-e29b-41d4-a716-446655440002" {
|
||||||
|
t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.CorrelationID)
|
||||||
|
}
|
||||||
|
|
||||||
|
actualEmpty := audits.FilterByCorrelationID("")
|
||||||
|
|
||||||
|
if len(actualEmpty.Data) != 0 {
|
||||||
|
t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByRemoteAddr(t *testing.T) {
|
||||||
|
actual := audits.FilterByRemoteAddr("192.168.1.100").FindOne()
|
||||||
|
|
||||||
|
if actual.RemoteAddr != "192.168.1.100" {
|
||||||
|
t.Fatal("expected remote address 192.168.1.100, found: ", actual.RemoteAddr)
|
||||||
|
}
|
||||||
|
|
||||||
|
actualEmpty := audits.FilterByRemoteAddr("")
|
||||||
|
|
||||||
|
if len(actualEmpty.Data) != 0 {
|
||||||
|
t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByUser(t *testing.T) {
|
||||||
|
actual := audits.FilterByUser("test@example.com").FindOne()
|
||||||
|
|
||||||
|
if actual.User != "test@example.com" {
|
||||||
|
t.Fatal("expected user test@example.com, found: ", actual.RemoteAddr)
|
||||||
|
}
|
||||||
|
|
||||||
|
actualEmpty := audits.FilterByUser("")
|
||||||
|
|
||||||
|
if len(actualEmpty.Data) != 0 {
|
||||||
|
t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByCall(t *testing.T) {
|
||||||
|
actual := audits.FilterByCall("/restmachine/cloudapi/audit/test").FindOne()
|
||||||
|
|
||||||
|
if actual.Call != "/restmachine/cloudapi/audit/test" {
|
||||||
|
t.Fatal("expected call /restmachine/cloudapi/audit/test, found: ", actual.Call)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByStatusCode(t *testing.T) {
|
||||||
|
actual := audits.FilterByStatusCode(200)
|
||||||
|
|
||||||
|
for _, item := range actual.Data {
|
||||||
|
if item.StatusCode != 200 {
|
||||||
|
t.Fatal("expected 200 status code, found: ", item.StatusCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -50,6 +50,50 @@ 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 resource group id
|
||||||
|
// Required: false
|
||||||
|
RGID uint64 `url:"resgroup_id,omitempty" json:"resgroup_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by compute id
|
||||||
|
// Required: false
|
||||||
|
ComputeID uint64 `url:"compute_id,omitempty" json:"compute_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by account id
|
||||||
|
// Required: false
|
||||||
|
AccountID uint64 `url:"account_id,omitempty" json:"account_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by vins id
|
||||||
|
// Required: false
|
||||||
|
VINSID uint64 `url:"vins_id,omitempty" json:"vins_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by service id
|
||||||
|
// Required: false
|
||||||
|
ServiceID uint64 `url:"service_id,omitempty" json:"service_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by k8s id
|
||||||
|
// Required: false
|
||||||
|
K8SID uint64 `url:"k8s_id,omitempty" json:"k8s_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by flipgroup id
|
||||||
|
// Required: false
|
||||||
|
FLIPGroupID uint64 `url:"flipgroup_id,omitempty" json:"flipgroup_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by load balancer id
|
||||||
|
// Required: false
|
||||||
|
LBID uint64 `url:"lb_id,omitempty" json:"lb_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by sep id
|
||||||
|
// Required: false
|
||||||
|
SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`
|
||||||
|
|
||||||
|
// Find by node id
|
||||||
|
// Required: false
|
||||||
|
NodeID uint64 `url:"node_id,omitempty" json:"node_id,omitempty"`
|
||||||
|
|
||||||
|
// Exclude audit lines from response
|
||||||
|
// Required: false
|
||||||
|
ExcludeAuditLines bool `url:"exclude_audit_lines,omitempty" json:"exclude_audit_lines,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// List gets audit records for the specified account object
|
// List gets audit records for the specified account object
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ type ItemAudit struct {
|
|||||||
// GUID
|
// GUID
|
||||||
GUID string `json:"guid"`
|
GUID string `json:"guid"`
|
||||||
|
|
||||||
|
// Correlation ID
|
||||||
|
CorrelationID string `json:"correlation_id"`
|
||||||
|
|
||||||
// Kwargs
|
// Kwargs
|
||||||
Kwargs string `json:"kwargs"`
|
Kwargs string `json:"kwargs"`
|
||||||
|
|
||||||
@@ -37,9 +40,6 @@ type ItemAudit struct {
|
|||||||
|
|
||||||
// TTL
|
// TTL
|
||||||
TTL string `json:"_ttl"`
|
TTL string `json:"_ttl"`
|
||||||
|
|
||||||
// Tags
|
|
||||||
Tags string `json:"tags"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// List of audits
|
// List of audits
|
||||||
@@ -60,6 +60,9 @@ type RecordAudit struct {
|
|||||||
// Call
|
// Call
|
||||||
Call string `json:"call"`
|
Call string `json:"call"`
|
||||||
|
|
||||||
|
// Correlation ID
|
||||||
|
CorrelationID string `json:"correlation_id"`
|
||||||
|
|
||||||
// GUID
|
// GUID
|
||||||
GUID string `json:"guid"`
|
GUID string `json:"guid"`
|
||||||
|
|
||||||
|
|||||||
@@ -38,11 +38,9 @@ type GroupAddRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
|
ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
|
||||||
|
|
||||||
// Compute driver
|
// Compute driver like a KVM_X86, etc.
|
||||||
// should be one of:
|
|
||||||
// - KVM_X86
|
|
||||||
// Required: true
|
// Required: true
|
||||||
Driver string `url:"driver" json:"driver" validate:"driver"`
|
Driver string `url:"driver" json:"driver" validate:"required"`
|
||||||
|
|
||||||
// Storage endpoint provider ID
|
// Storage endpoint provider ID
|
||||||
// Required: false
|
// Required: false
|
||||||
@@ -75,6 +73,10 @@ type GroupAddRequest struct {
|
|||||||
//Chipset "i440fx" or "Q35
|
//Chipset "i440fx" or "Q35
|
||||||
//Required: false
|
//Required: false
|
||||||
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset"`
|
Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset"`
|
||||||
|
|
||||||
|
// ID of the chosen storage policy
|
||||||
|
// Required: false
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRAM returns RAM field values
|
// GetRAM returns RAM field values
|
||||||
|
|||||||
@@ -42,6 +42,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
|
AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
|
||||||
|
|
||||||
// Sort by one of supported fields, format +|-(field)
|
// Sort by one of supported fields, format +|-(field)
|
||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|||||||
@@ -12,11 +12,47 @@ import (
|
|||||||
type AuditsRequest struct {
|
type AuditsRequest struct {
|
||||||
// ID of the compute
|
// ID of the compute
|
||||||
// Required: true
|
// Required: true
|
||||||
ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
|
ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
|
||||||
|
|
||||||
|
// Find all audits after point in time
|
||||||
|
// Required: false
|
||||||
|
TimestampAT uint64 `url:"timestamp_at,omitempty" json:"timestamp_at,omitempty"`
|
||||||
|
|
||||||
|
// Find all audits before point in time
|
||||||
|
// Required: false
|
||||||
|
TimestampTO uint64 `url:"timestamp_to,omitempty" json:"timestamp_to,omitempty"`
|
||||||
|
|
||||||
|
// Find by user
|
||||||
|
// Required: false
|
||||||
|
User string `url:"user,omitempty" json:"user,omitempty"`
|
||||||
|
|
||||||
|
// Find by api endpoints
|
||||||
|
// Required: false
|
||||||
|
Call string `url:"call,omitempty" json:"call,omitempty"`
|
||||||
|
|
||||||
|
// Sort by one of supported fields, format ±<field>
|
||||||
|
// Required: false
|
||||||
|
SortBy string `url:"sort_by,omitempty" json:"sort_by,omitempty"`
|
||||||
|
|
||||||
|
// Page number
|
||||||
|
// Required: false
|
||||||
|
Page uint64 `url:"page,omitempty" json:"page,omitempty"`
|
||||||
|
|
||||||
|
// Page size
|
||||||
|
// Required: false
|
||||||
|
Size uint64 `url:"size,omitempty" json:"size,omitempty"`
|
||||||
|
|
||||||
|
// Find by HTTP min status code
|
||||||
|
// Required: false
|
||||||
|
MinStatusCode uint64 `url:"min_status_code,omitempty" json:"min_status_code,omitempty"`
|
||||||
|
|
||||||
|
// Find by HTTP max status code
|
||||||
|
// Required: false
|
||||||
|
MaxStatusCode uint64 `url:"max_status_code,omitempty" json:"max_status_code,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Audits gets audit records for the specified compute object
|
// Audits gets audit records for the specified compute object
|
||||||
func (c Compute) Audits(ctx context.Context, req AuditsRequest) (ListDetailedAudits, error) {
|
func (c Compute) Audits(ctx context.Context, req AuditsRequest) (*ListDetailedAudits, error) {
|
||||||
err := validators.ValidateRequest(req)
|
err := validators.ValidateRequest(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
return nil, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
@@ -24,7 +60,7 @@ func (c Compute) Audits(ctx context.Context, req AuditsRequest) (ListDetailedAud
|
|||||||
|
|
||||||
url := "/cloudbroker/compute/audits"
|
url := "/cloudbroker/compute/audits"
|
||||||
|
|
||||||
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
|
res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -36,5 +72,5 @@ func (c Compute) Audits(ctx context.Context, req AuditsRequest) (ListDetailedAud
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return list, nil
|
return &list, nil
|
||||||
}
|
}
|
||||||
|
|||||||
50
pkg/cloudbroker/compute/change_secutity_group.go
Normal file
50
pkg/cloudbroker/compute/change_secutity_group.go
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
package compute
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ChangeSecGroupsRequest struct to change security groups for compute
|
||||||
|
type ChangeSecGroupsRequest struct {
|
||||||
|
// Identifier compute
|
||||||
|
// Required: true
|
||||||
|
ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
|
||||||
|
|
||||||
|
// Interface name or MAC address
|
||||||
|
// Required: true
|
||||||
|
Interface string `url:"interface" json:"interface" validate:"required"`
|
||||||
|
|
||||||
|
// List of security group IDs to assign to this interface
|
||||||
|
// Required: false
|
||||||
|
SecGroups []uint64 `url:"security_groups,omitempty" json:"security_groups,omitempty"`
|
||||||
|
|
||||||
|
// Flag indicating whether security groups are enabled for this interface
|
||||||
|
// Required: false
|
||||||
|
EnableSecGroups bool `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChangeSecGroups changes security groups for compute
|
||||||
|
func (c Compute) ChangeSecGroups(ctx context.Context, req ChangeSecGroupsRequest) (bool, error) {
|
||||||
|
err := validators.ValidateRequest(req)
|
||||||
|
if err != nil {
|
||||||
|
return false, validators.ValidationErrors(validators.GetErrors(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
url := "/cloudbroker/compute/change_security_groups"
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
@@ -27,6 +27,10 @@ type CreateTemplateFromBlankRequest struct {
|
|||||||
// Required: true
|
// Required: true
|
||||||
ImageType string `url:"imagetype" json:"imagetype" validate:"imageType"`
|
ImageType string `url:"imagetype" json:"imagetype" validate:"imageType"`
|
||||||
|
|
||||||
|
// Storage policy id of compute. The rules of the specified storage policy will be used.
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// Username for the image
|
// Username for the image
|
||||||
// Required: false
|
// Required: false
|
||||||
Username string `url:"username,omitempty" json:"username,omitempty"`
|
Username string `url:"username,omitempty" json:"username,omitempty"`
|
||||||
|
|||||||
@@ -27,6 +27,10 @@ type DiskAddRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
|
SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
|
||||||
|
|
||||||
|
// Storage policy id of compute. The rules of the specified storage policy will be used.
|
||||||
|
// Required: true
|
||||||
|
StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
|
||||||
|
|
||||||
// Type of the disk
|
// Type of the disk
|
||||||
// Should be one of:
|
// Should be one of:
|
||||||
// - D
|
// - D
|
||||||
@@ -46,6 +50,14 @@ type DiskAddRequest struct {
|
|||||||
// Specify image id for create disk from template
|
// Specify image id for create disk from template
|
||||||
// Required: false
|
// Required: false
|
||||||
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
||||||
|
|
||||||
|
// Desired PCI slot (hex string, e.g. "0x1A")
|
||||||
|
// Required: false
|
||||||
|
PCISlot string `url:"pci_slot,omitempty" json:"pci_slot,omitempty"`
|
||||||
|
|
||||||
|
// Desired bus number (hex string, e.g. "0x03")
|
||||||
|
// Required: false
|
||||||
|
BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskAdd creates new disk and attach to compute
|
// DiskAdd creates new disk and attach to compute
|
||||||
|
|||||||
@@ -21,6 +21,14 @@ 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"`
|
||||||
|
|
||||||
|
// Desired PCI slot (hex string, e.g. "0x1A")
|
||||||
|
// Required: false
|
||||||
|
PCISlot string `url:"pci_slot,omitempty" json:"pci_slot,omitempty"`
|
||||||
|
|
||||||
|
// Desired bus number (hex string, e.g. "0x03")
|
||||||
|
// Required: false
|
||||||
|
BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskAttach attach disk to compute
|
// DiskAttach attach disk to compute
|
||||||
|
|||||||
@@ -58,7 +58,6 @@ var computes = ListComputes{
|
|||||||
GID: 212,
|
GID: 212,
|
||||||
GUID: 48500,
|
GUID: 48500,
|
||||||
ID: 48500,
|
ID: 48500,
|
||||||
ImageID: 9884,
|
|
||||||
Interfaces: ListInterfaces{},
|
Interfaces: ListInterfaces{},
|
||||||
LockStatus: "UNLOCKED",
|
LockStatus: "UNLOCKED",
|
||||||
ManagerID: 0,
|
ManagerID: 0,
|
||||||
@@ -85,7 +84,6 @@ var computes = ListComputes{
|
|||||||
UserManaged: true,
|
UserManaged: true,
|
||||||
VGPUs: []uint64{},
|
VGPUs: []uint64{},
|
||||||
VINSConnected: 0,
|
VINSConnected: 0,
|
||||||
VirtualImageID: 0,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -122,7 +120,6 @@ var computes = ListComputes{
|
|||||||
GID: 212,
|
GID: 212,
|
||||||
GUID: 48556,
|
GUID: 48556,
|
||||||
ID: 48556,
|
ID: 48556,
|
||||||
ImageID: 9884,
|
|
||||||
Interfaces: ListInterfaces{},
|
Interfaces: ListInterfaces{},
|
||||||
LockStatus: "UNLOCKED",
|
LockStatus: "UNLOCKED",
|
||||||
ManagerID: 0,
|
ManagerID: 0,
|
||||||
@@ -149,7 +146,6 @@ var computes = ListComputes{
|
|||||||
UserManaged: true,
|
UserManaged: true,
|
||||||
VGPUs: []uint64{},
|
VGPUs: []uint64{},
|
||||||
VINSConnected: 0,
|
VINSConnected: 0,
|
||||||
VirtualImageID: 0,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -301,7 +297,6 @@ var deleteComputes = ListDeletedComputes{
|
|||||||
GID: 212,
|
GID: 212,
|
||||||
GUID: 48500,
|
GUID: 48500,
|
||||||
ID: 48500,
|
ID: 48500,
|
||||||
ImageID: 9884,
|
|
||||||
Interfaces: ListInterfaces{},
|
Interfaces: ListInterfaces{},
|
||||||
LockStatus: "UNLOCKED",
|
LockStatus: "UNLOCKED",
|
||||||
ManagerID: 0,
|
ManagerID: 0,
|
||||||
@@ -327,7 +322,6 @@ var deleteComputes = ListDeletedComputes{
|
|||||||
UserManaged: true,
|
UserManaged: true,
|
||||||
VGPUs: []uint64{},
|
VGPUs: []uint64{},
|
||||||
VINSConnected: 0,
|
VINSConnected: 0,
|
||||||
VirtualImageID: 0,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -364,7 +358,6 @@ var deleteComputes = ListDeletedComputes{
|
|||||||
GID: 212,
|
GID: 212,
|
||||||
GUID: 48556,
|
GUID: 48556,
|
||||||
ID: 48556,
|
ID: 48556,
|
||||||
ImageID: 9884,
|
|
||||||
Interfaces: ListInterfaces{},
|
Interfaces: ListInterfaces{},
|
||||||
LockStatus: "UNLOCKED",
|
LockStatus: "UNLOCKED",
|
||||||
ManagerID: 0,
|
ManagerID: 0,
|
||||||
@@ -390,7 +383,6 @@ var deleteComputes = ListDeletedComputes{
|
|||||||
UserManaged: true,
|
UserManaged: true,
|
||||||
VGPUs: []uint64{},
|
VGPUs: []uint64{},
|
||||||
VINSConnected: 0,
|
VINSConnected: 0,
|
||||||
VirtualImageID: 0,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -46,10 +46,6 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"`
|
StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"`
|
||||||
|
|
||||||
// Find by image ID
|
|
||||||
// Required: false
|
|
||||||
ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
|
|
||||||
|
|
||||||
// Find by CD image ID
|
// Find by CD image ID
|
||||||
// Required: false
|
// Required: false
|
||||||
CDImageID uint64 `url:"cdImageId,omitempty" json:"cdImageId,omitempty"`
|
CDImageID uint64 `url:"cdImageId,omitempty" json:"cdImageId,omitempty"`
|
||||||
@@ -74,6 +70,11 @@ type ListRequest struct {
|
|||||||
// Required: false
|
// Required: false
|
||||||
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
|
||||||
|
|
||||||
|
// Sort by zone id
|
||||||
|
// Default value: 0
|
||||||
|
// Required: false
|
||||||
|
ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,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"`
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ type MigrateRequest struct {
|
|||||||
Force bool `url:"force,omitempty" json:"force,omitempty"`
|
Force bool `url:"force,omitempty" json:"force,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type asyncWrapperMigrateRequest struct {
|
type AsyncWrapperMigrateRequest struct {
|
||||||
MigrateRequest
|
MigrateRequest
|
||||||
SyncMode bool `url:"sync"`
|
SyncMode bool `url:"sync"`
|
||||||
}
|
}
|
||||||
@@ -39,7 +39,7 @@ func (c Compute) Migrate(ctx context.Context, req MigrateRequest) (bool, error)
|
|||||||
|
|
||||||
url := "/cloudbroker/compute/migrate"
|
url := "/cloudbroker/compute/migrate"
|
||||||
|
|
||||||
syncReq := asyncWrapperMigrateRequest{MigrateRequest: req, SyncMode: true}
|
syncReq := AsyncWrapperMigrateRequest{MigrateRequest: req, SyncMode: true}
|
||||||
|
|
||||||
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, syncReq)
|
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, syncReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -63,7 +63,7 @@ func (c Compute) AsyncMigrate(ctx context.Context, req MigrateRequest) (string,
|
|||||||
|
|
||||||
url := "/cloudbroker/compute/migrate"
|
url := "/cloudbroker/compute/migrate"
|
||||||
|
|
||||||
asyncReq := asyncWrapperMigrateRequest{MigrateRequest: req, SyncMode: false}
|
asyncReq := AsyncWrapperMigrateRequest{MigrateRequest: req, SyncMode: false}
|
||||||
|
|
||||||
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, asyncReq)
|
res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, asyncReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user