Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions openstack/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,14 @@ func NewDNSV2(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*gol
return sc, err
}

// NewImageServiceV1 creates a ServiceClient that may be used to access the v1
// image service.
func NewImageServiceV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golangsdk.ServiceClient, error) {
sc, err := initClientOpts(client, eo, "image")
sc.ResourceBase = sc.Endpoint + "v1/"
return sc, err
}

// NewImageServiceV2 creates a ServiceClient that may be used to access the v2
// image service.
func NewImageServiceV2(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golangsdk.ServiceClient, error) {
Expand Down
32 changes: 32 additions & 0 deletions openstack/ims/v2/cloudimages/requests.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,22 @@ type CreateDataImageByServerOpts struct {
DataImages []DataImage `json:"data_images" required:"true"`
}

// CreateOpts represents options used to create an image.
type CreateDataImageByOBSOpts struct {
// the name of the data disk image
Name string `json:"name" required:"true"`
// Description of image
Description string `json:"description,omitempty"`
// the OS type
OsType string `json:"os_type" required:"true"`
// the URL of the external image file in the OBS bucket
ImageUrl string `json:"image_url" required:"true"`
// the minimum size of the system disk in the unit of GB
MinDisk int `json:"min_disk" required:"true"`
// the master key used for encrypting an image
CmkId string `json:"cmk_id,omitempty"`
}

type DataImage struct {
// the data disk image name
Name string `json:"name" required:"true"`
Expand Down Expand Up @@ -207,6 +223,10 @@ func (opts CreateDataImageByServerOpts) ToImageCreateMap() (map[string]interface
return golangsdk.BuildRequestBody(opts, "")
}

func (opts CreateDataImageByOBSOpts) ToImageCreateMap() (map[string]interface{}, error) {
return golangsdk.BuildRequestBody(opts, "")
}

// Create implements create image request.
func CreateImageByServer(client *golangsdk.ServiceClient, opts CreateOptsBuilder) (r JobResult) {
b, err := opts.ToImageCreateMap()
Expand Down Expand Up @@ -242,3 +262,15 @@ func CreateDataImageByServer(client *golangsdk.ServiceClient, opts CreateOptsBui
_, r.Err = client.Post(createURL(client), b, &r.Body, &golangsdk.RequestOpts{OkCodes: []int{200}})
return
}

// Create implements create image request.
func CreateDataImageByOBS(client *golangsdk.ServiceClient, opts CreateOptsBuilder) (r JobResult) {
b, err := opts.ToImageCreateMap()
if err != nil {
r.Err = err
return
}

_, r.Err = client.Post(createDataImageURL(client), b, &r.Body, &golangsdk.RequestOpts{OkCodes: []int{200}})
return
}
4 changes: 4 additions & 0 deletions openstack/ims/v2/cloudimages/urls.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ func createURL(c *golangsdk.ServiceClient) string {
return c.ServiceURL("cloudimages/action")
}

func createDataImageURL(c *golangsdk.ServiceClient) string {
return c.ServiceURL("cloudimages/dataimages/action")
}

// builds next page full url based on current url
func nextPageURL(serviceURL, requestedNext string) (string, error) {
base, err := utils.BaseEndpoint(serviceURL)
Expand Down