v1.8.0

pkg/cloudbroker/kvmx86/create.go

@@ -26,6 +26,35 @@ type Interface struct {
 	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
 }
 
+// DataDisk detailed struct for DataDisks field in CreateRequest, CreateBlankRequest and MassCreateRequest
+type DataDisk struct {
+	// Name for disk
+	// Required: true
+	DiskName string `url:"diskName" json:"diskName" validate:"required"`
+
+	// Disk size in GB
+	// Required: true
+	Size uint64 `url:"size" json:"size" validate:"required"`
+
+	// Storage endpoint provider ID
+	// By default the same with boot disk
+	// Required: false
+	SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
+
+	// Pool name
+	// By default will be chosen automatically
+	// Required: false
+	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
+
+	// Optional description
+	// Required: false
+	Description string `url:"desc,omitempty" json:"desc,omitempty"`
+
+	// Specify image id for create disk from template
+	// Required: false
+	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
+}
+
 // CreateRequest struct to create KVM x86 VM
 type CreateRequest struct {
 	// ID of the resource group, which will own this VM
@@ -63,6 +92,12 @@ type CreateRequest struct {
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
 
+	// Slice of structs with data disk description. Each disk has parameters: required - diskName, size; optional - sepId, pool, desc and imageId.
+	// If not specified, compute will be created without disks.
+	// To create compute without disks, pass initialized empty slice .
+	// Required: false
+	DataDisks []DataDisk `url:"-" json:"dataDisks,omitempty" validate:"omitempty,dive"`
+
 	// Slice of structs with net interface description.
 	// If not specified, compute will be created with default interface from RG.
 	// To create compute without interfaces, pass initialized empty slice .
@@ -106,9 +141,20 @@ type CreateRequest struct {
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
+// GetRAM returns RAM field values
+func (r CreateRequest) GetRAM() map[string]uint64 {
+
+	res := make(map[string]uint64, 1)
+
+	res["RAM"] = r.RAM
+
+	return res
+}
+
 type wrapperCreateRequest struct {
 	CreateRequest
 	Interfaces []string `url:"interfaces,omitempty"`
+	DataDisks  []string `url:"dataDisks,omitempty"`
 }
 
 // Create creates KVM PowerPC VM based on specified OS image
@@ -135,9 +181,25 @@ func (k KVMX86) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 		interfaces = []string{"[]"}
 	}
 
+	var dataDisks []string
+
+	if req.DataDisks != nil && len(req.DataDisks) != 0 {
+		dataDisks = make([]string, 0, len(req.DataDisks))
+
+		for i := range req.DataDisks {
+			b, err := json.Marshal(req.DataDisks[i])
+			if err != nil {
+				return 0, err
+			}
+
+			dataDisks = append(dataDisks, string(b))
+		}
+	}
+
 	reqWrapped := wrapperCreateRequest{
 		CreateRequest: req,
 		Interfaces:    interfaces,
+		DataDisks:     dataDisks,
 	}
 
 	url := "/cloudbroker/kvmx86/create"

pkg/cloudbroker/kvmx86/create_blank.go

@@ -41,6 +41,12 @@ type CreateBlankRequest struct {
 	// Required: true
 	Pool string `url:"pool" json:"pool" validate:"required"`
 
+	// Slice of structs with data disk description. Each disk has parameters: required - diskName, size; optional - sepId, pool, desc and imageId.
+	// If not specified, compute will be created without disks.
+	// To create compute without disks, pass initialized empty slice .
+	// Required: false
+	DataDisks []DataDisk `url:"-" json:"dataDisks,omitempty" validate:"omitempty,dive"`
+
 	// Slice of structs with net interface description.
 	// If not specified, compute will be created with default interface from RG.
 	// To create compute without interfaces, pass initialized empty slice .
@@ -56,9 +62,20 @@ type CreateBlankRequest struct {
 	Driver string `url:"driver,omitempty" json:"driver,omitempty"`
 }
 
+// GetRAM returns RAM field values
+func (r CreateBlankRequest) GetRAM() map[string]uint64 {
+
+	res := make(map[string]uint64, 1)
+
+	res["RAM"] = r.RAM
+
+	return res
+}
+
 type wrapperCreateBlankRequest struct {
 	CreateBlankRequest
 	Interfaces []string `url:"interfaces,omitempty"`
+	DataDisks  []string `url:"dataDisks,omitempty"`
 }
 
 // CreateBlank creates KVM x86 VM from scratch
@@ -85,9 +102,25 @@ func (k KVMX86) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64
 		interfaces = []string{"[]"}
 	}
 
+	var dataDisks []string
+
+	if req.DataDisks != nil && len(req.DataDisks) != 0 {
+		dataDisks = make([]string, 0, len(req.DataDisks))
+
+		for i := range req.DataDisks {
+			b, err := json.Marshal(req.DataDisks[i])
+			if err != nil {
+				return 0, err
+			}
+
+			dataDisks = append(dataDisks, string(b))
+		}
+	}
+
 	reqWrapped := wrapperCreateBlankRequest{
 		CreateBlankRequest: req,
 		Interfaces:         interfaces,
+		DataDisks:          dataDisks,
 	}
 
 	url := "/cloudbroker/kvmx86/createBlank"

pkg/cloudbroker/kvmx86/mass_create.go

@@ -48,6 +48,12 @@ type MassCreateRequest struct {
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
 
+	// Slice of structs with data disk description. Each disk has parameters: required - diskName, size; optional - sepId, pool, desc and imageId.
+	// If not specified, compute will be created without disks.
+	// To create compute without disks, pass initialized empty slice .
+	// Required: false
+	DataDisks []DataDisk `url:"-" json:"dataDisks,omitempty" validate:"omitempty,dive"`
+
 	// Slice of structs with net interface description.
 	// If not specified, compute will be created with default interface from RG.
 	// To create compute without interfaces, pass initialized empty slice .
@@ -71,9 +77,20 @@ type MassCreateRequest struct {
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
+// GetRAM returns RAM field values
+func (r MassCreateRequest) GetRAM() map[string]uint64 {
+
+	res := make(map[string]uint64, 1)
+
+	res["RAM"] = r.RAM
+
+	return res
+}
+
 type wrapperMassCreateRequest struct {
 	MassCreateRequest
 	Interfaces []string `url:"interfaces,omitempty"`
+	DataDisks  []string `url:"dataDisks,omitempty"`
 }
 
 // MassCreate creates KVM x86 computes based on specified OS image
@@ -100,9 +117,25 @@ func (k KVMX86) MassCreate(ctx context.Context, req MassCreateRequest) ([]uint64
 		interfaces = []string{"[]"}
 	}
 
+	var dataDisks []string
+
+	if req.DataDisks != nil && len(req.DataDisks) != 0 {
+		dataDisks = make([]string, 0, len(req.DataDisks))
+
+		for i := range req.DataDisks {
+			b, err := json.Marshal(req.DataDisks[i])
+			if err != nil {
+				return nil, err
+			}
+
+			dataDisks = append(dataDisks, string(b))
+		}
+	}
+
 	reqWrapped := wrapperMassCreateRequest{
 		MassCreateRequest: req,
 		Interfaces:        interfaces,
+		DataDisks:         dataDisks,
 	}
 
 	url := "/cloudbroker/kvmx86/massCreate"