v1.3.1

pkg/cloudapi/disks/filter.go

@@ -130,3 +130,62 @@ func (ld ListDisks) FindOne() ItemDisk {
 
 	return ld[0]
 }
+
+// FilterByID returns ListDisksUnattached with specified ID.
+func (lu ListDisksUnattached) FilterByID(id uint64) ListDisksUnattached {
+	predicate := func(idisk ItemDiskUnattached) bool {
+		return idisk.ID == id
+	}
+
+	return lu.FilterFunc(predicate)
+}
+
+// FilterByName returns ListDisksUnattached with specified Name.
+func (lu ListDisksUnattached) FilterByName(name string) ListDisksUnattached {
+	predicate := func(idisk ItemDiskUnattached) bool {
+		return idisk.Name == name
+	}
+
+	return lu.FilterFunc(predicate)
+}
+
+// FilterByStatus returns ListDisksUnattached with specified Status.
+func (lu ListDisksUnattached) FilterByStatus(status string) ListDisksUnattached {
+	predicate := func(idisk ItemDiskUnattached) bool {
+		return idisk.Status == status
+	}
+
+	return lu.FilterFunc(predicate)
+}
+
+// FilterByTechStatus returns ListDisksUnattached with specified TechStatus.
+func (lu ListDisksUnattached) FilterByTechStatus(techStatus string) ListDisksUnattached {
+	predicate := func(idisk ItemDiskUnattached) bool {
+		return idisk.TechStatus == techStatus
+	}
+
+	return lu.FilterFunc(predicate)
+}
+
+// FilterFunc allows filtering ListDisksUnattached based on a user-specified predicate.
+func (lu ListDisksUnattached) FilterFunc(predicate func(ItemDiskUnattached) bool) ListDisksUnattached {
+	var result ListDisksUnattached
+
+	for _, item := range lu {
+		if predicate(item) {
+			result = append(result, item)
+		}
+	}
+
+	return result
+}
+
+// FindOne returns first found ItemDiskUnattached
+// If none was found, returns an empty struct.
+func (lu ListDisksUnattached) FindOne() ItemDiskUnattached {
+	if len(lu) == 0 {
+		return ItemDiskUnattached{}
+	}
+
+	return lu[0]
+}

pkg/cloudapi/disks/filter_test.go

@@ -1,6 +1,8 @@
 package disks
 
