Shuffled resources into sub-packages and upgraded to new pagination idiom
diff --git a/openstack/networking/v2/extensions/doc.go b/openstack/networking/v2/extensions/doc.go
index 83c4a6a..aeec0fa 100644
--- a/openstack/networking/v2/extensions/doc.go
+++ b/openstack/networking/v2/extensions/doc.go
@@ -1 +1 @@
-package networks
+package extensions
diff --git a/openstack/networking/v2/extensions/errors.go b/openstack/networking/v2/extensions/errors.go
index 83c4a6a..aeec0fa 100644
--- a/openstack/networking/v2/extensions/errors.go
+++ b/openstack/networking/v2/extensions/errors.go
@@ -1 +1 @@
-package networks
+package extensions
diff --git a/openstack/networking/v2/extensions/requests.go b/openstack/networking/v2/extensions/requests.go
index b406c51..1ef7b6d 100644
--- a/openstack/networking/v2/extensions/requests.go
+++ b/openstack/networking/v2/extensions/requests.go
@@ -1,4 +1,4 @@
-package networks
+package extensions
import (
"github.com/racker/perigee"
@@ -20,3 +20,7 @@
}
return &ext, nil
}
+
+func List(c *gophercloud.ServiceClient) gophercloud.Pager {
+ return gophercloud.NewLinkedPager(c, ListExtensionURL(c))
+}
diff --git a/openstack/networking/v2/extensions/requests_test.go b/openstack/networking/v2/extensions/requests_test.go
index 5ae7ec6..ae2fbcb 100644
--- a/openstack/networking/v2/extensions/requests_test.go
+++ b/openstack/networking/v2/extensions/requests_test.go
@@ -1,4 +1,4 @@
-package networks
+package extensions
import (
"fmt"
@@ -21,14 +21,66 @@
}
func TestList(t *testing.T) {
+ th.SetupHTTP()
+ defer th.TeardownHTTP()
+ th.Mux.HandleFunc("/v2.0/extensions", func(w http.ResponseWriter, r *http.Request) {
+ th.TestMethod(t, r, "GET")
+ th.TestHeader(t, r, "X-Auth-Token", TokenID)
+
+ w.Header().Add("Content-Type", "application/json")
+
+ fmt.Fprintf(w, `
+{
+ "extensions": [
+ {
+ "updated": "2013-01-20T00:00:00-00:00",
+ "name": "Neutron Service Type Management",
+ "links": [],
+ "namespace": "http://docs.openstack.org/ext/neutron/service-type/api/v1.0",
+ "alias": "service-type",
+ "description": "API for retrieving service providers for Neutron advanced services"
+ }
+ ]
+}
+ `)
+ })
+
+ count := 0
+
+ List(ServiceClient()).EachPage(func(page gophercloud.Page) (bool, error) {
+ count++
+ actual, err := ExtractExtensions(page)
+ if err != nil {
+ t.Errorf("Failed to extract extensions: %v", err)
+ }
+
+ expected := []Extension{
+ Extension{
+ Updated: "2013-01-20T00:00:00-00:00",
+ Name: "Neutron Service Type Management",
+ Links: []interface{}{},
+ Namespace: "http://docs.openstack.org/ext/neutron/service-type/api/v1.0",
+ Alias: "service-type",
+ Description: "API for retrieving service providers for Neutron advanced services",
+ },
+ }
+
+ th.AssertDeepEquals(t, expected, actual)
+
+ return true, nil
+ })
+
+ if count != 1 {
+ t.Errorf("Expected 1 page, got %d", count)
+ }
}
func TestGet(t *testing.T) {
th.SetupHTTP()
defer th.TeardownHTTP()
- th.Mux.HandleFunc("/v2.0/extension/agent", func(w http.ResponseWriter, r *http.Request) {
+ th.Mux.HandleFunc("/v2.0/extensions/agent", func(w http.ResponseWriter, r *http.Request) {
th.TestMethod(t, r, "GET")
th.TestHeader(t, r, "X-Auth-Token", TokenID)
diff --git a/openstack/networking/v2/extensions/results.go b/openstack/networking/v2/extensions/results.go
index 3b21644..c249149 100644
--- a/openstack/networking/v2/extensions/results.go
+++ b/openstack/networking/v2/extensions/results.go
@@ -1,4 +1,9 @@
-package networks
+package extensions
+
+import (
+ "github.com/mitchellh/mapstructure"
+ "github.com/rackspace/gophercloud"
+)
type Extension struct {
Updated string `json:"updated"`
@@ -8,3 +13,16 @@
Alias string `json:"alias"`
Description string `json:"description"`
}
+
+func ExtractExtensions(page gophercloud.Page) ([]Extension, error) {
+ var resp struct {
+ Extensions []Extension `mapstructure:"extensions"`
+ }
+
+ err := mapstructure.Decode(page.(gophercloud.LinkedPage).Body, &resp)
+ if err != nil {
+ return nil, err
+ }
+
+ return resp.Extensions, nil
+}
diff --git a/openstack/networking/v2/extensions/urls.go b/openstack/networking/v2/extensions/urls.go
index d70dd9b..608b25f 100644
--- a/openstack/networking/v2/extensions/urls.go
+++ b/openstack/networking/v2/extensions/urls.go
@@ -1,4 +1,4 @@
-package networks
+package extensions
import "github.com/rackspace/gophercloud"
@@ -7,3 +7,7 @@
func ExtensionURL(c *gophercloud.ServiceClient, name string) string {
return c.ServiceURL(Version, "extensions", name)
}
+
+func ListExtensionURL(c *gophercloud.ServiceClient) string {
+ return c.ServiceURL(Version, "extensions")
+}
diff --git a/openstack/networking/v2/extensions/urls_test.go b/openstack/networking/v2/extensions/urls_test.go
index af01cb9..34731cd 100644
--- a/openstack/networking/v2/extensions/urls_test.go
+++ b/openstack/networking/v2/extensions/urls_test.go
@@ -1,4 +1,4 @@
-package networks
+package extensions
import (
"testing"
@@ -18,3 +18,9 @@
expected := Endpoint + "v2.0/extensions/agent"
th.AssertEquals(t, expected, actual)
}
+
+func TestListExtensionURL(t *testing.T) {
+ actual := ListExtensionURL(EndpointClient())
+ expected := Endpoint + "v2.0/extensions"
+ th.AssertEquals(t, expected, actual)
+}