add ExpectedRunDevice constant

builder/osc/bsu/builder.go

@@ -145,7 +145,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Debug:                       b.config.PackerDebug,
 			BsuOptimized:                b.config.BsuOptimized,
 			EnableT2Unlimited:           b.config.EnableT2Unlimited,
-			ExpectedRootDevice:          "ebs", // should it be bsu
+			ExpectedRootDevice:          osccommon.RunSourceVmBSUExpectedRootDevice,
 			IamVmProfile:                b.config.IamVmProfile,
 			VmInitiatedShutdownBehavior: b.config.VmInitiatedShutdownBehavior,
 			VmType:                      b.config.VmType,

builder/osc/bsu/builder_acc_test.go

@@ -47,7 +47,7 @@ const testBuilderAccBasic = `
 		"type": "test",
 		"region": "eu-west-2",
 		"vm_type": "m3.medium",
-		"source_omi": "omi-76b2a71e",
+		"source_omi": "ami-76b2a71e",
 		"ssh_username": "ubuntu",
 		"omi_name": "packer-test {{timestamp}}"
 	}]

builder/osc/bsusurrogate/builder.go

@@ -176,7 +176,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Debug:                       b.config.PackerDebug,
 			BsuOptimized:                b.config.BsuOptimized,
 			EnableT2Unlimited:           b.config.EnableT2Unlimited,
-			ExpectedRootDevice:          "ebs", // should it be bsu
+			ExpectedRootDevice:          osccommon.RunSourceVmBSUExpectedRootDevice,
 			IamVmProfile:                b.config.IamVmProfile,
 			VmInitiatedShutdownBehavior: b.config.VmInitiatedShutdownBehavior,
 			VmType:                      b.config.VmType,

builder/osc/common/step_run_source_vm.go

@@ -18,6 +18,10 @@ import (
 	"github.com/hashicorp/packer/template/interpolate"
 )
 
+const (
+	RunSourceVmBSUExpectedRootDevice = "ebs"
+)
+
 type StepRunSourceVm struct {
 	AssociatePublicIpAddress    bool
 	BlockDevices                BlockDevices