From f7366dce835d84e23b0e86e363fd3e4b62719984 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nsoffer@redhat.com>
Date: Wed, 6 Sep 2023 22:34:53 +0300
Subject: [PATCH] Use labels to locate the drpc

Instead of assuming the drpc name, which is different in our busybox
samples and in openshift, use the label app=app-name to locate the drpc.

With this change the failover and relocate scripts should be compatible
with openshift. The deploy and undeploy scripts are not since we don't
have samples using placement.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
---
 test/basic-test/config.yaml |  2 +-
 test/drenv/test.py          | 49 ++++++++++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/test/basic-test/config.yaml b/test/basic-test/config.yaml
index ce5d01804..ca31c93a7 100644
--- a/test/basic-test/config.yaml
+++ b/test/basic-test/config.yaml
@@ -4,5 +4,5 @@
 ---
 repo: https://github.com/ramendr/ocm-ramen-samples.git
 branch: main
+name: busybox-sample
 namespace: busybox-sample
-name: busybox-drpc
diff --git a/test/drenv/test.py b/test/drenv/test.py
index 38dcb9aae..4cd41cb64 100644
--- a/test/drenv/test.py
+++ b/test/drenv/test.py
@@ -126,10 +126,12 @@ def failover(cluster):
     """
     Start failover to cluster.
     """
-    info("Starting failover to cluster '%s'", cluster)
+    drpc = _drpc_name()
+
+    info("Starting failover for '%s' to cluster '%s'", drpc, cluster)
     patch = {"spec": {"action": "Failover", "failoverCluster": cluster}}
     kubectl.patch(
-        f"drpc/{config['name']}",
+        drpc,
         "--patch",
         json.dumps(patch),
         "--type=merge",
@@ -143,10 +145,12 @@ def relocate(cluster):
     """
     Start relocate to cluster.
     """
-    info("Starting relocate to cluster '%s'", cluster)
+    drpc = _drpc_name()
+
+    info("Starting relocate for '%s' to cluster '%s'", drpc, cluster)
     patch = {"spec": {"action": "Relocate", "preferredCluster": cluster}}
     kubectl.patch(
-        f"drpc/{config['name']}",
+        drpc,
         "--patch",
         json.dumps(patch),
         "--type=merge",
@@ -169,9 +173,11 @@ def wait_for_drpc_status():
         log=debug,
     )
 
-    info("Waiting until busybox drpc reports status")
+    drpc = _drpc_name()
+
+    info("Waiting until '%s' reports status", drpc)
     drenv.wait_for(
-        f"drpc/{config['name']}",
+        drpc,
         output="jsonpath={.status}",
         namespace=config["namespace"],
         timeout=60,
@@ -181,9 +187,11 @@ def wait_for_drpc_status():
 
 
 def wait_for_drpc_phase(phase):
-    info("Waiting for drpc '%s' phase", phase)
+    drpc = _drpc_name()
+
+    info("Waiting for '%s' phase '%s'", drpc, phase)
     kubectl.wait(
-        f"drpc/{config['name']}",
+        drpc,
         f"--for=jsonpath={{.status.phase}}={phase}",
         f"--namespace={config['namespace']}",
         "--timeout=300s",
@@ -199,9 +207,11 @@ def wait_until_drpc_is_stable(timeout=300):
     - PeerReady=true
     - lastGroupSyncTime!=''
     """
-    info("Waiting for Available condition")
+    drpc = _drpc_name()
+
+    info("Waiting for '%s' Available condition", drpc)
     kubectl.wait(
-        f"drpc/{config['name']}",
+        drpc,
         "--for=condition=Available",
         f"--namespace={config['namespace']}",
         f"--timeout={timeout}s",
@@ -209,9 +219,9 @@ def wait_until_drpc_is_stable(timeout=300):
         log=debug,
     )
 
-    info("Waiting for PeerReady condition")
+    info("Waiting for '%s' PeerReady condition", drpc)
     kubectl.wait(
-        f"drpc/{config['name']}",
+        drpc,
         "--for=condition=PeerReady",
         f"--namespace={config['namespace']}",
         f"--timeout={timeout}s",
@@ -219,9 +229,9 @@ def wait_until_drpc_is_stable(timeout=300):
         log=debug,
     )
 
-    info("Waiting for first replication")
+    info("Waiting for '%s' first replication", drpc)
     drenv.wait_for(
-        f"drpc/{config['name']}",
+        drpc,
         output="jsonpath={.status.lastGroupSyncTime}",
         namespace=config["namespace"],
         timeout=timeout,
@@ -230,6 +240,17 @@ def wait_until_drpc_is_stable(timeout=300):
     )
 
 
+def _drpc_name():
+    out = kubectl.get(
+        "drpc",
+        f"--selector=app={config['name']}",
+        f"--namespace={config['namespace']}",
+        "--output=name",
+        context=env["hub"],
+    )
+    return out.rstrip()
+
+
 def _kustomization(cluster):
     yaml = """
 resources: