new changes

Author: sipriyaa

tests/e2e/mgmt_wrkld_domain_isolation_utils.go

@@ -40,62 +40,72 @@ pod node anotation and cns volume metadata
 func verifyAnnotationsAndNodeAffinityForStatefulsetinSvc(ctx context.Context, client clientset.Interface,
 	statefulset *appsv1.StatefulSet, namespace string,
 	allowedTopologies []v1.TopologySelectorLabelRequirement) error {
-	// read topology mapping
+	// Read topology mapping
 	allowedTopologiesMap := createAllowedTopologiesMap(allowedTopologies)
 	topologyMap := GetAndExpectStringEnvVar(envTopologyMap)
 	_, topologyCategories := createTopologyMapLevel5(topologyMap)
 
 	framework.Logf("Reading statefulset pod list for node affinity verification")
 	ssPodsBeforeScaleDown := GetListOfPodsInSts(client, statefulset)
 	for _, sspod := range ssPodsBeforeScaleDown.Items {
+		// Get Pod details
 		_, err := client.CoreV1().Pods(namespace).Get(ctx, sspod.Name, metav1.GetOptions{})
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to get pod %s in namespace %s: %w", sspod.Name, namespace, err)
 		}
 
-		framework.Logf("Verifying PVC annotation and pv affinity rules")
+		framework.Logf("Verifying PVC annotation and PV affinity rules")
 		for _, volumespec := range sspod.Spec.Volumes {
 			if volumespec.PersistentVolumeClaim != nil {
 				svPvcName := volumespec.PersistentVolumeClaim.ClaimName
 				pv := getPvFromClaim(client, statefulset.Namespace, svPvcName)
-				svcPVC, err := client.CoreV1().PersistentVolumeClaims(namespace).Get(ctx, svPvcName,
-					metav1.GetOptions{})
-				gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
+				// Get SVC PVC
+				svcPVC, err := client.CoreV1().PersistentVolumeClaims(namespace).Get(ctx, svPvcName, metav1.GetOptions{})
+				if err != nil {
+					return fmt.Errorf("failed to get SVC PVC %s in namespace %s: %w", svPvcName, namespace, err)
+				}
+
+				// Get ready and schedulable nodes
 				nodeList, err := fnodes.GetReadySchedulableNodes(ctx, client)
 				if err != nil {
-					return err
+					return fmt.Errorf("failed to get ready and schedulable nodes: %w", err)
 				}
 				if len(nodeList.Items) <= 0 {
-					return fmt.Errorf("unable to find ready and schedulable Node")
+					return fmt.Errorf("no ready and schedulable nodes found")
 				}
 
-				framework.Logf("Verify SV PVC has topology annotations set")
+				// Verify SV PVC topology annotations
 				err = checkPvcTopologyAnnotationOnSvc(svcPVC, allowedTopologiesMap, topologyCategories)
-				gomega.Expect(err).NotTo(gomega.HaveOccurred())
-				framework.Logf("SVC PVC: %s has topology annotations set", svcPVC.Name)
+				if err != nil {
+					return fmt.Errorf("topology annotation verification failed for SVC PVC %s: %w", svcPVC.Name, err)
+				}
 
-				framework.Logf("Verify SV PV has has required PV node affinity details")
+				// Verify SV PV node affinity details
 				svcPV := getPvFromClaim(client, namespace, svPvcName)
 				_, err = verifyVolumeTopologyForLevel5(svcPV, allowedTopologiesMap)
-				gomega.Expect(err).NotTo(gomega.HaveOccurred())
-				framework.Logf("SVC PV: %s has required PV node affinity details", svcPV.Name)
+				if err != nil {
+					return fmt.Errorf("topology verification failed for SVC PV %s: %w", svcPV.Name, err)
+				}
 
-				framework.Logf("Verify Pod node annotation")
+				// Verify pod node annotation
 				_, err = verifyPodLocationLevel5(&sspod, nodeList, allowedTopologiesMap)
-				gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-				framework.Logf("Verify CNS volume metadata for Pod, PVC and PV")
-				err = verifyVolumeMetadataInCNS(&e2eVSphere, pv.Spec.CSI.VolumeHandle,
-					svPvcName, pv.ObjectMeta.Name, sspod.Name)
-				gomega.Expect(err).NotTo(gomega.HaveOccurred())
+				if err != nil {
+					return fmt.Errorf("pod node annotation verification failed for pod %s: %w", sspod.Name, err)
+				}
 
+				// Verify CNS volume metadata
+				err = verifyVolumeMetadataInCNS(&e2eVSphere, pv.Spec.CSI.VolumeHandle, svPvcName, pv.ObjectMeta.Name, sspod.Name)
+				if err != nil {
+					return fmt.Errorf("CNS volume metadata verification failed for pod %s: %w", sspod.Name, err)
+				}
 			}
 		}
 	}
 	return nil
 }
 
+
 // Function to check annotation on a Supervisor PVC
 func checkPvcTopologyAnnotationOnSvc(svcPVC *v1.PersistentVolumeClaim,
 	allowedTopologies map[string][]string, categories []string) error {