From 7b8a443eac36ee5fb9c397a0e0ca8a85959bf6e8 Mon Sep 17 00:00:00 2001
From: Arpit Bandejiya <abandeji@amazon.com>
Date: Wed, 10 Jul 2024 14:03:24 +0530
Subject: [PATCH] fix tests

Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>
---
 .../gateway/remote/model/RemoteRoutingTableBlobStore.java | 1 +
 .../remote/routingtable/RemoteIndexRoutingTable.java      | 8 ++------
 .../routing/remote/RemoteRoutingTableServiceTests.java    | 4 +++-
 .../gateway/remote/RemoteClusterStateServiceTests.java    | 7 ++++---
 .../remote/routingtable/RemoteIndexRoutingTableTests.java | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteRoutingTableBlobStore.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteRoutingTableBlobStore.java
index ecadb3159bb9f..6a2d9c29b4d81 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteRoutingTableBlobStore.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteRoutingTableBlobStore.java
@@ -81,6 +81,7 @@ public BlobPath getBlobPathForUpload(final AbstractRemoteWritableBlobEntity<Inde
             .add("cluster-state")
             .add(obj.clusterUUID())
             .add(INDEX_ROUTING_TABLE);
+
         BlobPath path = pathType.path(
             RemoteStorePathStrategy.PathInput.builder()
                 .basePath(indexRoutingPath)
diff --git a/server/src/main/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTable.java b/server/src/main/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTable.java
index 94af4c3c22d32..b656386c360fe 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTable.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTable.java
@@ -68,17 +68,13 @@ public RemoteIndexRoutingTable(String blobName, String clusterUUID, Compressor c
         this.blobName = blobName;
     }
 
-    public IndexRoutingTable getIndexRoutingTable() {
-        return indexRoutingTable;
-    }
-
     public Index getIndex() {
         return index;
     }
 
     @Override
     public BlobPathParameters getBlobPathParameters() {
-        return new BlobPathParameters(List.of(indexRoutingTable.getIndex().getUUID()));
+        return new BlobPathParameters(List.of(indexRoutingTable.getIndex().getUUID()), INDEX_ROUTING_FILE);
     }
 
     @Override
@@ -91,7 +87,7 @@ public String generateBlobFileName() {
         if (blobFileName == null) {
             blobFileName = String.join(
                 DELIMITER,
-                INDEX_ROUTING_FILE,
+                getBlobPathParameters().getFilePrefix(),
                 RemoteStoreUtils.invertLong(term),
                 RemoteStoreUtils.invertLong(version),
                 RemoteStoreUtils.invertLong(System.currentTimeMillis())
diff --git a/server/src/test/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableServiceTests.java b/server/src/test/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableServiceTests.java
index e287fb9799d1d..82040f2c64244 100644
--- a/server/src/test/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableServiceTests.java
+++ b/server/src/test/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableServiceTests.java
@@ -63,6 +63,8 @@
 import static org.opensearch.gateway.remote.ClusterMetadataManifestTests.randomUploadedIndexMetadataList;
 import static org.opensearch.gateway.remote.RemoteClusterStateUtils.DELIMITER;
 import static org.opensearch.gateway.remote.RemoteClusterStateUtils.PATH_DELIMITER;
+import static org.opensearch.gateway.remote.routingtable.RemoteIndexRoutingTable.INDEX_ROUTING_FILE;
+import static org.opensearch.gateway.remote.routingtable.RemoteIndexRoutingTable.INDEX_ROUTING_METADATA_PREFIX;
 import static org.opensearch.gateway.remote.routingtable.RemoteIndexRoutingTable.INDEX_ROUTING_TABLE;
 import static org.opensearch.gateway.remote.routingtable.RemoteIndexRoutingTable.INDEX_ROUTING_TABLE_FORMAT;
 import static org.opensearch.gateway.remote.routingtable.RemoteIndexRoutingTable.INDEX_ROUTING_TABLE_PREFIX;
@@ -577,7 +579,7 @@ public void testGetAsyncIndexRoutingWriteAction() throws Exception {
         assertNotNull(listener.getResult());
         ClusterMetadataManifest.UploadedMetadata uploadedMetadata = listener.getResult();
 
-        assertEquals(INDEX_ROUTING_TABLE_PREFIX + indexName, uploadedMetadata.getComponent());
+        assertEquals(INDEX_ROUTING_METADATA_PREFIX + indexName, uploadedMetadata.getComponent());
         String uploadedFileName = uploadedMetadata.getUploadedFilename();
         String[] pathTokens = uploadedFileName.split(PATH_DELIMITER);
         assertEquals(8, pathTokens.length);
diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java
index 3683c93cc99e4..337069c15b0d2 100644
--- a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java
+++ b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java
@@ -142,6 +142,7 @@
 import static org.opensearch.gateway.remote.model.RemotePersistentSettingsMetadata.SETTING_METADATA;
 import static org.opensearch.gateway.remote.model.RemoteTemplatesMetadata.TEMPLATES_METADATA;
 import static org.opensearch.gateway.remote.model.RemoteTemplatesMetadata.TEMPLATES_METADATA_FORMAT;
+import static org.opensearch.gateway.remote.routingtable.RemoteIndexRoutingTable.INDEX_ROUTING_METADATA_PREFIX;
 import static org.opensearch.gateway.remote.routingtable.RemoteIndexRoutingTable.INDEX_ROUTING_TABLE;
 import static org.opensearch.gateway.remote.model.RemoteTemplatesMetadataTests.getTemplatesMetadata;
 import static org.opensearch.gateway.remote.model.RemoteTransientSettingsMetadata.TRANSIENT_SETTING_METADATA;
@@ -2605,7 +2606,7 @@ public void testWriteFullMetadataSuccessWithRoutingTable() throws IOException {
             "test-index",
             "index-uuid",
             "routing-filename",
-            INDEX_ROUTING_TABLE + CUSTOM_DELIMITER
+            INDEX_ROUTING_METADATA_PREFIX
         );
         final ClusterMetadataManifest expectedManifest = ClusterMetadataManifest.builder()
             .indices(List.of(uploadedIndexMetadata))
@@ -2656,7 +2657,7 @@ public void testWriteFullMetadataInParallelSuccessWithRoutingTable() throws IOEx
             "test-index",
             "index-uuid",
             "routing-filename",
-            INDEX_ROUTING_TABLE + CUSTOM_DELIMITER
+            INDEX_ROUTING_METADATA_PREFIX
         );
 
         final ClusterMetadataManifest expectedManifest = ClusterMetadataManifest.builder()
@@ -2711,7 +2712,7 @@ public void testWriteIncrementalMetadataSuccessWithRoutingTable() throws IOExcep
             "test-index",
             "index-uuid",
             "routing-filename",
-            INDEX_ROUTING_TABLE + CUSTOM_DELIMITER
+            INDEX_ROUTING_METADATA_PREFIX
         );
         final ClusterMetadataManifest expectedManifest = ClusterMetadataManifest.builder()
             .indices(List.of(uploadedIndexMetadata))
diff --git a/server/src/test/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTableTests.java b/server/src/test/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTableTests.java
index dee32c64e1327..43a1d6fdcb4eb 100644
--- a/server/src/test/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTableTests.java
+++ b/server/src/test/java/org/opensearch/gateway/remote/routingtable/RemoteIndexRoutingTableTests.java
@@ -273,7 +273,7 @@ public void testGetUploadedMetadata() throws IOException {
             try (InputStream inputStream = remoteObjectForUpload.serialize()) {
                 remoteObjectForUpload.setFullBlobName(new BlobPath().add(TEST_BLOB_PATH));
                 ClusterMetadataManifest.UploadedMetadata uploadedMetadata = remoteObjectForUpload.getUploadedMetadata();
-                String expectedPrefix = String.join(CUSTOM_DELIMITER, INDEX_ROUTING_TABLE, indexRoutingTable.getIndex().getName());
+                String expectedPrefix = INDEX_ROUTING_TABLE_PREFIX + indexRoutingTable.getIndex().getName();
                 assertThat(uploadedMetadata.getComponent(), is(expectedPrefix));
                 assertThat(uploadedMetadata.getUploadedFilename(), is(remoteObjectForUpload.getFullBlobName()));
             } catch (IOException e) {