Skip to content

Commit ba85c16

Browse files
committed
add test vpc
1 parent ada770a commit ba85c16

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
@@ -243,8 +243,6 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
243243
return diag.FromErr(err)
244244
}
245245

246-
privateNetworkAPI := applesilicon.NewPrivateNetworkAPI(meta.ExtractScwClient(m))
247-
248246
req := &applesilicon.UpdateServerRequest{
249247
Zone: zone,
250248
ServerID: ID,
@@ -257,26 +255,6 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
257255
if d.HasChange("enable_vpc") {
258256
enableVpc := d.Get("enable_vpc").(bool)
259257
req.EnableVpc = &enableVpc
260-
if !enableVpc {
261-
listPrivateNetworks, err := privateNetworkAPI.ListServerPrivateNetworks(&applesilicon.PrivateNetworkAPIListServerPrivateNetworksRequest{
262-
Zone: res.Zone,
263-
ServerID: &res.ID,
264-
})
265-
if err != nil {
266-
return diag.FromErr(err)
267-
}
268-
for _, v := range listPrivateNetworks.ServerPrivateNetworks {
269-
err = privateNetworkAPI.DeleteServerPrivateNetwork(&applesilicon.PrivateNetworkAPIDeleteServerPrivateNetworkRequest{
270-
Zone: zone,
271-
ServerID: v.ServerID,
272-
PrivateNetworkID: v.PrivateNetworkID,
273-
})
274-
if err != nil {
275-
return diag.FromErr(err)
276-
}
277-
}
278-
279-
}
280258
}
281259

282260
_, 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
@@ -55,15 +55,45 @@ func TestAccServer_EnableVPC(t *testing.T) {
5555
Steps: []resource.TestStep{
5656
{
5757
Config: `
58+
resource "scaleway_vpc" "vpc01" {
59+
name = "TestAccScalewayBaremetalIPAM"
60+
}
61+
62+
resource "scaleway_vpc_private_network" "pn01" {
63+
name = "TestAccScalewayBaremetalIPAM"
64+
ipv4_subnet {
65+
subnet = "172.16.64.0/22"
66+
}
67+
vpc_id = scaleway_vpc.vpc01.id
68+
}
69+
70+
resource "scaleway_ipam_ip" "ip01" {
71+
address = "172.16.64.7"
72+
source {
73+
private_network_id = scaleway_vpc_private_network.pn01.id
74+
}
75+
}
76+
77+
resource "scaleway_ipam_ip" "ip02" {
78+
address = "172.16.64.9"
79+
source {
80+
private_network_id = scaleway_vpc_private_network.pn01.id
81+
}
82+
}
83+
5884
resource scaleway_apple_silicon_server main {
59-
name = "test-m1"
85+
name = "test-m2"
6086
type = "M2-M"
6187
enable_vpc = true
88+
private_network {
89+
id = scaleway_vpc_private_network.pn01.id
90+
ipam_ip_ids = [scaleway_ipam_ip.ip01.id]
91+
}
6292
}
6393
`,
6494
Check: resource.ComposeTestCheckFunc(
6595
isServerPresent(tt, "scaleway_apple_silicon_server.main"),
66-
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m1"),
96+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m2"),
6797
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M2-M"),
6898
// Computed
6999
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),
@@ -76,14 +106,14 @@ func TestAccServer_EnableVPC(t *testing.T) {
76106
{
77107
Config: `
78108
resource scaleway_apple_silicon_server main {
79-
name = "test-m1"
109+
name = "test-m2"
80110
type = "M2-M"
81111
enable_vpc = false
82112
}
83113
`,
84114
Check: resource.ComposeTestCheckFunc(
85115
isServerPresent(tt, "scaleway_apple_silicon_server.main"),
86-
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m1"),
116+
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "name", "test-m2"),
87117
resource.TestCheckResourceAttr("scaleway_apple_silicon_server.main", "type", "M1-M"),
88118
// Computed
89119
resource.TestCheckResourceAttrSet("scaleway_apple_silicon_server.main", "ip"),

0 commit comments

Comments
 (0)