rename provision_config_instances to cluster-configs

Signed-off-by: Chinmay Gadgil <[email protected]> renamed provision_config_instances directory Signed-off-by: Chinmay Gadgil <[email protected]> renamed pending provision_config_instance to cluster_config Signed-off-by: Chinmay Gadgil <[email protected]> renamed provision-config-path,repostiry and revision to cluster-config-path,repository and revision respectively renamed provision_config_instance_types to cluster_config_types Signed-off-by: Chinmay Gadgil <[email protected]> renamed provision_config_instance_descriptor to cluster_config_descriptor Signed-off-by: Chinmay Gadgil <[email protected]>
opensearch-project · Nov 5, 2023 · 385ff96 · 385ff96
1 parent a0adc90
commit 385ff96
Show file tree

Hide file tree

Showing 112 changed files with 516 additions and 516 deletions.
diff --git a/docs/api/execute-test.md b/docs/api/execute-test.md
@@ -61,9 +61,9 @@ Execute the `nyc_taxis` workload against an existing OpenSearch cluster with the
 Argument | Description | Required
 :--- | :--- |:---
 `distribution-version` | Define the version of the OpenSearch distribution to download. Check https://opensearch.org/docs/version-history/ for released versions. | No
-`provision-config-path` | Define the path to the provision_config_instance and plugin configurations to use. | No
-`provision-config-repository` | Define repository from where Benchmark will load provision_configs and provision_config_instances (default: `default`). | No
-`provision-config-revision` | Define a specific revision in the provision_config repository that Benchmark should use. | No
+`cluster-config-path` | Define the path to the cluster-configs and plugin configurations to use. | No
+`cluster-config-repository` | Define repository from where Benchmark will load cluster-configs (default: `default`). | No
+`cluster-config-revision` | Define a specific revision in the cluster-config repository that Benchmark should use. | No
 `test-execution-id` | Define a unique id for this test_execution. | No
 `pipeline` | Select the pipeline to run. | No
 `revision` | Define the source code revision for building the benchmark candidate. 'current' uses the source tree as is, 'latest' fetches the latest version on main. It is also possible to specify a commit id or an ISO timestamp. The timestamp must be specified as: "@ts" where "ts" must be a valid ISO 8601 timestamp, e.g. "@2013-07-27T10:37:00Z" (default: `current`). | No
@@ -73,8 +73,8 @@ Argument | Description | Required
 `workload` | Define the workload to use. List possible workloads with `opensearch-benchmark list workloads`. | No
 `workload-params` | Define a comma-separated list of key:value pairs that are injected verbatim to the workload as variables. | No
 `test-procedure` | Define the test_procedure to use. List possible test_procedures for workloads with `opensearch-benchmark list workloads`. | No
-`provision-config-instance` | Define the provision_config_instance to use. List possible provision_config_instances with `opensearch-benchmark list provision_config_instances` (default: `defaults`). | No
-`provision-config-instance-params` | Define a comma-separated list of key:value pairs that are injected verbatim as variables for the provision_config_instance. | No
+`cluster-config` | Define the cluster-config to use. List possible cluster-configs with `opensearch-benchmark list cluster-configs` (default: `defaults`). | No
+`provision-config-instance-params` | Define a comma-separated list of key:value pairs that are injected verbatim as variables for the cluster-config. | No
 `runtime-jdk` | The major version of the runtime JDK to use. | No
 `opensearch-plugins` | Define the OpenSearch plugins to install. (default: install no plugins). | No
 `plugin-params` | Define a comma-separated list of key:value pairs that are injected verbatim to all plugins as variables. | No

diff --git a/it/__init__.py b/it/__init__.py
@@ -162,19 +162,19 @@ def __init__(self, cfg):
         self.installation_id = None
         self.http_port = None
 
-    def install(self, distribution_version, node_name, provision_config_instance, http_port):
+    def install(self, distribution_version, node_name, cluster_config, http_port):
         self.http_port = http_port
         transport_port = http_port + 100
         try:
             err, retcode = process.run_subprocess_with_stderr(
                 "opensearch-benchmark install --configuration-name={cfg} --distribution-version={dist} --build-type=tar "
                 "--http-port={http_port} --node={node_name} --master-nodes="
-                "{node_name} --provision-config-instance={provision_config_instance} "
+                "{node_name} --cluster-config={cluster_config} "
                 "--seed-hosts=\"127.0.0.1:{transport_port}\"".format(cfg=self.cfg,
                                                                      dist=distribution_version,
                                                                      http_port=http_port,
                                                                      node_name=node_name,
-                                                                     provision_config_instance=provision_config_instance,
+                                                                     cluster_config=cluster_config,
                                                                      transport_port=transport_port))
             if retcode != 0:
                 raise AssertionError("Failed to install OpenSearch {}.".format(distribution_version), err)
