Skip to content

Make rabbitmq user and vhost name shorter in kuttl tests #1121

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.

Sign up for GitHub

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

Open
amoralej wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −17
Open

Make rabbitmq user and vhost name shorter in kuttl tests #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions test/kuttl/test-suites/default/rmquser-vhost/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ metadata:
name: nova-kuttl-notification-transport
spec:
rabbitmqClusterName: rabbitmq-notifications
username: nova-notifications
vhost: nova-notifications
username: nova-notif
vhost: nova-notif
---
# Verify that 2 TransportURL CRs were created (separate clusters)
apiVersion: kuttl.dev/v1beta1
Expand Down Expand Up @@ -63,15 +63,15 @@ commands:
# Verify notification-transport has correct user and vhost
notif_user=$(kubectl get transporturl nova-kuttl-notification-transport -n $NAMESPACE -o jsonpath='{.spec.username}')
notif_vhost=$(kubectl get transporturl nova-kuttl-notification-transport -n $NAMESPACE -o jsonpath='{.spec.vhost}')
if [ "$notif_user" != "nova-notifications" ]; then
echo "Expected notification-transport username 'nova-notifications', found '$notif_user'"
if [ "$notif_user" != "nova-notif" ]; then
echo "Expected notification-transport username 'nova-notif', found '$notif_user'"
exit 1
fi
if [ "$notif_vhost" != "nova-notifications" ]; then
echo "Expected notification-transport vhost 'nova-notifications', found '$notif_vhost'"
if [ "$notif_vhost" != "nova-notif" ]; then
echo "Expected notification-transport vhost 'nova-notif', found '$notif_vhost'"
exit 1
fi
echo "Notification transport has correct user (nova-notifications) and vhost (nova-notifications)"
echo "Notification transport has correct user (nova-notif) and vhost (nova-notif)"

# Verify that nova.conf contains the notifications transport_url
NOVA_API_POD=$(kubectl get pods -n $NAMESPACE -l "service=nova-api" -o custom-columns=:metadata.name --no-headers | grep -v ^$ | head -1)
Expand Down Expand Up @@ -109,18 +109,18 @@ commands:
fi
echo "Found notifications transport_url: $notif_transport_url"

# Verify the notifications transport_url contains the correct vhost (nova-notifications)
if ! echo "$notif_transport_url" | grep -q '/nova-notifications'; then
echo "Notifications transport_url does not contain expected vhost '/nova-notifications'"
# Verify the notifications transport_url contains the correct vhost (nova-notif)
if ! echo "$notif_transport_url" | grep -q '/nova-notif'; then
echo "Notifications transport_url does not contain expected vhost '/nova-notif'"
exit 1
fi
echo "Successfully verified vhost 'nova-notifications' in notifications transport_url"
echo "Successfully verified vhost 'nova-notif' in notifications transport_url"

# Verify the notifications transport_url contains the correct username (nova-notifications)
if ! echo "$notif_transport_url" | grep -q 'nova-notifications:'; then
echo "Notifications transport_url does not contain expected username 'nova-notifications:'"
# Verify the notifications transport_url contains the correct username (nova-notif)
if ! echo "$notif_transport_url" | grep -q 'nova-notif:'; then
echo "Notifications transport_url does not contain expected username 'nova-notif:'"
exit 1
fi
echo "Successfully verified username 'nova-notifications' in notifications transport_url"
echo "Successfully verified username 'nova-notif' in notifications transport_url"

exit 0
4 changes: 2 additions & 2 deletions test/kuttl/test-suites/default/rmquser-vhost/01-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ spec:
vhost: nova-rpc
notificationsBus:
cluster: rabbitmq-notifications
user: nova-notifications
vhost: nova-notifications
user: nova-notif
vhost: nova-notif
Loading