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
6 changes: 6 additions & 0 deletions openstack/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,12 @@ func NewVBS(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golan
return sc, err
}

// NewMAASV1 creates a ServiceClient that may be used to access the MAAS service.
func NewMAASV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golangsdk.ServiceClient, error) {
sc, err := initClientOpts(client, eo, "maasv1")
return sc, err
}

func NewHwAntiDDoSV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golangsdk.ServiceClient, error) {
sc, err := initClientOpts(client, eo, "volumev2")
if err != nil {
Expand Down
75 changes: 75 additions & 0 deletions openstack/maas/v1/task/requests.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
package task

import (
"github.com/huaweicloud/golangsdk"
)

var RequestOpts golangsdk.RequestOpts = golangsdk.RequestOpts{
MoreHeaders: map[string]string{"Content-Type": "application/json", "X-Language": "en-us"},
}

type CreateOpts struct {
SrcNode SrcNodeOpts `json:"src_node" required:"true"`
DstNode DstNodeOpts `json:"dst_node" required:"true"`
EnableKMS bool `json:"enableKMS" required:"true"`
ThreadNum int `json:"thread_num" required:"true"`
Description string `json:"description,omitempty"`
SmnInfo *SmnInfoOpts `json:"smnInfo,omitempty"`
}

type SrcNodeOpts struct {
Region string `json:"region" required:"true"`
AK string `json:"ak" required:"true"`
SK string `json:"sk" required:"true"`
ObjectKey string `json:"object_key" required:"true"`
Bucket string `json:"bucket" required:"true"`
CloudType string `json:"cloud_type,omitempty"`
}

type DstNodeOpts struct {
Region string `json:"region" required:"true"`
AK string `json:"ak" required:"true"`
SK string `json:"sk" required:"true"`
ObjectKey string `json:"object_key,omitempty"`
Bucket string `json:"bucket" required:"true"`
}

type SmnInfoOpts struct {
TopicUrn string `json:"topicUrn" required:"true"`
Language string `json:"language" required:"true"`
TriggerConditions []string `json:"triggerConditions" required:"true"`
}

type CreateOptsBuilder interface {
ToTaskCreateMap() (map[string]interface{}, error)
}

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

func Create(c *golangsdk.ServiceClient, opts CreateOptsBuilder) (r CreateResult) {
b, err := opts.ToTaskCreateMap()
if err != nil {
r.Err = err
return
}
reqOpt := &golangsdk.RequestOpts{OkCodes: []int{200},
MoreHeaders: RequestOpts.MoreHeaders}
_, r.Err = c.Post(rootURL(c), b, &r.Body, reqOpt)
return
}

func Get(c *golangsdk.ServiceClient, id string) (r GetResult) {
reqOpt := &golangsdk.RequestOpts{OkCodes: []int{200},
MoreHeaders: RequestOpts.MoreHeaders}
_, r.Err = c.Get(resourceURL(c, id), &r.Body, reqOpt)
return
}

func Delete(c *golangsdk.ServiceClient, id string) (r DeleteResult) {
reqOpt := &golangsdk.RequestOpts{OkCodes: []int{200},
MoreHeaders: RequestOpts.MoreHeaders}
_, r.Err = c.Delete(resourceURL(c, id), reqOpt)
return
}
80 changes: 80 additions & 0 deletions openstack/maas/v1/task/results.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package task

import "github.com/huaweicloud/golangsdk"

type Task struct {
ID int64 `json:"id"`
TaskName string `json:"task_name"`
}

type TaskResult struct {
ID int64 `json:"id"`
Name string `json:"name"`
SrcNode SrcNode `json:"src_node"`
DstNode DstNode `json:"dst_node"`
ThreadNum int `json:"thread_num"`
Status int `json:"status"`
Progress float64 `json:"progress"`
MigrateSpeed int64 `json:"migrate_speed"`
EnableKMS bool `json:"enableKMS"`
Description string `json:"description"`
TotalSize int64 `json:"total_size"`
CompleteSize int64 `json:"complete_size"`
StartTime int64 `json:"start_time"`
LeftTime int64 `json:"left_time"`
TotalTime int64 `json:"total_time"`
SuccessNum int64 `json:"success_num"`
FailNum int64 `json:"fail_num"`
TotalNum int64 `json:"total_num"`
SmnInfo SmnInfo `json:"smnInfo"`
}

type SrcNode struct {
Region string `json:"region"`
ObjectKey []string `json:"object_key"`
Bucket string `json:"bucket"`
}

type DstNode struct {
Region string `json:"region"`
ObjectKey string `json:"object_key"`
Bucket string `json:"bucket"`
}

type SmnInfo struct {
NotifyResult string `json:"notifyResult"`
NotifyErrorMessage string `json:"notifyErrorMessage"`
TopicName string `json:"topicName"`
}

type CreateResult struct {
golangsdk.Result
}

func (r CreateResult) Extract() (*Task, error) {
var s Task
err := r.ExtractInto(&s)
return &s, err
}

func (r CreateResult) ExtractInto(v interface{}) error {
return r.Result.ExtractIntoStructPtr(v, "")
}

type GetResult struct {
golangsdk.Result
}

func (r GetResult) Extract() (*TaskResult, error) {
var s TaskResult
err := r.ExtractInto(&s)
return &s, err
}

func (r GetResult) ExtractInto(v interface{}) error {
return r.Result.ExtractIntoStructPtr(v, "")
}

type DeleteResult struct {
golangsdk.ErrResult
}
13 changes: 13 additions & 0 deletions openstack/maas/v1/task/urls.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package task

import "github.com/huaweicloud/golangsdk"

const resourcePath = "objectstorage/task"

func rootURL(client *golangsdk.ServiceClient) string {
return client.ServiceURL(resourcePath)
}

func resourceURL(client *golangsdk.ServiceClient, id string) string {
return client.ServiceURL(resourcePath, id)
}
2 changes: 1 addition & 1 deletion openstack/rts/v1/stacks/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"

"github.com/huaweicloud/golangsdk"
"gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v2"
)

// Client is an interface that expects a Get method similar to http.Get. This
Expand Down