refactor

Signed-off-by: Coleen Iona Quadros <[email protected]>

Author: coleenquadros

tests/pkg/tests/observability_rbac_test.go

@@ -28,7 +28,7 @@ var _ = Describe("Observability:", Ordered, func() {
 	It("RHACM4K-1406 - Observability - RBAC - only authorized user could query managed cluster metrics data [Observability][Integration]@ocpInterop @non-ui-post-restore @non-ui-post-release @non-ui-pre-upgrade @non-ui-post-upgrade @post-upgrade @post-restore @e2e @post-release (requires-ocp/g0) (obs_rbac/g0)", func() {
 		By("Logging in as admin and querying managed cluster metrics data", func() {
 			Eventually(func() error {
-				err = utils.LoginOCUser(testOptions, "e2eadmin", "e2eadmin")
+				err = utils.LoginOCUser(testOptions, "admin", "admin")
 				if err != nil {
 					klog.Errorf("Failed to login as admin: %v", err)
 					return err
@@ -83,7 +83,7 @@ var _ = Describe("Observability:", Ordered, func() {
 	})
 
 	It("RHACM4K-1439 - Observability - RBAC - Verify only cluster-manager-admin role can deploy MCO CR [Observability][Integration]@ocpInterop @non-ui-post-restore @non-ui-post-release @non-ui-pre-upgrade @non-ui-post-upgrade @post-upgrade @post-restore @e2e @post-release (requires-ocp/g0) (obs_rbac/g0)", func() {
-		By("Logging as kube:admin checking if MCO can be deleted by user1 and e2eadmin", func() {
+		By("Logging as kube:admin checking if MCO can be deleted by user1 and admin", func() {
 			Eventually(func() error {
 				_, err = exec.Command("oc", "config", "use-context", testOptions.HubCluster.KubeContext).CombinedOutput()
 				if err != nil {
@@ -100,8 +100,8 @@ var _ = Describe("Observability:", Ordered, func() {
 				if bytes.Contains(out.Bytes(), []byte("user1")) {
 					return fmt.Errorf("user1 can delete multiclusterobservabilities.observability.open-cluster-management.io CR")
 				}
-				if !bytes.Contains(out.Bytes(), []byte("e2eadmin")) {
-					return fmt.Errorf("e2eadmin can't delete multiclusterobservabilities.observability.open-cluster-management.io CR")
+				if !bytes.Contains(out.Bytes(), []byte("admin")) {
+					return fmt.Errorf("admin can't delete multiclusterobservabilities.observability.open-cluster-management.io CR")
 				}
 				return nil
 			}, EventuallyTimeoutMinute*1, EventuallyIntervalSecond*5).Should(Succeed())
@@ -110,7 +110,6 @@ var _ = Describe("Observability:", Ordered, func() {
 
 	AfterEach(func() {
 		os.Unsetenv("USER_TOKEN")
-		_, _ = exec.Command("oc", "config", "use-context", testOptions.HubCluster.KubeContext).CombinedOutput()
 		if CurrentSpecReport().Failed() {
 			utils.LogFailingTestStandardDebugInfo(testOptions)
 		}

tests/setup_rbac_test.sh

@@ -4,7 +4,7 @@
 
 create_test_users() {
   echo CREATING USER PASSWORDS SECRET
-  htpasswd -c -B -b users.htpasswd e2eadmin e2eadmin
+  htpasswd -c -B -b users.htpasswd admin admin
   htpasswd -B -b users.htpasswd user1 user1
   oc create ns openshift-config
   oc delete secret htpass-user-test -n openshift-config &>/dev/null
@@ -34,7 +34,7 @@ EOL
 
 create_role_bindings() {
   echo CREATING ROLE BINDINGS
-  oc create clusterrolebinding cluster-manager-admin-binding --clusterrole=open-cluster-management:cluster-manager-admin --user=e2eadmin
+  oc create clusterrolebinding cluster-manager-admin-binding --clusterrole=open-cluster-management:cluster-manager-admin --user=admin
   oc create rolebinding view-binding-user1 --clusterrole=view --user=user1 -n local-cluster
 }