Skip to content

Commit 7cbb8fd

Browse files
kayruskayrus
authored
Merge pull request #230 from kayrus/gnocci
Fix gnocchi EOF results
2 parents 46e6234 + dc029e4 commit 7cbb8fd

7 files changed

Lines changed: 42 additions & 28 deletions

File tree

‎gnocchi/metric/v1/archivepolicies/requests.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ func List(client *gophercloud.ServiceClient) pagination.Pager {
1616

1717
// Get retrieves a specific Gnocchi archive policy based on its name.
1818
func Get(ctx context.Context, c *gophercloud.ServiceClient, archivePolicyName string) (r GetResult) {
19-
_, r.Err = c.Get(ctx, getURL(c, archivePolicyName), &r.Body, nil)
19+
resp, err := c.Get(ctx, getURL(c, archivePolicyName), &r.Body, nil)
20+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
2021
return
2122
}
2223

@@ -72,10 +73,10 @@ func Create(ctx context.Context, client *gophercloud.ServiceClient, opts CreateO
7273
r.Err = err
7374
return
7475
}
75-
_, r.Err = client.Post(ctx, createURL(client), b, &r.Body, &gophercloud.RequestOpts{
76+
resp, err := client.Post(ctx, createURL(client), b, &r.Body, &gophercloud.RequestOpts{
7677
OkCodes: []int{201},
7778
})
78-
79+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
7980
return
8081
}
8182

@@ -103,10 +104,10 @@ func Update(ctx context.Context, client *gophercloud.ServiceClient, archivePolic
103104
r.Err = err
104105
return
105106
}
106-
_, r.Err = client.Patch(ctx, updateURL(client, archivePolicyName), b, &r.Body, &gophercloud.RequestOpts{
107+
resp, err := client.Patch(ctx, updateURL(client, archivePolicyName), b, &r.Body, &gophercloud.RequestOpts{
107108
OkCodes: []int{200},
108109
})
109-
110+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
110111
return
111112
}
112113

@@ -117,6 +118,7 @@ func Delete(ctx context.Context, c *gophercloud.ServiceClient, archivePolicyName
117118
"Accept": "application/json, */*",
118119
},
119120
}
120-
_, r.Err = c.Delete(ctx, deleteURL(c, archivePolicyName), requestOpts)
121+
resp, err := c.Delete(ctx, deleteURL(c, archivePolicyName), requestOpts)
122+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
121123
return
122124
}

‎gnocchi/metric/v1/measures/requests.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,13 @@ func Create(ctx context.Context, client *gophercloud.ServiceClient, metricID str
128128
r.Err = err
129129
return
130130
}
131-
_, r.Err = client.Post(ctx, createURL(client, metricID), b["measures"], &r.Body, &gophercloud.RequestOpts{
131+
resp, err := client.Post(ctx, createURL(client, metricID), b["measures"], nil, &gophercloud.RequestOpts{
132132
OkCodes: []int{202},
133133
MoreHeaders: map[string]string{
134134
"Accept": "application/json, */*",
135135
},
136136
})
137+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
137138
return
138139
}
139140

@@ -210,12 +211,13 @@ func BatchCreateMetrics(ctx context.Context, client *gophercloud.ServiceClient,
210211
return
211212
}
212213

213-
_, r.Err = client.Post(ctx, batchCreateMetricsURL(client), b["batchCreateMetrics"], &r.Body, &gophercloud.RequestOpts{
214+
resp, err := client.Post(ctx, batchCreateMetricsURL(client), b["batchCreateMetrics"], nil, &gophercloud.RequestOpts{
214215
OkCodes: []int{202},
215216
MoreHeaders: map[string]string{
216217
"Accept": "application/json, */*",
217218
},
218219
})
220+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
219221
return
220222
}
221223

@@ -390,11 +392,12 @@ func BatchCreateResourcesMetrics(ctx context.Context, client *gophercloud.Servic
390392
return
391393
}
392394

393-
_, r.Err = client.Post(ctx, url, b["batchCreateResourcesMetrics"], &r.Body, &gophercloud.RequestOpts{
395+
resp, err := client.Post(ctx, url, b["batchCreateResourcesMetrics"], nil, &gophercloud.RequestOpts{
394396
OkCodes: []int{202},
395397
MoreHeaders: map[string]string{
396398
"Accept": "application/json, */*",
397399
},
398400
})
401+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
399402
return
400403
}

‎gnocchi/metric/v1/measures/testing/requests_test.go‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ func TestCreateMeasures(t *testing.T) {
6565
th.TestHeader(t, r, "Accept", "application/json, */*")
6666
th.TestJSONRequest(t, r, MeasuresCreateRequest)
6767
w.WriteHeader(http.StatusAccepted)
68-
fmt.Fprintf(w, `{}`)
6968
})
7069

7170
firstMeasureTimestamp := time.Date(2018, 1, 18, 12, 31, 0, 0, time.UTC)
@@ -97,7 +96,6 @@ func TestBatchCreateMetrics(t *testing.T) {
9796
th.TestHeader(t, r, "Accept", "application/json, */*")
9897
th.TestJSONRequest(t, r, MeasuresBatchCreateMetricsRequest)
9998
w.WriteHeader(http.StatusAccepted)
100-
fmt.Fprintf(w, `{}`)
10199
})
102100

103101
firstTimestamp := time.Date(2018, 1, 10, 01, 00, 0, 0, time.UTC)
@@ -130,8 +128,8 @@ func TestBatchCreateMetrics(t *testing.T) {
130128
},
131129
},
132130
}
133-
res := measures.BatchCreateMetrics(context.TODO(), fake.ServiceClient(), createOpts)
134-
th.AssertNoErr(t, res.Err)
131+
err := measures.BatchCreateMetrics(context.TODO(), fake.ServiceClient(), createOpts).ExtractErr()
132+
th.AssertNoErr(t, err)
135133
}
136134

