Skip to content

Commit 655bd05

Browse files
Laure-diLaure-di
committed
fix(baremetal): update offer and refacto tests
1 parent c4e0262 commit 655bd05

25 files changed

+10544
-12839
lines changed

‎internal/namespaces/baremetal/v1/custom_server_create_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
)
1212

13+
const (
14+
offerNameNVME = "EM-I215E-NVME"
15+
offerNameSATA = "EM-B111X-SATA"
16+
zone = "fr-par-2"
17+
)
18+
1319
// All test below should succeed to create an instance.
1420
func Test_CreateServer(t *testing.T) {
1521
// Simple use cases
@@ -19,7 +25,7 @@ func Test_CreateServer(t *testing.T) {
1925
BeforeFunc: func(ctx *core.BeforeFuncCtx) error {
2026
api := baremetalSDK.NewAPI(ctx.Client)
2127
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
22-
OfferName: offerName,
28+
OfferName: offerNameNVME,
2329
Zone: region,
2430
})
2531
if server.Stock != baremetalSDK.OfferStockAvailable {
@@ -28,14 +34,12 @@ func Test_CreateServer(t *testing.T) {
2834

2935
return nil
3036
},
31-
Cmd: "scw baremetal server create zone=" + region + " type=" + offerName + " -w",
37+
Cmd: "scw baremetal server create zone=" + region + " type=" + offerNameNVME + " -w",
3238
Check: core.TestCheckCombine(
3339
core.TestCheckGolden(),
3440
core.TestCheckExitCode(0),
3541
),
36-
AfterFunc: core.ExecAfterCmd(
37-
"scw baremetal server delete {{ .CmdResult.ID }} zone=" + region,
38-
),
42+
AfterFunc: core.ExecAfterCmd("scw baremetal server delete {{ .CmdResult.ID }} zone=" + zone),
3943
},
4044
))
4145

@@ -44,7 +48,7 @@ func Test_CreateServer(t *testing.T) {
4448
BeforeFunc: func(ctx *core.BeforeFuncCtx) error {
4549
api := baremetalSDK.NewAPI(ctx.Client)
4650
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
47-
OfferName: offerName,
51+
OfferName: offerNameNVME,
4852
Zone: region,
4953
})
5054
if server.Stock != baremetalSDK.OfferStockAvailable {
@@ -53,7 +57,7 @@ func Test_CreateServer(t *testing.T) {
5357

5458
return nil
5559
},
56-
Cmd: "scw baremetal server create name=test-create-server-with-name zone=" + region + " type=" + offerName + " -w",
60+
Cmd: "scw baremetal server create name=test-create-server-with-name zone=" + region + " type=" + offerNameNVME + " -w",
5761
Check: core.TestCheckCombine(
5862
func(t *testing.T, ctx *core.CheckFuncCtx) {
5963
t.Helper()
@@ -65,17 +69,15 @@ func Test_CreateServer(t *testing.T) {
6569
},
6670
core.TestCheckExitCode(0),
6771
),
68-
AfterFunc: core.ExecAfterCmd(
69-
"scw baremetal server delete {{ .CmdResult.ID }} zone=" + region,
70-
),
72+
AfterFunc: core.ExecAfterCmd("scw baremetal server delete {{ .CmdResult.ID }} zone=" + zone),
7173
}))
7274

