From dbb1d3a9e26184d63081d080fdd2bd15b02d4e22 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:35:06 -0500
Subject: [PATCH] add configurable throughput + client params to geopoint,
 geopointshape, geopoint workloads (#424) (#433)

(cherry picked from commit 60b0e52f2c8c92f143597eb9300c9c2195feb2df)

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 geopoint/test_procedures/default.json      | 52 +++++-----------------
 geopointshape/test_procedures/default.json | 26 +++--------
 geoshape/test_procedures/default.json      | 26 +++--------
 3 files changed, 24 insertions(+), 80 deletions(-)

diff --git a/geopoint/test_procedures/default.json b/geopoint/test_procedures/default.json
index 37dff374..62c16d1a 100644
--- a/geopoint/test_procedures/default.json
+++ b/geopoint/test_procedures/default.json
@@ -62,58 +62,30 @@
         {
           "operation": "polygon",
           "warmup-iterations": 200,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 2
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 100,
+          "target-throughput": {{ polygon_target_throughput or target_throughput | default(2) | tojson }},
+          "clients": {{ polygon_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "bbox",
           "warmup-iterations": 200,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 2
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 100,
+          "target-throughput": {{ bbox_target_throughput or target_throughput | default(2) | tojson }},
+          "clients": {{ bbox_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "distance",
           "warmup-iterations": 200,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 5
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 100,
+          "target-throughput": {{ distance_target_throughput or target_throughput | default(5) | tojson }},
+          "clients": {{ distance_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "distanceRange",
           "warmup-iterations": 200,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 0.5
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 100,
+          "target-throughput": {{ distanceRange_target_throughput or target_throughput | default(0.5) | tojson }},
+          "clients": {{ distanceRange_search_clients or search_clients | default(1) }}
         }
       ]
     },
diff --git a/geopointshape/test_procedures/default.json b/geopointshape/test_procedures/default.json
index e5181397..dcf81b33 100644
--- a/geopointshape/test_procedures/default.json
+++ b/geopointshape/test_procedures/default.json
@@ -60,30 +60,16 @@
         {
           "operation": "polygon",
           "warmup-iterations": 200,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 2
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 100,
+          "target-throughput": {{ polygon_target_throughput or target_throughput | default(2) | tojson }},
+          "clients": {{ polygon_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "bbox",
           "warmup-iterations": 200,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 2
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 100,
+          "target-throughput": {{ bbox_target_throughput or target_throughput | default(2) | tojson }},
+          "clients": {{ bbox_search_clients or search_clients | default(1) }}
         }
       ]
     },
diff --git a/geoshape/test_procedures/default.json b/geoshape/test_procedures/default.json
index 06e4e5bd..798eea25 100644
--- a/geoshape/test_procedures/default.json
+++ b/geoshape/test_procedures/default.json
@@ -127,30 +127,16 @@
         {
           "operation": "polygon",
           "warmup-iterations": 200,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 0.3
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 100,
+          "target-throughput": {{ polygon_target_throughput or target_throughput | default(0.3) | tojson }},
+          "clients": {{ polygon_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "bbox",
           "warmup-iterations": 200,
-          "iterations": 100
-          {%- if not target_throughput %}
-          ,"target-throughput": 0.25
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 100,
+          "target-throughput": {{ bbox_target_throughput or target_throughput | default(0.25) | tojson }},
+          "clients": {{ bbox_search_clients or search_clients | default(1) }}
         }
       ]
     }