Add list method

openstack/ces/v1/metrics/results.go

@@ -2,6 +2,7 @@ package metrics
 
 import (
 	"bytes"
+	"strconv"
 
 	"github.com/huaweicloud/golangsdk"
 	"github.com/huaweicloud/golangsdk/pagination"
@@ -11,6 +12,7 @@ type Metrics struct {
 	Metrics  []Metric `json:"metrics"`
 	MetaData MetaData `json:"meta_data"`
 }
+
 type MetaData struct {
 	Count  int    `json:"count"`
 	Marker string `json:"marker"`
@@ -90,6 +92,12 @@ func (r MetricsPage) NextPageURL() (string, error) {
 		return "", nil
 	}
 
+	limit := r.URL.Query().Get("limit")
+	num, _ := strconv.Atoi(limit)
+	if num > len(metrics.Metrics) {
+		return "", nil
+	}
+
 	metricslen := len(metrics.Metrics) - 1
 
 	var buf bytes.Buffer

openstack/dcs/v1/instances/requests.go

@@ -2,6 +2,7 @@ package instances
 
 import (
 	"github.com/huaweicloud/golangsdk"
+	"github.com/huaweicloud/golangsdk/pagination"
 )
 
 // CreateOpsBuilder is used for creating instance parameters.
@@ -118,6 +119,29 @@ type PeriodicalBackupPlan struct {
 	BackupAt []int `json:"backup_at" required:"true"`
 }
 
+type ListDcsInstanceOpts struct {
+	Id            string `q:"id"`
+	Name          string `q:"name"`
+	Type          string `q:"type"`
+	DataStoreType string `q:"datastore_type"`
+	VpcId         string `q:"vpc_id"`
+	SubnetId      string `q:"subnet_id"`
+	Offset        int    `q:"offset"`
+	Limit         int    `q:"limit"`
+}
+
+type ListDcsBuilder interface {
+	ToDcsListDetailQuery() (string, error)
+}
+
+func (opts ListDcsInstanceOpts) ToDcsListDetailQuery() (string, error) {
+	q, err := golangsdk.BuildQueryString(opts)
+	if err != nil {
+		return "", err
+	}
+	return q.String(), err
+}
+
 // ToInstanceCreateMap is used for type convert
 func (ops CreateOps) ToInstanceCreateMap() (map[string]interface{}, error) {
 	return golangsdk.BuildRequestBody(ops, "")
@@ -134,7 +158,6 @@ func Create(client *golangsdk.ServiceClient, ops CreateOpsBuilder) (r CreateResu
 	_, r.Err = client.Post(createURL(client), b, &r.Body, &golangsdk.RequestOpts{
 		OkCodes: []int{200},
 	})
-
 	return
 }
 
@@ -281,3 +304,23 @@ func Extend(client *golangsdk.ServiceClient, id string, opts ExtendOptsBuilder)
 	})
 	return
 }
+
+func List(client *golangsdk.ServiceClient, opts ListDcsBuilder) pagination.Pager {
+	url := listURL(client)
+	if opts != nil {
+		query, err := opts.ToDcsListDetailQuery()
+
+		if err != nil {
+			return pagination.Pager{Err: err}
+		}
+		url += query
+	}
+
+	pageDcsList := pagination.NewPager(client, url, func(r pagination.PageResult) pagination.Page {
+		return DcsPage{pagination.SinglePageBase(r)}
+	})
+
+	dcsheader := map[string]string{"Content-Type": "application/json"}
+	pageDcsList.Headers = dcsheader
+	return pageDcsList
+}

openstack/dcs/v1/instances/results.go

@@ -2,6 +2,7 @@ package instances
 
 import (
 	"github.com/huaweicloud/golangsdk"
+	"github.com/huaweicloud/golangsdk/pagination"
 )
 
 // InstanceCreate response
@@ -26,6 +27,11 @@ type DeleteResult struct {
 	golangsdk.ErrResult
 }
 