7375
t.Run("Tags", core.Test(&core.TestConfig{
7476
Commands: baremetal.GetCommands(),
7577
BeforeFunc: func(ctx *core.BeforeFuncCtx) error {
7678
api := baremetalSDK.NewAPI(ctx.Client)
7779
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
78-
OfferName: offerName,
80+
OfferName: offerNameNVME,
7981
Zone: region,
8082
})
8183
if server.Stock != baremetalSDK.OfferStockAvailable {
@@ -84,7 +86,7 @@ func Test_CreateServer(t *testing.T) {
8486

8587
return nil
8688
},
87-
Cmd: "scw baremetal server create tags.0=prod tags.1=blue zone=" + region + " type=" + offerName + " -w",
89+
Cmd: "scw baremetal server create tags.0=prod tags.1=blue zone=" + zone + " type=" + offerNameNVME + " -w",
8890
Check: core.TestCheckCombine(
8991
func(t *testing.T, ctx *core.CheckFuncCtx) {
9092
t.Helper()
@@ -93,9 +95,7 @@ func Test_CreateServer(t *testing.T) {
9395
},
9496
core.TestCheckExitCode(0),
9597
),
96-
AfterFunc: core.ExecAfterCmd(
97-
"scw baremetal server delete {{ .CmdResult.ID }} zone=" + region,
98-
),
98+
AfterFunc: core.ExecAfterCmd("scw baremetal server delete {{ .CmdResult.ID }} zone=" + zone),
9999
}))
100100
})
101101
}

‎internal/namespaces/baremetal/v1/custom_server_fip_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func Test_CreateFlexibleIPInteractive(t *testing.T) {
2424
func(ctx *core.BeforeFuncCtx) error {
2525
api := baremetalSDK.NewAPI(ctx.Client)
2626
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
27-
OfferName: offerName,
27+
OfferName: offerNameNVME,
2828
Zone: region,
2929
})
3030
if server.Stock != baremetalSDK.OfferStockAvailable {
@@ -33,15 +33,15 @@ func Test_CreateFlexibleIPInteractive(t *testing.T) {
3333

3434
return nil
3535
},
36-
createServerAndWaitDefault("Server"),
36+
createServerAndWait("Server"),
3737
),
38-
Cmd: "scw baremetal server add-flexible-ip {{ .Server.ID }}",
38+
Cmd: "scw baremetal server add-flexible-ip {{ .Server.ID }} zone=" + zone,
3939
Check: core.TestCheckCombine(
4040
core.TestCheckGolden(),
4141
),
4242
AfterFunc: core.AfterFuncCombine(
43-
deleteServerDefault("Server"),
44-
core.ExecAfterCmd("scw fip ip delete {{ .CmdResult.ID }}"),
43+
deleteServer("Server"),
44+
core.ExecAfterCmd("scw fip ip delete {{ .CmdResult.ID }} zone="+zone),
4545
),
4646
PromptResponseMocks: promptResponse,
4747
}))
@@ -57,7 +57,7 @@ func Test_CreateFlexibleIP(t *testing.T) {
5757
func(ctx *core.BeforeFuncCtx) error {
5858
api := baremetalSDK.NewAPI(ctx.Client)
5959
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
60-
OfferName: offerName,
60+
OfferName: offerNameNVME,
6161
Zone: region,
6262
})
6363
if server.Stock != baremetalSDK.OfferStockAvailable {
@@ -66,15 +66,15 @@ func Test_CreateFlexibleIP(t *testing.T) {
6666

6767
return nil
6868
},
69-
createServerAndWaitDefault("Server"),
69+
createServerAndWait("Server"),
7070
),
71-
Cmd: "scw baremetal server add-flexible-ip {{ .Server.ID }} ip-type=IPv4",
71+
Cmd: "scw baremetal server add-flexible-ip {{ .Server.ID }} ip-type=IPv4 zone=" + zone,
7272
Check: core.TestCheckCombine(
7373
core.TestCheckGolden(),
7474
),
7575
AfterFunc: core.AfterFuncCombine(
76-
deleteServerDefault("Server"),
77-
core.ExecAfterCmd("scw fip ip delete {{ .CmdResult.ID }}"),
76+
deleteServer("Server"),
77+
core.ExecAfterCmd("scw fip ip delete {{ .CmdResult.ID }} zone="+zone),
7878
),
7979
}))
8080
}

