Merge pull request #699 from jorgevgut/pagerfix

ciao-controller: api: Set 'limit' value properly for instances

Fixes: #698

openstack/compute/api.go

@@ -288,12 +288,22 @@ func pagerQueryParse(r *http.Request) (int, int, string) {
 	// we only support marker and offset for now.
 	if values["marker"] != nil {
 		marker = values["marker"][0]
-	} else if values["offset"] != nil {
-		o, err := strconv.ParseInt(values["offset"][0], 10, 32)
-		if err != nil {
-			offset = 0
-		} else {
-			offset = (int)(o)
+	} else {
+		if values["offset"] != nil {
+			o, err := strconv.ParseInt(values["offset"][0], 10, 32)
+			if err != nil {
+				offset = 0
+			} else {
+				offset = (int)(o)
+			}
+		}
+		if values["limit"] != nil {
+			l, err := strconv.ParseInt(values["limit"][0], 10, 32)
+			if err != nil {
+				limit = 0
+			} else {
+				limit = (int)(l)
+			}
 		}
 	}
 

openstack/compute/api_test.go

@@ -45,6 +45,14 @@ var tests = []test{
 		http.StatusAccepted,
 		`{"server":{"id":"validServerID","name":"new-server-test","imageRef":"http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b","flavorRef":"http://openstack.example.com/flavors/1","max_count":0,"min_count":0}}`,
 	},
+	{
+		"GET",
+		"/v2.1/{tenant}/servers/detail?limit=1&offset=1",
+		ListServersDetails,
+		"",
+		http.StatusOK,
+		`{"total_servers":1,"servers":[]}`,
+	},
 	{
 		"GET",
 		"/v2.1/{tenant}/servers/detail",
@@ -274,3 +282,18 @@ func TestRoutes(t *testing.T) {
 		t.Fatalf("No routes returned")
 	}
 }
+
+func TestPager(t *testing.T) {
+	req, err := http.NewRequest("GET", "/v2.1/{tenant}/servers/detail?limit=2&offset=2", bytes.NewBuffer([]byte("")))
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	limit, offset, _ := pagerQueryParse(req)
+	if limit != 2 {
+		t.Fatalf("Invalid limit registered")
+	}
+	if offset != 2 {
+		t.Fatalf("Invalid offset registered")
+	}
+}