Did changes in test config files (kubev2v#956)

pkg/qe-tests/cypress/integration/models/plan.ts

@@ -130,7 +130,7 @@ export class Plan {
       .within(() => {
         click(button);
       });
-    const selector = `[aria-label="Select Folder ${sourceClusterName}"]`;
+    const selector = `[aria-label="Select Cluster ${sourceClusterName}"]`;
     selectCheckBox(selector); //Added selectCheckBox function
     next();
   }
@@ -149,6 +149,7 @@ export class Plan {
         });
     });
   }
+
   //Method to unselect VMs those are not needed
   protected unSelectVm(vmList: string[]): void {
     const selector = `[aria-label="search button for search input"]`;

pkg/qe-tests/cypress/integration/tests/tier0/tier0_config_rhv.ts

@@ -25,6 +25,7 @@ const v2v_rhv_username = Cypress.env('v2v_rhv_username');
 const v2v_rhv_password = Cypress.env('v2v_rhv_password');
 const v2v_rhv_hostname = Cypress.env('v2v_rhv_hostname');
 const v2v_rhv_clustername = Cypress.env('v2v_rhv_clustername');
+const sourceProviderStorage = Cypress.env('v2v_rhvStorageSource');
 const v2v_rhv_cert = Cypress.env('v2v_rhv_cert');
 const vmListArray = Cypress.env('vm_list');
 const warmVmListArray = Cypress.env('warm_vm_list');
@@ -67,20 +68,20 @@ export const rhvNetworkMappingPeer_2x_network: MappingPeer[] = [
 ];
 
 //Defining RHV storage mapping peer for NFS
-export const rhvStorageMappingPeer_nfs: MappingPeer[] = [
-  {
-    sProvider: 'v2v-fc',
-    dProvider: storageType.nfs,
-  },
-];
+export const rhvStorageMappingPeer_nfs: MappingPeer[] = [];
 
 //Defining RHV storage mapping peer for ceph-rbd
-export const rhvStorageMappingPeer_ceph: MappingPeer[] = [
-  {
-    sProvider: 'v2v-fc',
+export const rhvStorageMappingPeer_ceph: MappingPeer[] = [];
+sourceProviderStorage.forEach((currentStorage) => {
+  rhvStorageMappingPeer_nfs.push({
+    sProvider: currentStorage,
+    dProvider: storageType.nfs,
+  });
+  rhvStorageMappingPeer_ceph.push({
+    sProvider: currentStorage,
     dProvider: storageType.cephRbd,
-  },
-];
+  });
+});
 
 //Defining RHV network mapping using 2 peers
 export const rhvNetworkMapping_2x_network: MappingData = {
@@ -146,6 +147,8 @@ export const rhvTier0Plan_nfs_cold: PlanData = {
   networkMappingData: rhvNetworkMapping_2x_network,
   storageMappingData: rhvStorageMapping_nfs,
   warmMigration: false,
+  preHook: preHookData,
+  postHook: postHookData,
 };
 
 //Defining RHV warm migration plan for NFS file system
@@ -163,6 +166,8 @@ export const rhvTier0Plan_nfs_warm: PlanData = {
   storageMappingData: rhvStorageMapping_nfs,
   warmMigration: true,
   scheduledCutover: cutoverTime,
+  preHook: preHookData,
+  postHook: postHookData,
 };
 
 //Defining RHV warm migration plan for ceph-rbd file system
@@ -180,6 +185,8 @@ export const rhvTier0Plan_ceph_warm: PlanData = {
   storageMappingData: rhvStorageMapping_ceph,
   warmMigration: true,
   scheduledCutover: cutoverTime,
+  preHook: preHookData,
+  postHook: postHookData,
 };
 
 //Defining test for RHV cold migration with ceph-rbd file system
@@ -208,7 +215,7 @@ export const rhvTier0TestNfsWarm: TestData = {
 
 export const rhvTier0TestArray = [
   rhvTier0TestCephCold,
-  // rhvTier0TestNfsCold,
+  rhvTier0TestNfsCold,
   rhvTiesr0TestCephWarm,
-  // rhvTier0TestNfsWarm,
+  rhvTier0TestNfsWarm,
 ];

pkg/qe-tests/cypress/integration/tests/tier0/tier0_config_vmware.ts

@@ -69,20 +69,23 @@ export const vmwareNetworkMappingPeer_2x_network: MappingPeer[] = [
 ];
 
 //Defining vmware storage mapping peer for NFS
-export const vmwareStorageMappingPeer_nfs: MappingPeer[] = [
-  {
-    sProvider: sourceProviderStorage,
-    dProvider: storageType.nfs,
-  },
-];
+export const vmwareStorageMappingPeer_nfs: MappingPeer[] = [];
 
 //Defining vmware storage mapping peer for CEPH
-export const vmwareStorageMappingPeer_ceph: MappingPeer[] = [
-  {
-    sProvider: sourceProviderStorage,
+export const vmwareStorageMappingPeer_ceph: MappingPeer[] = [];
+
+sourceProviderStorage.forEach((currentStorage) => {
+  // Adding all peers defined in external config
+  vmwareStorageMappingPeer_nfs.push({
+    sProvider: currentStorage,
+    dProvider: storageType.nfs,
+  });
+
+  vmwareStorageMappingPeer_ceph.push({
+    sProvider: currentStorage,
     dProvider: storageType.cephRbd,
-  },
-];
+  });
+});
 
 //Defining vmware network mapping using 2 peers
 export const vmwareNetworkMapping_2x_network: MappingData = {
@@ -216,7 +219,7 @@ export const vmwareTier0TestCephWarm: TestData = {
 
 export const vmwareTier0TestArray = [
   vmwareTier0TestCephCold,
-  vmwareTier0TestNfsCold,
+  // vmwareTier0TestNfsCold,
   vmwareTier0TestCephWarm,
-  vmwareTier0TestNfsWarm,
+  // vmwareTier0TestNfsWarm,
 ];

pkg/qe-tests/cypress/integration/tests/tier0/tier0_tests_rhv.ts

@@ -4,14 +4,13 @@ import {
   createNamespace,
   deleteNamespace,
   login,
-  ocApply,
   provisionNetwork,
+  unprovisionNetwork,
 } from '../../../utils/utils';
 import { providerRhv } from '../../models/providerRhv';
 import { MappingNetwork } from '../../models/mappingNetwork';
 import { MappingStorage } from '../../models/mappingStorage';
 import { Plan } from '../../models/plan';
-import { secondNetwork } from '../../types/constants';
 
 rhvTier0TestArray.forEach((currentTest) => {
   describe(
@@ -26,14 +25,13 @@ rhvTier0TestArray.forEach((currentTest) => {
       before(() => {
         createNamespace(currentTest.planData.namespace);
         provisionNetwork(currentTest.planData.namespace);
-        // ocApply(secondNetwork, currentTest.planData.namespace);
       });
 
       beforeEach(() => {
         login(currentTest.loginData);
       });
 
-      it('Login to MTV and create provider', () => {
+      it('Create new provider', () => {
         provider.create(currentTest.planData.providerData);
       });
 
@@ -56,6 +54,7 @@ rhvTier0TestArray.forEach((currentTest) => {
         storageMapping.delete(currentTest.planData.storageMappingData);
         provider.delete(currentTest.planData.providerData);
         cleanVms(currentTest.planData.vmList, currentTest.planData.namespace);
+        unprovisionNetwork(currentTest.planData.namespace);
         deleteNamespace(currentTest.planData.namespace);
       });
     }