Skip to content

Commit 3342d66

Browse files
committed
feat(instance_server): use sbs api per default for block volumes
1 parent bd489ed commit 3342d66

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

internal/services/instance/helpers_instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ func prepareRootVolume(rootVolumeI map[string]any, serverType *instance.ServerTy
511511
// If the rootVolumeType is not defined, define it depending on the offer
512512
if rootVolumeType == "" {
513513
if serverTypeCanBootOnBlock {
514-
rootVolumeType = instance.VolumeVolumeTypeBSSD.String()
514+
rootVolumeType = instance.VolumeVolumeTypeSbsVolume.String()
515515
} else {
516516
rootVolumeType = instance.VolumeVolumeTypeLSSD.String()
517517
}

internal/services/instance/helpers_instance_block.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,16 @@ func instanceAndBlockAPIWithZoneAndID(m interface{}, zonedID string) (*BlockAndI
194194
}
195195

196196
func volumeTypeToMarketplaceFilter(volumeType any) marketplace.LocalImageType {
197-
if volumeType != nil && instance.VolumeVolumeType(volumeType.(string)) == instance.VolumeVolumeTypeSbsVolume {
198-
return marketplace.LocalImageTypeInstanceSbs
197+
if volumeType != nil {
198+
switch instance.VolumeVolumeType(volumeType.(string)) {
199+
case instance.VolumeVolumeTypeSbsVolume:
200+
return marketplace.LocalImageTypeInstanceSbs
201+
case instance.VolumeVolumeTypeBSSD:
202+
return marketplace.LocalImageTypeInstanceLocal
203+
case instance.VolumeVolumeTypeLSSD:
204+
return marketplace.LocalImageTypeInstanceLocal
205+
}
199206
}
200-
return marketplace.LocalImageTypeInstanceLocal
207+
208+
return marketplace.LocalImageTypeUnknownType
201209
}

0 commit comments

Comments
 (0)