github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 15:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

[TEST] Use persistent settings in YML tests (#78480)

Browse source 
Use persistent instead of transient settings for various REST
YML tests, because we are deprecating the transient cluster
settings.
This commit is contained in:
Nikola Grcevski 2021-09-30 10:59:58 -04:00 • committed by GitHub
parent c33e340a47
commit 23b74b0e59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 144 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml
View file

@ -235,7 +235,7 @@
- match: { aggregations.cluster.buckets.1.animal_length.value: 15 }
---
"Add transient remote cluster based on the preset cluster":
"Add persistent remote cluster based on the preset cluster":
- do:
cluster.get_settings:
include_defaults: true
@ -246,10 +246,10 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.seeds: $remote_ip
- match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
- match: {persistent: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
- do:
search:
@ -276,10 +276,10 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.seeds: $remote_ip
- match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
- match: {persistent: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
- do:
search:

46
qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/15_connection_mode_configuration.yml
View file

@ -1,5 +1,5 @@
---
"Add transient remote cluster in proxy mode with invalid sniff settings":
"Add persistent remote cluster in proxy mode with invalid sniff settings":
- do:
cluster.get_settings:
include_defaults: true
@ -11,7 +11,7 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: "proxy"
cluster.remote.test_remote_cluster.node_connections: "5"
cluster.remote.test_remote_cluster.proxy_address: $remote_ip
@ -26,7 +26,7 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: "proxy"
cluster.remote.test_remote_cluster.seeds: $remote_ip
cluster.remote.test_remote_cluster.proxy_address: $remote_ip
@ -37,7 +37,7 @@
used with the configured \"cluster.remote.test_remote_cluster.mode\" [required=SNIFF, configured=PROXY]" }
---
"Add transient remote cluster in sniff mode with invalid proxy settings":
"Add persistent remote cluster in sniff mode with invalid proxy settings":
- do:
cluster.get_settings:
include_defaults: true
@ -49,7 +49,7 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.proxy_socket_connections: "20"
cluster.remote.test_remote_cluster.seeds: $remote_ip
@ -63,7 +63,7 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.proxy_address: $remote_ip
cluster.remote.test_remote_cluster.seeds: $remote_ip
@ -73,7 +73,7 @@
used with the configured \"cluster.remote.test_remote_cluster.mode\" [required=PROXY, configured=SNIFF]" }
---
"Add transient remote cluster using proxy connection mode using valid settings":
"Add persistent remote cluster using proxy connection mode using valid settings":
- do:
cluster.get_settings:
include_defaults: true
@ -84,14 +84,14 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: "proxy"
cluster.remote.test_remote_cluster.proxy_socket_connections: "3"
cluster.remote.test_remote_cluster.proxy_address: $remote_ip
- match: {transient.cluster\.remote\.test_remote_cluster\.mode: "proxy"}
- match: {transient.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "3"}
- match: {transient.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip}
- match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "proxy"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "3"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip}
- do:
search:
@ -107,7 +107,7 @@
- match: { hits.hits.0._index: "test_remote_cluster:test_index" }
---
"Add transient remote cluster using sniff connection mode using valid settings":
"Add persistent remote cluster using sniff connection mode using valid settings":
- do:
cluster.get_settings:
include_defaults: true
@ -118,14 +118,14 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: "sniff"
cluster.remote.test_remote_cluster.node_connections: "3"
cluster.remote.test_remote_cluster.seeds: $remote_ip
- match: {transient.cluster\.remote\.test_remote_cluster\.mode: "sniff"}
- match: {transient.cluster\.remote\.test_remote_cluster\.node_connections: "3"}
- match: {transient.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip}
- match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "sniff"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.node_connections: "3"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip}
- do:
search:
@ -152,12 +152,12 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: "sniff"
cluster.remote.test_remote_cluster.seeds: $remote_ip
- match: {transient.cluster\.remote\.test_remote_cluster\.mode: "sniff"}
- match: {transient.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip}
- match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "sniff"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip}
- do:
search:
@ -177,7 +177,7 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: "proxy"
cluster.remote.test_remote_cluster.proxy_address: $remote_ip
@ -190,13 +190,13 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: "proxy"
cluster.remote.test_remote_cluster.seeds: null
cluster.remote.test_remote_cluster.proxy_address: $remote_ip
- match: {transient.cluster\.remote\.test_remote_cluster\.mode: "proxy"}
- match: {transient.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip}
- match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "proxy"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip}
- do:
search:

38
qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
View file

@ -10,7 +10,7 @@
- match: { my_remote_cluster.mode: "sniff" }
---
"Add transient remote cluster based on the preset cluster and check remote info":
"Add persistent remote cluster based on the preset cluster and check remote info":
- do:
cluster.get_settings:
include_defaults: true
@ -21,14 +21,14 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: "sniff"
cluster.remote.test_remote_cluster.node_connections: "2"
cluster.remote.test_remote_cluster.seeds: $remote_ip
- match: {transient.cluster\.remote\.test_remote_cluster\.mode: "sniff"}
- match: {transient.cluster\.remote\.test_remote_cluster\.node_connections: "2"}
- match: {transient.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip}
- match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "sniff"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.node_connections: "2"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip}
# we do another search here since this will enforce the connection to be established
# otherwise the cluster might not have been connected yet.
@ -65,16 +65,16 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: "proxy"
cluster.remote.test_remote_cluster.seeds: null
cluster.remote.test_remote_cluster.node_connections: null
cluster.remote.test_remote_cluster.proxy_socket_connections: "10"
cluster.remote.test_remote_cluster.proxy_address: $remote_ip
- match: {transient.cluster\.remote\.test_remote_cluster\.mode: "proxy"}
- match: {transient.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "10"}
- match: {transient.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip}
- match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "proxy"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "10"}
- match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip}
- do:
cluster.remote_info: {}
@ -89,7 +89,7 @@
- do:
cluster.put_settings:
body:
transient:
persistent:
cluster.remote.test_remote_cluster.mode: null
cluster.remote.test_remote_cluster.proxy_socket_connections: null
cluster.remote.test_remote_cluster.proxy_address: null
@ -106,10 +106,10 @@
cluster.put_settings:
flat_settings: true
body:
transient:
persistent:
cluster.remote.remote1.seeds: $remote_ip
- match: {transient: {cluster.remote.remote1.seeds: $remote_ip}}
- match: {persistent: {cluster.remote.remote1.seeds: $remote_ip}}
- do:
cluster.remote_info: {}
@ -118,10 +118,10 @@
- do:
cluster.put_settings:
body:
transient:
persistent:
cluster.remote.remote1.skip_unavailable: true
- is_true: transient.cluster.remote.remote1.skip_unavailable
- is_true: persistent.cluster.remote.remote1.skip_unavailable
- do:
cluster.remote_info: {}
@ -131,10 +131,10 @@
- do:
cluster.put_settings:
body:
transient:
persistent:
cluster.remote.remote1.skip_unavailable: false
- is_false: transient.cluster.remote.remote1.skip_unavailable
- is_false: persistent.cluster.remote.remote1.skip_unavailable
- do:
cluster.remote_info: {}
@ -144,10 +144,10 @@
- do:
cluster.put_settings:
body:
transient:
persistent:
cluster.remote.remote1.skip_unavailable: null
- match: {transient: {}}
- match: {persistent: {}}
- do:
cluster.remote_info: {}
@ -157,6 +157,6 @@
- do:
cluster.put_settings:
body:
transient:
persistent:
cluster.remote.remote1.seeds: null
cluster.remote.remote1.skip_unavailable: null