v1.11.0

pkg/cloudapi/disks/create.go

@@ -3,8 +3,9 @@ package disks
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // CreateRequest struct to create disk
@@ -13,10 +14,6 @@ type CreateRequest struct {
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
-	// ID of the grid (platform)
-	// Required: true
-	GID uint64 `url:"gid" json:"gid" validate:"required"`
-
 	// Name of disk
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`
@@ -29,17 +26,6 @@ type CreateRequest struct {
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 
-	// Type of disk
-	//	- B=Boot
-	//	- D=Data
-	//	- T=Temp
-	// Required: true
-	Type string `url:"type" json:"type" validate:"diskType"`
-
-	// Size in GB default is 0
-	// Required: false
-	SSDSize uint64 `url:"ssdSize,omitempty" json:"ssdSize,omitempty"`
-
 	// Max IOPS disk can perform defaults to 2000
 	// Required: false
 	IOPS uint64 `url:"iops,omitempty" json:"iops,omitempty"`

pkg/cloudapi/disks/filter_test.go

@@ -35,9 +35,9 @@ var disks = ListDisks{
 			ParentID: 0,
 			PCISlot:  6,
 			Pool:     "vmstor",
-			PresentTo: []uint64{
-				27,
-			},
+			//PresentTo: []uint64{
+			//	27,
+			//},
 			PurgeTime:  0,
 			ResID:      "sample",
 			ResName:    "sample",
@@ -78,10 +78,10 @@ var disks = ListDisks{
 			ParentID: 0,
 			PCISlot:  6,
 			Pool:     "vmstor",
-			PresentTo: []uint64{
-				27,
-				27,
-			},
+			//PresentTo: []uint64{
+			//	27,
+			//	27,
+			//},
 			PurgeTime:  0,
 			ResID:      "sample",
 			ResName:    "sample",
@@ -211,9 +211,9 @@ var searchDisks = ListSearchDisks{
 		ParentID: 0,
 		PCISlot:  6,
 		Pool:     "vmstor",
-		PresentTo: []uint64{
-			27,
-		},
+		//PresentTo: []uint64{
+		//	27,
+		//},
 		PurgeTime:  0,
 		ResID:      "sample",
 		ResName:    "sample",
@@ -254,10 +254,10 @@ var searchDisks = ListSearchDisks{
 		ParentID: 0,
 		PCISlot:  6,
 		Pool:     "vmstor",
-		PresentTo: []uint64{
-			27,
-			27,
-		},
+		//PresentTo: []uint64{
+		//	27,
+		//	27,
+		//},
 		PurgeTime:  0,
 		ResID:      "sample",
 		ResName:    "sample",
@@ -393,7 +393,7 @@ var unattachedDisks = ListDisksUnattached{
 			Password:            "",
 			PCISlot:             -1,
 			Pool:                "data05",
-			PresentTo:           []uint64{},
+			PresentTo:           map[string]uint64{},
 			PurgeAttempts:       0,
 			PurgeTime:           0,
 			RealityDeviceNumber: 0,
@@ -445,10 +445,10 @@ var unattachedDisks = ListDisksUnattached{
 			Password:   "",
 			PCISlot:    -1,
 			Pool:       "data05",
-			PresentTo: []uint64{
-				27,
-				27,
-			},
+			//PresentTo: []uint64{
+			//	27,
+			//	27,
+			//},
 			PurgeAttempts:       0,
 			PurgeTime:           0,
 			RealityDeviceNumber: 0,

pkg/cloudapi/disks/models.go

@@ -14,9 +14,15 @@ type ItemDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
+	//Created by
+	CreatedBy string `json:"createdBy"`
+
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
+	// Deleted by
+	DeletedBy string `json:"deletedBy"`
+
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -50,6 +56,9 @@ type ItemDisk struct {
 	// Machine name
 	MachineName string `json:"machineName"`
 
+	// Milestones
+	Milestones uint64 `json:"milestones"`
+
 	// Name
 	Name string `json:"name"`
 
@@ -69,7 +78,7 @@ type ItemDisk struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo []uint64 `json:"presentTo"`
+	PresentTo map[string]uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -95,6 +104,9 @@ type ItemDisk struct {
 	// SepID
 	SepID uint64 `json:"sepId"`
 
+	// Size available
+	SizeAvailable uint64 `json:"sizeAvailable"`
+
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -115,6 +127,12 @@ type ItemDisk struct {
 
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
+
+	// Update time
+	UpdatedTime uint64 `json:"updatedTime"`
+
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
 }
 
 type ItemDiskUnattached struct {
@@ -200,7 +218,7 @@ type ItemDiskUnattached struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo []uint64 `json:"presentTo"`
+	PresentTo map[string]uint64 `json:"presentTo"`
 
 	// Purge attempts
 	PurgeAttempts uint64 `json:"purgeAttempts"`
@@ -354,9 +372,15 @@ type RecordDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
+	// Created by
+	CreatedBy string `json:"createdBy"`
+
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
+	// Deleted by
+	DeletedBy string `json:"deletedBy"`
+
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -384,6 +408,15 @@ type RecordDisk struct {
 	// IOTune
 	IOTune IOTune `json:"iotune"`
 
+	// Machine ID
+	MachineID uint64 `json:"machineId"`
+
+	// Machine name
+	MachineName string `json:"machineName"`
+
+	// Milestones
+	Milestones uint64 `json:"milestones"`
+
 	// Name
 	Name string `json:"name"`
 
@@ -403,7 +436,7 @@ type RecordDisk struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo []uint64 `json:"presentTo"`
+	PresentTo map[string]uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -429,6 +462,9 @@ type RecordDisk struct {
 	// Shareable
 	Shareable bool `json:"shareable"`
 
+	// Size available
+	SizeAvailable uint64 `json:"sizeAvailable"`
+
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -449,6 +485,12 @@ type RecordDisk struct {
 
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
+
+	// Update time
+	UpdatedTime uint64 `json:"updatedTime"`
+
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
 }
 
 type ItemReplication struct {