Skip to content

Commit 3a9607b

Browse files
authored
fix(baremetal): unset PN (#3533)
* fix(baremetal): unset PN * update cassettes
1 parent e00b6fe commit 3a9607b

File tree

3 files changed

+2410
-1429
lines changed

3 files changed

+2410
-1429
lines changed

internal/services/baremetal/server.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,9 +705,11 @@ func ResourceServerUpdate(ctx context.Context, d *schema.ResourceData, m any) di
705705
return diag.FromErr(err)
706706
}
707707

708-
_, err = waitForServerPrivateNetwork(ctx, privateNetworkAPI, zone, baremetalPrivateNetwork.ServerPrivateNetworks[0].ServerID, d.Timeout(schema.TimeoutUpdate))
709-
if err != nil && !httperrors.Is404(err) {
710-
return diag.FromErr(err)
708+
if baremetalPrivateNetwork.ServerPrivateNetworks != nil {
709+
_, err = waitForServerPrivateNetwork(ctx, privateNetworkAPI, zone, baremetalPrivateNetwork.ServerPrivateNetworks[0].ServerID, d.Timeout(schema.TimeoutUpdate))
710+
if err != nil && !httperrors.Is404(err) {
711+
return diag.FromErr(err)
712+
}
711713
}
712714
}
713715

internal/services/baremetal/server_test.go

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,49 @@ func TestAccServer_AddPrivateNetwork(t *testing.T) {
856856
baremetalchecks.CheckServerDestroy(tt),
857857
),
858858
Steps: []resource.TestStep{
859+
{
860+
Config: fmt.Sprintf(`
861+
data "scaleway_baremetal_os" "my_os" {
862+
zone = "%s"
863+
name = "Ubuntu"
864+
version = "22.04 LTS (Jammy Jellyfish)"
865+
}
866+
867+
data "scaleway_baremetal_offer" "my_offer" {
868+
zone = "%s"
869+
name = "%s"
870+
}
871+
872+
data "scaleway_baremetal_option" "private_network" {
873+
zone = "%s"
874+
name = "Private Network"
875+
}
876+
877+
resource "scaleway_vpc_private_network" "pn" {
878+
name = "baremetal_private_network"
879+
}
880+
881+
resource "scaleway_iam_ssh_key" "base" {
882+
name = "%s"
883+
public_key = "%s"
884+
}
885+
886+
resource "scaleway_baremetal_server" "base" {
887+
name = "%s"
888+
zone = "%s"
889+
offer = data.scaleway_baremetal_offer.my_offer.offer_id
890+
os = data.scaleway_baremetal_os.my_os.os_id
891+
892+
ssh_key_ids = [ scaleway_iam_ssh_key.base.id ]
893+
options {
894+
id = data.scaleway_baremetal_option.private_network.option_id
895+
}
896+
}
897+
`, Zone, Zone, OfferName, Zone, SSHKeyName, SSHKeyBaremetal, name, Zone),
898+
Check: resource.ComposeTestCheckFunc(
899+
testAccCheckBaremetalServerExists(tt, "scaleway_baremetal_server.base"),
900+
),
901+
},
859902
{
860903
Config: fmt.Sprintf(`
861904
data "scaleway_baremetal_os" "my_os" {
@@ -893,10 +936,15 @@ func TestAccServer_AddPrivateNetwork(t *testing.T) {
893936
options {
894937
id = data.scaleway_baremetal_option.private_network.option_id
895938
}
939+
private_network {
940+
id = scaleway_vpc_private_network.pn.id
941+
}
896942
}
897943
`, Zone, Zone, OfferName, Zone, SSHKeyName, SSHKeyBaremetal, name, Zone),
898944
Check: resource.ComposeTestCheckFunc(
899945
testAccCheckBaremetalServerExists(tt, "scaleway_baremetal_server.base"),
946+
testAccCheckBaremetalServerHasPrivateNetwork(tt, "scaleway_baremetal_server.base"),
947+
resource.TestCheckResourceAttrPair("scaleway_baremetal_server.base", "private_network.0.id", "scaleway_vpc_private_network.pn", "id"),
900948
),
901949
},
902950
{
@@ -936,15 +984,11 @@ func TestAccServer_AddPrivateNetwork(t *testing.T) {
936984
options {
937985
id = data.scaleway_baremetal_option.private_network.option_id
938986
}
939-
private_network {
940-
id = scaleway_vpc_private_network.pn.id
941-
}
942987
}
943988
`, Zone, Zone, OfferName, Zone, SSHKeyName, SSHKeyBaremetal, name, Zone),
944989
Check: resource.ComposeTestCheckFunc(
945990
testAccCheckBaremetalServerExists(tt, "scaleway_baremetal_server.base"),
946-
testAccCheckBaremetalServerHasPrivateNetwork(tt, "scaleway_baremetal_server.base"),
947-
resource.TestCheckResourceAttrPair("scaleway_baremetal_server.base", "private_network.0.id", "scaleway_vpc_private_network.pn", "id"),
991+
resource.TestCheckNoResourceAttr("scaleway_baremetal_server.base", "private_network.0"),
948992
),
949993
},
950994
},

internal/services/baremetal/testdata/server-add-private-network.cassette.yaml

Lines changed: 2356 additions & 1421 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)