From 7eb0e8b4af8f64209bb7cb28e60e4913896a0137 Mon Sep 17 00:00:00 2001
From: Jiri Novotny <jnovotny@redhat.com>
Date: Mon, 23 Oct 2023 17:00:08 +0200
Subject: [PATCH] DBZ-7002 Use working OCP connection check

---
 .../NamespacePreparationListener.java         | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/listeners/NamespacePreparationListener.java b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/listeners/NamespacePreparationListener.java
index a6e0be41e..666759965 100644
--- a/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/listeners/NamespacePreparationListener.java
+++ b/debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/listeners/NamespacePreparationListener.java
@@ -9,6 +9,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+import java.net.UnknownHostException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -22,6 +23,7 @@
 import io.debezium.testing.system.tools.WaitConditions;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.ObjectReferenceBuilder;
+import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.openshift.api.model.ClusterRoleBindingBuilder;
 import io.fabric8.openshift.api.model.Project;
 import io.fabric8.openshift.api.model.ProjectBuilder;
@@ -35,8 +37,9 @@ public class NamespacePreparationListener implements TestExecutionListener {
     private List<String> projectNames;
 
     public void testPlanExecutionStarted(TestPlan testPlan) {
+        client = OpenShiftUtils.createOcpClient();
         // execute only before OCP system tests
-        if (ConfigProperties.OCP_PROJECT_DBZ != null && OpenShiftUtils.isRunningFromOcp()) {
+        if (ConfigProperties.OCP_PROJECT_DBZ != null && isOcpAvailable()) {
             projectNames = List.of(ConfigProperties.OCP_PROJECT_DBZ,
                     ConfigProperties.OCP_PROJECT_ORACLE,
                     ConfigProperties.OCP_PROJECT_MONGO,
@@ -45,7 +48,6 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
                     ConfigProperties.OCP_PROJECT_POSTGRESQL,
                     ConfigProperties.OCP_PROJECT_REGISTRY,
                     ConfigProperties.OCP_PROJECT_SQLSERVER);
-            client = OpenShiftUtils.createOcpClient();
 
             validateSystemParameters();
             if (ConfigProperties.PREPARE_NAMESPACES_AND_STRIMZI) {
@@ -56,10 +58,10 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
 
     public void testPlanExecutionFinished(TestPlan testPlan) {
         // execute only after OCP system tests
-        if (ConfigProperties.OCP_PROJECT_DBZ != null && ConfigProperties.PREPARE_NAMESPACES_AND_STRIMZI && OpenShiftUtils.isRunningFromOcp()) {
+        if (ConfigProperties.OCP_PROJECT_DBZ != null && ConfigProperties.PREPARE_NAMESPACES_AND_STRIMZI && isOcpAvailable()) {
             deleteNamespaces();
-            client.close();
         }
+        client.close();
     }
 
     private void prepareNamespaces() {
@@ -152,4 +154,16 @@ private void deleteNamespaces() {
             }
         });
     }
+
+    private boolean isOcpAvailable() {
+        try {
+            client.getVersion();
+        }
+        catch (KubernetesClientException e) {
+            if (e.getCause() instanceof UnknownHostException) {
+                return false;
+            }
+        }
+        return true;
+    }
 }