Skip to content

Commit a470269

Browse files
kayruskayrus
committed
core: switch to gophercloud v3
1 parent b0c67de commit a470269

File tree

14 files changed

+172
-167
lines changed

14 files changed

+172
-167
lines changed

‎gnocchi/client.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package gnocchi
22

33
import (
4+
"context"
5+
46
"github.com/gophercloud/gophercloud/v2"
57
)
68

7-
func initClientOpts(client *gophercloud.ProviderClient, eo gophercloud.EndpointOpts, clientType string) (*gophercloud.ServiceClient, error) {
9+
func initClientOpts(ctx context.Context, client *gophercloud.ProviderClient, eo gophercloud.EndpointOpts, clientType string) (*gophercloud.ServiceClient, error) {
810
sc := new(gophercloud.ServiceClient)
911
eo.ApplyDefaults(clientType)
10-
url, err := client.EndpointLocator(eo)
12+
url, err := client.EndpointLocator(ctx, eo)
1113
if err != nil {
1214
return sc, err
1315
}
@@ -18,8 +20,8 @@ func initClientOpts(client *gophercloud.ProviderClient, eo gophercloud.EndpointO
1820
}
1921

2022
// NewGnocchiV1 creates a ServiceClient that may be used with the v1 Gnocchi package.
21-
func NewGnocchiV1(client *gophercloud.ProviderClient, eo gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error) {
22-
sc, err := initClientOpts(client, eo, "metric")
23+
func NewGnocchiV1(ctx context.Context, client *gophercloud.ProviderClient, eo gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error) {
24+
sc, err := initClientOpts(ctx, client, eo, "metric")
2325
sc.ResourceBase = sc.Endpoint + "v1/"
2426
return sc, err
2527
}

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
)
1414

1515
func TestListArchivePolicies(t *testing.T) {
16-
th.SetupHTTP()
17-
defer th.TeardownHTTP()
16+
fakeServer := th.SetupHTTP()
17+
defer fakeServer.Teardown()
1818

19-
th.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
19+
fakeServer.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
2020
th.TestMethod(t, r, "GET")
2121
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
2222

@@ -28,7 +28,7 @@ func TestListArchivePolicies(t *testing.T) {
2828

2929
expected := ListArchivePoliciesExpected
3030
pages := 0
31-
err := archivepolicies.List(fake.ServiceClient()).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
31+
err := archivepolicies.List(fake.ServiceClient(fakeServer)).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
3232
pages++
3333

3434
actual, err := archivepolicies.ExtractArchivePolicies(page)
@@ -46,10 +46,10 @@ func TestListArchivePolicies(t *testing.T) {
4646
}
4747

4848
func TestListArchivePoliciesAllPages(t *testing.T) {
49-
th.SetupHTTP()
50-
defer th.TeardownHTTP()
49+
fakeServer := th.SetupHTTP()
50+
defer fakeServer.Teardown()
5151

52-
th.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
52+
fakeServer.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
5353
th.TestMethod(t, r, "GET")
5454
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
5555

@@ -59,17 +59,17 @@ func TestListArchivePoliciesAllPages(t *testing.T) {
5959
fmt.Fprintf(w, ArchivePoliciesListResult)
6060
})
6161

62-
allPages, err := archivepolicies.List(fake.ServiceClient()).AllPages(context.TODO())
62+
allPages, err := archivepolicies.List(fake.ServiceClient(fakeServer)).AllPages(context.TODO())
6363
th.AssertNoErr(t, err)
6464
_, err = archivepolicies.ExtractArchivePolicies(allPages)
6565
th.AssertNoErr(t, err)
6666
}
6767

6868
func TestGetArchivePolicy(t *testing.T) {
69-
th.SetupHTTP()
70-
defer th.TeardownHTTP()
69+
fakeServer := th.SetupHTTP()
70+
defer fakeServer.Teardown()
7171

72-
th.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
72+
fakeServer.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
7373
th.TestMethod(t, r, "GET")
7474
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
7575

@@ -79,7 +79,7 @@ func TestGetArchivePolicy(t *testing.T) {
7979
fmt.Fprintf(w, ArchivePolicyGetResult)
8080
})
8181

82-
s, err := archivepolicies.Get(context.TODO(), fake.ServiceClient(), "test_policy").Extract()
82+
s, err := archivepolicies.Get(context.TODO(), fake.ServiceClient(fakeServer), "test_policy").Extract()
8383
th.AssertNoErr(t, err)
8484

8585
th.AssertDeepEquals(t, s.AggregationMethods, []string{
@@ -104,10 +104,10 @@ func TestGetArchivePolicy(t *testing.T) {
104104
}
105105

106106
func TestCreate(t *testing.T) {
107-
th.SetupHTTP()
108-
defer th.TeardownHTTP()
107+
fakeServer := th.SetupHTTP()
108+
defer fakeServer.Teardown()
109109

110-
th.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
110+
fakeServer.Mux.HandleFunc("/v1/archive_policy", func(w http.ResponseWriter, r *http.Request) {
111111
th.TestMethod(t, r, "POST")
112112
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
113113
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -139,7 +139,7 @@ func TestCreate(t *testing.T) {
139139
},
140140
Name: "test_policy",
141141
}
142-
s, err := archivepolicies.Create(context.TODO(), fake.ServiceClient(), opts).Extract()
142+
s, err := archivepolicies.Create(context.TODO(), fake.ServiceClient(fakeServer), opts).Extract()
143143
th.AssertNoErr(t, err)
144144

145145
th.AssertDeepEquals(t, s.AggregationMethods, []string{
@@ -164,10 +164,10 @@ func TestCreate(t *testing.T) {
164164
}
165165

166166
func TestUpdateArchivePolicy(t *testing.T) {
167-
th.SetupHTTP()
168-
defer th.TeardownHTTP()
167+
fakeServer := th.SetupHTTP()
168+
defer fakeServer.Teardown()
169169

170-
th.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
170+
fakeServer.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
171171
th.TestMethod(t, r, "PATCH")
172172
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
173173
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -192,7 +192,7 @@ func TestUpdateArchivePolicy(t *testing.T) {
192192
},
193193
},
194194
}
195-
s, err := archivepolicies.Update(context.TODO(), fake.ServiceClient(), "test_policy", updateOpts).Extract()
195+
s, err := archivepolicies.Update(context.TODO(), fake.ServiceClient(fakeServer), "test_policy", updateOpts).Extract()
196196
th.AssertNoErr(t, err)
197197

198198
th.AssertDeepEquals(t, s.AggregationMethods, []string{
@@ -215,15 +215,15 @@ func TestUpdateArchivePolicy(t *testing.T) {
215215
}
216216

217217
func TestDelete(t *testing.T) {
218-
th.SetupHTTP()
219-
defer th.TeardownHTTP()
218+
fakeServer := th.SetupHTTP()
219+
defer fakeServer.Teardown()
220220

221-
th.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
221+
fakeServer.Mux.HandleFunc("/v1/archive_policy/test_policy", func(w http.ResponseWriter, r *http.Request) {
222222
th.TestMethod(t, r, "DELETE")
223223
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
224224
w.WriteHeader(http.StatusNoContent)
225225
})
226226

227-
res := archivepolicies.Delete(context.TODO(), fake.ServiceClient(), "test_policy")
227+
res := archivepolicies.Delete(context.TODO(), fake.ServiceClient(fakeServer), "test_policy")
228228
th.AssertNoErr(t, res.Err)
229229
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
)
1515

1616
func TestListMeasures(t *testing.T) {
17-
th.SetupHTTP()
18-
defer th.TeardownHTTP()
17+
fakeServer := th.SetupHTTP()
18+
defer fakeServer.Teardown()
1919

20-
th.Mux.HandleFunc("/v1/metric/9e5a6441-1044-4181-b66e-34e180753040/measures", func(w http.ResponseWriter, r *http.Request) {
20+
fakeServer.Mux.HandleFunc("/v1/metric/9e5a6441-1044-4181-b66e-34e180753040/measures", func(w http.ResponseWriter, r *http.Request) {
2121
th.TestMethod(t, r, "GET")
2222
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
2323

@@ -37,7 +37,7 @@ func TestListMeasures(t *testing.T) {
3737
}
3838
expected := ListMeasuresExpected
3939
pages := 0
40-
err := measures.List(fake.ServiceClient(), metricID, opts).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
40+
err := measures.List(fake.ServiceClient(fakeServer), metricID, opts).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
4141
pages++
4242

4343
actual, err := measures.ExtractMeasures(page)
@@ -55,10 +55,10 @@ func TestListMeasures(t *testing.T) {
5555
}
5656

5757
func TestCreateMeasures(t *testing.T) {
58-
th.SetupHTTP()
59-
defer th.TeardownHTTP()
58+
fakeServer := th.SetupHTTP()
59+
defer fakeServer.Teardown()
6060

61-
th.Mux.HandleFunc("/v1/metric/9e5a6441-1044-4181-b66e-34e180753040/measures", func(w http.ResponseWriter, r *http.Request) {
61+
fakeServer.Mux.HandleFunc("/v1/metric/9e5a6441-1044-4181-b66e-34e180753040/measures", func(w http.ResponseWriter, r *http.Request) {
6262
th.TestMethod(t, r, "POST")
6363
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
6464
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -81,15 +81,15 @@ func TestCreateMeasures(t *testing.T) {
8181
},
8282
},
8383
}
84-
res := measures.Create(context.TODO(), fake.ServiceClient(), "9e5a6441-1044-4181-b66e-34e180753040", createOpts)
84+
res := measures.Create(context.TODO(), fake.ServiceClient(fakeServer), "9e5a6441-1044-4181-b66e-34e180753040", createOpts)
8585
th.AssertNoErr(t, res.Err)
8686
}
8787

8888
func TestBatchCreateMetrics(t *testing.T) {
89-
th.SetupHTTP()
90-
defer th.TeardownHTTP()
89+
fakeServer := th.SetupHTTP()
90+
defer fakeServer.Teardown()
9191

92-
th.Mux.HandleFunc("/v1/batch/metrics/measures", func(w http.ResponseWriter, r *http.Request) {
92+
fakeServer.Mux.HandleFunc("/v1/batch/metrics/measures", func(w http.ResponseWriter, r *http.Request) {
9393
th.TestMethod(t, r, "POST")
9494
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
9595
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -128,15 +128,15 @@ func TestBatchCreateMetrics(t *testing.T) {
128128
},
129129
},
130130
}
131-
err := measures.BatchCreateMetrics(context.TODO(), fake.ServiceClient(), createOpts).ExtractErr()
131+
err := measures.BatchCreateMetrics(context.TODO(), fake.ServiceClient(fakeServer), createOpts).ExtractErr()
132132
th.AssertNoErr(t, err)
133133
}
134134

135135
func TestBatchCreateResourcesMetrics(t *testing.T) {
136-
th.SetupHTTP()
137-
defer th.TeardownHTTP()
136+
fakeServer := th.SetupHTTP()
137+
defer fakeServer.Teardown()
138138

139-
th.Mux.HandleFunc("/v1/batch/resources/metrics/measures", func(w http.ResponseWriter, r *http.Request) {
139+
fakeServer.Mux.HandleFunc("/v1/batch/resources/metrics/measures", func(w http.ResponseWriter, r *http.Request) {
140140
th.TestMethod(t, r, "POST")
141141
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
142142
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -207,6 +207,6 @@ func TestBatchCreateResourcesMetrics(t *testing.T) {
207207
},
208208
},
209209
}
210-
err := measures.BatchCreateResourcesMetrics(context.TODO(), fake.ServiceClient(), createOpts).ExtractErr()
210+
err := measures.BatchCreateResourcesMetrics(context.TODO(), fake.ServiceClient(fakeServer), createOpts).ExtractErr()
211211
th.AssertNoErr(t, err)
212212
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
)
1717

1818
func TestList(t *testing.T) {
19-
th.SetupHTTP()
20-
defer th.TeardownHTTP()
19+
fakeServer := th.SetupHTTP()
20+
defer fakeServer.Teardown()
2121

22-
th.Mux.HandleFunc("/v1/metric", func(w http.ResponseWriter, r *http.Request) {
22+
fakeServer.Mux.HandleFunc("/v1/metric", func(w http.ResponseWriter, r *http.Request) {
2323
th.TestMethod(t, r, "GET")
2424
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
2525

@@ -39,7 +39,7 @@ func TestList(t *testing.T) {
3939

4040
count := 0
4141

42-
metrics.List(fake.ServiceClient(), metrics.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
42+
metrics.List(fake.ServiceClient(fakeServer), metrics.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
4343
count++
4444
actual, err := metrics.ExtractMetrics(page)
4545
if err != nil {
@@ -63,10 +63,10 @@ func TestList(t *testing.T) {
6363
}
6464

6565
func TestGet(t *testing.T) {
66-
th.SetupHTTP()
67-
defer th.TeardownHTTP()
66+
fakeServer := th.SetupHTTP()
67+
defer fakeServer.Teardown()
6868

69-
th.Mux.HandleFunc("/v1/metric/0ddf61cf-3747-4f75-bf13-13c28ff03ae3", func(w http.ResponseWriter, r *http.Request) {
69+
fakeServer.Mux.HandleFunc("/v1/metric/0ddf61cf-3747-4f75-bf13-13c28ff03ae3", func(w http.ResponseWriter, r *http.Request) {
7070
th.TestMethod(t, r, "GET")
7171
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
7272

@@ -76,7 +76,7 @@ func TestGet(t *testing.T) {
7676
fmt.Fprintf(w, MetricGetResult)
7777
})
7878

79-
s, err := metrics.Get(context.TODO(), fake.ServiceClient(), "0ddf61cf-3747-4f75-bf13-13c28ff03ae3").Extract()
79+
s, err := metrics.Get(context.TODO(), fake.ServiceClient(fakeServer), "0ddf61cf-3747-4f75-bf13-13c28ff03ae3").Extract()
8080
th.AssertNoErr(t, err)
8181

8282
th.AssertDeepEquals(t, s.ArchivePolicy, archivepolicies.ArchivePolicy{
@@ -123,10 +123,10 @@ func TestGet(t *testing.T) {
123123
}
124124

125125
func TestCreate(t *testing.T) {
126-
th.SetupHTTP()
127-
defer th.TeardownHTTP()
126+
fakeServer := th.SetupHTTP()
127+
defer fakeServer.Teardown()
128128

129-
th.Mux.HandleFunc("/v1/metric", func(w http.ResponseWriter, r *http.Request) {
129+
fakeServer.Mux.HandleFunc("/v1/metric", func(w http.ResponseWriter, r *http.Request) {
130130
th.TestMethod(t, r, "POST")
131131
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
132132
th.TestHeader(t, r, "Content-Type", "application/json")
@@ -145,7 +145,7 @@ func TestCreate(t *testing.T) {
145145
ResourceID: "23d5d3f7-9dfa-4f73-b72b-8b0b0063ec55",
146146
Unit: "B/s",
147147
}
148-
s, err := metrics.Create(context.TODO(), fake.ServiceClient(), opts).Extract()
148+
s, err := metrics.Create(context.TODO(), fake.ServiceClient(fakeServer), opts).Extract()
149149
th.AssertNoErr(t, err)
150150

151151
th.AssertEquals(t, s.ArchivePolicyName, "high")
@@ -159,15 +159,15 @@ func TestCreate(t *testing.T) {
159159
}
160160

161161
func TestDelete(t *testing.T) {
162-
th.SetupHTTP()
163-
defer th.TeardownHTTP()
162+
fakeServer := th.SetupHTTP()
163+
defer fakeServer.Teardown()
164164

165-
th.Mux.HandleFunc("/v1/metric/01b2953e-de74-448a-a305-c84440697933", func(w http.ResponseWriter, r *http.Request) {
165+
fakeServer.Mux.HandleFunc("/v1/metric/01b2953e-de74-448a-a305-c84440697933", func(w http.ResponseWriter, r *http.Request) {
166166
th.TestMethod(t, r, "DELETE")
167167
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
168168
w.WriteHeader(http.StatusNoContent)
169169
})
170170

171-
res := metrics.Delete(context.TODO(), fake.ServiceClient(), "01b2953e-de74-448a-a305-c84440697933")
171+
res := metrics.Delete(context.TODO(), fake.ServiceClient(fakeServer), "01b2953e-de74-448a-a305-c84440697933")
172172
th.AssertNoErr(t, res.Err)
173173
}

0 commit comments

Comments
 (0)