Skip to content

Commit

Permalink
Tests: use restricted namespaces
Browse files Browse the repository at this point in the history 
Until now the target namespace for the migration in the tests were
generated by the plan without labeling them. This change will create the
target namespace as restricted.

Signed-off-by: Liran Rotenberg <lrotenbe@redhat.com>
  • Loading branch information
@liranr23 @ahadas
liranr23 authored and ahadas committed Aug 31, 2023
1 parent c5e0e6b commit b8dfca6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
12 changes: 8 additions & 4 deletions tests/suit/ovirt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ var _ = Describe("[level:component]Migration tests for oVirt providers", func()
}, namespace, "provider-test-secret"))
Expect(err).ToNot(HaveOccurred())

targetNS, err := f.CreateNamespace("default", map[string]string{})
Expect(err).ToNot(HaveOccurred())
By("Create target Openshift provider")
targetPr := utils.NewProvider(utils.TargetProviderName, forkliftv1.OpenShift, namespace, map[string]string{}, map[string]string{}, "", nil)
err = utils.CreateProviderFromDefinition(f.CrClient, targetPr)
Expand All @@ -70,7 +72,7 @@ var _ = Describe("[level:component]Migration tests for oVirt providers", func()
err = utils.WaitForStorageMapReadyWithTimeout(f.CrClient, namespace, test_storage_map_name, 10*time.Second)
Expect(err).ToNot(HaveOccurred())
By("Creating plan")
planDenf := utils.NewPlanWithVmId(*provider, namespace, test_plan_name, test_storage_map_name, networkMapName, "default", []string{vmData.GetTestVMId()})
planDenf := utils.NewPlanWithVmId(*provider, namespace, test_plan_name, test_storage_map_name, networkMapName, targetNS.Name, []string{vmData.GetTestVMId()})
err = utils.CreatePlanFromDefinition(f.CrClient, planDenf)
Expect(err).ToNot(HaveOccurred())
err, _ = utils.WaitForPlanReadyWithTimeout(f.CrClient, namespace, test_plan_name, 15*time.Second)
Expand All @@ -83,7 +85,7 @@ var _ = Describe("[level:component]Migration tests for oVirt providers", func()
Expect(err).ToNot(HaveOccurred())
By("Verifying imported VM exists")
vmId := types.UID(vmData.GetTestVMId())
vm, err := utils.GetImportedVm(f.CrClient, "default", func(vm cnv.VirtualMachine) bool {
vm, err := utils.GetImportedVm(f.CrClient, targetNS.Name, func(vm cnv.VirtualMachine) bool {
return vm.Spec.Template.Spec.Domain.Firmware.UUID == vmId
})
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -122,6 +124,8 @@ var _ = Describe("[level:component]Migration tests for oVirt providers", func()
}, namespace, "provider-insecure-test-secret"))
Expect(err).ToNot(HaveOccurred())

targetNS, err := f.CreateNamespace("default-insecure", map[string]string{})
Expect(err).ToNot(HaveOccurred())
By("Create target Openshift provider")
targetPr := utils.NewProvider(utils.TargetProviderName, forkliftv1.OpenShift, namespace, map[string]string{}, map[string]string{}, "", nil)
err = utils.CreateProviderFromDefinition(f.CrClient, targetPr)
Expand Down Expand Up @@ -149,7 +153,7 @@ var _ = Describe("[level:component]Migration tests for oVirt providers", func()
err = utils.WaitForStorageMapReadyWithTimeout(f.CrClient, namespace, test_storage_map_name_insecure, 30*time.Second)
Expect(err).ToNot(HaveOccurred())
By("Creating plan")
planDenf := utils.NewPlanWithVmId(*provider, namespace, test_plan_name_insecure, test_storage_map_name_insecure, test_network_map_name_insecure, "default-insecure", []string{vmData.GetTestVMId()})
planDenf := utils.NewPlanWithVmId(*provider, namespace, test_plan_name_insecure, test_storage_map_name_insecure, test_network_map_name_insecure, targetNS.Name, []string{vmData.GetTestVMId()})
err = utils.CreatePlanFromDefinition(f.CrClient, planDenf)
Expect(err).ToNot(HaveOccurred())
err, _ = utils.WaitForPlanReadyWithTimeout(f.CrClient, namespace, test_plan_name_insecure, 15*time.Second)
Expand All @@ -162,7 +166,7 @@ var _ = Describe("[level:component]Migration tests for oVirt providers", func()
Expect(err).ToNot(HaveOccurred())
By("Verifying imported VM exists")
vmId := types.UID(vmData.GetTestVMId())
vm, err := utils.GetImportedVm(f.CrClient, "default-insecure", func(vm cnv.VirtualMachine) bool {
vm, err := utils.GetImportedVm(f.CrClient, targetNS.Name, func(vm cnv.VirtualMachine) bool {
return vm.Spec.Template.Spec.Domain.Firmware.UUID == vmId
})
Expect(err).ToNot(HaveOccurred())
Expand Down
4 changes: 3 additions & 1 deletion tests/suit/vsphere_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ var _ = Describe("[level:component]Migration tests for vSphere provider", func()
}, namespace, "provider-test-secret"))
Expect(err).ToNot(HaveOccurred())

targetNS, err := f.CreateNamespace("default", map[string]string{})
Expect(err).ToNot(HaveOccurred())
By("Create target Openshift provider")
targetPr := utils.NewProvider(utils.TargetProviderName, forkliftv1.OpenShift, namespace, map[string]string{}, map[string]string{}, "", nil)
err = utils.CreateProviderFromDefinition(f.CrClient, targetPr)
Expand All @@ -55,7 +57,7 @@ var _ = Describe("[level:component]Migration tests for vSphere provider", func()
Expect(err).ToNot(HaveOccurred())

By("Creating plan")
planDef := utils.NewPlanWithVmName(*provider, namespace, test_plan_name, test_storage_map_name, networkMapName, []string{"DC0_H0_VM0"}, "default")
planDef := utils.NewPlanWithVmName(*provider, namespace, test_plan_name, test_storage_map_name, networkMapName, []string{"DC0_H0_VM0"}, targetNS.Name)

err = utils.CreatePlanFromDefinition(f.CrClient, planDef)
Expect(err).ToNot(HaveOccurred())
Expand Down

0 comments on commit b8dfca6

Please sign in to comment.