Merge pull request #266 from fernflower/supportsubnets

Allow passing several subnets for vm creation

builder/powervs/builder.go

@@ -97,7 +97,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Source: b.config.Source,
 		},
 		&StepCreateNetwork{
-			SubnetID:    b.config.SubnetID,
+			SubnetIDs:   b.config.SubnetIDs,
 			DHCPNetwork: b.config.DHCPNetwork,
 		},
 		&StepCreateInstance{

builder/powervs/common/run_config.go

@@ -37,12 +37,12 @@ type CaptureCOS struct {
 }
 
 type RunConfig struct {
-	InstanceName string  `mapstructure:"instance_name" required:"true"`
-	KeyPairName  string  `mapstructure:"key_pair_name" required:"true"`
-	SubnetID     string  `mapstructure:"subnet_id" required:"false"`
-	DHCPNetwork  bool    `mapstructure:"dhcp_network" required:"false"`
-	Source       Source  `mapstructure:"source" required:"true"`
-	Capture      Capture `mapstructure:"capture" required:"true"`
+	InstanceName string    `mapstructure:"instance_name" required:"true"`
+	KeyPairName  string    `mapstructure:"key_pair_name" required:"true"`
+	SubnetIDs    []string  `mapstructure:"subnet_ids" required:"false"`
+	DHCPNetwork  bool      `mapstructure:"dhcp_network" required:"false"`
+	Source       Source    `mapstructure:"source" required:"true"`
+	Capture      Capture   `mapstructure:"capture" required:"true"`
 
 	// Communicator settings
 	Comm communicator.Config `mapstructure:",squash"`

builder/powervs/step_create_instance.go

@@ -28,11 +28,23 @@ func (s *StepCreateInstance) Run(_ context.Context, state multistep.StateBag) mu
 	net := state.Get("network").(*models.Network)
 
 	imageRef := state.Get("source_image").(*models.ImageReference)
-	networks := []*models.PVMInstanceAddNetwork{
-		{
-			NetworkID: net.NetworkID,
-		},
+
+	networks := []*models.PVMInstanceAddNetwork{}
+
+	if state.Get("networks") != nil {
+		// Several subnets have been specified -> pass them all for vm creation
+		networks = []*models.PVMInstanceAddNetwork{}
+
+		for _, subnet := range state.Get("networks").([]string){
+			subnetAdd := &models.PVMInstanceAddNetwork{
+				NetworkID: &subnet,
+			}
+			networks = append(networks, subnetAdd)
+	    }
+	} else {
+		networks = append(networks, &models.PVMInstanceAddNetwork{NetworkID: net.NetworkID})
 	}
+
 	body := &models.PVMInstanceCreate{
 		ImageID:     imageRef.ImageID,
 		KeyPairName: s.KeyPairName,

builder/powervs/step_create_network.go

@@ -20,29 +20,37 @@ const (
 )
 
 type StepCreateNetwork struct {
-	SubnetID    string
-	DHCPNetwork bool
-	doCleanup   bool
+	SubnetIDs           []string
+	DHCPNetwork         bool
+	doCleanup           bool
 }
 
+
 func (s *StepCreateNetwork) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
 	ui := state.Get("ui").(packersdk.Ui)
 
 	networkClient := state.Get("networkClient").(*instance.IBMPINetworkClient)
 
-	if s.SubnetID != "" {
-		ui.Say("The subnet is specified by the user; reuse it instead of creating a new one.")
-		net, err := networkClient.Get(s.SubnetID)
-		if err != nil {
-			ui.Error(fmt.Sprintf("failed to get subnet: %s, error: %v", s.SubnetID, err))
-			return multistep.ActionHalt
+	if s.SubnetIDs != nil {
+		for i, subnetID := range s.SubnetIDs {
+			ui.Say("The subnet is specified by the user; reuse it instead of creating a new one.")
+			net, err := networkClient.Get(subnetID)
+			if err != nil {
+				ui.Error(fmt.Sprintf("failed to get subnet: %s, error: %v", subnetID, err))
+				return multistep.ActionHalt
+			}
+			ui.Message(fmt.Sprintf("Network found!, Name: %s, ID: %s", *net.Name, *net.NetworkID))
+			if i == 0 {
+				ui.Say(fmt.Sprintf("Registering subnet %s as interface for ssh", subnetID))
+				state.Put("network", net)
+			}
 		}
-		ui.Message(fmt.Sprintf("Network found!, Name: %s, ID: %s", *net.Name, *net.NetworkID))
-		state.Put("network", net)
-		// do not delete the user specified subnet, hence skipping the cleanup
+		// The subnets have been validated, let's pass them further as plain ids
+		state.Put("networks", s.SubnetIDs)
+		// do not delete user specified subnets, hence skipping the cleanup
 		s.doCleanup = false
 		return multistep.ActionContinue
-	}
+        }
 
 	// If CreateDHCPNetwork is set, Create DHCP network.
 	if s.DHCPNetwork {