Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update namespace for community version #85

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/keywords/login.resource
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion resources/keywords/operators.resource
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions resources/object_repo/operatorhub_obj.resource
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ${txtBxProjectSelect} //input[contains(@data-test,"dropdown-text-filte
${btnProjectSelect} //span[.="<<project>>"]/parent::button
${lblProjectSelect} //span[.="Project: <<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 (.="<<project>>")]
2 changes: 1 addition & 1 deletion test-variables.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ RDS:
DBAASPOLICY:
ENABLED: FALSE
PERSONA: cluster-adm
NAMESPACE: redhat-dbaas-operator
NAMESPACE: openshift-dbaas-operator
2 changes: 1 addition & 1 deletion tests/100_installation.robot
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions utils/data/oc_install_dev_rhoda_build.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
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: <<rhobs-token>>
---
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:<<version>>
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions utils/scripts/ocm/ocm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion utils/scripts/testconfig/test-variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ RDS:
DBAASPOLICY:
ENABLED: FALSE
PERSONA: cluster-adm
NAMESPACE: redhat-dbaas-operator
NAMESPACE: openshift-dbaas-operator