Reverting back the secure testing flag, refactor BWC tests

Signed-off-by: Martin Gaievski <gaievski@amazon.com>

Author: martin-gaievski

qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/AbstractRollingUpgradeTestCase.java

@@ -8,8 +8,11 @@
 import java.nio.file.Path;
 import java.util.Locale;
 import java.util.Optional;
+import java.util.Set;
+
 import org.junit.Before;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.ml.common.model.MLModelState;
 import org.opensearch.neuralsearch.BaseNeuralSearchIT;
 import static org.opensearch.neuralsearch.util.TestUtils.NEURAL_SEARCH_BWC_PREFIX;
 import static org.opensearch.neuralsearch.util.TestUtils.OLD_CLUSTER;
@@ -23,6 +26,8 @@
 
 public abstract class AbstractRollingUpgradeTestCase extends BaseNeuralSearchIT {
 
+    private static final Set<MLModelState> READY_FOR_INFERENCE_STATES = Set.of(MLModelState.LOADED, MLModelState.DEPLOYED);
+
     @Before
     protected String getIndexNameForTest() {
         // Creating index name by concatenating "neural-bwc-" prefix with test method name
@@ -159,4 +164,24 @@ protected void createPipelineForTextChunkingProcessor(String pipelineName) throw
         );
         createPipelineProcessor(requestBody, pipelineName, "", null);
     }
+
+    protected boolean isModelReadyForInference(final MLModelState mlModelState) throws Exception {
+        return READY_FOR_INFERENCE_STATES.contains(mlModelState);
+    }
+
+    protected void waitForModelToLoad(String modelId) throws Exception {
+        int maxAttempts = 30;  // Maximum number of attempts
+        int waitTimeInSeconds = 2;  // Time to wait between attempts
+
+        for (int attempt = 0; attempt < maxAttempts; attempt++) {
+            MLModelState state = getModelState(modelId);
+            if (isModelReadyForInference(state)) {
+                logger.info("Model {} is now loaded after {} attempts", modelId, attempt + 1);
+                return;
+            }
+            logger.info("Waiting for model {} to load. Current state: {}. Attempt {}/{}", modelId, state, attempt + 1, maxAttempts);
+            Thread.sleep(waitTimeInSeconds * 1000);
+        }
+        throw new RuntimeException("Model " + modelId + " failed to load after " + maxAttempts + " attempts");
+    }
 }

qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/rolling/BatchIngestionIT.java

@@ -21,7 +21,6 @@ public class BatchIngestionIT extends AbstractRollingUpgradeTestCase {
     private static final String SPARSE_PIPELINE = "BatchIngestionIT_sparse_pipeline_rolling";
     private static final String TEXT_FIELD_NAME = "passage_text";
     private static final String EMBEDDING_FIELD_NAME = "passage_embedding";
-    private static final Set<MLModelState> READY_FOR_INFERENCE_STATES = Set.of(MLModelState.LOADED, MLModelState.DEPLOYED);
 
     public void testBatchIngestion_SparseEncodingProcessor_E2EFlow() throws Exception {
         waitForClusterHealthGreen(NODES_BWC_CLUSTER, 90);
@@ -93,20 +92,4 @@ public void testBatchIngestion_SparseEncodingProcessor_E2EFlow() throws Exceptio
                 throw new IllegalStateException("Unexpected value: " + getClusterType());
         }
     }
-
-    private void waitForModelToLoad(String modelId) throws Exception {
-        int maxAttempts = 30;  // Maximum number of attempts
-        int waitTimeInSeconds = 2;  // Time to wait between attempts
-
-        for (int attempt = 0; attempt < maxAttempts; attempt++) {
-            MLModelState state = getModelState(modelId);
-            if (READY_FOR_INFERENCE_STATES.contains(state)) {
-                logger.info("Model {} is now loaded after {} attempts", modelId, attempt + 1);
-                return;
-            }
-            logger.info("Waiting for model {} to load. Current state: {}. Attempt {}/{}", modelId, state, attempt + 1, maxAttempts);
-            Thread.sleep(waitTimeInSeconds * 1000);
-        }
-        throw new RuntimeException("Model " + modelId + " failed to load after " + maxAttempts + " attempts");
-    }
 }