Skip to content

Commit 1e5cb73

Browse files
Laure-diLaure-di
authored
tests(baremetal): update server offer (#2589)
* fix(baremetal): update server offer * update cassettes * fix golangci-lint * change server type ipflexible * update ipflexible baremetal cassettes * add of last test
1 parent cf31b15 commit 1e5cb73

26 files changed

+135953
-195732
lines changed

‎internal/services/baremetal/offer_data_source_test.go‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
2323
{
2424
Config: `
2525
data "scaleway_baremetal_offer" "test1" {
26-
zone = "fr-par-2"
27-
name = "EM-A210R-HDD"
26+
zone = "fr-par-1"
27+
name = "EM-A115X-SSD"
2828
}
2929
3030
data "scaleway_baremetal_offer" "test2" {
@@ -33,26 +33,26 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
3333
`,
3434
Check: resource.ComposeTestCheckFunc(
3535
isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
36-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", "EM-A210R-HDD"),
36+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", "EM-A115X-SSD"),
3737
isOfferPresent(tt, "data.scaleway_baremetal_offer.test2"),
3838
resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
39-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", "EM-A210R-HDD"),
39+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", "EM-A115X-SSD"),
4040
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
4141
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
42-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
42+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "500000000"),
4343
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
44-
// resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "stock", "available"), // skipping this as stocks vary too much
45-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "AMD Ryzen PRO 3600"),
46-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "6"),
47-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3600"),
48-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "12"),
49-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "HDD"),
44+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "stock", "available"), // skipping this as stocks vary too much
45+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "Intel Xeon E3 1220 or equivalent"),
46+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "4"),
47+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3100"),
48+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "4"),
49+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "SSD"),
5050
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.capacity", "1000000000000"),
51-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "HDD"),
51+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "SSD"),
5252
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.capacity", "1000000000000"),
53-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR4"),
54-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "16000000000"),
55-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "3200"),
53+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR3"),
54+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "32000000000"),
55+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "1600"),
5656
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc", "true"),
5757
),
5858
},
@@ -70,8 +70,8 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
7070
{
7171
Config: `
7272
data "scaleway_baremetal_offer" "test1" {
73-
zone = "fr-par-2"
74-
name = "EM-A210R-HDD"
73+
zone = "fr-par-1"
74+
name = "EM-A115X-SSD"
7575
7676
subscription_period = "hourly"
7777
}
@@ -82,28 +82,28 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
8282
`,
8383
Check: resource.ComposeTestCheckFunc(
8484
isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
85-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", "EM-A210R-HDD"),
85+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", "EM-A115X-SSD"),
8686
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "subscription_period", "hourly"),
8787
isOfferPresent(tt, "data.scaleway_baremetal_offer.test2"),
8888
resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
89-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", "EM-A210R-HDD"),
89+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", "EM-A115X-SSD"),
9090
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "subscription_period", "hourly"),
9191
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
9292
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
93-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
93+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "500000000"),
9494
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
95-
// resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "stock", "available"), // skipping this as stocks vary too much
96-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "AMD Ryzen PRO 3600"),
97-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "6"),
98-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3600"),
99-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "12"),
100-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "HDD"),
95+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "stock", "available"), // skipping this as stocks vary too much
96+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "Intel Xeon E3 1220 or equivalent"),
97+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "4"),
98+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3100"),
99+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "4"),
100+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "SSD"),
101101
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.capacity", "1000000000000"),
102-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "HDD"),
102+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "SSD"),
103103
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.capacity", "1000000000000"),
104-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR4"),
105-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "16000000000"),
106-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "3200"),
104+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR3"),
105+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "32000000000"),
106+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "1600"),
107107
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc", "true"),
108108
),
109109
},
@@ -121,8 +121,8 @@ func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) {
121121
{
122122
Config: `
123123
data "scaleway_baremetal_offer" "test1" {
124-
zone = "fr-par-2"
125-
name = "EM-A210R-HDD"
124+
zone = "fr-par-1"
125+
name = "EM-A115X-SSD"
126126
127127
subscription_period = "monthly"
128128
}
@@ -133,28 +133,28 @@ func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) {
133133
`,
134134
Check: resource.ComposeTestCheckFunc(
135135
isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
136-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", "EM-A210R-HDD"),
136+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", "EM-A115X-SSD"),
137137
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "subscription_period", "monthly"),
138138
isOfferPresent(tt, "data.scaleway_baremetal_offer.test2"),
139139
resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
140-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", "EM-A210R-HDD"),
140+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", "EM-A115X-SSD"),
141141
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "subscription_period", "monthly"),
142142
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
143143
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
144-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
144+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "500000000"),
145145
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "aluminium"),
146-
// resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "stock", "available"), // skipping this as stocks vary too much
147-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "AMD Ryzen PRO 3600"),
148-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "6"),
149-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3600"),
150-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "12"),
151-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "HDD"),
146+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "stock", "available"),
147+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "Intel Xeon E3 1220 or equivalent"),
148+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "4"),
149+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3100"),
150+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.thread_count", "4"),
151+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.type", "SSD"),
152152
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.0.capacity", "1000000000000"),
153-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "HDD"),
153+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.type", "SSD"),
154154
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "disk.1.capacity", "1000000000000"),
155-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR4"),
156-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "16000000000"),
157-
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "3200"),
155+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.type", "DDR3"),
156+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.capacity", "32000000000"),
157+
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.frequency", "1600"),
158158
resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "memory.0.is_ecc", "true"),
159159
),
160160
},

