Skip to content

Commit e7614bd

Browse files
committed
Add VPC Boskos support to deployer.go for s390x
- Support both lowercase and capitalized Boskos field names - Extract resource-group-name, vpc-name, and subnet-name from Boskos - Use resource.Name as fallback for VPC name - Maintains backward compatibility with PowerVS - Enables single-command approach for VPC like PowerVS
1 parent 146b797 commit e7614bd

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

kubetest2-tf/deployer/deployer.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,22 @@ func (d *deployer) initialize() error {
176176
case "vpc":
177177
vpc.VPCProvider.Region = d.BoskosResourceUserData["region"]
178178
vpc.VPCProvider.Zone = d.BoskosResourceUserData["zone"]
179-
vpc.VPCProvider.ResourceGroup = d.BoskosResourceUserData["resource-group"]
180-
vpc.VPCProvider.VPCName = d.BoskosResourceUserData["vpc-name"]
179+
// Try both lowercase and capitalized field names for compatibility
180+
if resourceGroup := d.BoskosResourceUserData["resource-group"]; resourceGroup != "" {
181+
vpc.VPCProvider.ResourceGroup = resourceGroup
182+
} else if resourceGroup := d.BoskosResourceUserData["resource-group-name"]; resourceGroup != "" {
183+
vpc.VPCProvider.ResourceGroup = resourceGroup
184+
}
185+
// Try both lowercase and capitalized field names for VPC name
186+
if vpcName := d.BoskosResourceUserData["vpc-name"]; vpcName != "" {
187+
vpc.VPCProvider.VPCName = vpcName
188+
} else if vpcName := resource.Name; vpcName != "" {
189+
vpc.VPCProvider.VPCName = vpcName
190+
}
191+
// Get subnet name if available
192+
if subnetName := d.BoskosResourceUserData["subnet-name"]; subnetName != "" {
193+
vpc.VPCProvider.SubnetName = subnetName
194+
}
181195

182196
case "powervs":
183197
powervs.PowerVSProvider.Zone = d.BoskosResourceUserData["zone"]

0 commit comments

Comments
 (0)