add ht to cpu type model

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>

Author: nevermarine

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go

@@ -163,6 +163,7 @@ func (b *KVVM) SetCPUModel(class *v1alpha2.VirtualMachineClass) error {
 		cpu.Model = virtv1.CPUModeHostPassthrough
 	case v1alpha2.CPUTypeModel:
 		cpu.Model = class.Spec.CPU.Model
+		cpu.Features = []virtv1.CPUFeature{{Name: HTCPUFeature, Policy: "require"}}
 	case v1alpha2.CPUTypeDiscovery, v1alpha2.CPUTypeFeatures:
 		cpu.Model = GenericCPUModel
 		features := make([]virtv1.CPUFeature, 0, len(class.Status.CpuFeatures.Enabled)+2)

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_test.go

@@ -229,6 +229,24 @@ func TestSetCPUModel(t *testing.T) {
 	name := "test-name"
 	namespace := "test-namespace"
 
+	t.Run("should add required ht feature for model cpu", func(t *testing.T) {
+		builder := NewEmptyKVVM(types.NamespacedName{Name: name, Namespace: namespace}, KVVMOptions{})
+		class := &v1alpha2.VirtualMachineClass{
+			Spec: v1alpha2.VirtualMachineClassSpec{
+				CPU: v1alpha2.CPU{Type: v1alpha2.CPUTypeModel, Model: "Nehalem"},
+			},
+		}
+
+		if err := builder.SetCPUModel(class); err != nil {
+			t.Fatalf("SetCPUModel() failed: %v", err)
+		}
+
+		features := builder.Resource.Spec.Template.Spec.Domain.CPU.Features
+		if !containsCPUFeature(features, virtv1.CPUFeature{Name: HTCPUFeature, Policy: "require"}) {
+			t.Fatalf("expected required ht feature to be added for model cpu, got %#v", features)
+		}
+	})
+
 	t.Run("should add required ht feature for discovery cpu", func(t *testing.T) {
 		builder := NewEmptyKVVM(types.NamespacedName{Name: name, Namespace: namespace}, KVVMOptions{})
 		class := &v1alpha2.VirtualMachineClass{