‎internal/namespaces/baremetal/v1/custom_server_install_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func Test_InstallServer(t *testing.T) {
2424
func(ctx *core.BeforeFuncCtx) error {
2525
api := baremetalSDK.NewAPI(ctx.Client)
2626
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
27-
OfferName: offerName,
27+
OfferName: offerNameNVME,
2828
Zone: region,
2929
})
3030
if server.Stock != baremetalSDK.OfferStockAvailable {
@@ -39,7 +39,7 @@ func Test_InstallServer(t *testing.T) {
3939
createServerAndWait("Server"),
4040
),
4141
Commands: cmds,
42-
Cmd: "scw baremetal server install {{ .Server.ID }} zone=" + region + " hostname=test-install-server ssh-key-ids.0={{ .key.ID }} os-id=" + osID + " -w",
42+
Cmd: "scw baremetal server install {{ .Server.ID }} zone=" + zone + " hostname=test-install-server ssh-key-ids.0={{ .key.ID }} os-id=" + osID + " -w",
4343
Check: core.TestCheckCombine(
4444
core.TestCheckGolden(),
4545
core.TestCheckExitCode(0),
@@ -56,7 +56,7 @@ func Test_InstallServer(t *testing.T) {
5656
func(ctx *core.BeforeFuncCtx) error {
5757
api := baremetalSDK.NewAPI(ctx.Client)
5858
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
59-
OfferName: offerName,
59+
OfferName: offerNameNVME,
6060
Zone: region,
6161
})
6262
if server.Stock != baremetalSDK.OfferStockAvailable {
@@ -68,7 +68,7 @@ func Test_InstallServer(t *testing.T) {
6868
addSSH("key", sshKey),
6969
createServerAndWait("Server"),
7070
),
71-
Cmd: "scw baremetal server install {{ .Server.ID }} zone=" + region + " hostname=test-install-server all-ssh-keys=true os-id=" + osID + " -w",
71+
Cmd: "scw baremetal server install {{ .Server.ID }} zone=" + zone + " hostname=test-install-server all-ssh-keys=true os-id=" + osID + " -w",
7272
Check: core.TestCheckCombine(
7373
core.TestCheckGolden(),
7474
core.TestCheckExitCode(0),

‎internal/namespaces/baremetal/v1/custom_server_test.go

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,25 @@ import (
1010
"github.com/scaleway/scaleway-sdk-go/scw"
1111
)
1212

13-
const (
14-
offerName = "EM-B220E-NVME"
15-
region = "fr-par-1"
16-
)
17-
1813
func Test_StartServerErrors(t *testing.T) {
1914
t.Run("Error: cannot be started while not delivered", core.Test(&core.TestConfig{
2015
BeforeFunc: core.BeforeFuncCombine(
2116
func(ctx *core.BeforeFuncCtx) error {
2217
api := baremetalSDK.NewAPI(ctx.Client)
2318
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
24-
OfferName: "EM-B111X-SATA",
25-
Zone: region,
19+
OfferName: offerNameSATA,
20+
Zone: zone,
2621
})
2722
if server.Stock != baremetalSDK.OfferStockAvailable {
2823
return errors.New("offer out of stock")
2924
}
3025

3126
return nil
3227
},
33-
createServer("Server", "EM-B111X-SATA"),
28+
createServer("Server", offerNameSATA),
3429
),
3530
Commands: baremetal.GetCommands(),
36-
Cmd: "scw baremetal server start zone=" + region + " {{ .Server.ID }}",
31+
Cmd: "scw baremetal server start zone=" + zone + " {{ .Server.ID }}",
3732
Check: core.TestCheckCombine(
3833
core.TestCheckGolden(),
3934
core.TestCheckExitCode(1),
@@ -62,8 +57,8 @@ func Test_StopServerErrors(t *testing.T) {
6257
func(ctx *core.BeforeFuncCtx) error {
6358
api := baremetalSDK.NewAPI(ctx.Client)
6459
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
65-
OfferName: "EM-B111X-SATA",
66-
Zone: region,
60+
OfferName: offerNameSATA,
61+
Zone: zone,
6762
})
6863
if server.Stock != baremetalSDK.OfferStockAvailable {
6964
return errors.New("offer out of stock")
@@ -74,7 +69,7 @@ func Test_StopServerErrors(t *testing.T) {
7469
createServer("Server", "EM-B111X-SATA"),
7570
),
7671
Commands: baremetal.GetCommands(),
77-
Cmd: "scw baremetal server stop zone=" + region + " {{ .Server.ID }}",
72+
Cmd: "scw baremetal server stop zone=" + zone + " {{ .Server.ID }}",
7873
Check: core.TestCheckCombine(
7974
core.TestCheckGolden(),
8075
core.TestCheckExitCode(1),
@@ -103,19 +98,19 @@ func Test_RebootServerErrors(t *testing.T) {
10398
func(ctx *core.BeforeFuncCtx) error {
10499
api := baremetalSDK.NewAPI(ctx.Client)
105100
server, _ := api.GetOfferByName(&baremetalSDK.GetOfferByNameRequest{
106-
OfferName: "EM-B111X-SATA",
107-
Zone: region,
101+
OfferName: offerNameSATA,
102+
Zone: zone,
108103
})
109104
if server.Stock != baremetalSDK.OfferStockAvailable {
110105
return errors.New("offer out of stock")
111106
}
112107

113108
return nil
114109
},
115-
createServer("Server", "EM-B111X-SATA"),
110+
createServer("Server", offerNameSATA),
116111
),
117112
Commands: baremetal.GetCommands(),
118-
Cmd: "scw baremetal server reboot zone=" + region + " {{ .Server.ID }}",
113+
Cmd: "scw baremetal server reboot zone=" + zone + " {{ .Server.ID }}",
119114
Check: core.TestCheckCombine(
120115
core.TestCheckGolden(),
121116
core.TestCheckExitCode(1),

‎internal/namespaces/baremetal/v1/helpers_test.go

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,19 @@ import (
99
// createServerAndWait creates a baremetal instance
1010
// register it in the context Meta at metaKey.
1111
func createServerAndWait(metaKey string) core.BeforeFunc {
12-
return core.ExecStoreBeforeCmd(
13-
metaKey,
14-
"scw baremetal server create zone="+region+" type="+offerName+" -w",
15-
)
12+
return core.ExecStoreBeforeCmd(metaKey, "scw baremetal server create type="+offerNameNVME+" zone="+zone+" -w")
1613
}
1714

18-
func createServerAndWaitDefault(metaKey string) core.BeforeFunc {
19-
return core.ExecStoreBeforeCmd(metaKey, "scw baremetal server create type="+offerName+" -w")
20-
}
21-
22-
func createServer(metaKey string, offerType string) core.BeforeFunc {
23-
return core.ExecStoreBeforeCmd(
24-
metaKey,
25-
"scw baremetal server create zone="+region+" type="+offerType,
26-
)
15+
func createServer(metaKey string, offer string) core.BeforeFunc {
16+
return core.ExecStoreBeforeCmd(metaKey, "scw baremetal server create zone="+zone+" type="+offer)
2717
}
2818

2919
// deleteServer deletes a server
3020
// previously registered in the context Meta at metaKey.
3121
//
3222
//nolint:unparam
3323
func deleteServer(metaKey string) core.AfterFunc {
34-
return core.ExecAfterCmd(
35-
fmt.Sprintf("scw baremetal server delete zone="+region+" {{ .%s.ID }}", metaKey),
36-
)
37-
}
38-
39-
func deleteServerDefault(metaKey string) core.AfterFunc {
40-
return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete {{ .%s.ID }}", metaKey))
24+
return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete {{ .%s.ID }} zone=%s", metaKey, zone))
4125
}
4226

4327
// add an ssh key with a given meta key

0 commit comments

Comments
 (0)