Fixes for TIER0 tests (kubev2v#949)

mturley · Apr 6, 2022 · 0f7150e · 0f7150e
1 parent fa8f9e7
commit 0f7150e
Show file tree

Hide file tree

Showing 20 changed files with 222 additions and 133 deletions.
diff --git a/pkg/qe-tests/.VMWARE_7.0.json.kate-swp b/pkg/qe-tests/.VMWARE_7.0.json.kate-swp
diff --git a/pkg/qe-tests/cypress/integration/tests/Rhv/Add_Rhv_Provider.ts b/pkg/qe-tests/cypress/integration/tests/Rhv/Add_Rhv_Provider.ts
@@ -1,14 +1,14 @@
-import { testData } from './config_separate_mapping_rhv';
+import { testrhel8Cold } from './config_separate_mapping_rhv';
 import { login } from '../../../utils/utils';
 import { providerRhv } from '../../models/providerRhv';
 import { RhvProviderData } from '../../types/types';
 
 describe('Creating provider and deleting', () => {
   const provider = new providerRhv();
-  const providerData: RhvProviderData = testData.planData.providerData;
+  const providerData: RhvProviderData = testrhel8Cold.planData.providerData;
 
   beforeEach(() => {
-    login(testData.loginData);
+    login(testrhel8Cold.loginData);
   });
 
   it('Login to MTV and create provider', () => {

diff --git a/pkg/qe-tests/cypress/integration/tests/Rhv/Archive_CanceledPlan_Test.ts b/pkg/qe-tests/cypress/integration/tests/Rhv/Archive_CanceledPlan_Test.ts
@@ -1,6 +1,6 @@
 import { login } from '../../../utils/utils';
 import { Plan } from '../../models/plan';
-import { testData } from './config_separate_mapping_rhv';
+import { testrhel8Cold } from './config_separate_mapping_rhv';
 import { providerRhv } from '../../models/providerRhv';
 import { MappingNetwork } from '../../models/mappingNetwork';
 import { MappingStorage } from '../../models/mappingStorage';
@@ -12,32 +12,32 @@ describe('Automate archive migration plan test', () => {
   const plan = new Plan();
 
   beforeEach(() => {
-    login(testData.loginData);
+    login(testrhel8Cold.loginData);
   });
 
   it('Create a provider, mappings, plan and cancel plan', () => {
-    source.create(testData.planData.providerData);
-    networkMapping.create(testData.planData.networkMappingData);
-    storageMapping.create(testData.planData.storageMappingData);
-    plan.create(testData.planData);
-    plan.cancel_plan(testData.planData);
+    source.create(testrhel8Cold.planData.providerData);
+    networkMapping.create(testrhel8Cold.planData.networkMappingData);
+    storageMapping.create(testrhel8Cold.planData.storageMappingData);
+    plan.create(testrhel8Cold.planData);
+    plan.cancel_plan(testrhel8Cold.planData);
   });
 
   it('Archiving plan', () => {
-    plan.archive(testData.planData);
+    plan.archive(testrhel8Cold.planData);
   });
 
   it('Delete Duplicated Plan', () => {
-    plan.delete(testData.planData);
+    plan.delete(testrhel8Cold.planData);
   });
 
   it('Deleting Archived plan', () => {
-    plan.deleteArchive(testData.planData);
+    plan.deleteArchive(testrhel8Cold.planData);
   });
 
   after(() => {
-    networkMapping.delete(testData.planData.networkMappingData);
-    storageMapping.delete(testData.planData.storageMappingData);
-    source.delete(testData.planData.providerData);
+    networkMapping.delete(testrhel8Cold.planData.networkMappingData);
+    storageMapping.delete(testrhel8Cold.planData.storageMappingData);
+    source.delete(testrhel8Cold.planData.providerData);
   });
 });
diff --git a/pkg/qe-tests/cypress/integration/tests/Rhv/Archive_SuccessfulPlan_Test.ts b/pkg/qe-tests/cypress/integration/tests/Rhv/Archive_SuccessfulPlan_Test.ts
@@ -1,6 +1,6 @@
 import { login } from '../../../utils/utils';
 import { Plan } from '../../models/plan';
-import { testData } from './config_separate_mapping_rhv';
+import { testrhel8Cold } from './config_separate_mapping_rhv';
 import { providerRhv } from '../../models/providerRhv';
 import { MappingNetwork } from '../../models/mappingNetwork';
 import { MappingStorage } from '../../models/mappingStorage';
@@ -12,31 +12,31 @@ describe('Automate archive migration plan test', () => {
   const plan = new Plan();
 
   beforeEach(() => {
-    login(testData.loginData);
+    login(testrhel8Cold.loginData);
   });
 
   it('Create a provider, mappings, plan and succeeded plan', () => {
-    source.create(testData.planData.providerData);
-    networkMapping.create(testData.planData.networkMappingData);
-    storageMapping.create(testData.planData.storageMappingData);
-    plan.create(testData.planData);
-    plan.execute(testData.planData);
+    source.create(testrhel8Cold.planData.providerData);
+    networkMapping.create(testrhel8Cold.planData.networkMappingData);
+    storageMapping.create(testrhel8Cold.planData.storageMappingData);
+    plan.create(testrhel8Cold.planData);
+    plan.execute(testrhel8Cold.planData);
   });
 
   it('Archiving plan', () => {
-    plan.archive(testData.planData);
+    plan.archive(testrhel8Cold.planData);
   });
   it('Delete Duplicated Plan', () => {
-    plan.delete(testData.planData);
+    plan.delete(testrhel8Cold.planData);
   });
 
   it('Deleting Archived plan', () => {
-    plan.deleteArchive(testData.planData);
+    plan.deleteArchive(testrhel8Cold.planData);
   });
 
   after(() => {
-    networkMapping.delete(testData.planData.networkMappingData);
-    storageMapping.delete(testData.planData.storageMappingData);
-    source.delete(testData.planData.providerData);
+    networkMapping.delete(testrhel8Cold.planData.networkMappingData);
+    storageMapping.delete(testrhel8Cold.planData.storageMappingData);
+    source.delete(testrhel8Cold.planData.providerData);
   });
 });
diff --git a/pkg/qe-tests/cypress/integration/tests/Rhv/Cancel_Restart_Test.ts b/pkg/qe-tests/cypress/integration/tests/Rhv/Cancel_Restart_Test.ts
@@ -3,7 +3,7 @@ import { MappingNetwork } from '../../models/mappingNetwork';
 import { MappingStorage } from '../../models/mappingStorage';
 import { Plan } from '../../models/plan';
 import { providerRhv } from '../../models/providerRhv';
-import { testData } from './config_separate_mapping_rhv';
+import { testrhel8Cold } from './config_separate_mapping_rhv';
 
 describe('Automate cancel and restart of cold migration test', () => {
   const source = new providerRhv();
@@ -12,29 +12,29 @@ describe('Automate cancel and restart of cold migration test', () => {
   const plan = new Plan();
 
   beforeEach(() => {
-    login(testData.loginData);
-    source.create(testData.planData.providerData);
-    networkMapping.create(testData.planData.networkMappingData);
-    storageMapping.create(testData.planData.storageMappingData);
-    plan.create(testData.planData);
+    login(testrhel8Cold.loginData);
+    source.create(testrhel8Cold.planData.providerData);
+    networkMapping.create(testrhel8Cold.planData.networkMappingData);
+    storageMapping.create(testrhel8Cold.planData.storageMappingData);
+    plan.create(testrhel8Cold.planData);
   });
 
   it('Cancel and restart migration', () => {
-    plan.cancel_and_restart(testData.planData);
+    plan.cancel_and_restart(testrhel8Cold.planData);
   });
 
   it.skip('cancel and Restart at Transfer Disk Step', () => {
-    plan.cancelRestartAtTransferDisks(testData.planData);
+    plan.cancelRestartAtTransferDisks(testrhel8Cold.planData);
   });
 
   it.skip('cancel and Restart at Convert to Image Step', () => {
-    plan.cancelRestartAtKubevirt(testData.planData);
+    plan.cancelRestartAtKubevirt(testrhel8Cold.planData);
   });
 
   afterEach(() => {
-    plan.delete(testData.planData);
-    networkMapping.delete(testData.planData.networkMappingData);
-    storageMapping.delete(testData.planData.storageMappingData);
-    source.delete(testData.planData.providerData);
+    plan.delete(testrhel8Cold.planData);
+    networkMapping.delete(testrhel8Cold.planData.networkMappingData);
+    storageMapping.delete(testrhel8Cold.planData.storageMappingData);
+    source.delete(testrhel8Cold.planData.providerData);
   });
 });
diff --git a/pkg/qe-tests/cypress/integration/tests/Rhv/Duplicate_Test.ts b/pkg/qe-tests/cypress/integration/tests/Rhv/Duplicate_Test.ts
@@ -3,32 +3,32 @@ import { MappingNetwork } from '../../models/mappingNetwork';
 import { MappingStorage } from '../../models/mappingStorage';
 import { Plan } from '../../models/plan';
 import { providerRhv } from '../../models/providerRhv';
-import { testData, duplicateTestData } from './config_separate_mapping_rhv';
+import { testrhel8Cold, duplicateTestData } from './config_separate_mapping_rhv';
 describe('Duplicate a cold migration test', () => {
   const source = new providerRhv();
   const networkMapping = new MappingNetwork();
   const storageMapping = new MappingStorage();
   const plan = new Plan();
 
   before(() => {
-    login(testData.loginData);
-    source.create(testData.planData.providerData);
-    networkMapping.create(testData.planData.networkMappingData);
-    storageMapping.create(testData.planData.storageMappingData);
-    plan.create(testData.planData);
-    plan.cancel_plan(testData.planData);
+    login(testrhel8Cold.loginData);
+    source.create(testrhel8Cold.planData.providerData);
+    networkMapping.create(testrhel8Cold.planData.networkMappingData);
+    storageMapping.create(testrhel8Cold.planData.storageMappingData);
+    plan.create(testrhel8Cold.planData);
+    plan.cancel_plan(testrhel8Cold.planData);
   });
   it('Edit a duplicate Plan', () => {
-    plan.duplicate(testData.planData, duplicateTestData.planData);
+    plan.duplicate(testrhel8Cold.planData, duplicateTestData.planData);
   });
   it.skip('duplicate a Plan', () => {
-    plan.duplicate(testData.planData, testData.planData);
+    plan.duplicate(testrhel8Cold.planData, testrhel8Cold.planData);
   });
   after(() => {
     plan.delete(duplicateTestData.planData);
-    plan.delete(testData.planData);
-    networkMapping.delete(testData.planData.networkMappingData);
-    storageMapping.delete(testData.planData.storageMappingData);
-    source.delete(testData.planData.providerData);
+    plan.delete(testrhel8Cold.planData);
+    networkMapping.delete(testrhel8Cold.planData.networkMappingData);
+    storageMapping.delete(testrhel8Cold.planData.storageMappingData);
+    source.delete(testrhel8Cold.planData.providerData);
   });
 });
diff --git a/pkg/qe-tests/cypress/integration/tests/Rhv/config_separate_mapping_rhv.ts b/pkg/qe-tests/cypress/integration/tests/Rhv/config_separate_mapping_rhv.ts
@@ -19,6 +19,7 @@ const v2v_rhv_clustername = Cypress.env('v2v_rhv_clustername');
 const v2v_rhv_cert = Cypress.env('v2v_rhv_cert');
 const preAnsiblePlaybook = Cypress.env('preAnsiblePlaybook');
 const postAnsiblePlaybook = Cypress.env('postAnsiblePlaybook');
+const targetNamespace = 'default';
 
 export const loginData: LoginData = {
   username: user_login,
@@ -50,14 +51,14 @@ export const networkMappingPeer: MappingPeer[] = [
   },
   {
     sProvider: 'vm',
-    dProvider: 'default / ovn-kubernetes1',
+    dProvider: 'default / mybridge',
   },
 ];
 
 export const storageMappingPeer: MappingPeer[] = [
   {
     sProvider: 'v2v-fc',
-    dProvider: storageType.nfs,
+    dProvider: storageType.cephRbd,
   },
 ];
 
@@ -90,7 +91,7 @@ export const editNetworkMapping: MappingData = {
   mappingPeer: [
     {
       sProvider: 'vm',
-      dProvider: 'default /mybridge ',
+      dProvider: `${targetNamespace} /mybridge`,
     },
   ],
 };
@@ -107,13 +108,13 @@ export const editStorageMapping: MappingData = {
   ],
 };
 
-export const originalPlanData: PlanData = {
+export const rhel8Cold: PlanData = {
   name: 'testplan-rhv-rhel8-separate-mapping-cold',
   sProvider: providerData.name,
   tProvider: 'host',
-  namespace: 'default',
+  namespace: targetNamespace,
   sourceClusterName: v2v_rhv_clustername,
-  vmList: ['v2v-karishma-rhel8-2disks2nics-vm'],
+  vmList: ['v2v-migration-rhel8-2disks2nics'],
   useExistingNetworkMapping: true,
   useExistingStorageMapping: true,
   providerData: providerData,
@@ -124,6 +125,23 @@ export const originalPlanData: PlanData = {
   postHook: postHookData,
 };
 
+export const rhel8Warm: PlanData = {
+  name: 'testplan-rhv-rhel8-separate-mapping-warm',
+  sProvider: providerData.name,
+  tProvider: 'host',
+  namespace: targetNamespace,
+  sourceClusterName: v2v_rhv_clustername,
+  vmList: ['mtv-rhel8-warm-2disks2nics'],
+  useExistingNetworkMapping: true,
+  useExistingStorageMapping: true,
+  providerData: providerData,
+  networkMappingData: networkMapping,
+  storageMappingData: storageMapping,
+  warmMigration: true,
+  preHook: preHookData,
+  postHook: postHookData,
+};
+
 export const duplicatePlanData: PlanData = {
   name: 'copy-of-testplan-rhv-rhel8-separate-mapping-cold',
   sProvider: providerData.name,
@@ -146,7 +164,12 @@ export const duplicateTestData: TestData = {
   planData: duplicatePlanData,
 };
 
-export const testData: TestData = {
+export const testrhel8Cold: TestData = {
+  loginData: loginData,
+  planData: rhel8Cold,
+};
+
+export const testrhel8Warm: TestData = {
   loginData: loginData,
-  planData: originalPlanData,
+  planData: rhel8Warm,
 };
diff --git a/pkg/qe-tests/cypress/integration/tests/Rhv/deleteProviderMappingPlan_test.ts b/pkg/qe-tests/cypress/integration/tests/Rhv/deleteProviderMappingPlan_test.ts
@@ -1,5 +1,5 @@
 import { providerRhv } from '../../models/providerRhv';
-import { testData } from './config_separate_mapping_rhv';
+import { testrhel8Cold } from './config_separate_mapping_rhv';
 import { login } from '../../../utils/utils';
 import { MappingNetwork } from '../../models/mappingNetwork';
 import { MappingStorage } from '../../models/mappingStorage';
@@ -12,10 +12,10 @@ describe('Deleting plan, mappings and provider', () => {
   const plan = new Plan();
 
   it('Deleting provider, mappings and plan created in a previous tests', () => {
-    login(testData.loginData);
-    plan.delete(testData.planData);
-    networkMapping.delete(testData.planData.networkMappingData);
-    storageMapping.delete(testData.planData.storageMappingData);
-    provider.delete(testData.planData.providerData);
+    login(testrhel8Cold.loginData);
+    plan.delete(testrhel8Cold.planData);
+    networkMapping.delete(testrhel8Cold.planData.networkMappingData);
+    storageMapping.delete(testrhel8Cold.planData.storageMappingData);
+    provider.delete(testrhel8Cold.planData.providerData);
   });
 });
diff --git a/pkg/qe-tests/cypress/integration/tests/Rhv/editPlanTest.ts b/pkg/qe-tests/cypress/integration/tests/Rhv/editPlanTest.ts
@@ -1,20 +1,20 @@
-import { duplicateTestData, testData } from './config_separate_mapping_rhv';
+import { duplicateTestData, testrhel8Cold } from './config_separate_mapping_rhv';
 import { Plan } from '../../models/plan';
 import { login } from '../../../utils/utils';
 
 describe('Creating plan', () => {
   const plan = new Plan();
 
   beforeEach(() => {
-    login(testData.loginData);
+    login(testrhel8Cold.loginData);
   });
 
   it('Editing an existing plan', () => {
-    plan.create(testData.planData);
-    plan.edit(testData.planData, duplicateTestData.planData);
+    plan.create(testrhel8Cold.planData);
+    plan.edit(testrhel8Cold.planData, duplicateTestData.planData);
   });
 
   it('Deleting plan', () => {
-    plan.delete(testData.planData);
+    plan.delete(testrhel8Cold.planData);
   });
 });
diff --git a/pkg/qe-tests/cypress/integration/tests/Rhv/editProvider.ts b/pkg/qe-tests/cypress/integration/tests/Rhv/editProvider.ts
@@ -1,14 +1,14 @@
-import { incorrectProviderData, testData } from './config_separate_mapping_rhv';
+import { incorrectProviderData, testrhel8Cold } from './config_separate_mapping_rhv';
 import { login } from '../../../utils/utils';
 import { providerRhv } from '../../models/providerRhv';
 import { RhvProviderData } from '../../types/types';
 
 describe('Creating CRUD operation', () => {
   const provider = new providerRhv();
-  const providerData: RhvProviderData = testData.planData.providerData;
+  const providerData: RhvProviderData = testrhel8Cold.planData.providerData;
 
   beforeEach(() => {
-    login(testData.loginData);
+    login(testrhel8Cold.loginData);
   });
 
   it('Create a RHV Provider and Edit existing provider', () => {