Moving network v2 to new(est) pagination idiom
diff --git a/openstack/networking/v2/extensions/requests.go b/openstack/networking/v2/extensions/requests.go
index 1ef7b6d..7120490 100644
--- a/openstack/networking/v2/extensions/requests.go
+++ b/openstack/networking/v2/extensions/requests.go
@@ -3,6 +3,7 @@
import (
"github.com/racker/perigee"
"github.com/rackspace/gophercloud"
+ "github.com/rackspace/gophercloud/pagination"
)
func Get(c *gophercloud.ServiceClient, name string) (*Extension, error) {
@@ -21,6 +22,8 @@
return &ext, nil
}
-func List(c *gophercloud.ServiceClient) gophercloud.Pager {
- return gophercloud.NewLinkedPager(c, ListExtensionURL(c))
+func List(c *gophercloud.ServiceClient) pagination.Pager {
+ return pagination.NewPager(c, ListExtensionURL(c), func(r pagination.LastHTTPResponse) pagination.Page {
+ return ExtensionPage{pagination.SinglePageBase(r)}
+ })
}
diff --git a/openstack/networking/v2/extensions/requests_test.go b/openstack/networking/v2/extensions/requests_test.go
index ae2fbcb..d4bc34c 100644
--- a/openstack/networking/v2/extensions/requests_test.go
+++ b/openstack/networking/v2/extensions/requests_test.go
@@ -6,6 +6,7 @@
"testing"
"github.com/rackspace/gophercloud"
+ "github.com/rackspace/gophercloud/pagination"
th "github.com/rackspace/gophercloud/testhelper"
)
@@ -48,7 +49,7 @@
count := 0
- List(ServiceClient()).EachPage(func(page gophercloud.Page) (bool, error) {
+ List(ServiceClient()).EachPage(func(page pagination.Page) (bool, error) {
count++
actual, err := ExtractExtensions(page)
if err != nil {
diff --git a/openstack/networking/v2/extensions/results.go b/openstack/networking/v2/extensions/results.go
index c249149..c67bd01 100644
--- a/openstack/networking/v2/extensions/results.go
+++ b/openstack/networking/v2/extensions/results.go
@@ -2,7 +2,7 @@
import (
"github.com/mitchellh/mapstructure"
- "github.com/rackspace/gophercloud"
+ "github.com/rackspace/gophercloud/pagination"
)
type Extension struct {
@@ -14,12 +14,24 @@
Description string `json:"description"`
}
-func ExtractExtensions(page gophercloud.Page) ([]Extension, error) {
+type ExtensionPage struct {
+ pagination.SinglePageBase
+}
+
+func (r ExtensionPage) IsEmpty() (bool, error) {
+ is, err := ExtractExtensions(r)
+ if err != nil {
+ return true, err
+ }
+ return len(is) == 0, nil
+}
+
+func ExtractExtensions(page pagination.Page) ([]Extension, error) {
var resp struct {
Extensions []Extension `mapstructure:"extensions"`
}
- err := mapstructure.Decode(page.(gophercloud.LinkedPage).Body, &resp)
+ err := mapstructure.Decode(page.(ExtensionPage).Body, &resp)
if err != nil {
return nil, err
}