Skip to content

Commit 6e31f1e

Browse files
lgarber-akamailgarber-akamai
committed
Fix test capabilities
1 parent 93e1b58 commit 6e31f1e

3 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎test/integration/instance_reserved_ips_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestInstance_CreateWithReservedIPAddress(t *testing.T) {
1515
client, teardown := createTestClient(t, "fixtures/TestInstance_CreateWithReservedIPAddress")
1616
defer teardown()
1717

18-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
18+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
1919

2020
// Reserve an IP for testing
2121
reservedIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{Region: region})
@@ -50,7 +50,7 @@ func createInstanceWithReservedIP(
5050

5151
createOpts := linodego.InstanceCreateOptions{
5252
Label: "go-test-ins-reserved-ip-" + randLabel(),
53-
Region: getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
53+
Region: getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
5454
Type: "g6-nanode-1",
5555
Booted: linodego.Pointer(false),
5656
Image: "linode/alpine3.23",
@@ -87,7 +87,7 @@ func TestInstance_CreateWithOwnedNonAssignedReservedIP(t *testing.T) {
8787
client, teardown := createTestClient(t, "fixtures/TestInstance_CreateWithOwnedNonAssignedReservedIP")
8888
defer teardown()
8989

90-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
90+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
9191

9292
reservedIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{Region: region})
9393
if err != nil {
@@ -114,7 +114,7 @@ func TestInstance_CreateWithAlreadyAssignedReservedIP(t *testing.T) {
114114
client, teardown := createTestClient(t, "fixtures/TestInstance_CreateWithAlreadyAssignedReservedIP")
115115
defer teardown()
116116

117-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
117+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
118118

119119
reservedIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{Region: region})
120120
if err != nil {
@@ -198,7 +198,7 @@ func TestInstance_CreateWithMultipleIPAddresses(t *testing.T) {
198198
client, teardown := createTestClient(t, "fixtures/TestInstance_CreateWithMultipleIPAddresses")
199199
defer teardown()
200200

201-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
201+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
202202

203203
reservedIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{Region: region})
204204
if err != nil {
@@ -238,7 +238,7 @@ func TestInstance_AddReservedIPToInstance(t *testing.T) {
238238
client, teardown := createTestClient(t, "fixtures/TestInstance_AddReservedIPToInstance")
239239
defer teardown()
240240

241-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
241+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
242242

243243
// Create a test Linode instance
244244
instance, err := client.CreateInstance(context.Background(), linodego.InstanceCreateOptions{
@@ -308,7 +308,7 @@ func TestInstance_AddReservedIPToInstanceVariants(t *testing.T) {
308308
t.Skip("Skipping test because DevCloud environment has only one region")
309309
}
310310

311-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
311+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
312312

313313
// Create a test Linode instance
314314
instance, err := client.CreateInstance(context.Background(), linodego.InstanceCreateOptions{
@@ -413,7 +413,7 @@ func TestInstance_AddReservedIPToInstanceVariants(t *testing.T) {
413413

414414
// Test: Reserved IP in different datacenter
415415
// Reserve an IP address
416-
region2 := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[1]
416+
region2 := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[1]
417417
diffDataCentreIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{
418418
Region: region2,
419419
})
@@ -494,7 +494,7 @@ func TestInstance_DeleteInstanceVariants(t *testing.T) {
494494
client, teardown := createTestClient(t, "fixtures/TestInstance_DeleteInstanceVariants")
495495
defer teardown()
496496

497-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
497+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
498498

499499
// Create a Linode with a reserved IP
500500
reservedIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{Region: region})

‎test/integration/network_reserved_ips_test.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestReservedIPAddress_ReserveWithTags(t *testing.T) {
1717
defer teardown()
1818

1919
resIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{
20-
Region: getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
20+
Region: getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
2121
Tags: []string{"lb"},
2222
})
2323
if err != nil {
@@ -72,7 +72,7 @@ func TestReservedIPAddress_UpdateTags(t *testing.T) {
7272

7373
// Reserve without tags first
7474
resIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{
75-
Region: getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
75+
Region: getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
7676
})
7777
if err != nil {
7878
t.Fatalf("Failed to reserve IP: %v", err)
@@ -144,9 +144,9 @@ func TestReservedIPAddresses_InsufficientPermissions(t *testing.T) {
144144
defer teardown()
145145
defer func() { validTestAPIKey = original }()
146146

147-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
147+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
148148
filter := ""
149-
ips, listErr := client.ListReservedIPAddresses(context.Background(), NewListOptions(0, filter))
149+
ips, listErr := client.ListReservedIPAddresses(context.Background(), linodego.NewListOptions(0, filter))
150150
if listErr == nil {
151151
t.Errorf("Expected error due to insufficient permissions, but got none %v", ips)
152152
} else {
@@ -158,7 +158,7 @@ func TestReservedIPAddresses_InsufficientPermissions(t *testing.T) {
158158
}
159159

160160
// Attempt to reserve an IP address
161-
resIP, resErr := client.ReserveIPAddress(context.Background(), ReserveIPOptions{
161+
resIP, resErr := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{
162162
Region: region,
163163
})
164164
if resErr == nil {
@@ -194,16 +194,16 @@ func TestReservedIPAddresses_EndToEndTest(t *testing.T) {
194194

195195
filter := ""
196196

197-
ipList, err := client.ListReservedIPAddresses(context.Background(), NewListOptions(0, filter))
197+
ipList, err := client.ListReservedIPAddresses(context.Background(), linodego.NewListOptions(0, filter))
198198
if err != nil {
199199
t.Fatalf("Error listing IP addresses: %v", err)
200200
}
201201

202202
initialCount := len(ipList)
203203

204204
// Attempt to reserve an IP
205-
resIP, resErr := client.ReserveIPAddress(context.Background(), ReserveIPOptions{
206-
Region: getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
205+
resIP, resErr := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{
206+
Region: getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
207207
Tags: []string{"lb"},
208208
})
209209

@@ -227,7 +227,7 @@ func TestReservedIPAddresses_EndToEndTest(t *testing.T) {
227227
}
228228

229229
// Verify the list of IPs has increased
230-
verifyList, verifyErr := client.ListReservedIPAddresses(context.Background(), NewListOptions(0, filter))
230+
verifyList, verifyErr := client.ListReservedIPAddresses(context.Background(), linodego.NewListOptions(0, filter))
231231
if verifyErr != nil {
232232
t.Fatalf("Error listing IP addresses after reservation: %v", verifyErr)
233233
}
@@ -257,7 +257,7 @@ func TestReservedIPAddresses_EndToEndTest(t *testing.T) {
257257
t.Errorf("Expected error when fetching %s, got nil", resIP.Address)
258258
}
259259

260-
verifyDelList, verifyDelErr := client.ListReservedIPAddresses(context.Background(), NewListOptions(0, filter))
260+
verifyDelList, verifyDelErr := client.ListReservedIPAddresses(context.Background(), linodego.NewListOptions(0, filter))
261261
if verifyDelErr != nil {
262262
t.Fatalf("Error listing IP addresses after deletion: %v", verifyDelErr)
263263
}
@@ -273,7 +273,7 @@ func TestReservedIPAddresses_ListIPAddressesVariants(t *testing.T) {
273273
defer teardown()
274274

275275
expectedIPs := 2
276-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
276+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
277277

278278
// Reserve two IP addresses in region
279279
reservedIPs := make([]string, expectedIPs)
@@ -340,8 +340,8 @@ func TestReservedIPAddresses_GetIPAddressVariants(t *testing.T) {
340340
defer teardown()
341341

342342
// Reserve an IP for testing
343-
resIP, resErr := client.ReserveIPAddress(context.Background(), ReserveIPOptions{
344-
Region: getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
343+
resIP, resErr := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{
344+
Region: getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
345345
})
346346

347347
if resErr != nil {
@@ -405,27 +405,27 @@ func TestReservedIPAddresses_ReserveIPAddressVariants(t *testing.T) {
405405
defer cleanupIPs()
406406

407407
// Test reserving IP with omitted region
408-
_, omitErr := client.ReserveIPAddress(context.Background(), ReserveIPOptions{})
408+
_, omitErr := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{})
409409
if omitErr == nil {
410410
t.Errorf("Expected error when reserving IP with omitted region, got nil")
411411
}
412412

413413
// Test reserving IP with invalid region
414-
_, invalidErr := client.ReserveIPAddress(context.Background(), ReserveIPOptions{Region: "us"})
414+
_, invalidErr := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{Region: "us"})
415415
if invalidErr == nil {
416416
t.Errorf("Expected error when reserving IP with invalid region, got nil")
417417
}
418418

419419
// Test reserving IP with empty region
420-
_, emptyErr := client.ReserveIPAddress(context.Background(), ReserveIPOptions{Region: ""})
420+
_, emptyErr := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{Region: ""})
421421
if emptyErr == nil {
422422
t.Errorf("Expected error when reserving IP with empty region, got nil")
423423
}
424424

425425
// Make 2 valid IP Reservations
426426
for i := 0; i < 2; i++ {
427427
reserveIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{
428-
Region: getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
428+
Region: getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
429429
})
430430
if err != nil {
431431
t.Fatalf("Failed to reserve IP %d: %v", i+1, err)
@@ -456,7 +456,7 @@ func TestReservedIPAddresses_ExceedLimit(t *testing.T) {
456456
// Reserve IPs until the limit is reached and assert the error message
457457
for i := 0; i < 100; i++ {
458458
reservedIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{
459-
Region: getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
459+
Region: getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
460460
})
461461
if err != nil {
462462
expectedErrorMessage := "[400] Additional Reserved IPv4 addresses require technical justification."
@@ -481,8 +481,8 @@ func TestReservedIPAddresses_DeleteIPAddressVariants(t *testing.T) {
481481
client, teardown := createTestClient(t, "fixtures/TestReservedIPAddresses_DeleteIPAddressVariants")
482482
defer teardown()
483483

484-
validRes, validErr := client.ReserveIPAddress(context.Background(), ReserveIPOptions{
485-
Region: getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
484+
validRes, validErr := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{
485+
Region: getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0],
486486
})
487487
if validErr != nil {
488488
t.Fatalf("Failed to reserve IP. This test should start with 0 reservations or reservations < limit. Error from the API: %v", validErr)
@@ -495,7 +495,7 @@ func TestReservedIPAddresses_DeleteIPAddressVariants(t *testing.T) {
495495
t.Logf("Successfully reserved IP: %+v", validRes)
496496

497497
filter := ""
498-
ipList, listErr := client.ListReservedIPAddresses(context.Background(), NewListOptions(0, filter))
498+
ipList, listErr := client.ListReservedIPAddresses(context.Background(), linodego.NewListOptions(0, filter))
499499
if listErr != nil {
500500
t.Fatalf("Error listing IP addresses: %v", listErr)
501501
}
@@ -510,7 +510,7 @@ func TestReservedIPAddresses_DeleteIPAddressVariants(t *testing.T) {
510510
}
511511

512512
// Verify deletion
513-
verifyDelList, verifyDelErr := client.ListReservedIPAddresses(context.Background(), NewListOptions(0, filter))
513+
verifyDelList, verifyDelErr := client.ListReservedIPAddresses(context.Background(), linodego.NewListOptions(0, filter))
514514
if verifyDelErr != nil {
515515
t.Fatalf("Error listing IP addresses after deletion: %v", verifyDelErr)
516516
}
@@ -536,7 +536,7 @@ func TestReservedIPAddresses_GetIPReservationStatus(t *testing.T) {
536536
client, teardown := createTestClient(t, "fixtures/TestReservedIPAddresses_GetIPReservationStatus")
537537
defer teardown()
538538

539-
region := getRegionsWithCaps(t, client, []string{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
539+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{linodego.CapabilityLinodes, linodego.CapabilityCloudFirewall})[0]
540540

541541
// Create a Linode with a reserved IP
542542
reservedIP, err := client.ReserveIPAddress(context.Background(), linodego.ReserveIPOptions{Region: region})

‎test/integration/tags_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func TestTag_CreateTagWithReservedIP(t *testing.T) {
9393
client, teardown := createTestClient(t, "fixtures/TestTag_CreateTagWithReservedIP")
9494
defer teardown()
9595

96-
region := getRegionsWithCaps(t, client, []string{CapabilityLinodes, CapabilityCloudFirewall})[0]
96+
region := getRegionsWithCaps(t, client, []linodego.RegionCapability{CapabilityLinodes, CapabilityCloudFirewall})[0]
9797

9898
// Reserve an IP for testing
9999
reservedIP, err := client.ReserveIPAddress(context.Background(), ReserveIPOptions{Region: region})

0 commit comments

Comments
 (0)