-import "testing"
+import (
+	"testing"
+)
 
 var disks = ListDisks{
 	ItemDisk{
@@ -175,3 +177,198 @@ func TestSortByCreatedTime(t *testing.T) {
 		t.Fatal("expected ID 65193, found: ", actual[0].ID)
 	}
 }
+
+var unattachedDisks = ListDisksUnattached{
+	{
+		CKey: "",
+		Meta: []interface{}{
+			"cloudbroker",
+			"disk",
+			1,
+		},
+		AccountID:       149,
+		AccountName:     "test_account1",
+		ACL:             map[string]interface{}{},
+		BootPartition:   0,
+		CreatedTime:     1681477547,
+		DeletedTime:     0,
+		Description:     "",
+		DestructionTime: 0,
+		DiskPath:        "",
+		GID:             2002,
+		GUID:            22636,
+		ID:              22636,
+		ImageID:         0,
+		Images:          []uint64{},
+		IOTune: IOTune{
+			TotalIOPSSec: 2000,
+		},
+		IQN:                 "",
+		Login:               "",
+		Milestones:          43834,
+		Name:                "test_disk",
+		Order:               0,
+		Params:              "",
+		ParentID:            0,
+		Password:            "",
+		PCISlot:             -1,
+		Pool:                "data05",
+		PresentTo:           []uint64{},
+		PurgeAttempts:       0,
+		PurgeTime:           0,
+		RealityDeviceNumber: 0,
+		ReferenceID:         "",
+		ResID:               "79bd3bd8-3424-48d3-963f-1870d506f169",
+		ResName:             "volumes/volume_22636",
+		Role:                "",
+		SEPID:               1,
+		Shareable:           false,
+		SizeMax:             0,
+		SizeUsed:            0,
+		Snapshots:           nil,
+		Status:              "CREATED",
+		TechStatus:          "ALLOCATED",
+		Type:                "D",
+		VMID:                0,
+	},
+	{
+		CKey: "",
+		Meta: []interface{}{
+			"cloudbroker",
+			"disk",
+			1,
+		},
+		AccountID:       150,
+		AccountName:     "test_account",
+		ACL:             map[string]interface{}{},
+		BootPartition:   0,
+		CreatedTime:     1681477558,
+		DeletedTime:     0,
+		Description:     "",
+		DestructionTime: 0,
+		DiskPath:        "",
+		GID:             2002,
+		GUID:            22637,
+		ID:              22637,
+		ImageID:         0,
+		Images:          []uint64{},
+		IOTune: IOTune{
+			TotalIOPSSec: 2000,
+		},
+		IQN:        "",
+		Login:      "",
+		Milestones: 43834,
+		Name:       "test_disk",
+		Order:      0,
+		Params:     "",
+		ParentID:   0,
+		Password:   "",
+		PCISlot:    -1,
+		Pool:       "data05",
+		PresentTo: []uint64{
+			27,
+			27,
+		},
+		PurgeAttempts:       0,
+		PurgeTime:           0,
+		RealityDeviceNumber: 0,
+		ReferenceID:         "",
+		ResID:               "79bd3bd8-3424-48d3-963f-1870d506f169",
+		ResName:             "volumes/volume_22637",
+		Role:                "",
+		SEPID:               1,
+		Shareable:           false,
+		SizeMax:             0,
+		SizeUsed:            0,
+		Snapshots:           nil,
+		Status:              "CREATED",
+		TechStatus:          "ALLOCATED",
+		Type:                "B",
+		VMID:                0,
+	},
+}
+
+func TestListDisksUnattached_FilterByID(t *testing.T) {
+	actual := unattachedDisks.FilterByID(22636)
+
+	if len(actual) == 0 {
+		t.Fatal("No elements were found")
+	}
+
+	actualItem := actual.FindOne()
+
+	if actualItem.ID != 22636 {
+		t.Fatal("expected ID 22636, found: ", actualItem.ID)
+	}
+}
+
+func TestListDisksUnattached_FilterByName(t *testing.T) {
+	actual := unattachedDisks.FilterByName("test_disk")
+
+	if len(actual) != 2 {
+		t.Fatal("expected 2 elements, found: ", len(actual))
+	}
+
+	for _, item := range actual {
+		if item.Name != "test_disk" {
+			t.Fatal("expected 'test_disk' name, found: ", item.Name)
+		}
+	}
+}
+
+func TestListDisksUnattached_FilterByStatus(t *testing.T) {
+	actual := unattachedDisks.FilterByStatus("CREATED")
+
+	if len(actual) == 0 {
+		t.Fatal("No elements were found")
+	}
+
+	for _, item := range actual {
+		if item.Status != "CREATED" {
+			t.Fatal("expected 'CREATED' status, found: ", item.Status)
+		}
+	}
+}
+
+func TestListDisksUnattached_FilterByTechStatus(t *testing.T) {
+	actual := unattachedDisks.FilterByTechStatus("ALLOCATED")
+
+	if len(actual) == 0 {
+		t.Fatal("No elements were found")
+	}
+
+	for _, item := range actual {
+		if item.TechStatus != "ALLOCATED" {
+			t.Fatal("expected 'ALLOCATED' techStatus, found: ", item.TechStatus)
+		}
+	}
+}
+
+func TestListDisksUnattached_FilterFunc(t *testing.T) {
+	actual := unattachedDisks.FilterFunc(func(id ItemDiskUnattached) bool {
+		return len(id.PresentTo) == 2
+	})
+
+	if len(actual) == 0 {
+		t.Fatal("No elements were found")
+	}
+
+	if len(actual[0].PresentTo) != 2 {
+		t.Fatal("expected 2 elements in PresentTo, found: ", len(actual[0].PresentTo))
+	}
+}
+
+func TestListDisksUnattached_SortByCreatedTime(t *testing.T) {
+	actual := unattachedDisks.SortByCreatedTime(false)
+
+	if actual[0].ID != 22636 {
+		t.Fatal("expected ID 22636, found: ", actual[0].ID)
+	}
+
+	actual = unattachedDisks.SortByCreatedTime(true)
+
+	if actual[0].ID != 22637 {
+		t.Fatal("expected ID 22637, found: ", actual[0].ID)
+	}
+
+}

pkg/cloudapi/disks/list_unattached.go

@@ -14,7 +14,7 @@ type ListUnattachedRequest struct {
 }
 
 // ListUnattached gets list of unattached disks
-func (d Disks) ListUnattached(ctx context.Context, req ListUnattachedRequest) (ListDisks, error) {
+func (d Disks) ListUnattached(ctx context.Context, req ListUnattachedRequest) (ListDisksUnattached, error) {
 	url := "/cloudapi/disks/listUnattached"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -22,7 +22,7 @@ func (d Disks) ListUnattached(ctx context.Context, req ListUnattachedRequest) (L
 		return nil, err
 	}
 
-	list := ListDisks{}
+	list := ListDisksUnattached{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudapi/disks/models.go

@@ -114,9 +114,146 @@ type ItemDisk struct {
 	VMID uint64 `json:"vmid"`
 }
 
+type ItemDiskUnattached struct {
+	// CKey
+	CKey string `json:"_ckey"`
+
+	// Meta
+	Meta []interface{} `json:"_meta"`
+
+	// Account ID
+	AccountID uint64 `json:"accountId"`
+
+	// Account name
+	AccountName string `json:"accountName"`
+
+	// Access Control List
+	ACL map[string]interface{} `json:"acl"`
+
+	// Boot Partition
+	BootPartition uint64 `json:"bootPartition"`
+
+	// Created time
+	CreatedTime uint64 `json:"createdTime"`
+
+	// Deleted time
+	DeletedTime uint64 `json:"deletedTime"`
+
+	// Description
+	Description string `json:"desc"`
+
+	// Destruction time
+	DestructionTime uint64 `json:"destructionTime"`
+
+	// Disk path
+	DiskPath string `json:"diskPath"`
+
+	// Grid ID
+	GID uint64 `json:"gid"`
+
+	// GUID
+	GUID uint64 `json:"guid"`
+
+	// ID
+	ID uint64 `json:"id"`
+
+	// Image ID
+	ImageID uint64 `json:"imageId"`
+
+	// Images
+	Images []uint64 `json:"images"`
+
+	// IOTune
+	IOTune IOTune `json:"iotune"`
+
+	// IQN
+	IQN string `json:"iqn"`
+
+	// Login
+	Login string `json:"login"`
+
+	// Milestones
+	Milestones uint64 `json:"milestones"`
+
+	// Name
+	Name string `json:"name"`
+
+	// Order
+	Order uint64 `json:"order"`
+
+	// Params
+	Params string `json:"params"`
+
+	// Parent ID
+	ParentID uint64 `json:"parentId"`
+
+	// Password
+	Password string `json:"passwd"`
+
+	//PCISlot
+	PCISlot int64 `json:"pciSlot"`
+
+	// Pool
+	Pool string `json:"pool"`
+
+	// Present to
+	PresentTo []uint64 `json:"presentTo"`
+
+	// Purge attempts
+	PurgeAttempts uint64 `json:"purgeAttempts"`
+
+	// Purge time
+	PurgeTime uint64 `json:"purgeTime"`
+
+	// Reality device number
+	RealityDeviceNumber uint64 `json:"realityDeviceNumber"`
+
+	// Reference ID
+	ReferenceID string `json:"referenceId"`
+
+	// Resource ID
+	ResID string `json:"resId"`
+
+	// Resource name
+	ResName string `json:"resName"`
+
+	// Role
+	Role string `json:"role"`
+
+	// ID SEP
+	SEPID uint64 `json:"sepId"`
+
+	// Shareable
+	Shareable bool `json:"shareable"`
+
+	// Size max
+	SizeMax uint64 `json:"sizeMax"`
+
+	// Size used
+	SizeUsed float64 `json:"sizeUsed"`
+
+	// List of snapshots
+	Snapshots ListSnapshots `json:"snapshots"`
+
+	// Status
+	Status string `json:"status"`
+
+	// Tech status
+	TechStatus string `json:"techStatus"`
+
+	// Type
+	Type string `json:"type"`
+
+	// Virtual machine ID
+	VMID uint64 `json:"vmid"`
+}
+
 // List of disks
 type ListDisks []ItemDisk
 
+// List of unattached disks
+type ListDisksUnattached []ItemDiskUnattached
+
 // Main information about snapshot
 type ItemSnapshot struct {
 	// GUID

pkg/cloudapi/disks/serialize.go

@@ -41,3 +41,39 @@ func (idisk ItemDisk) Serialize(params ...string) (serialization.Serialized, err
 
 	return json.Marshal(idisk)
 }
+
+// Serialize returns JSON-serialized []byte. Used as a wrapper over json.Marshal and json.MarshalIndent functions.
+//
+// In order to serialize with indent make sure to follow these guidelines:
+//   - First argument -> prefix
+//   - Second argument -> indent
+func (lu ListDisksUnattached) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(lu) == 0 {
+		return []byte{}, nil
+	}
+
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(lu, prefix, indent)
+	}
+
+	return json.Marshal(lu)
+}
+
+// Serialize returns JSON-serialized []byte. Used as a wrapper over json.Marshal and json.MarshalIndent functions.
+//
+// In order to serialize with indent make sure to follow these guidelines:
+//   - First argument -> prefix
+//   - Second argument -> indent
+func (idisk ItemDiskUnattached) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(idisk, prefix, indent)
+	}
+
+	return json.Marshal(idisk)
+}

pkg/cloudapi/disks/sorting.go

@@ -58,3 +58,60 @@ func (ld ListDisks) SortByDeletedTime(inverse bool) ListDisks {
 
 	return ld
 }
+
+// SortByCreatedTime sorts ListDisksUnattached by the CreatedTime field in ascending order.
+//
+// If inverse param is set to true, the order is reversed.
+func (lu ListDisksUnattached) SortByCreatedTime(inverse bool) ListDisksUnattached {
+	if len(lu) < 2 {
+		return lu
+	}
+
+	sort.Slice(lu, func(i, j int) bool {
+		if inverse {
+			return lu[i].CreatedTime > lu[j].CreatedTime
+		}
+
+		return lu[i].CreatedTime < lu[j].CreatedTime
+	})
+
+	return lu
+}
+
+// SortByDestructionTime sorts ListDisksUnattached by the DestructionTime field in ascending order.
+//
+// If inverse param is set to true, the order is reversed.
+func (lu ListDisksUnattached) SortByDestructionTime(inverse bool) ListDisksUnattached {
+	if len(lu) < 2 {
+		return lu
+	}
+
+	sort.Slice(lu, func(i, j int) bool {
+		if inverse {
+			return lu[i].DestructionTime > lu[j].DestructionTime
+		}
+
+		return lu[i].DestructionTime < lu[j].DestructionTime
+	})
+
+	return lu
+}
+
+// SortByDeletedTime sorts ListDisksUnattached by the DeletedTime field in ascending order.
+//
+// If inverse param is set to true, the order is reversed.
+func (lu ListDisksUnattached) SortByDeletedTime(inverse bool) ListDisksUnattached {
+	if len(lu) < 2 {
+		return lu
+	}
+
+	sort.Slice(lu, func(i, j int) bool {
+		if inverse {
+			return lu[i].DeletedTime > lu[j].DeletedTime
+		}
+
+		return lu[i].DeletedTime < lu[j].DeletedTime
+	})
+
+	return lu
+}