Moving network v2 to new(est) pagination idiom
diff --git a/openstack/networking/v2/apiversions/results.go b/openstack/networking/v2/apiversions/results.go
index dbf40eb..9181e7e 100644
--- a/openstack/networking/v2/apiversions/results.go
+++ b/openstack/networking/v2/apiversions/results.go
@@ -2,7 +2,7 @@
import (
"github.com/mitchellh/mapstructure"
- "github.com/rackspace/gophercloud"
+ "github.com/rackspace/gophercloud/pagination"
)
type APIVersion struct {
@@ -10,12 +10,24 @@
ID string `mapstructure:"id" json:"id"`
}
-func ExtractAPIVersions(page gophercloud.Page) ([]APIVersion, error) {
+type APIVersionPage struct {
+ pagination.SinglePageBase
+}
+
+func (r APIVersionPage) IsEmpty() (bool, error) {
+ is, err := ExtractAPIVersions(r)
+ if err != nil {
+ return true, err
+ }
+ return len(is) == 0, nil
+}
+
+func ExtractAPIVersions(page pagination.Page) ([]APIVersion, error) {
var resp struct {
Versions []APIVersion `mapstructure:"versions"`
}
- err := mapstructure.Decode(page.(gophercloud.LinkedPage).Body, &resp)
+ err := mapstructure.Decode(page.(APIVersionPage).Body, &resp)
if err != nil {
return nil, err
}
@@ -28,12 +40,24 @@
Collection string `mapstructure:"collection" json:"collection"`
}
-func ExtractVersionResources(page gophercloud.Page) ([]APIVersionResource, error) {
+type APIVersionResourcePage struct {
+ pagination.SinglePageBase
+}
+
+func (r APIVersionResourcePage) IsEmpty() (bool, error) {
+ is, err := ExtractVersionResources(r)
+ if err != nil {
+ return true, err
+ }
+ return len(is) == 0, nil
+}
+
+func ExtractVersionResources(page pagination.Page) ([]APIVersionResource, error) {
var resp struct {
APIVersionResources []APIVersionResource `mapstructure:"resources"`
}
- err := mapstructure.Decode(page.(gophercloud.LinkedPage).Body, &resp)
+ err := mapstructure.Decode(page.(APIVersionResourcePage).Body, &resp)
if err != nil {
return nil, err
}