test(api): refactor e2e label and annotation test case (#515)

- adapt existing label and annotation test case to updated API - fix typo and improve test cases contexts Signed-off-by: Roman Sysoev <[email protected]>
deckhouse · Nov 28, 2024 · 41908ae · 41908ae
1 parent 7ea5bae
commit 41908ae
Show file tree

Hide file tree

Showing 24 changed files with 516 additions and 290 deletions.
diff --git a/tests/e2e/Taskfile.yaml b/tests/e2e/Taskfile.yaml
@@ -56,7 +56,6 @@ tasks:
       - |
         ginkgo \
           --skip-file vm_test.go \
-          --skip-file vm_label_annotation_test.go \
           --skip-file ipam_test.go \
           --skip-file disks_test.go \
           -v

diff --git a/tests/e2e/complex_test.go b/tests/e2e/complex_test.go
@@ -65,7 +65,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 		hasNoConsumerLabel = map[string]string{"hasNoConsumer": "complex-test"}
 	)
 
-	Context("When virtualization resources are applied:", func() {
+	Context("When virtualization resources are applied", func() {
 		It("result should be succeeded", func() {
 			res := kubectl.Apply(kc.ApplyOptions{
 				Filename:       []string{conf.TestData.ComplexTest},
@@ -75,7 +75,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When virtual images are applied:", func() {
+	Context("When virtual images are applied", func() {
 		It("checks VIs phases", func() {
 			By(fmt.Sprintf("VIs should be in %s phases", PhaseReady))
 			WaitPhaseByLabel(kc.ResourceVI, PhaseReady, kc.WaitOptions{
@@ -86,7 +86,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When cluster virtual images are applied:", func() {
+	Context("When cluster virtual images are applied", func() {
 		It("checks CVIs phases", func() {
 			By(fmt.Sprintf("CVIs should be in %s phases", PhaseReady))
 			WaitPhaseByLabel(kc.ResourceCVI, PhaseReady, kc.WaitOptions{
@@ -97,7 +97,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When virtual machine classes are applied:", func() {
+	Context("When virtual machine classes are applied", func() {
 		It("checks VMClasses phases", func() {
 			By(fmt.Sprintf("VMClasses should be in %s phases", PhaseReady))
 			WaitPhaseByLabel(kc.ResourceVMClass, PhaseReady, kc.WaitOptions{
@@ -108,7 +108,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When virtual machines IP addresses are applied:", func() {
+	Context("When virtual machines IP addresses are applied", func() {
 		It("patches custom VMIP with unassigned address", func() {
 			vmipName := fmt.Sprintf("%s-%s", namePrefix, "vm-custom-ip")
 			Eventually(func() error {
@@ -126,7 +126,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When virtual disks are applied:", func() {
+	Context("When virtual disks are applied", func() {
 		It("checks VDs phases with consumers", func() {
 			By(fmt.Sprintf("VDs should be in %s phases", PhaseReady))
 			WaitPhaseByLabel(kc.ResourceVD, PhaseReady, kc.WaitOptions{
@@ -147,7 +147,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When virtual machines are applied:", func() {
+	Context("When virtual machines are applied", func() {
 		It("checks VMs phases", func() {
 			By(fmt.Sprintf("VMs should be in %s phases", PhaseRunning))
 			WaitPhaseByLabel(kc.ResourceVM, PhaseRunning, kc.WaitOptions{
@@ -158,7 +158,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When virtual machine block device attachments are applied:", func() {
+	Context("When virtual machine block device attachments are applied", func() {
 		It("checks VMBDAs phases", func() {
 			By(fmt.Sprintf("VMBDAs should be in %s phases", PhaseAttached))
 			WaitPhaseByLabel(kc.ResourceVMBDA, PhaseAttached, kc.WaitOptions{
@@ -186,7 +186,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 	})
 
 	Describe("Migrations", func() {
-		Context(fmt.Sprintf("When VMs are in %s phases:", PhaseRunning), func() {
+		Context(fmt.Sprintf("When VMs are in %s phases", PhaseRunning), func() {
 			It("starts migrations", func() {
 				res := kubectl.List(kc.ResourceVM, kc.GetOptions{
 					Labels:    testCaseLabel,
@@ -200,7 +200,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 			})
 		})
 
-		Context("When VMs migrations are applied:", func() {
+		Context("When VMs migrations are applied", func() {
 			It("checks VMs and KubevirtVMIMs phases", func() {
 				By(fmt.Sprintf("KubevirtVMIMs should be in %s phases", PhaseSucceeded))
 				WaitPhaseByLabel(kc.ResourceKubevirtVMIM, PhaseSucceeded, kc.WaitOptions{
@@ -229,7 +229,7 @@ var _ = Describe("Complex test", ginkgoutil.CommonE2ETestDecorators(), func() {
 			})
 		})
 
-		Context("When test is complited:", func() {
+		Context("When test is completed", func() {
 			It("deletes test case resources", func() {
 				DeleteTestCaseResources(ResourcesToDelete{
 					KustomizationDir: conf.TestData.ComplexTest,

diff --git a/tests/e2e/config/config.go b/tests/e2e/config/config.go
@@ -128,15 +128,16 @@ type Config struct {
 }
 
 type TestData struct {
-	ComplexTest      string `yaml:"complexTest"`
-	Connectivity     string `yaml:"connectivity"`
-	DiskResizing     string `yaml:"diskResizing"`
-	SizingPolicy     string `yaml:"sizingPolicy"`
-	VmConfiguration  string `yaml:"vmConfiguration"`
-	VmMigration      string `yaml:"vmMigration"`
-	VmDiskAttachment string `yaml:"vmDiskAttachment"`
-	Sshkey           string `yaml:"sshKey"`
-	SshUser          string `yaml:"sshUser"`
+	ComplexTest       string `yaml:"complexTest"`
+	Connectivity      string `yaml:"connectivity"`
+	DiskResizing      string `yaml:"diskResizing"`
+	SizingPolicy      string `yaml:"sizingPolicy"`
+	VmConfiguration   string `yaml:"vmConfiguration"`
+	VmLabelAnnotation string `yaml:"vmLabelAnnotation"`
+	VmMigration       string `yaml:"vmMigration"`
+	VmDiskAttachment  string `yaml:"vmDiskAttachment"`
+	Sshkey            string `yaml:"sshKey"`
+	SshUser           string `yaml:"sshUser"`
 }
 
 type StorageClass struct {

diff --git a/tests/e2e/default_config.yaml b/tests/e2e/default_config.yaml
@@ -24,6 +24,7 @@ testData:
   diskResizing: "/tmp/testdata/disk-resizing"
   sizingPolicy: "/tmp/testdata/sizing-policy"
   vmConfiguration: "/tmp/testdata/vm-configuration"
+  vmLabelAnnotation: "/tmp/testdata/vm-label-annotation"
   vmMigration: "/tmp/testdata/vm-migration"
   vmDiskAttachment: "/tmp/testdata/vm-disk-attachment"
   sshKey: "/tmp/testdata/sshkeys/id_ed"

diff --git a/tests/e2e/sizing_policy_test.go b/tests/e2e/sizing_policy_test.go
@@ -87,7 +87,7 @@ var _ = Describe("Sizing policy", ginkgoutil.CommonE2ETestDecorators(), func() {
 		newVmClassFilePath = fmt.Sprintf("%s/vmc-copy.yaml", conf.TestData.SizingPolicy)
 	})
 
-	Context("When resources are applied:", func() {
+	Context("When resources are applied", func() {
 		It("result should be succeeded", func() {
 			res := kubectl.Apply(kc.ApplyOptions{
 				Filename:       []string{conf.TestData.SizingPolicy},
@@ -97,7 +97,7 @@ var _ = Describe("Sizing policy", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When virtual images are applied:", func() {
+	Context("When virtual images are applied", func() {
 		It("checks VIs phases", func() {
 			By(fmt.Sprintf("VIs should be in %s phases", PhaseReady))
 			WaitPhaseByLabel(kc.ResourceVI, PhaseReady, kc.WaitOptions{
@@ -108,7 +108,7 @@ var _ = Describe("Sizing policy", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When virtual disks are applied:", func() {
+	Context("When virtual disks are applied", func() {
 		It(fmt.Sprintf("checks VDs phases with %s and %s label", notExistingVmClassChanging, notExistingVmClassCreating), func() {
 			By(fmt.Sprintf("VDs should be in %s phases", phaseByVolumeBindingMode))
 			WaitPhaseByLabel(kc.ResourceVD, phaseByVolumeBindingMode, kc.WaitOptions{
@@ -133,7 +133,7 @@ var _ = Describe("Sizing policy", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When virtual machines are applied:", func() {
+	Context("When virtual machines are applied", func() {
 		It(fmt.Sprintf("checks VMs phases with %s and %s label", notExistingVmClassChanging, notExistingVmClassCreating), func() {
 			By(fmt.Sprintf("VMs should be in %s phases", PhasePending))
 			WaitPhaseByLabel(kc.ResourceVM, PhasePending, kc.WaitOptions{
@@ -159,7 +159,7 @@ var _ = Describe("Sizing policy", ginkgoutil.CommonE2ETestDecorators(), func() {
 	})
 
 	Describe("Not existing virtual machine class", func() {
-		Context(fmt.Sprintf("When virtual machine with label %s in phase %s:", notExistingVmClassChanging, PhasePending), func() {
+		Context(fmt.Sprintf("When virtual machine with label %s in phase %s", notExistingVmClassChanging, PhasePending), func() {
 			It("checks condition status before changing 'virtulaMachineCLass` field with existing class", func() {
 				By(fmt.Sprintf("VirtualMachineClassReady status should be '%s' before changing", ReadyStatusFalse))
 				CompareVirtualMachineClassReadyStatus(vmNotValidSizingPolicyChanging, ReadyStatusFalse)
@@ -183,7 +183,7 @@ var _ = Describe("Sizing policy", ginkgoutil.CommonE2ETestDecorators(), func() {
 			})
 		})
 
-		Context(fmt.Sprintf("When virtual machine with label %s in phase %s:", notExistingVmClassCreating, PhasePending), func() {
+		Context(fmt.Sprintf("When virtual machine with label %s in phase %s", notExistingVmClassCreating, PhasePending), func() {
 			It("checks condition status before creating `VirtualMachineClass`", func() {
 				By(fmt.Sprintf("VirtualMachineClassReady status should be '%s' before creating", ReadyStatusFalse))
 				CompareVirtualMachineClassReadyStatus(vmNotValidSizingPolicyCreating, ReadyStatusFalse)
@@ -223,7 +223,7 @@ var _ = Describe("Sizing policy", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context(fmt.Sprintf("When virtual machines in phase %s:", PhaseRunning), func() {
+	Context(fmt.Sprintf("When virtual machines in phase %s", PhaseRunning), func() {
 		It("checks sizing policy match", func() {
 			res := kubectl.List(kc.ResourceVM, kc.GetOptions{
 				Labels:    testCaseLabel,
@@ -247,7 +247,7 @@ var _ = Describe("Sizing policy", ginkgoutil.CommonE2ETestDecorators(), func() {
 		})
 	})
 
-	Context("When test is complited:", func() {
+	Context("When test is completed", func() {
 		It("deletes test case resources", func() {
 			DeleteTestCaseResources(ResourcesToDelete{
 				KustomizationDir: conf.TestData.SizingPolicy,

diff --git a/tests/e2e/testdata/vm-label-annotation/base/cfg/cloudinit.yaml b/tests/e2e/testdata/vm-label-annotation/base/cfg/cloudinit.yaml
@@ -0,0 +1,12 @@
+#cloud-config
+users:
+  - name: cloud
+    # passwd: cloud
+    passwd: $6$rounds=4096$vln/.aPHBOI7BMYR$bBMkqQvuGs5Gyd/1H5DP4m9HjQSy.kgrxpaGEHwkX7KEFV8BS.HZWPitAtZ2Vd8ZqIZRqmlykRCagTgPejt1i.
+    shell: /bin/bash
+    sudo: ALL=(ALL) NOPASSWD:ALL
+    chpasswd: { expire: False }
+    lock_passwd: false
+    ssh_authorized_keys:
+      # testcases
+      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxcXHmwaGnJ8scJaEN5RzklBPZpVSic4GdaAsKjQoeA [email protected]
diff --git a/tests/e2e/testdata/vm-label-annotation/base/kustomization.yaml b/tests/e2e/testdata/vm-label-annotation/base/kustomization.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./vm.yaml
+  - ./vd-root.yaml
+configurations:
+  - transformer.yaml
+generatorOptions:
+  disableNameSuffixHash: true
+secretGenerator:
+  - files:
+      - userData=cfg/cloudinit.yaml
+    name: cloud-init
+    type: provisioning.virtualization.deckhouse.io/cloud-init
diff --git a/tests/e2e/testdata/vm-label-annotation/base/transformer.yaml b/tests/e2e/testdata/vm-label-annotation/base/transformer.yaml
@@ -0,0 +1,54 @@
+# https://github.com/kubernetes-sigs/kustomize/blob/master/examples/transformerconfigs/README.md#transformer-configurations
+
+namespace:
+  - kind: ClusterVirtualImage
+    path: spec/dataSource/objectRef/namespace
+nameReference:
+  - kind: VirtualImage
+    version: v1alpha2 # optional
+    fieldSpecs:
+      - path: spec/dataSource/objectRef/name
+        kind: ClusterVirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualDisk
+      - path: spec/blockDeviceRefs/name
+        kind: VirtualMachine
+  - kind: ClusterVirtualImage
+    version: v1alpha2 # optional
+    fieldSpecs:
+      - path: spec/dataSource/objectRef/name
+        kind: ClusterVirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualDisk
+      - path: spec/blockDeviceRefs/name
+        kind: VirtualMachine
+  - kind: VirtualDisk
+    version: v1alpha2 # optional
+    fieldSpecs:
+      - path: spec/blockDeviceRefs/name
+        kind: VirtualMachine
+      - path: spec/blockDeviceRef/name
+        kind: VirtualMachineBlockDeviceAttachment
+  - kind: Secret
+    fieldSpecs:
+      - path: spec/provisioning/userDataRef/name
+        kind: VirtualMachine
+  - kind: VirtualMachineIPAddress
+    version: v1alpha2
+    fieldSpecs:
+      - path: spec/virtualMachineIPAddressName
+        kind: VirtualMachine
+  - kind: VirtualMachine
+    version: v1alpha2
+    fieldSpecs:
+      - path: spec/virtualMachineName
+        kind: VirtualMachineBlockDeviceAttachment
+  - kind: VirtualMachineClass
+    version: v1alpha2
+    fieldSpecs:
+      - path: spec/virtualMachineClassName
+        kind: VirtualMachine
diff --git a/tests/e2e/testdata/vm-label-annotation/base/vd-root.yaml b/tests/e2e/testdata/vm-label-annotation/base/vd-root.yaml
@@ -0,0 +1,12 @@
+apiVersion: virtualization.deckhouse.io/v1alpha2
+kind: VirtualDisk
+metadata:
+  name: vd-root
+spec:
+  persistentVolumeClaim:
+    size: 512Mi
+  dataSource:
+    type: ObjectRef
+    objectRef:
+      kind: VirtualImage
+      name: vi-alpine-http
diff --git a/tests/e2e/testdata/vm-label-annotation/base/vm.yaml b/tests/e2e/testdata/vm-label-annotation/base/vm.yaml
@@ -0,0 +1,21 @@
+apiVersion: virtualization.deckhouse.io/v1alpha2
+kind: VirtualMachine
+metadata:
+  name: vm
+spec:
+  virtualMachineClassName: generic
+  cpu:
+    cores: 1
+    coreFraction: 5%
+  memory:
+    size: 256Mi
+  disruptions:
+    restartApprovalMode: Manual
+  provisioning:
+    type: UserDataRef
+    userDataRef:
+      kind: Secret
+      name: cloud-init
+  blockDeviceRefs:
+    - kind: VirtualDisk
+      name: vd-root
diff --git a/tests/e2e/testdata/vm-label-annotation/kustomization.yaml b/tests/e2e/testdata/vm-label-annotation/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: testcases
+namePrefix: pr-number-or-commit-hash-
+resources:
+  - ns.yaml
+  - vi
+  - overlays/vm-label-annotation
+configurations:
+  - transformer.yaml
+labels:
+  - includeSelectors: true
+    pairs:
+      id: pr-number-or-commit-hash
+      testcase: vm-label-annotation
diff --git a/tests/e2e/testdata/vm-label-annotation/ns.yaml b/tests/e2e/testdata/vm-label-annotation/ns.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: default
diff --git a/tests/e2e/testdata/vm-label-annotation/overlays/vm-label-annotation/kustomization.yaml b/tests/e2e/testdata/vm-label-annotation/overlays/vm-label-annotation/kustomization.yaml
@@ -0,0 +1,20 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+nameSuffix: -label-annotation
+resources:
+  - ../../base
+patches:
+  - patch: |-
+      - op: replace
+        path: /spec/runPolicy
+        value: AlwaysOn
+    target:
+      kind: VirtualMachine
+      name: vm
+  - patch: |-
+      - op: replace
+        path: /spec/disruptions/restartApprovalMode
+        value: Automatic
+    target:
+      kind: VirtualMachine
+      name: vm