From 45265a390310cffb7e98e637a3c964aee74da4e5 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Thu, 21 May 2026 09:23:53 +0200
Subject: [PATCH] Make rabbitmq user and vhost name shorter in kuttl tests

Some recent change (maybe [1a)], the string used in infra-operator for
rabbitmquser creation has changed from
`nova-kuttl-notification-transport-nova-notifications-user`
to `rabbitmq-notifications-nova-notifications-user-nova-notifications`
which is longer that 63 char openshift limit, leading to error:

RabbitMQ user error occurred Secret "rabbitmq-user-rabbitmq-notifications-nova-notifications-user-nova-notifications" is invalid: metadata.labels: Invalid value: "rabbitmq-notifications-nova-notifications-user-nova-notifications": must be no more than 63 characters

While this may be understood as a bug, this patch is making vhost and user names
shorter to unblock the kuttl test.

[1] https://github.com/openstack-k8s-operators/infra-operator/commit/fcc8556324f5a6b5e24031a2be97c17cbc1c4baa#diff-627c3e6f14aec9dd16405a764cf2e60199490e15a399bd3df182df26f00e999d

Signed-off-by: Alfredo Moralejo <amoralej@redhat.com>
---
 .../default/rmquser-vhost/01-assert.yaml      | 30 +++++++++----------
 .../default/rmquser-vhost/01-deploy.yaml      |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/kuttl/test-suites/default/rmquser-vhost/01-assert.yaml b/test/kuttl/test-suites/default/rmquser-vhost/01-assert.yaml
index 72c8fa64a..4a69a619c 100644
--- a/test/kuttl/test-suites/default/rmquser-vhost/01-assert.yaml
+++ b/test/kuttl/test-suites/default/rmquser-vhost/01-assert.yaml
@@ -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
@@ -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)
@@ -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
diff --git a/test/kuttl/test-suites/default/rmquser-vhost/01-deploy.yaml b/test/kuttl/test-suites/default/rmquser-vhost/01-deploy.yaml
index d31053621..795937af2 100644
--- a/test/kuttl/test-suites/default/rmquser-vhost/01-deploy.yaml
+++ b/test/kuttl/test-suites/default/rmquser-vhost/01-deploy.yaml
@@ -10,5 +10,5 @@ spec:
     vhost: nova-rpc
   notificationsBus:
     cluster: rabbitmq-notifications
-    user: nova-notifications
-    vhost: nova-notifications
+    user: nova-notif
+    vhost: nova-notif