@@ -207,7 +207,7 @@ def __init__(self):
     def start(self):
         self.cluster.install(distribution_version=OsMetricsStore.VERSION,
                              node_name="metrics-store",
-                             provision_config_instance="defaults",
+                             cluster_config="defaults",
                              http_port=10200)
         self.cluster.start(test_execution_id="metrics-store")
 

diff --git a/it/distribution_test.py b/it/distribution_test.py
@@ -32,7 +32,7 @@ def test_tar_distributions(cfg):
         for workload in it.WORKLOADS:
             it.wait_until_port_is_free(port_number=port)
             assert it.execute_test(cfg, f"--distribution-version=\"{dist}\" --workload=\"{workload}\" "
-                                f"--test-mode --provision-config-instance=4gheap --target-hosts=127.0.0.1:{port}") == 0
+                                f"--test-mode --cluster-config=4gheap --target-hosts=127.0.0.1:{port}") == 0
 
 
 @it.random_benchmark_config
@@ -43,4 +43,4 @@ def test_docker_distribution(cfg):
     it.wait_until_port_is_free(port_number=port)
     assert it.execute_test(cfg, f"--pipeline=\"docker\" --distribution-version=\"{dist}\" "
                         f"--workload=\"geonames\" --test-procedure=\"append-no-conflicts-index-only\" --test-mode "
-                        f"--provision-config-instance=4gheap --target-hosts=127.0.0.1:{port}") == 0
+                        f"--cluster-config=4gheap --target-hosts=127.0.0.1:{port}") == 0
diff --git a/it/list_test.py b/it/list_test.py
@@ -31,9 +31,9 @@ def test_list_test_executions(cfg):
 
 
 @it.benchmark_in_mem
-def test_list_provision_config_instances(cfg):
-    assert it.osbenchmark(cfg, "list provision_config_instances") == 0
-    assert it.osbenchmark(cfg, "list provision_config_instances --provision-config-repository=default") == 0
+def test_list_cluster_configs(cfg):
+    assert it.osbenchmark(cfg, "list cluster-configs") == 0
+    assert it.osbenchmark(cfg, "list cluster-configs --cluster-config-repository=default") == 0
 
 
 @it.benchmark_in_mem

diff --git a/it/sources_test.py b/it/sources_test.py
@@ -30,9 +30,9 @@ def test_sources(cfg):
     it.wait_until_port_is_free(port_number=port)
     assert it.execute_test(cfg, f"--pipeline=from-sources --revision=latest \
                            --workload=geonames --test-mode  --target-hosts=127.0.0.1:{port} "
-                        f"--test-procedure=append-no-conflicts --provision-config-instance=4gheap "
+                        f"--test-procedure=append-no-conflicts --cluster-config=4gheap "
                         f"--opensearch-plugins=analysis-icu") == 0
 
     it.wait_until_port_is_free(port_number=port)
     assert it.execute_test(cfg, f"--pipeline=from-sources --workload=geonames --test-mode --target-hosts=127.0.0.1:{port} "
-                        f"--test-procedure=append-no-conflicts-index-only --provision-config-instance=\"4gheap,ea\"") == 0
+                        f"--test-procedure=append-no-conflicts-index-only --cluster-config=\"4gheap,ea\"") == 0
diff --git a/it/tracker_test.py b/it/tracker_test.py
@@ -38,7 +38,7 @@ def test_cluster():
     test_execution_id = str(uuid.uuid4())
 
     it.wait_until_port_is_free(port_number=port)
-    cluster.install(distribution_version=dist, node_name="benchmark-node", provision_config_instance="4gheap", http_port=port)
+    cluster.install(distribution_version=dist, node_name="benchmark-node", cluster_config="4gheap", http_port=port)
     cluster.start(test_execution_id=test_execution_id)
     yield cluster
     cluster.stop()