refactoring

Signed-off-by: Valeriy Khorunzhin <[email protected]>

Author: Valeriy Khorunzhin

test/e2e/vm/configuration.go

@@ -57,7 +57,7 @@ var _ = Describe("VirtualMachineConfiguration", func() {
 		f.Before()
 
 		By("Environment preparation")
-		t.GenerateConfigurationResources(restartApprovalMode)
+		t.GenerateResources(restartApprovalMode)
 		err := f.CreateWithDeferredDeletion(context.Background(), t.VM, t.VDRoot, t.VDBlank)
 		Expect(err).NotTo(HaveOccurred())
 
@@ -125,24 +125,24 @@ func NewConfigurationTest(f *framework.Framework) *configurationTest {
 	}
 }
 
-func (c *configurationTest) GenerateConfigurationResources(restartApprovalMode v1alpha2.RestartApprovalMode) {
-	c.VDRoot = vdbuilder.New(
+func (t *configurationTest) GenerateResources(restartApprovalMode v1alpha2.RestartApprovalMode) {
+	t.VDRoot = vdbuilder.New(
 		vdbuilder.WithName("vd-root"),
-		vdbuilder.WithNamespace(c.Framework.Namespace().Name),
+		vdbuilder.WithNamespace(t.Framework.Namespace().Name),
 		vdbuilder.WithDataSourceHTTP(&v1alpha2.DataSourceHTTP{
 			URL: object.ImageURLUbuntu,
 		}),
 	)
 
-	c.VDBlank = vdbuilder.New(
+	t.VDBlank = vdbuilder.New(
 		vdbuilder.WithName("vd-blank"),
-		vdbuilder.WithNamespace(c.Framework.Namespace().Name),
+		vdbuilder.WithNamespace(t.Framework.Namespace().Name),
 		vdbuilder.WithSize(ptr.To(resource.MustParse("100Mi"))),
 	)
 
-	c.VM = vmbuilder.New(
+	t.VM = vmbuilder.New(
 		vmbuilder.WithName("vm"),
-		vmbuilder.WithNamespace(c.Framework.Namespace().Name),
+		vmbuilder.WithNamespace(t.Framework.Namespace().Name),
 		vmbuilder.WithCPU(1, ptr.To(initialCoreFraction)),
 		vmbuilder.WithMemory(resource.MustParse(initialMemorySize)),
 		vmbuilder.WithLiveMigrationPolicy(v1alpha2.AlwaysSafeMigrationPolicy),
@@ -151,14 +151,14 @@ func (c *configurationTest) GenerateConfigurationResources(restartApprovalMode v
 		vmbuilder.WithBlockDeviceRefs(
 			v1alpha2.BlockDeviceSpecRef{
 				Kind: v1alpha2.DiskDevice,
-				Name: c.VDRoot.Name,
+				Name: t.VDRoot.Name,
 			},
 		),
 		vmbuilder.WithRestartApprovalMode(restartApprovalMode),
 	)
 }
 
-func (c *configurationTest) IsVDAttached(vd *v1alpha2.VirtualDisk, vm *v1alpha2.VirtualMachine) bool {
+func (t *configurationTest) IsVDAttached(vd *v1alpha2.VirtualDisk, vm *v1alpha2.VirtualMachine) bool {
 	for _, bd := range vm.Status.BlockDeviceRefs {
 		if bd.Kind == v1alpha2.DiskDevice && bd.Name == vd.Name && bd.Attached {
 			return true
@@ -172,7 +172,7 @@ func (t *configurationTest) CheckRestartAwaitingChanges(vm *v1alpha2.VirtualMach
 		return
 	}
 
-	// Avoid race condition with need restart condition calculation
+	// Avoid race conditions during the calculation of the "need restart" condition.
 	Eventually(func(g Gomega) {
 		err := t.Framework.Clients.GenericClient().Get(context.Background(), crclient.ObjectKeyFromObject(t.VM), t.VM)
 		g.Expect(err).NotTo(HaveOccurred())