Skip to content

Commit

Permalink
instancetype: Move remaining tests to v1alpha2
Browse files Browse the repository at this point in the history 
b91332f and
c9e474a recently added more tests using
v1alpha1, this change moves these to the v1alpha2.

Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
  • Loading branch information
@lyarwood
lyarwood committed Sep 29, 2022
1 parent 7ba66d3 commit 2f4fda4
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions pkg/virt-api/webhooks/mutating-webhook/mutators/BUILD.bazel
View file
Expand Up @@ -62,10 +62,10 @@ go_test(
"//staging/src/kubevirt.io/api/core:go_default_library",
"//staging/src/kubevirt.io/api/core/v1:go_default_library",
"//staging/src/kubevirt.io/api/instancetype:go_default_library",
"//staging/src/kubevirt.io/api/instancetype/v1alpha1:go_default_library",
"//staging/src/kubevirt.io/api/instancetype/v1alpha2:go_default_library",
"//staging/src/kubevirt.io/client-go/api:go_default_library",
"//staging/src/kubevirt.io/client-go/generated/kubevirt/clientset/versioned/fake:go_default_library",
"//staging/src/kubevirt.io/client-go/generated/kubevirt/clientset/versioned/typed/instancetype/v1alpha1:go_default_library",
"//staging/src/kubevirt.io/client-go/generated/kubevirt/clientset/versioned/typed/instancetype/v1alpha2:go_default_library",
"//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
"//staging/src/kubevirt.io/client-go/testutils:go_default_library",
"//tests/util:go_default_library",
Expand Down
24 changes: 12 additions & 12 deletions pkg/virt-api/webhooks/mutating-webhook/mutators/vm-mutator_test.go
View file
Expand Up @@ -34,11 +34,11 @@ import (

v1 "kubevirt.io/api/core/v1"
apiinstancetype "kubevirt.io/api/instancetype"
instancetypev1alpha1 "kubevirt.io/api/instancetype/v1alpha1"
instancetypev1alpha2 "kubevirt.io/api/instancetype/v1alpha2"
"kubevirt.io/client-go/kubecli"

fakeclientset "kubevirt.io/client-go/generated/kubevirt/clientset/versioned/fake"
instancetypeclientset "kubevirt.io/client-go/generated/kubevirt/clientset/versioned/typed/instancetype/v1alpha1"
instancetypeclientset "kubevirt.io/client-go/generated/kubevirt/clientset/versioned/typed/instancetype/v1alpha2"

"kubevirt.io/kubevirt/pkg/instancetype"
"kubevirt.io/kubevirt/pkg/testutils"
Expand All @@ -52,7 +52,7 @@ var _ = Describe("VirtualMachine Mutator", func() {
var mutator *VMsMutator
var ctrl *gomock.Controller
var virtClient *kubecli.MockKubevirtClient
var fakeInstancetypeClients instancetypeclientset.InstancetypeV1alpha1Interface
var fakeInstancetypeClients instancetypeclientset.InstancetypeV1alpha2Interface
var fakePreferenceClient instancetypeclientset.VirtualMachinePreferenceInterface

machineTypeFromConfig := "pc-q35-3.0"
Expand Down Expand Up @@ -102,7 +102,7 @@ var _ = Describe("VirtualMachine Mutator", func() {
ctrl = gomock.NewController(GinkgoT())
virtClient = kubecli.NewMockKubevirtClient(ctrl)

fakeInstancetypeClients = fakeclientset.NewSimpleClientset().InstancetypeV1alpha1()
fakeInstancetypeClients = fakeclientset.NewSimpleClientset().InstancetypeV1alpha2()
fakePreferenceClient = fakeInstancetypeClients.VirtualMachinePreferences(vm.Namespace)
virtClient.EXPECT().VirtualMachinePreference(gomock.Any()).Return(fakePreferenceClient).AnyTimes()

Expand Down Expand Up @@ -150,16 +150,16 @@ var _ = Describe("VirtualMachine Mutator", func() {

It("should not override user specified MachineType with PreferredMachineType or cluster config on VM create", func() {
vm.Spec.Template.Spec.Domain.Machine = &v1.Machine{Type: "pc-q35-2.0"}
preference := &instancetypev1alpha1.VirtualMachinePreference{
preference := &instancetypev1alpha2.VirtualMachinePreference{
ObjectMeta: k8smetav1.ObjectMeta{
Name: "machineTypePreference",
},
TypeMeta: k8smetav1.TypeMeta{
Kind: apiinstancetype.SingularPreferenceResourceName,
APIVersion: instancetypev1alpha1.SchemeGroupVersion.String(),
APIVersion: instancetypev1alpha2.SchemeGroupVersion.String(),
},
Spec: instancetypev1alpha1.VirtualMachinePreferenceSpec{
Machine: &instancetypev1alpha1.MachinePreferences{
Spec: instancetypev1alpha2.VirtualMachinePreferenceSpec{
Machine: &instancetypev1alpha2.MachinePreferences{
PreferredMachineType: "pc-q35-4.0",
},
},
Expand All @@ -185,16 +185,16 @@ var _ = Describe("VirtualMachine Mutator", func() {
})

It("should use PreferredMachineType over cluster config on VM create", func() {
preference := &instancetypev1alpha1.VirtualMachinePreference{
preference := &instancetypev1alpha2.VirtualMachinePreference{
ObjectMeta: k8smetav1.ObjectMeta{
Name: "machineTypePreference",
},
TypeMeta: k8smetav1.TypeMeta{
Kind: apiinstancetype.SingularPreferenceResourceName,
APIVersion: instancetypev1alpha1.SchemeGroupVersion.String(),
APIVersion: instancetypev1alpha2.SchemeGroupVersion.String(),
},
Spec: instancetypev1alpha1.VirtualMachinePreferenceSpec{
Machine: &instancetypev1alpha1.MachinePreferences{
Spec: instancetypev1alpha2.VirtualMachinePreferenceSpec{
Machine: &instancetypev1alpha2.MachinePreferences{
PreferredMachineType: "pc-q35-4.0",
},
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/virt-api/webhooks/validating-webhook/admitters/vms-admitter_test.go
View file
Expand Up @@ -1522,12 +1522,12 @@ var _ = Describe("Validating VM Admitter", func() {

It("should not apply instancetype to the VMISpec of the original VM", func() {

instancetypeMethods.FindInstancetypeSpecFunc = func(_ *v1.VirtualMachine) (*instancetypev1alpha1.VirtualMachineInstancetypeSpec, error) {
return &instancetypev1alpha1.VirtualMachineInstancetypeSpec{}, nil
instancetypeMethods.FindInstancetypeSpecFunc = func(_ *v1.VirtualMachine) (*instancetypev1alpha2.VirtualMachineInstancetypeSpec, error) {
return &instancetypev1alpha2.VirtualMachineInstancetypeSpec{}, nil
}

// Mock out ApplyToVmiFunc so that it applies some changes to the CPU of the provided VMISpec
instancetypeMethods.ApplyToVmiFunc = func(_ *k8sfield.Path, _ *instancetypev1alpha1.VirtualMachineInstancetypeSpec, _ *instancetypev1alpha1.VirtualMachinePreferenceSpec, vmiSpec *v1.VirtualMachineInstanceSpec) instancetype.Conflicts {
instancetypeMethods.ApplyToVmiFunc = func(_ *k8sfield.Path, _ *instancetypev1alpha2.VirtualMachineInstancetypeSpec, _ *instancetypev1alpha2.VirtualMachinePreferenceSpec, vmiSpec *v1.VirtualMachineInstanceSpec) instancetype.Conflicts {
vmiSpec.Domain.CPU = &v1.CPU{Cores: 1, Threads: 1, Sockets: 1}
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion tests/storage/BUILD.bazel
View file
Expand Up @@ -32,7 +32,7 @@ go_library(
"//staging/src/kubevirt.io/api/core:go_default_library",
"//staging/src/kubevirt.io/api/core/v1:go_default_library",
"//staging/src/kubevirt.io/api/export/v1alpha1:go_default_library",
"//staging/src/kubevirt.io/api/instancetype/v1alpha1:go_default_library",
"//staging/src/kubevirt.io/api/instancetype/v1alpha2:go_default_library",
"//staging/src/kubevirt.io/api/snapshot/v1alpha1:go_default_library",
"//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
"//staging/src/kubevirt.io/client-go/log:go_default_library",
Expand Down
12 changes: 6 additions & 6 deletions tests/storage/snapshot.go
View file
Expand Up @@ -21,7 +21,7 @@ import (
. "kubevirt.io/kubevirt/tests/framework/matcher"

v1 "kubevirt.io/api/core/v1"
instancetypev1alpha1 "kubevirt.io/api/instancetype/v1alpha1"
instancetypev1alpha2 "kubevirt.io/api/instancetype/v1alpha2"
snapshotv1 "kubevirt.io/api/snapshot/v1alpha1"
"kubevirt.io/client-go/kubecli"
cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
Expand Down Expand Up @@ -1285,19 +1285,19 @@ var _ = SIGDescribe("VirtualMachineSnapshot Tests", func() {

Context("With VM using instancetype and preferences", func() {

var instancetype *instancetypev1alpha1.VirtualMachineInstancetype
var instancetype *instancetypev1alpha2.VirtualMachineInstancetype

BeforeEach(func() {
instancetype = &instancetypev1alpha1.VirtualMachineInstancetype{
instancetype = &instancetypev1alpha2.VirtualMachineInstancetype{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "vm-instancetype-",
Namespace: util.NamespaceTestDefault,
},
Spec: instancetypev1alpha1.VirtualMachineInstancetypeSpec{
CPU: instancetypev1alpha1.CPUInstancetype{
Spec: instancetypev1alpha2.VirtualMachineInstancetypeSpec{
CPU: instancetypev1alpha2.CPUInstancetype{
Guest: 1,
},
Memory: instancetypev1alpha1.MemoryInstancetype{
Memory: instancetypev1alpha2.MemoryInstancetype{
Guest: resource.MustParse("128Mi"),
},
},
Expand Down

0 comments on commit 2f4fda4

Please sign in to comment.