+type ListDcsResponse struct {
+	Instances  []Instance `json:"instances"`
+	TotalCount int        `json:"instance_num"`
+}
+
 // Instance response
 type Instance struct {
 	Name                 string               `json:"name"`
@@ -111,3 +117,22 @@ func (r UpdatePasswordResult) Extract() (*Password, error) {
 type ExtendResult struct {
 	golangsdk.Result
 }
+
+type DcsPage struct {
+	pagination.SinglePageBase
+}
+
+func (r DcsPage) IsEmpty() (bool, error) {
+	data, err := ExtractDcsInstances(r)
+	if err != nil {
+		return false, err
+	}
+	return len(data.Instances) == 0, err
+}
+
+// ExtractCloudServers is a function that takes a ListResult and returns the services' information.
+func ExtractDcsInstances(r pagination.Page) (ListDcsResponse, error) {
+	var s ListDcsResponse
+	err := (r.(DcsPage)).ExtractInto(&s)
+	return s, err
+}

openstack/dcs/v1/instances/urls.go

@@ -36,3 +36,7 @@ func passwordURL(client *golangsdk.ServiceClient, id string) string {
 func extendURL(client *golangsdk.ServiceClient, id string) string {
 	return client.ServiceURL(resourcePath, id, extendPath)
 }
+
+func listURL(client *golangsdk.ServiceClient) string {
+	return client.ServiceURL(resourcePath)
+}

openstack/dms/v1/instances/requests.go

@@ -2,6 +2,7 @@ package instances
 
 import (
 	"github.com/huaweicloud/golangsdk"
+	"github.com/huaweicloud/golangsdk/pagination"
 )
 
 // CreateOpsBuilder is used for creating instance parameters.
@@ -167,3 +168,45 @@ func Get(client *golangsdk.ServiceClient, id string) (r GetResult) {
 	_, r.Err = client.Get(getURL(client, id), &r.Body, nil)
 	return
 }
+
+type ListDmsInstanceOpts struct {
+	Id                  string `q:"id"`
+	Name                string `q:"name"`
+	Engine              string `q:"engine"`
+	Status              string `q:"status"`
+	IncludeFailure      string `q:"includeFailure"`
+	ExactMatchName      string `q:"exactMatchName"`
+	EnterpriseProjectID int    `q:"enterprise_project_id"`
+}
+
+type ListDmsBuilder interface {
+	ToDmsListDetailQuery() (string, error)
+}
+
+func (opts ListDmsInstanceOpts) ToDmsListDetailQuery() (string, error) {
+	q, err := golangsdk.BuildQueryString(opts)
+	if err != nil {
+		return "", err
+	}
+	return q.String(), err
+}
+
+func List(client *golangsdk.ServiceClient, opts ListDmsBuilder) pagination.Pager {
+	url := listURL(client)
+	if opts != nil {
+		query, err := opts.ToDmsListDetailQuery()
+
+		if err != nil {
+			return pagination.Pager{Err: err}
+		}
+		url += query
+	}
+
+	pageDmsList := pagination.NewPager(client, url, func(r pagination.PageResult) pagination.Page {
+		return DmsPage{pagination.SinglePageBase(r)}
+	})
+
+	dmsheader := map[string]string{"Content-Type": "application/json"}
+	pageDmsList.Headers = dmsheader
+	return pageDmsList
+}

openstack/dms/v1/instances/results.go

@@ -2,6 +2,7 @@ package instances
 
 import (
 	"github.com/huaweicloud/golangsdk"
+	"github.com/huaweicloud/golangsdk/pagination"
 )
 
 // InstanceCreate response
@@ -26,6 +27,11 @@ type DeleteResult struct {
 	golangsdk.ErrResult
 }
 
+type ListDmsResponse struct {
+	Instances  []Instance `json:"instances"`
+	TotalCount int        `json:"instance_num"`
+}
+
 // Instance response
 type Instance struct {
 	Name              string   `json:"name"`
@@ -76,3 +82,22 @@ func (r GetResult) Extract() (*Instance, error) {
 	err := r.Result.ExtractInto(&s)
 	return &s, err
 }
+
+type DmsPage struct {
+	pagination.SinglePageBase
+}
+
+func (r DmsPage) IsEmpty() (bool, error) {
+	data, err := ExtractDmsInstances(r)
+	if err != nil {
+		return false, err
+	}
+	return len(data.Instances) == 0, err
+}
+
+// ExtractCloudServers is a function that takes a ListResult and returns the services' information.
+func ExtractDmsInstances(r pagination.Page) (ListDmsResponse, error) {
+	var s ListDmsResponse
+	err := (r.(DmsPage)).ExtractInto(&s)
+	return s, err
+}

openstack/dms/v1/instances/urls.go

@@ -24,3 +24,7 @@ func updateURL(c *golangsdk.ServiceClient, id string) string {
 func getURL(client *golangsdk.ServiceClient, id string) string {
 	return client.ServiceURL(resourcePath, id)
 }
+
+func listURL(client *golangsdk.ServiceClient) string {
+	return client.ServiceURL(resourcePath)
+}

openstack/networking/v2/extensions/natgateways/requests.go

@@ -2,6 +2,7 @@ package natgateways
 
 import (
 	"github.com/huaweicloud/golangsdk"
+	"github.com/huaweicloud/golangsdk/pagination"
 )
 
 // CreateOptsBuilder is an interface must satisfy to be used as Create
@@ -21,6 +22,20 @@ type CreateOpts struct {
 	TenantID          string `json:"tenant_id,omitempty"`
 }
 
+type ListOpts struct {
+	Limit             int    `q:"limit"`
+	ID                string `q:"id"`
+	Name              string `q:"name"`
+	TenantId          string `q:"tenant_id"`
+	Description       string `q:"description"`
+	Spec              string `q:"spec"`
+	RouterID          string `q:"router_id"`
+	InternalNetworkID string `q:"internal_network_id"`
+	Status            string `q:"status"`
+	AdminStateUp      *bool  `q:"admin_state_up"`
+	CreatedAt         string `q:"created_at"`
+}
+
 // ToNatGatewayCreateMap allows CreateOpts to satisfy the CreateOptsBuilder
 // interface
 func (opts CreateOpts) ToNatGatewayCreateMap() (map[string]interface{}, error) {
@@ -70,6 +85,15 @@ func (opts UpdateOpts) ToNatGatewayUpdateMap() (map[string]interface{}, error) {
 	return golangsdk.BuildRequestBody(opts, "nat_gateway")
 }
 
+func (opts ListOpts) ToNatGatewayListQuery() (string, error) {
+	q, err := golangsdk.BuildQueryString(opts)
+	return q.String(), err
+}
+
+type ListOptsBuilder interface {
+	ToNatGatewayListQuery() (string, error)
+}
+
 //Update allows nat gateway resources to be updated.
 func Update(c *golangsdk.ServiceClient, id string, opts UpdateOptsBuilder) (r UpdateResult) {
 	b, err := opts.ToNatGatewayUpdateMap()
@@ -82,3 +106,18 @@ func Update(c *golangsdk.ServiceClient, id string, opts UpdateOptsBuilder) (r Up
 	})
 	return
 }
+
+func List(c *golangsdk.ServiceClient, opts ListOptsBuilder) pagination.Pager {
+	url := rootURL(c)
+	if opts != nil {
+		query, err := opts.ToNatGatewayListQuery()
+		if err != nil {
+			return pagination.Pager{Err: err}
+		}
+		url += query
+	}
+
+	return pagination.NewPager(c, url, func(r pagination.PageResult) pagination.Page {
+		return NatGatewayPage{pagination.LinkedPageBase{PageResult: r}}
+	})
+}

openstack/networking/v2/extensions/natgateways/results.go

@@ -2,6 +2,7 @@ package natgateways
 
 import (
 	"github.com/huaweicloud/golangsdk"
+	"github.com/huaweicloud/golangsdk/pagination"
 )
 
 // NatGateway is a struct that represents a nat gateway
@@ -54,3 +55,31 @@ func (r UpdateResult) Extract() (NatGateway, error) {
 type DeleteResult struct {
 	golangsdk.ErrResult
 }
+
+type NatGatewayPage struct {
+	pagination.LinkedPageBase
+}
+
+func (r NatGatewayPage) NextPageURL() (string, error) {
+	var s struct {
+		Links []golangsdk.Link `json:"nat_gateways_links"`
+	}
+	err := r.ExtractInto(&s)
+	if err != nil {
+		return "", err
+	}
+	return golangsdk.ExtractNextURL(s.Links)
+}
+
+func (r NatGatewayPage) IsEmpty() (bool, error) {
+	is, err := ExtractNatGateways(r)
+	return len(is) == 0, err
+}
+
+func ExtractNatGateways(r pagination.Page) ([]NatGateway, error) {
+	var s struct {
+		NatGateways []NatGateway `json:"nat_gateways"`
+	}
+	err := (r.(NatGatewayPage)).ExtractInto(&s)
+	return s.NatGateways, err
+}