137135
func TestBatchCreateResourcesMetrics(t *testing.T) {
@@ -145,7 +143,6 @@ func TestBatchCreateResourcesMetrics(t *testing.T) {
145143
th.TestHeader(t, r, "Accept", "application/json, */*")
146144
th.TestJSONRequest(t, r, MeasuresBatchCreateResourcesMetricsRequest)
147145
w.WriteHeader(http.StatusAccepted)
148-
fmt.Fprintf(w, `{}`)
149146
})
150147

151148
firstTimestamp := time.Date(2018, 1, 20, 12, 30, 0, 0, time.UTC)
@@ -210,6 +207,6 @@ func TestBatchCreateResourcesMetrics(t *testing.T) {
210207
},
211208
},
212209
}
213-
res := measures.BatchCreateResourcesMetrics(context.TODO(), fake.ServiceClient(), createOpts)
214-
th.AssertNoErr(t, res.Err)
210+
err := measures.BatchCreateResourcesMetrics(context.TODO(), fake.ServiceClient(), createOpts).ExtractErr()
211+
th.AssertNoErr(t, err)
215212
}

‎gnocchi/metric/v1/metrics/requests.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ func List(c *gophercloud.ServiceClient, opts ListOptsBuilder) pagination.Pager {
7171

7272
// Get retrieves a specific Gnocchi metric based on its id.
7373
func Get(ctx context.Context, c *gophercloud.ServiceClient, metricID string) (r GetResult) {
74-
_, r.Err = c.Get(ctx, getURL(c, metricID), &r.Body, nil)
74+
resp, err := c.Get(ctx, getURL(c, metricID), &r.Body, nil)
75+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
7576
return
7677
}
7778

@@ -117,9 +118,10 @@ func Create(ctx context.Context, client *gophercloud.ServiceClient, opts CreateO
117118
r.Err = err
118119
return
119120
}
120-
_, r.Err = client.Post(ctx, createURL(client), b, &r.Body, &gophercloud.RequestOpts{
121+
resp, err := client.Post(ctx, createURL(client), b, &r.Body, &gophercloud.RequestOpts{
121122
OkCodes: []int{201},
122123
})
124+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
123125
return
124126
}
125127

@@ -130,6 +132,7 @@ func Delete(ctx context.Context, c *gophercloud.ServiceClient, metricID string)
130132
"Accept": "application/json, */*",
131133
},
132134
}
133-
_, r.Err = c.Delete(ctx, deleteURL(c, metricID), requestOpts)
135+
resp, err := c.Delete(ctx, deleteURL(c, metricID), requestOpts)
136+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
134137
return
135138
}

