Skip to content

Commit 5684804

Browse files
committed
add test vpc
1 parent 7c4da1c commit 5684804

File tree

2 files changed

+34
-26
lines changed

2 files changed

+34
-26
lines changed

internal/services/applesilicon/server.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,6 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
241241
return diag.FromErr(err)
242242
}
243243

244-
privateNetworkAPI := applesilicon.NewPrivateNetworkAPI(meta.ExtractScwClient(m))
245-
246244
req := &applesilicon.UpdateServerRequest{
247245
Zone: zone,
248246
ServerID: ID,
@@ -255,26 +253,6 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
255253
if d.HasChange("enable_vpc") {
256254
enableVpc := d.Get("enable_vpc").(bool)
257255
req.EnableVpc = &enableVpc
258-
if !enableVpc {
259-
listPrivateNetworks, err := privateNetworkAPI.ListServerPrivateNetworks(&applesilicon.PrivateNetworkAPIListServerPrivateNetworksRequest{
260-
Zone: res.Zone,
261-
ServerID: &res.ID,
262-
})
263-
if err != nil {
264-
return diag.FromErr(err)
265-
}
266-
for _, v := range listPrivateNetworks.ServerPrivateNetworks {
267-
err = privateNetworkAPI.DeleteServerPrivateNetwork(&applesilicon.PrivateNetworkAPIDeleteServerPrivateNetworkRequest{
268-
Zone: zone,
269-
ServerID: v.ServerID,
270-
PrivateNetworkID: v.PrivateNetworkID,
271-
})
272-
if err != nil {
273-
return diag.FromErr(err)
274-
}
275-
}
276-
277-
}
278256
}
279257

280258
_, err = asAPI.UpdateServer(req, scw.WithContext(ctx))

internal/services/applesilicon/server_test.go

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,45 @@ func TestAccServer_EnableVPC(t *testing.T) {
5454
Steps: []resource.TestStep{
5555
{
5656
Config: `
57+
resource "scaleway_vpc" "vpc01" {
58+
name = "TestAccScalewayBaremetalIPAM"
59+
}
60+
61+
resource "scaleway_vpc_private_network" "pn01" {
62+
name = "TestAccScalewayBaremetalIPAM"
63+
ipv4_subnet {
64+
subnet = "172.16.64.0/22"
65+
}
66+
vpc_id = scaleway_vpc.vpc01.id
67+
}
68+
69+
resource "scaleway_ipam_ip" "ip01" {
70+
address = "172.16.64.7"
71+
source {
72+
private_network_id = scaleway_vpc_private_network.pn01.id
73+
}
74+
}
75+
76+
resource "scaleway_ipam_ip" "ip02" {
77+
address = "172.16.64.9"
78+
source {
79+
private_network_id = scaleway_vpc_private_network.pn01.id
80+
}
81+
}
82+
5783
resource scaleway_apple_silicon_server main {
58-
name = "test-m1"
84+
name = "test-m2"
5985
type = "M2-M"
6086
enable_vpc = true
87+
private_network {
88+
id = scaleway_vpc_private_network.pn01.id
89+
ipam_ip_ids = [scaleway_ipam_ip.ip01.id]
90+
}
6191
}
6292
`,
6393
Check: resource.ComposeTestCheckFunc(
6494
isServerPresent(tt, "scaleway_apple_silicon_server.main"),
65-
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m1"),
95+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m2"),
6696
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
6797
// Computed
6898
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
@@ -75,14 +105,14 @@ func TestAccServer_EnableVPC(t *testing.T) {
75105
{
76106
Config: `
77107
resource scaleway_apple_silicon_server main {
78-
name = "test-m1"
108+
name = "test-m2"
79109
type = "M2-M"
80110
enable_vpc = false
81111
}
82112
`,
83113
Check: resource.ComposeTestCheckFunc(
84114
isServerPresent(tt, "scaleway_apple_silicon_server.main"),
85-
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m1"),
115+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m2"),
86116
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M1-M"),
87117
// Computed
88118
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),

0 commit comments

Comments
 (0)