++ fix unit tests

Signed-off-by: Ivan Mikheykin <ivan.mikheykin@flant.com>

Author: diafour

…migration-configuration-externally.patch …migration-configuration-externally.patchimages/virt-artifact/patches/050-set-migration-configuration-externally.patch renamed to images/virt-artifact/patches/051-set-migration-configuration-externally.patch images/virt-artifact/patches/050-set-migration-configuration-externally.patch renamed to images/virt-artifact/patches/051-set-migration-configuration-externally.patch

@@ -80,14 +80,29 @@ var _ = Describe("TestDynamicSettingsHandler", func() {
 		return vmop
 	}
 
+	newKVConfig := func() *virtv1.KubeVirt {
+		return &virtv1.KubeVirt{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: virtv1.SchemeGroupVersion.String(),
+				Kind:       virtv1.KubeVirtGroupVersionKind.Kind,
+			},
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "config",
+				Namespace: "d8-virtualization",
+			},
+			Spec:   virtv1.KubeVirtSpec{},
+			Status: virtv1.KubeVirtStatus{},
+		}
+	}
+
 	When("Observe KVVMI with migrateState", func() {
 		It("Should set migrationConfiguration", func() {
 			vm := newVM()
 			kvvmi := newKVVMI()
 
 			kvvmi.Status.MigrationState = &virtv1.VirtualMachineInstanceMigrationState{}
 
-			fakeClient := setupEnvironment(kvvmi, vm)
+			fakeClient := setupEnvironment(kvvmi, vm, newKVConfig())
 			h := NewDynamicSettingsHandler(fakeClient, config.NewDefaultLiveMigrationSettings())
 			_, err := h.Handle(ctx, kvvmi)
 			Expect(err).NotTo(HaveOccurred())
@@ -105,7 +120,7 @@ var _ = Describe("TestDynamicSettingsHandler", func() {
 				Completed: true,
 			}
 
-			fakeClient := setupEnvironment(kvvmi, vm)
+			fakeClient := setupEnvironment(kvvmi, vm, newKVConfig())
 			h := NewDynamicSettingsHandler(fakeClient, config.NewDefaultLiveMigrationSettings())
 			_, err := h.Handle(ctx, kvvmi)
 			Expect(err).NotTo(HaveOccurred())
@@ -124,7 +139,7 @@ var _ = Describe("TestDynamicSettingsHandler", func() {
 
 			vmop := newVMOPEvict(force)
 
-			fakeClient := setupEnvironment(kvvmi, vm, vmop)
+			fakeClient := setupEnvironment(kvvmi, vm, vmop, newKVConfig())
 			h := NewDynamicSettingsHandler(fakeClient, config.NewDefaultLiveMigrationSettings())
 			_, err := h.Handle(ctx, kvvmi)
 			Expect(err).NotTo(HaveOccurred())

images/virtualization-artifact/pkg/controller/livemigration/internal/dynamic_settings_handler_test.go

@@ -40,17 +40,17 @@ const (
 func NewMigrationConfiguration(moduleSettings config.LiveMigrationSettings, allowAutoConverge bool, kvconfig virtv1.KubeVirt) *virtv1.MigrationConfiguration {
 	// TODO rework below section after proper implementation of liveMigration settings in ModuleConfig.
 	parallelMigrationsPerCluster := ParallelMigrationsPerClusterDefault
-	if kvconfig.Spec.Configuration.MigrationConfiguration.ParallelMigrationsPerCluster != nil {
+	if kvconfig.Spec.Configuration.MigrationConfiguration != nil && kvconfig.Spec.Configuration.MigrationConfiguration.ParallelMigrationsPerCluster != nil {
 		parallelMigrationsPerCluster = *kvconfig.Spec.Configuration.MigrationConfiguration.ParallelMigrationsPerCluster
 	}
 	// Reuse default value of MaxMigrationsPerNode as parallelOutboundMigrationsPerNode.
 	parallelOutboundMigrationsPerNode := uint32(moduleSettings.MaxMigrationsPerNode)
-	if kvconfig.Spec.Configuration.MigrationConfiguration.ParallelOutboundMigrationsPerNode != nil {
+	if kvconfig.Spec.Configuration.MigrationConfiguration != nil && kvconfig.Spec.Configuration.MigrationConfiguration.ParallelOutboundMigrationsPerNode != nil {
 		parallelOutboundMigrationsPerNode = *kvconfig.Spec.Configuration.MigrationConfiguration.ParallelOutboundMigrationsPerNode
 	}
 	// Reuse default value of BandwidthPerNode as bandwidthPerMigration.
 	bandwidthPerMigration := moduleSettings.BandwidthPerNode.DeepCopy()
-	if kvconfig.Spec.Configuration.MigrationConfiguration.BandwidthPerMigration != nil {
+	if kvconfig.Spec.Configuration.MigrationConfiguration != nil && kvconfig.Spec.Configuration.MigrationConfiguration.BandwidthPerMigration != nil {
 		bandwidthPerMigration = kvconfig.Spec.Configuration.MigrationConfiguration.BandwidthPerMigration.DeepCopy()
 	}