Merge pull request #3223 from sapcc/fix-hypervisor-pagination

mandre · web-flow · commit 7889e7ffc66e · 2025-03-06T11:28:35.000+01:00
[nova] fix pagination of hypervisors.List()
diff --git a/openstack/compute/v2/hypervisors/requests.go b/openstack/compute/v2/hypervisors/requests.go
@@ -53,7 +53,7 @@ func List(client *gophercloud.ServiceClient, opts ListOptsBuilder) pagination.Pa
 	}
 
 	return pagination.NewPager(client, url, func(r pagination.PageResult) pagination.Page {
-		return HypervisorPage{pagination.SinglePageBase(r)}
+		return HypervisorPage{pagination.LinkedPageBase{PageResult: r}}
 	})
 }
 
diff --git a/openstack/compute/v2/hypervisors/results.go b/openstack/compute/v2/hypervisors/results.go
@@ -240,7 +240,7 @@ func (r *Hypervisor) UnmarshalJSON(b []byte) error {
 // HypervisorPage represents a single page of all Hypervisors from a List
 // request.
 type HypervisorPage struct {
-	pagination.SinglePageBase
+	pagination.LinkedPageBase
 }
 
 // IsEmpty determines whether or not a HypervisorPage is empty.
@@ -253,6 +253,19 @@ func (page HypervisorPage) IsEmpty() (bool, error) {
 	return len(va) == 0, err
 }
 
+// NextPageURL uses the response's embedded link reference to navigate to the
+// next page of results.
+func (page HypervisorPage) NextPageURL() (string, error) {
+	var s struct {
+		Links []gophercloud.Link `json:"hypervisors_links"`
+	}
+	err := page.ExtractInto(&s)
+	if err != nil {
+		return "", err
+	}
+	return gophercloud.ExtractNextURL(s.Links)
+}
+
 // ExtractHypervisors interprets a page of results as a slice of Hypervisors.
 func ExtractHypervisors(p pagination.Page) ([]Hypervisor, error) {
 	var h struct {
diff --git a/openstack/compute/v2/hypervisors/testing/fixtures_test.go b/openstack/compute/v2/hypervisors/testing/fixtures_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/hypervisors"
+	"github.com/gophercloud/gophercloud/v2/testhelper"
 	th "github.com/gophercloud/gophercloud/v2/testhelper"
 	"github.com/gophercloud/gophercloud/v2/testhelper/client"
 )
@@ -85,8 +86,8 @@ const HypervisorListBodyPre253 = `
     ]
 }`
 
-// HypervisorListBody represents a raw hypervisor list result with Pike+ release.
-const HypervisorListBody = `
+// HypervisorListBodyPage1 represents page 1 of a raw hypervisor list result with Pike+ release.
+const HypervisorListBodyPage1 = `
 {
     "hypervisors": [
         {
@@ -127,7 +128,20 @@ const HypervisorListBody = `
             },
             "vcpus": 1,
             "vcpus_used": 0
-        },
+        }
+    ],
+    "hypervisors_links": [
+        {
+            "href": "%s/os-hypervisors/detail?marker=c48f6247-abe4-4a24-824e-ea39e108874f",
+            "rel": "next"
+        }
+    ]
+}`
+
+// HypervisorListBodyPage2 represents page 2 of a raw hypervisor list result with Pike+ release.
+const HypervisorListBodyPage2 = `
+{
+    "hypervisors": [
         {
             "cpu_info": "{\"arch\": \"x86_64\", \"model\": \"Nehalem\", \"vendor\": \"Intel\", \"features\": [\"pge\", \"clflush\"], \"topology\": {\"cores\": 1, \"threads\": 1, \"sockets\": 4}}",
             "current_workload": 0,
@@ -157,6 +171,9 @@ const HypervisorListBody = `
     ]
 }`
 
+// HypervisorListBodyEmpty represents an empty raw hypervisor list result, marking the end of pagination.
+const HypervisorListBodyEmpty = `{ "hypervisors": [] }`
+
 // HypervisorListWithParametersBody represents a raw hypervisor list result with Pike+ release.
 const HypervisorListWithParametersBody = `
 {
@@ -624,8 +641,16 @@ func HandleHypervisorListSuccessfully(t *testing.T) {
 		th.TestMethod(t, r, "GET")
 		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
 
-		w.Header().Add("Content-Type", "application/json")
-		fmt.Fprint(w, HypervisorListBody)
+		switch r.URL.Query().Get("marker") {
+		case "":
+			w.Header().Add("Content-Type", "application/json")
+			fmt.Fprintf(w, HypervisorListBodyPage1, testhelper.Server.URL)
+		case "c48f6247-abe4-4a24-824e-ea39e108874f":
+			w.Header().Add("Content-Type", "application/json")
+			fmt.Fprint(w, HypervisorListBodyPage2)
+		default:
+			http.Error(w, "unexpected marker value", http.StatusInternalServerError)
+		}
 	})
 }
 
diff --git a/openstack/compute/v2/hypervisors/testing/requests_test.go b/openstack/compute/v2/hypervisors/testing/requests_test.go
@@ -69,19 +69,18 @@ func TestListHypervisors(t *testing.T) {
 			return false, err
 		}
 
-		if len(actual) != 2 {
-			t.Fatalf("Expected 2 hypervisors, got %d", len(actual))
+		if len(actual) != 1 {
+			t.Fatalf("Expected 1 hypervisors on page %d, got %d", pages, len(actual))
 		}
 		th.CheckDeepEquals(t, HypervisorFake, actual[0])
-		th.CheckDeepEquals(t, HypervisorFake, actual[1])
 
 		return true, nil
 	})
 
 	th.AssertNoErr(t, err)
 
-	if pages != 1 {
-		t.Errorf("Expected 1 page, saw %d", pages)
+	if pages != 2 {
+		t.Errorf("Expected 2 pages, saw %d", pages)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func List(client *gophercloud.ServiceClient, opts ListOptsBuilder) pagination.Pa`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`return pagination.NewPager(client, url, func(r pagination.PageResult) pagination.Page {`
`56`		`- return HypervisorPage{pagination.SinglePageBase(r)}`
	`56`	`+ return HypervisorPage{pagination.LinkedPageBase{PageResult: r}}`
`57`	`57`	`})`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -69,19 +69,18 @@ func TestListHypervisors(t *testing.T) {`
`69`	`69`	`return false, err`
`70`	`70`	`}`
`71`	`71`
`72`		`- if len(actual) != 2 {`
`73`		`- t.Fatalf("Expected 2 hypervisors, got %d", len(actual))`
	`72`	`+ if len(actual) != 1 {`
	`73`	`+ t.Fatalf("Expected 1 hypervisors on page %d, got %d", pages, len(actual))`
`74`	`74`	`}`
`75`	`75`	`th.CheckDeepEquals(t, HypervisorFake, actual[0])`
`76`		`- th.CheckDeepEquals(t, HypervisorFake, actual[1])`
`77`	`76`
`78`	`77`	`return true, nil`
`79`	`78`	`})`
`80`	`79`
`81`	`80`	`th.AssertNoErr(t, err)`
`82`	`81`
`83`		`- if pages != 1 {`
`84`		`- t.Errorf("Expected 1 page, saw %d", pages)`
	`82`	`+ if pages != 2 {`
	`83`	`+ t.Errorf("Expected 2 pages, saw %d", pages)`
`85`	`84`	`}`
`86`	`85`	`}`
`87`	`86`