Fixed failing unit tests

Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>

Author: vinaykpud

server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java

@@ -62,6 +62,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.opensearch.cluster.node.DiscoveryNodeRole.SEARCH_ROLE;
 import static org.opensearch.node.NodeRoleSettings.NODE_ROLES_SETTING;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_NODE_ATTRIBUTE_KEY_PREFIX;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.isClusterStateRepoConfigured;
@@ -494,7 +495,7 @@ public boolean isWarmNode() {
      * @return true if the node contains a search role, false otherwise
      */
     public boolean isSearchNode() {
-        return roles.contains(DiscoveryNodeRole.SEARCH_ROLE);
+        return roles.contains(SEARCH_ROLE);
     }
 
     /**

server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeRole.java

@@ -342,7 +342,7 @@ public void validateRole(List<DiscoveryNodeRole> roles) {
      * The built-in node roles.
      */
     public static SortedSet<DiscoveryNodeRole> BUILT_IN_ROLES = Collections.unmodifiableSortedSet(
-        new TreeSet<>(Arrays.asList(DATA_ROLE, INGEST_ROLE, CLUSTER_MANAGER_ROLE, REMOTE_CLUSTER_CLIENT_ROLE, WARM_ROLE))
+        new TreeSet<>(Arrays.asList(DATA_ROLE, INGEST_ROLE, CLUSTER_MANAGER_ROLE, REMOTE_CLUSTER_CLIENT_ROLE, WARM_ROLE, SEARCH_ROLE))
     );
 
     /**

server/src/test/java/org/opensearch/cluster/routing/allocation/FailedShardsRoutingTests.java

@@ -860,11 +860,13 @@ public void testPreferReplicaOnRemoteNodeForPrimaryPromotion() {
             REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY,
             "REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_VALUE"
         );
+        Set<DiscoveryNodeRole> nodeRoles = new HashSet<>(DiscoveryNodeRole.BUILT_IN_ROLES);
+        nodeRoles.remove(DiscoveryNodeRole.SEARCH_ROLE);
         DiscoveryNode remoteNode1 = new DiscoveryNode(
             UUIDs.base64UUID(),
             buildNewFakeTransportAddress(),
             remoteStoreNodeAttributes,
-            DiscoveryNodeRole.BUILT_IN_ROLES,
+            nodeRoles,
             Version.CURRENT
         );
         clusterState = ClusterState.builder(clusterState).nodes(DiscoveryNodes.builder().add(remoteNode1)).build();
@@ -881,18 +883,30 @@ public void testPreferReplicaOnRemoteNodeForPrimaryPromotion() {
             UUIDs.base64UUID(),
             buildNewFakeTransportAddress(),
             remoteStoreNodeAttributes,
-            DiscoveryNodeRole.BUILT_IN_ROLES,
+            nodeRoles,
             Version.CURRENT
         );
         DiscoveryNode remoteNode3 = new DiscoveryNode(
             UUIDs.base64UUID(),
             buildNewFakeTransportAddress(),
             remoteStoreNodeAttributes,
-            DiscoveryNodeRole.BUILT_IN_ROLES,
+            nodeRoles,
+            Version.CURRENT
+        );
+        DiscoveryNode nonRemoteNode1 = new DiscoveryNode(
+            UUIDs.base64UUID(),
+            buildNewFakeTransportAddress(),
+            Map.of(),
+            nodeRoles,
+            Version.CURRENT
+        );
+        DiscoveryNode nonRemoteNode2 = new DiscoveryNode(
+            UUIDs.base64UUID(),
+            buildNewFakeTransportAddress(),
+            Map.of(),
+            nodeRoles,
             Version.CURRENT
         );
-        DiscoveryNode nonRemoteNode1 = new DiscoveryNode(UUIDs.base64UUID(), buildNewFakeTransportAddress(), Version.CURRENT);
-        DiscoveryNode nonRemoteNode2 = new DiscoveryNode(UUIDs.base64UUID(), buildNewFakeTransportAddress(), Version.CURRENT);
         List<DiscoveryNode> replicaShardNodes = List.of(remoteNode2, remoteNode3, nonRemoteNode1, nonRemoteNode2);
 
         for (int i = 0; i < 4; i++) {