Addressing martin comments

Signed-off-by: Varun Jain <[email protected]>
opensearch-project · Dec 28, 2023 · de02df2 · de02df2
1 parent 88823b3
commit de02df2
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearch.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearch.java
@@ -47,6 +47,8 @@ public void testSemanticSearch() throws Exception{
             assertNotNull(pipeline);
             String modelId=getModelId(pipeline, TEXT_EMBEDDING_PROCESSOR);
             validateTestIndex(modelId);
+            deletePipeline(PIPELINE_NAME);
+            deleteModel(modelId);
             deleteIndex(testIndex);
         }
     }

diff --git a/qa/restart-upgrade/src/test/resources/processor/IndexMappings.json b/qa/restart-upgrade/src/test/resources/processor/IndexMappings.json
@@ -6,8 +6,8 @@
       "refresh_interval": "30s",
       "default_pipeline": "%s"
     },
-    "number_of_shards": 1,
-    "number_of_replicas": 0
+    "number_of_shards": 6,
+    "number_of_replicas": 2
   },
   "mappings": {
     "properties": {

diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearch.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/SemanticSearch.java
@@ -57,6 +57,8 @@ public void testSemanticSearch() throws Exception{
                 int totalDocsCountUpgraded=3*NUM_DOCS;
                 addDocument(testIndex, "2",TEST_FIELD,TEXT_UPGRADED);
                 validateTestIndexOnUpgrade(totalDocsCountUpgraded, modelId, TEXT_UPGRADED);
+                deletePipeline(PIPELINE_NAME);
+                deleteModel(modelId);
                 deleteIndex(testIndex);
                 break;
         }

diff --git a/qa/rolling-upgrade/src/test/resources/processor/IndexMappings.json b/qa/rolling-upgrade/src/test/resources/processor/IndexMappings.json
@@ -6,8 +6,8 @@
       "refresh_interval": "30s",
       "default_pipeline": "%s"
     },
-    "number_of_shards": 1,
-    "number_of_replicas": 0
+    "number_of_shards": 6,
+    "number_of_replicas": 2
   },
   "mappings": {
     "properties": {

diff --git a/src/testFixtures/java/org/opensearch/neuralsearch/BaseNeuralSearchIT.java b/src/testFixtures/java/org/opensearch/neuralsearch/BaseNeuralSearchIT.java
@@ -828,6 +828,11 @@ protected void waitForClusterHealthGreen(String numOfNodes) throws IOException {
 
     /**
      * Add a single Doc to an index
+     *
+     * @param index name of the index
+     * @param docId
+     * @param fieldName name of the field
+     * @param text to be added
      */
     protected void addDocument(String index, String docId, String fieldName, String text) throws IOException {
         Request request = new Request("PUT", "/" + index + "/_doc/" + docId + "?refresh=true");
@@ -843,6 +848,7 @@ protected void addDocument(String index, String docId, String fieldName, String
 
     /**
     * Get ingest pipeline
+    * @param pipelineName of the ingest pipeline
     */
     @SneakyThrows
     protected Map<String, Object> getIngestionPipeline(String pipelineName) {
@@ -854,6 +860,21 @@ protected Map<String, Object> getIngestionPipeline(String pipelineName) {
         return (Map<String, Object>) responseMap.get(pipelineName);
     }
 
+    /**
+     * Delete pipeline
+     *
+     * @param pipelineName of the pipeline
+     */
+    @SneakyThrows
+    protected Map<String, Object> deletePipeline(String pipelineName) {
+        Request request = new Request("DELETE", "/_ingest/pipeline/" + pipelineName);
+        Response response = client().performRequest(request);
+        assertEquals(request.getEndpoint() + ": failed", RestStatus.OK, RestStatus.fromCode(response.getStatusLine().getStatusCode()));
+        String responseBody = EntityUtils.toString(response.getEntity());
+        Map<String, Object> responseMap = createParser(XContentType.JSON.xContent(), responseBody).map();
+        return responseMap;
+    }
+
     /**
      * Enumeration for types of pipeline processors, used to lookup resources like create
      * processor request as those are type specific