Skip to content

[release-0.11] 🐛 Add FlavorID to be set by openStackMachineSpecToOpenStackServerSpec #2586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2025
Merged

[release-0.11] 🐛 Add FlavorID to be set by openStackMachineSpecToOpenStackServerSpec #2586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions controllers/openstackmachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ func openStackMachineSpecToOpenStackServerSpec(openStackMachineSpec *infrav1.Ope
AdditionalBlockDevices: openStackMachineSpec.AdditionalBlockDevices,
ConfigDrive: openStackMachineSpec.ConfigDrive,
Flavor: openStackMachineSpec.Flavor,
FlavorID: openStackMachineSpec.FlavorID,
IdentityRef: identityRef,
Image: openStackMachineSpec.Image,
RootVolume: openStackMachineSpec.RootVolume,
Expand Down
38 changes: 37 additions & 1 deletion controllers/openstackmachine_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func TestOpenStackMachineSpecToOpenStackServerSpec(t *testing.T) {
},
},
{
name: "Test a OpenStackMachineSpec to OpenStackServerSpec conversion with an additional security group",
name: "Test an OpenStackMachineSpec to OpenStackServerSpec conversion with an additional security group",
spec: &infrav1.OpenStackMachineSpec{
Flavor: ptr.To(flavorName),
Image: image,
Expand All @@ -138,6 +138,42 @@ func TestOpenStackMachineSpecToOpenStackServerSpec(t *testing.T) {
UserDataRef: userData,
},
},
{
name: "Test an OpenStackMachineSpec to OpenStackServerSpec conversion with flavor and flavorID specified",
spec: &infrav1.OpenStackMachineSpec{
Flavor: ptr.To(flavorName),
FlavorID: ptr.To(flavorUUID),
Image: image,
SSHKeyName: sshKeyName,
},
want: &infrav1alpha1.OpenStackServerSpec{
Flavor: ptr.To(flavorName),
FlavorID: ptr.To(flavorUUID),
IdentityRef: identityRef,
Image: image,
SSHKeyName: sshKeyName,
Ports: portOpts,
Tags: tags,
UserDataRef: userData,
},
},
{
name: "Test an OpenStackMachineSpec to OpenStackServerSpec conversion with flavorID specified but not flavor",
spec: &infrav1.OpenStackMachineSpec{
FlavorID: ptr.To(flavorUUID),
Image: image,
SSHKeyName: sshKeyName,
},
want: &infrav1alpha1.OpenStackServerSpec{
FlavorID: ptr.To(flavorUUID),
IdentityRef: identityRef,
Image: image,
SSHKeyName: sshKeyName,
Ports: portOpts,
Tags: tags,
UserDataRef: userData,
},
},
}
for i := range tests {
tt := tests[i]
Expand Down