diff --git a/resources/keywords/login.resource b/resources/keywords/login.resource index b2488c9..331115c 100644 --- a/resources/keywords/login.resource +++ b/resources/keywords/login.resource @@ -10,7 +10,7 @@ Resource ../keywords/suite_and_test_setup_teardown.resource *** Variables *** -${operatorNamespace} redhat-dbaas-operator +${operatorNamespace} openshift-dbaas-operator ${DBaaSPolicyEnabled} ${DBAASPOLICY.ENABLED} ${DBaaSPolicyConfigured} ${False} ${rbacAligned} ${False} @@ -37,7 +37,7 @@ Login To OpenShift CLI As Cluster Admin Oc Login ${OCP_API_URL} ${OCP_ADMIN_USER.USERNAME} ${OCP_ADMIN_USER.PASSWORD} ${cmd_login} Set Variable oc login ${OCP_API_URL} -u ${OCP_ADMIN_USER.USERNAME} -p ${OCP_ADMIN_USER.PASSWORD} ${stdout} = Execute Command ${cmd_login} True - ${cmd} Set Variable oc project redhat-dbaas-operator + ${cmd} Set Variable oc project openshift-dbaas-operator ${stdout} = Execute Command ${cmd} True Login To OpenShift CLI As LDAP User diff --git a/resources/keywords/operators.resource b/resources/keywords/operators.resource index 87bb289..89ae3c9 100644 --- a/resources/keywords/operators.resource +++ b/resources/keywords/operators.resource @@ -7,7 +7,7 @@ Resource ../object_repo/installed_operators_obj.resource *** Keywords *** User Searches Openshift Database Access Operator On RHODA Installed Cluster The Browser Is On OperatorHub Page - User Filters redhat-dbaas-operator Namespace On Project Dropdown + User Filters openshift-dbaas-operator Namespace On Project Dropdown User Filters Database Access Operator On Filter TextBox User Filters ${projectName} Namespace On Project Dropdown diff --git a/resources/object_repo/operatorhub_obj.resource b/resources/object_repo/operatorhub_obj.resource index 9928d41..f96ef3e 100644 --- a/resources/object_repo/operatorhub_obj.resource +++ b/resources/object_repo/operatorhub_obj.resource @@ -8,7 +8,7 @@ ${txtBxProjectSelect} //input[contains(@data-test,"dropdown-text-filte ${btnProjectSelect} //span[.="<>"]/parent::button ${lblProjectSelect} //span[.="Project: <>"] ${txtBxFilter} //input[contains(@aria-label,"Filter by keyword")] -${elemDatabaseAccessTile} //a[contains(@class, "co-catalog-tile") and contains(@href,"redhat-dbaas-operator")] -${elemDatabaseAccessStatus} //a[contains(@href,"redhat-dbaas-operator")]/div[contains(@class,"footer")]/span +${elemDatabaseAccessTile} //a[contains(@class, "co-catalog-tile") and contains(@href,"openshift-dbaas-operator")] +${elemDatabaseAccessStatus} //a[contains(@href,"openshift-dbaas-operator")]/div[contains(@class,"footer")]/span ${txtProjects} //h1//span[.="Projects"] ${lnkProjectName} //a[contains(@class,"co-resource-item__resource-name") and (.="<>")] diff --git a/test-variables.yaml.example b/test-variables.yaml.example index 10548d8..5ef6bea 100644 --- a/test-variables.yaml.example +++ b/test-variables.yaml.example @@ -45,4 +45,4 @@ RDS: DBAASPOLICY: ENABLED: FALSE PERSONA: cluster-adm - NAMESPACE: redhat-dbaas-operator + NAMESPACE: openshift-dbaas-operator diff --git a/tests/100_installation.robot b/tests/100_installation.robot index cdda3aa..652d2ac 100644 --- a/tests/100_installation.robot +++ b/tests/100_installation.robot @@ -25,7 +25,7 @@ Scenario: Redhat Database Operator Installed On Operator Hub Scenario: Redhat Dbaas Operator Namespace Created For RHODA Installation [Tags] RHODA-002 smoke When User Navigates To Installed Operators Under Operators - And User Filters redhat-dbaas-operator Namespace On Project Dropdown + And User Filters openshift-dbaas-operator Namespace On Project Dropdown Then Openshift Database Access Operator Filtered With Succeeded Status Scenario: Error Message To Select Valid Namespace To Import Provider Account diff --git a/utils/data/oc_install_dev_rhoda_build.yaml b/utils/data/oc_install_dev_rhoda_build.yaml index e8f252a..d7a1831 100644 --- a/utils/data/oc_install_dev_rhoda_build.yaml +++ b/utils/data/oc_install_dev_rhoda_build.yaml @@ -1,13 +1,13 @@ apiVersion: v1 kind: Namespace metadata: - name: redhat-dbaas-operator + name: openshift-dbaas-operator --- apiVersion: v1 kind: Secret metadata: name: dbaas-operator-dev-prom-remote-write - namespace: redhat-dbaas-operator + namespace: openshift-dbaas-operator stringData: rhobs-token: <> --- @@ -15,7 +15,7 @@ apiVersion: operators.coreos.com/v1alpha1 kind: CatalogSource metadata: name: addon-dbaas-operator-catalog - namespace: redhat-dbaas-operator + namespace: openshift-dbaas-operator spec: sourceType: grpc image: quay.io/ecosystem-appeng/dbaas-operator-dev-catalog:<> @@ -25,19 +25,19 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: name: redhat-layered-product-og - namespace: redhat-dbaas-operator + namespace: openshift-dbaas-operator --- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: name: addon-dbaas-operator - namespace: redhat-dbaas-operator + namespace: openshift-dbaas-operator spec: channel: alpha installPlanApproval: Automatic name: dbaas-operator source: addon-dbaas-operator-catalog - sourceNamespace: redhat-dbaas-operator + sourceNamespace: openshift-dbaas-operator config: env: - name: ADDON_NAME diff --git a/utils/scripts/ocm/ocm.py b/utils/scripts/ocm/ocm.py index 4f56884..ef51bf9 100644 --- a/utils/scripts/ocm/ocm.py +++ b/utils/scripts/ocm/ocm.py @@ -714,19 +714,19 @@ def add_users_to_rhoda_personas(self): for user in ldap_usernames: if "operator" in user: - cmd = "oc adm policy add-role-to-user admin {} -n redhat-dbaas-operator".format(user) + cmd = "oc adm policy add-role-to-user admin {} -n openshift-dbaas-operator".format(user) log.info("CMD: {}".format(cmd)) execute_command(cmd) elif "project" in user: - cmd = "oc adm policy add-role-to-user admin {} -n redhat-dbaas-operator".format(user) + cmd = "oc adm policy add-role-to-user admin {} -n openshift-dbaas-operator".format(user) log.info("CMD: {}".format(cmd)) execute_command(cmd) elif "service" in user: - cmd = "oc adm policy add-role-to-user edit {} -n redhat-dbaas-operator".format(user) + cmd = "oc adm policy add-role-to-user edit {} -n openshift-dbaas-operator".format(user) log.info("CMD: {}".format(cmd)) execute_command(cmd) elif "dev" in user: - cmd = "oc adm policy add-role-to-user view {} -n redhat-dbaas-operator".format(user) + cmd = "oc adm policy add-role-to-user view {} -n openshift-dbaas-operator".format(user) log.info("CMD: {}".format(cmd)) execute_command(cmd) diff --git a/utils/scripts/testconfig/test-variables.yaml b/utils/scripts/testconfig/test-variables.yaml index 8da16e4..30fa28e 100644 --- a/utils/scripts/testconfig/test-variables.yaml +++ b/utils/scripts/testconfig/test-variables.yaml @@ -44,5 +44,5 @@ RDS: DBAASPOLICY: ENABLED: FALSE PERSONA: cluster-adm - NAMESPACE: redhat-dbaas-operator + NAMESPACE: openshift-dbaas-operator