Merge branch 'scaleway:master' into master

Author: scaleway-bot

internal/namespaces/lb/v1/custom_private_network_test.go

@@ -5,19 +5,22 @@ import (
 	"time"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
+	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/ipam/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/lb/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 )
 
 func Test_ListLBPrivateNetwork(t *testing.T) {
 	cmds := lb.GetCommands()
 	cmds.Merge(vpc.GetCommands())
+	cmds.Merge(ipam.GetCommands())
 
 	t.Run("Simple", core.Test(&core.TestConfig{
 		Commands: cmds,
 		BeforeFunc: core.BeforeFuncCombine(
 			createLB(),
 			createPN(),
+			createIPAMIP(),
 			attachPN(),
 		),
 		Cmd:   "scw lb private-network list {{ .LB.ID }}",
@@ -32,6 +35,7 @@ func Test_ListLBPrivateNetwork(t *testing.T) {
 					return nil
 				},
 			),
+			deleteIPAMIP(),
 			deletePN(),
 			deleteLBFlexibleIP(),
 		),

internal/namespaces/lb/v1/helper_test.go

@@ -171,7 +171,7 @@ func deletePN() core.AfterFunc {
 
 func attachPN() core.BeforeFunc {
 	return core.ExecBeforeCmd(
-		"scw lb private-network attach {{ .LB.ID }} private-network-id={{ .PN.ID }}",
+		"scw lb private-network attach {{ .LB.ID }} private-network-id={{ .PN.ID }} ipam-ids.0={{ .IPAMIP.ID }}",
 	)
 }
 
@@ -187,3 +187,14 @@ func createIP() core.BeforeFunc {
 		"scw lb ip create is-ipv6=true",
 	)
 }
+
+func createIPAMIP() core.BeforeFunc {
+	return core.ExecStoreBeforeCmd(
+		"IPAMIP",
+		"scw ipam ip create source.private-network-id={{ .PN.ID }}",
+	)
+}
+
+func deleteIPAMIP() core.AfterFunc {
+	return core.ExecAfterCmd("scw ipam ip delete {{ .IPAMIP.ID }}")
+}