From d0f621b65874c596d720ff3ad5a28c2fe13dbf1a Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Sun, 15 May 2022 15:23:52 -0700 Subject: [PATCH 1/2] Replace 'master' terminology with 'cluster manager' in 'plugins' directory Signed-off-by: Tianli Feng --- .../test/discovery_azure_classic/10_basic.yml | 6 +++--- .../discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java | 2 +- .../rest-api-spec/test/discovery_ec2/10_basic.yml | 6 +++--- .../org/opensearch/discovery/gce/GceDiscoverTests.java | 8 ++++---- .../rest-api-spec/test/discovery_gce/10_basic.yml | 6 +++--- .../test/custom-significance-heuristic/10_basic.yml | 6 +++--- .../rest-api-spec/test/custom-suggester/10_basic.yml | 6 +++--- .../rest-api-spec/test/painless_whitelist/10_basic.yml | 6 +++--- .../rest-api-spec/test/example-rescore/10_basic.yml | 6 +++--- .../rest-api-spec/test/script_expert_scoring/10_basic.yml | 6 +++--- .../rest-api-spec/test/ingest_attachment/10_basic.yml | 6 +++--- .../rest-api-spec/test/repository_azure/10_basic.yml | 6 +++--- .../rest-api-spec/test/repository_gcs/10_basic.yml | 6 +++--- .../rest-api-spec/test/hdfs_repository/10_basic.yml | 6 +++--- .../test/secure_hdfs_repository/10_basic.yml | 6 +++--- .../rest-api-spec/test/repository_s3/10_basic.yml | 6 +++--- .../resources/rest-api-spec/test/store_smb/10_basic.yml | 6 +++--- 17 files changed, 50 insertions(+), 50 deletions(-) diff --git a/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml b/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml index 39aa9929f8a92..adcc6e063d2b8 100644 --- a/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml +++ b/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: discovery-azure-classic } } + - contains: { nodes.$cluster_manager.plugins: { name: discovery-azure-classic } } diff --git a/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java b/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java index 453ea2b3268a8..659bec0c6e89e 100644 --- a/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java +++ b/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java @@ -48,7 +48,7 @@ */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0) public class Ec2DiscoveryUpdateSettingsTests extends AbstractAwsTestCase { - public void testMinimumMasterNodesStart() { + public void testMinimumClusterManagerNodesStart() { Settings nodeSettings = Settings.builder().put(DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING.getKey(), "ec2").build(); internalCluster().startNode(nodeSettings); diff --git a/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml b/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml index ba51c623fe888..0c2c03da941d5 100644 --- a/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml +++ b/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: discovery-ec2 } } + - contains: { nodes.$cluster_manager.plugins: { name: discovery-ec2 } } diff --git a/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java b/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java index 60293614254c5..d5682940ccfee 100644 --- a/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java +++ b/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java @@ -85,11 +85,11 @@ protected Settings nodeSettings(int nodeOrdinal) { } public void testJoin() { - // start master node - final String masterNode = internalCluster().startClusterManagerOnlyNode(); - registerGceNode(masterNode); + // start cluster-manager node + final String clusterManagerNode = internalCluster().startClusterManagerOnlyNode(); + registerGceNode(clusterManagerNode); - ClusterStateResponse clusterStateResponse = client(masterNode).admin() + ClusterStateResponse clusterStateResponse = client(clusterManagerNode).admin() .cluster() .prepareState() .setMasterNodeTimeout("1s") diff --git a/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml b/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml index a5379c2c68bed..d55511d082da8 100644 --- a/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml +++ b/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: discovery-gce } } + - contains: { nodes.$cluster_manager.plugins: { name: discovery-gce } } diff --git a/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml b/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml index 620aa393a6b5b..c0eed88eecf9a 100644 --- a/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml +++ b/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml @@ -5,12 +5,12 @@ reason: "contains is a newly added assertion" features: contains - # Get master node id + # Get cluster-manager node id - do: cluster.state: {} - - set: { master_node: master } + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: custom-significance-heuristic } } + - contains: { nodes.$cluster_manager.plugins: { name: custom-significance-heuristic } } diff --git a/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml b/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml index ed8d0f78a092b..0517373daa166 100644 --- a/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml +++ b/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: custom-suggester } } + - contains: { nodes.$cluster_manager.plugins: { name: custom-suggester } } diff --git a/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml b/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml index cc3762eb42d68..1443b03e214f0 100644 --- a/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml +++ b/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: painless-whitelist } } + - contains: { nodes.$cluster_manager.plugins: { name: painless-whitelist } } diff --git a/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml b/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml index f0d0bcb35fad9..19f7154554a86 100644 --- a/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml +++ b/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: example-rescore } } + - contains: { nodes.$cluster_manager.plugins: { name: example-rescore } } diff --git a/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml b/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml index 70842d5e767e5..abf1ecc35381d 100644 --- a/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml +++ b/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: script-expert-scoring } } + - contains: { nodes.$cluster_manager.plugins: { name: script-expert-scoring } } diff --git a/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml b/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml index 88f6f33ad0a66..8154745eb4812 100644 --- a/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml +++ b/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml @@ -5,10 +5,10 @@ - do: cluster.state: {} - - set: {master_node: master} + - set: {master_node: cluster_manager} - do: nodes.info: {} - - contains: { 'nodes.$master.plugins': { name: ingest-attachment } } - - contains: { 'nodes.$master.ingest.processors': { type: attachment } } + - contains: { 'nodes.$cluster_manager.plugins': { name: ingest-attachment } } + - contains: { 'nodes.$cluster_manager.ingest.processors': { type: attachment } } diff --git a/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml b/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml index fe21a295e37bb..0c908c46ffd56 100644 --- a/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml +++ b/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: repository-azure } } + - contains: { nodes.$cluster_manager.plugins: { name: repository-azure } } diff --git a/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml b/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml index 072836280b3bc..07016c68e34cd 100644 --- a/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml +++ b/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: repository-gcs } } + - contains: { nodes.$cluster_manager.plugins: { name: repository-gcs } } diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml index bc419d75ba773..6a15b2bbcf182 100644 --- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml +++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml @@ -9,13 +9,13 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: repository-hdfs } } + - contains: { nodes.$cluster_manager.plugins: { name: repository-hdfs } } --- # # Check that we can't use file:// repositories or anything like that diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml index bc419d75ba773..6a15b2bbcf182 100644 --- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml +++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml @@ -9,13 +9,13 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: repository-hdfs } } + - contains: { nodes.$cluster_manager.plugins: { name: repository-hdfs } } --- # # Check that we can't use file:// repositories or anything like that diff --git a/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml b/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml index cde14321805f5..4810033fd5bc0 100644 --- a/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml +++ b/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: repository-s3 } } + - contains: { nodes.$cluster_manager.plugins: { name: repository-s3 } } diff --git a/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml b/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml index 8956b3a8c116f..6a813be22287e 100644 --- a/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml +++ b/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml @@ -7,10 +7,10 @@ - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { master_node: cluster_manager } - do: nodes.info: {} - - contains: { nodes.$master.plugins: { name: store-smb } } + - contains: { nodes.$cluster_manager.plugins: { name: store-smb } } From 2ea0e94e4f685b9ae9658cff602ffea46c24d34a Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Sun, 15 May 2022 22:03:36 -0700 Subject: [PATCH 2/2] Replace master_node with cluster_manager_node in cluster.state API test Signed-off-by: Tianli Feng --- .../rest-api-spec/test/discovery_azure_classic/10_basic.yml | 2 +- .../resources/rest-api-spec/test/discovery_ec2/10_basic.yml | 2 +- .../resources/rest-api-spec/test/discovery_gce/10_basic.yml | 2 +- .../test/custom-significance-heuristic/10_basic.yml | 2 +- .../resources/rest-api-spec/test/custom-suggester/10_basic.yml | 2 +- .../rest-api-spec/test/painless_whitelist/10_basic.yml | 2 +- .../resources/rest-api-spec/test/example-rescore/10_basic.yml | 2 +- .../rest-api-spec/test/script_expert_scoring/10_basic.yml | 2 +- .../resources/rest-api-spec/test/ingest_attachment/10_basic.yml | 2 +- .../resources/rest-api-spec/test/repository_azure/10_basic.yml | 2 +- .../resources/rest-api-spec/test/repository_gcs/10_basic.yml | 2 +- .../resources/rest-api-spec/test/hdfs_repository/10_basic.yml | 2 +- .../rest-api-spec/test/secure_hdfs_repository/10_basic.yml | 2 +- .../resources/rest-api-spec/test/repository_s3/10_basic.yml | 2 +- .../resources/rest-api-spec/test/store_smb/10_basic.yml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml b/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml index adcc6e063d2b8..73523d17bbfb9 100644 --- a/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml +++ b/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml b/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml index 0c2c03da941d5..f91565c5d204b 100644 --- a/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml +++ b/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml b/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml index d55511d082da8..828e006ae822d 100644 --- a/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml +++ b/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml b/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml index c0eed88eecf9a..5cd56683f427d 100644 --- a/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml +++ b/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml @@ -8,7 +8,7 @@ # Get cluster-manager node id - do: cluster.state: {} - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml b/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml index 0517373daa166..0ef1d4a0679d7 100644 --- a/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml +++ b/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml b/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml index 1443b03e214f0..fab9789eeec10 100644 --- a/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml +++ b/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml b/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml index 19f7154554a86..00c5977529c6c 100644 --- a/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml +++ b/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml b/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml index abf1ecc35381d..d65943f0201b3 100644 --- a/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml +++ b/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml b/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml index 8154745eb4812..09075e0573fbe 100644 --- a/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml +++ b/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml @@ -5,7 +5,7 @@ - do: cluster.state: {} - - set: {master_node: cluster_manager} + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml b/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml index 0c908c46ffd56..caec0a89101b4 100644 --- a/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml +++ b/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml b/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml index 07016c68e34cd..265b4e2fecfc7 100644 --- a/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml +++ b/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml index 6a15b2bbcf182..eedcaf099ccef 100644 --- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml +++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml @@ -10,7 +10,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml index 6a15b2bbcf182..eedcaf099ccef 100644 --- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml +++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml @@ -10,7 +10,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml b/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml index 4810033fd5bc0..b35366d904263 100644 --- a/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml +++ b/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {} diff --git a/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml b/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml index 6a813be22287e..d358c8980d245 100644 --- a/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml +++ b/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml @@ -8,7 +8,7 @@ cluster.state: {} # Get cluster-manager node id - - set: { master_node: cluster_manager } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: {}