tests: hide BashHelloScript

BashHelloScript should never be used, as it is an implementation detail relevant only to Cirros VMIs. This commit does not eliminate it completely, but hides it in the only file that still uses it. Signed-off-by: Dan Kenigsberg <[email protected]>
webe745 · Jun 21, 2022 · ac41552 · ac41552
1 parent d32d4eb
commit ac41552
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/tests/storage/restore.go b/tests/storage/restore.go
@@ -41,6 +41,7 @@ const (
 	creatingSnapshot          = "creating snapshot"
 
 	macAddressCloningPatchPattern = `{"op": "replace", "path": "/spec/template/spec/domain/devices/interfaces/0/macAddress", "value": "%s"}`
+	bashHelloScript               = "#!/bin/bash\necho 'hello'\n"
 )
 
 var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
@@ -216,7 +217,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 
 		BeforeEach(func() {
 			vmiImage := cd.ContainerDiskFor(cd.ContainerDiskCirros)
-			vmi := tests.NewRandomVMIWithEphemeralDiskAndUserdata(vmiImage, tests.BashHelloScript)
+			vmi := tests.NewRandomVMIWithEphemeralDiskAndUserdata(vmiImage, bashHelloScript)
 			vm = tests.NewRandomVirtualMachine(vmi, false)
 			vm.Labels = map[string]string{
 				"kubevirt.io/dummy-webhook-identifier": vm.Name,
@@ -419,7 +420,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 
 			It("should fail restoring to a different VM that already exists", func() {
 				By("Creating a new VM")
-				newVMI := tests.NewRandomVMIWithEphemeralDiskAndUserdata(cd.ContainerDiskFor(cd.ContainerDiskCirros), tests.BashHelloScript)
+				newVMI := tests.NewRandomVMIWithEphemeralDiskAndUserdata(cd.ContainerDiskFor(cd.ContainerDiskCirros), bashHelloScript)
 				newVM := tests.NewRandomVirtualMachine(newVMI, false)
 				newVM, err = virtClient.VirtualMachine(newVM.Namespace).Create(newVM)
 				Expect(err).ToNot(HaveOccurred())
@@ -785,7 +786,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 				vm, vmi = createAndStartVM(tests.NewRandomVMWithDataVolumeAndUserDataInStorageClass(
 					cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros),
 					util.NamespaceTestDefault,
-					tests.BashHelloScript,
+					bashHelloScript,
 					snapshotStorageClass,
 				))
 
@@ -817,7 +818,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 				vm = tests.NewRandomVMWithDataVolumeAndUserDataInStorageClass(
 					cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros),
 					util.NamespaceTestDefault,
-					tests.BashHelloScript,
+					bashHelloScript,
 					snapshotStorageClass,
 				)
 				quantity, err := resource.ParseQuantity("1528Mi")
@@ -853,7 +854,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 				vm, vmi = createAndStartVM(tests.NewRandomVMWithDataVolumeAndUserDataInStorageClass(
 					cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros),
 					util.NamespaceTestDefault,
-					tests.BashHelloScript,
+					bashHelloScript,
 					snapshotStorageClass,
 				))
 
@@ -878,7 +879,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 				vm = tests.NewRandomVMWithDataVolumeAndUserDataInStorageClass(
 					cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros),
 					util.NamespaceTestDefault,
-					tests.BashHelloScript,
+					bashHelloScript,
 					snapshotStorageClass,
 				)
 
@@ -950,7 +951,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 
 				originalPVCName := pvc.Name
 
-				vmi = tests.NewRandomVMIWithPVCAndUserData(pvc.Name, tests.BashHelloScript)
+				vmi = tests.NewRandomVMIWithPVCAndUserData(pvc.Name, bashHelloScript)
 				vm = tests.NewRandomVirtualMachine(vmi, false)
 
 				vm, vmi = createAndStartVM(vm)
@@ -989,7 +990,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 				Expect(err).ToNot(HaveOccurred())
 				vmi = tests.NewRandomVMIWithEphemeralDiskAndUserdata(
 					cd.ContainerDiskFor(cd.ContainerDiskCirros),
-					tests.BashHelloScript,
+					bashHelloScript,
 				)
 				vm = tests.NewRandomVirtualMachine(vmi, false)
 
@@ -1053,7 +1054,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 				vm, vmi = createAndStartVM(tests.NewRandomVMWithDataVolumeAndUserDataInStorageClass(
 					cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros),
 					util.NamespaceTestDefault,
-					tests.BashHelloScript,
+					bashHelloScript,
 					snapshotStorageClass,
 				))
 
@@ -1153,7 +1154,7 @@ var _ = SIGDescribe("VirtualMachineRestore Tests", func() {
 				vm, vmi = createAndStartVM(tests.NewRandomVMWithDataVolumeAndUserDataInStorageClass(
 					cd.DataVolumeImportUrlForContainerDisk(cd.ContainerDiskCirros),
 					util.NamespaceTestDefault,
-					tests.BashHelloScript,
+					bashHelloScript,
 					snapshotStorageClass,
 				))
 

diff --git a/tests/utils.go b/tests/utils.go
@@ -109,7 +109,6 @@ const (
 	WaitingVMInstanceStart       = "Waiting until the VirtualMachineInstance will start"
 	CouldNotFindComputeContainer = "could not find compute container for pod"
 	EchoLastReturnValue          = "echo $?\n"
-	BashHelloScript              = "#!/bin/bash\necho 'hello'\n"
 )
 
 const defaultTestGracePeriod int64 = 0