‎internal/services/baremetal/server_data_source_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
2424
{
2525
Config: fmt.Sprintf(`
2626
data "scaleway_baremetal_os" "my_os" {
27-
zone = "fr-par-2"
27+
zone = "fr-par-1"
2828
name = "Ubuntu"
2929
version = "22.04 LTS (Jammy Jellyfish)"
3030
}
3131
3232
data "scaleway_baremetal_offer" "my_offer" {
33-
zone = "fr-par-2"
34-
name = "EM-B112X-SSD"
33+
zone = "fr-par-1"
34+
name = "EM-A115X-SSD"
3535
}
3636
3737
resource "scaleway_iam_ssh_key" "main" {
@@ -41,7 +41,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
4141
4242
resource "scaleway_baremetal_server" "main" {
4343
name = "%s"
44-
zone = "fr-par-2"
44+
zone = "fr-par-1"
4545
description = "test a description"
4646
offer = data.scaleway_baremetal_offer.my_offer.offer_id
4747
os = data.scaleway_baremetal_os.my_os.os_id
@@ -53,14 +53,14 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
5353
{
5454
Config: fmt.Sprintf(`
5555
data "scaleway_baremetal_os" "my_os" {
56-
zone = "fr-par-2"
56+
zone = "fr-par-1"
5757
name = "Ubuntu"
5858
version = "22.04 LTS (Jammy Jellyfish)"
5959
}
6060
6161
data "scaleway_baremetal_offer" "my_offer" {
62-
zone = "fr-par-2"
63-
name = "EM-B112X-SSD"
62+
zone = "fr-par-1"
63+
name = "EM-A115X-SSD"
6464
}
6565
6666
resource "scaleway_iam_ssh_key" "main" {
@@ -70,7 +70,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
7070
7171
resource "scaleway_baremetal_server" "main" {
7272
name = "%s"
73-
zone = "fr-par-2"
73+
zone = "fr-par-1"
7474
description = "test a description"
7575
offer = data.scaleway_baremetal_offer.my_offer.offer_id
7676
os = data.scaleway_baremetal_os.my_os.os_id
@@ -80,12 +80,12 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
8080
8181
data "scaleway_baremetal_server" "by_name" {
8282
name = "${scaleway_baremetal_server.main.name}"
83-
zone = "fr-par-2"
83+
zone = "fr-par-1"
8484
}
8585
8686
data "scaleway_baremetal_server" "by_id" {
8787
server_id = "${scaleway_baremetal_server.main.id}"
88-
zone = "fr-par-2"
88+
zone = "fr-par-1"
8989
}
9090
`, SSHKeyName, SSHKeyBaremetal, name),
9191
Check: resource.ComposeTestCheckFunc(

0 commit comments

Comments
 (0)