‎gnocchi/metric/v1/resources/requests.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ func List(c *gophercloud.ServiceClient, opts ListOptsBuilder, resourceType strin
6464

6565
// Get retrieves a specific Gnocchi resource based on its type and ID.
6666
func Get(ctx context.Context, c *gophercloud.ServiceClient, resourceType string, resourceID string) (r GetResult) {
67-
_, r.Err = c.Get(ctx, getURL(c, resourceType, resourceID), &r.Body, nil)
67+
resp, err := c.Get(ctx, getURL(c, resourceType, resourceID), &r.Body, nil)
68+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
6869
return
6970
}
7071

@@ -132,9 +133,10 @@ func Create(ctx context.Context, client *gophercloud.ServiceClient, resourceType
132133
r.Err = err
133134
return
134135
}
135-
_, r.Err = client.Post(ctx, createURL(client, resourceType), b, &r.Body, &gophercloud.RequestOpts{
136+
resp, err := client.Post(ctx, createURL(client, resourceType), b, &r.Body, &gophercloud.RequestOpts{
136137
OkCodes: []int{201},
137138
})
139+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
138140
return
139141
}
140142

@@ -200,9 +202,10 @@ func Update(ctx context.Context, c *gophercloud.ServiceClient, resourceType, res
200202
r.Err = err
201203
return
202204
}
203-
_, r.Err = c.Patch(ctx, updateURL(c, resourceType, resourceID), b, &r.Body, &gophercloud.RequestOpts{
205+
resp, err := c.Patch(ctx, updateURL(c, resourceType, resourceID), b, &r.Body, &gophercloud.RequestOpts{
204206
OkCodes: []int{200},
205207
})
208+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
206209
return
207210
}
208211

@@ -213,6 +216,7 @@ func Delete(ctx context.Context, c *gophercloud.ServiceClient, resourceType, res
213216
"Accept": "application/json, */*",
214217
},
215218
}
216-
_, r.Err = c.Delete(ctx, deleteURL(c, resourceType, resourceID), requestOpts)
219+
resp, err := c.Delete(ctx, deleteURL(c, resourceType, resourceID), requestOpts)
220+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
217221
return
218222
}

‎gnocchi/metric/v1/resourcetypes/requests.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ func List(client *gophercloud.ServiceClient) pagination.Pager {
1818

1919
// Get retrieves a specific Gnocchi resource type based on its name.
2020
func Get(ctx context.Context, c *gophercloud.ServiceClient, resourceTypeName string) (r GetResult) {
21-
_, r.Err = c.Get(ctx, getURL(c, resourceTypeName), &r.Body, nil)
21+
resp, err := c.Get(ctx, getURL(c, resourceTypeName), &r.Body, nil)
22+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
2223
return
2324
}
2425

@@ -92,9 +93,10 @@ func Create(ctx context.Context, client *gophercloud.ServiceClient, opts CreateO
9293
r.Err = err
9394
return
9495
}
95-
_, r.Err = client.Post(ctx, createURL(client), b, &r.Body, &gophercloud.RequestOpts{
96+
resp, err := client.Post(ctx, createURL(client), b, &r.Body, &gophercloud.RequestOpts{
9697
OkCodes: []int{201},
9798
})
99+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
98100
return
99101
}
100102

@@ -182,12 +184,13 @@ func Update(ctx context.Context, client *gophercloud.ServiceClient, resourceType
182184
r.Err = err
183185
return
184186
}
185-
_, r.Err = client.Patch(ctx, updateURL(client, resourceTypeName), b, &r.Body, &gophercloud.RequestOpts{
187+
resp, err := client.Patch(ctx, updateURL(client, resourceTypeName), b, &r.Body, &gophercloud.RequestOpts{
186188
OkCodes: []int{200},
187189
MoreHeaders: map[string]string{
188190
"Content-Type": "application/json-patch+json",
189191
},
190192
})
193+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
191194
return
192195
}
193196

@@ -198,6 +201,7 @@ func Delete(ctx context.Context, c *gophercloud.ServiceClient, resourceTypeName
198201
"Accept": "application/json, */*",
199202
},
200203
}
201-
_, r.Err = c.Delete(ctx, deleteURL(c, resourceTypeName), requestOpts)
204+
resp, err := c.Delete(ctx, deleteURL(c, resourceTypeName), requestOpts)
205+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
202206
return
203207
}

‎gnocchi/metric/v1/status/requests.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ func Get(ctx context.Context, c *gophercloud.ServiceClient, opts GetOptsBuilder)
3434
}
3535
url += query
3636
}
37-
_, r.Err = c.Get(ctx, url, &r.Body, nil)
37+
resp, err := c.Get(ctx, url, &r.Body, nil)
38+
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
3839
return
3940
}

0 commit comments

Comments
 (0)