Moving network v2 to new(est) pagination idiom
diff --git a/openstack/networking/v2/networks/errors.go b/openstack/networking/v2/networks/errors.go
index 7397213..7a67ef7 100644
--- a/openstack/networking/v2/networks/errors.go
+++ b/openstack/networking/v2/networks/errors.go
@@ -6,6 +6,11 @@
return fmt.Errorf("You must specify %s for this resource", attr)
}
+func err(str string) error {
+ return fmt.Errorf("%s", str)
+}
+
var (
ErrNameRequired = requiredAttr("name")
+ ErrNoURLFound = err("Next URL could not be extracted from collection")
)
diff --git a/openstack/networking/v2/networks/requests.go b/openstack/networking/v2/networks/requests.go
index 98e70d1..7cb3598 100644
--- a/openstack/networking/v2/networks/requests.go
+++ b/openstack/networking/v2/networks/requests.go
@@ -6,6 +6,7 @@
"github.com/racker/perigee"
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/openstack/utils"
+ "github.com/rackspace/gophercloud/pagination"
)
type ListOpts struct {
@@ -17,6 +18,7 @@
ID string
Page int
PerPage int
+ Limit int
}
type NetworkOpts struct {
@@ -36,7 +38,7 @@
}
}
-func List(c *gophercloud.ServiceClient, opts ListOpts) gophercloud.Pager {
+func List(c *gophercloud.ServiceClient, opts ListOpts) pagination.Pager {
// Build query parameters
q := make(map[string]string)
if opts.Status != "" {
@@ -63,9 +65,14 @@
if opts.PerPage != 0 {
q["per_page"] = strconv.Itoa(opts.PerPage)
}
+ if opts.Limit != 0 {
+ q["limit"] = strconv.Itoa(opts.Limit)
+ }
u := ListURL(c) + utils.BuildQuery(q)
- return gophercloud.NewLinkedPager(c, u)
+ return pagination.NewPager(c, u, func(r pagination.LastHTTPResponse) pagination.Page {
+ return NetworkPage{pagination.LinkedPageBase(r)}
+ })
}
func Get(c *gophercloud.ServiceClient, id string) (*Network, error) {
diff --git a/openstack/networking/v2/networks/requests_test.go b/openstack/networking/v2/networks/requests_test.go
index e677f8e..b4332b0 100644
--- a/openstack/networking/v2/networks/requests_test.go
+++ b/openstack/networking/v2/networks/requests_test.go
@@ -6,6 +6,7 @@
"testing"
"github.com/rackspace/gophercloud"
+ "github.com/rackspace/gophercloud/pagination"
th "github.com/rackspace/gophercloud/testhelper"
)
@@ -72,7 +73,7 @@
client := ServiceClient()
count := 0
- List(client, ListOpts{}).EachPage(func(page gophercloud.Page) (bool, error) {
+ List(client, ListOpts{}).EachPage(func(page pagination.Page) (bool, error) {
count++
actual, err := ExtractNetworks(page)
if err != nil {
diff --git a/openstack/networking/v2/networks/results.go b/openstack/networking/v2/networks/results.go
index b23395a..1f4b809 100644
--- a/openstack/networking/v2/networks/results.go
+++ b/openstack/networking/v2/networks/results.go
@@ -2,7 +2,7 @@
import (
"github.com/mitchellh/mapstructure"
- "github.com/rackspace/gophercloud"
+ "github.com/rackspace/gophercloud/pagination"
)
type NetworkProvider struct {
@@ -31,12 +31,52 @@
PortSecurityEnabled bool `json:"port_security_enabled"`
}
-func ExtractNetworks(page gophercloud.Page) ([]Network, error) {
+type NetworkPage struct {
+ pagination.LinkedPageBase
+}
+
+func (current NetworkPage) NextPageURL() (string, error) {
+ type link struct {
+ Href string `mapstructure:"href"`
+ Rel string `mapstructure:"rel"`
+ }
+ type resp struct {
+ Links []link `mapstructure:"networks_links"`
+ }
+
+ var r resp
+ err := mapstructure.Decode(current.Body, &r)
+ if err != nil {
+ return "", err
+ }
+
+ var url string
+ for _, l := range r.Links {
+ if l.Rel == "next" {
+ url = l.Href
+ }
+ }
+ if url == "" {
+ return "", nil
+ }
+
+ return url, nil
+}
+
+func (r NetworkPage) IsEmpty() (bool, error) {
+ is, err := ExtractNetworks(r)
+ if err != nil {
+ return true, nil
+ }
+ return len(is) == 0, nil
+}
+
+func ExtractNetworks(page pagination.Page) ([]Network, error) {
var resp struct {
Networks []Network `mapstructure:"networks" json:"networks"`
}
- err := mapstructure.Decode(page.(gophercloud.LinkedPage).Body, &resp)
+ err := mapstructure.Decode(page.(NetworkPage).Body, &resp)
if err != nil {
return nil, err
}