loadtest-controller: make TERMINATE a config instead of a topology

Author: ivchicano

README.md

@@ -157,7 +157,7 @@ Define multiple test scenarios that run sequentially. Each test case can have th
 
 | Property                   | Required | Default   | Description                                                                                                |
 | -------------------------- | -------- | --------- | ---------------------------------------------------------------------------------------------------------- |
-| `topology`                 | **Yes**  | -         | `N:N`, `N:M`, `TEACHING`, `ONE_SESSION`, or `TERMINATE`                                                    |
+| `topology`                 | **Yes**  | -         | `N:N`, `N:M`, `TEACHING`, or `ONE_SESSION`                                                                 |
 | `participants`             | **Yes**  | -         | List of participant counts (e.g., `["2", "10"]`). Each element of the list will create a new test scenario |
 | `sessions`                 | **Yes**  | -         | Number of sessions or `infinite`                                                                           |
 | `browser`                  | No       | `chrome`  | Browser to use: `chrome` or `firefox`                                                                      |
@@ -176,7 +176,6 @@ Define multiple test scenarios that run sequentially. Each test case can have th
 | `N:M`         | N publishers, M subscribers            | `"5:50"` |
 | `TEACHING`    | Publisher with audio-only subscribers  | `"2:30"` |
 | `ONE_SESSION` | Single session with N participants     | `"100"`  |
-| `TERMINATE`   | Terminate all EC2 instances            | (none)   |
 
 ### Workers
 
@@ -208,6 +207,7 @@ Configuration for where browsers run. Workers can be manually provided and manag
 | `availabilityZone` | No       | `us-east-1f` | AWS availability zone                                            |
 | `workersAtStart`   | No       | `0`          | Number of instances to start the test with                       |
 | `rampUpWorkers`    | No       | `0`          | Workers instances to add when the test runs out of existing ones |
+| `terminateWorkers` | No       | _true_       | Whether to terminate EC2 instances after test completion         |
 
 ### Distribution
 

config/config-all.yaml

@@ -23,7 +23,7 @@ session:
 
 # ---------- Test Cases ----------
 # Each test case defines a load test scenario to run sequentially.
-# After all test cases complete, the load test ends (or TERMINATE terminates workers).
+# After all test cases complete, the load test ends.
 testcases:
   - topology: N:N
     participants:
@@ -58,6 +58,7 @@ aws:
   availabilityZone: us-east-1f
   workersAtStart: 0
   rampUpWorkers: 0
+  terminateWorkers: true
 
 # ---------- Participant Distribution ----------
 distribution:

loadtest-controller/src/main/java/io/openvidu/loadtest/config/LoadTestConfig.java

@@ -412,7 +412,9 @@ private void initWorkerConfig() {
     private void initAwsAndRecordingConfig() {
         medianodeLoadForStartRecording = asDouble("recording.mediaNodeLoadThreshold");
         recordingSessionGroup = asInt("recording.sessionsGroupSize");
-        terminateWorkers = asBoolean("terminateWorkers");
+        // Default terminateWorkers to true when AWS is configured (no worker URLs), false for local workers
+        Boolean terminateWorkersConfig = asBoolean("terminateWorkers");
+        terminateWorkers = terminateWorkersConfig != null ? terminateWorkersConfig : workerUrlList.isEmpty();
         awsSecretAccessKey = asOptionalString("aws.secretAccessKey");
         awsAccessKey = asOptionalString("aws.accessKey");
         s3bucketName = asOptionalString("storage.bucket");

loadtest-controller/src/main/java/io/openvidu/loadtest/models/testcase/TestCase.java

@@ -62,10 +62,6 @@ public boolean isOneSession() {
         return this.topology.getValue().equals(Topology.ONE_SESSION.getValue());
     }
 
-    public boolean isTerminate() {
-        return this.topology.getValue().equals(Topology.TERMINATE.getValue());
-    }
-
     public Topology getTopology() {
         return topology;
     }

loadtest-controller/src/main/java/io/openvidu/loadtest/models/testcase/Topology.java

@@ -8,9 +8,7 @@ public enum Topology {
 
     TEACHING("TEACHING", "TEACHING"),
 
-    ONE_SESSION("ONE_SESSION", "One session with N publishers or X:M subscribers"),
-
-    TERMINATE("TERMINATE", "Terminate all Ec2 instances launched");
+    ONE_SESSION("ONE_SESSION", "One session with N publishers or X:M subscribers");
 
     private String value;
     private String description;

loadtest-controller/src/main/java/io/openvidu/loadtest/services/core/LoadTestTopologyOrchestrator.java

@@ -36,12 +36,6 @@ private interface TestInvocation {
 
     void startLoadTests(List<TestCase> testCasesList) {
 
-        if (loadTestConfig.isTerminateWorkers()) {
-            log.info("Terminate all EC2 instances");
-            loadTestService.terminateAllInstances();
-            return;
-        }
-
         kibanaClient.importDashboards();
 
         if (!loadTestService.hasInitialWorkersAvailable()) {
@@ -50,6 +44,11 @@ void startLoadTests(List<TestCase> testCasesList) {
         }
 
         testCasesList.forEach(this::runTestCase);
+
+        if (loadTestConfig.isTerminateWorkers()) {
+            log.info("Terminate all EC2 instances");
+            loadTestService.terminateAllInstances();
+        }
     }
 
     private void runTestCase(TestCase testCase) {
@@ -59,9 +58,6 @@ private void runTestCase(TestCase testCase) {
             runNxMCase(testCase);
         } else if (testCase.isOneSession()) {
             runOneSessionCase(testCase);
-        } else if (testCase.isTerminate() && loadTestService.isProdMode()) {
-            log.info("TERMINATE topology. Terminate all EC2 instances");
-            loadTestService.terminateAllInstances();
         } else {
             log.error("Test case has wrong topology, SKIPPED.");
         }

loadtest-controller/src/main/java/io/openvidu/loadtest/utils/DataIO.java

@@ -128,11 +128,6 @@ private List<TestCase> convertMapListToTestCasesList(List<Map<String, Object>> t
     private TestCase parseTestCase(Map<String, Object> element) {
         String topology = parseTopology(element);
 
-        if (topology.equalsIgnoreCase(Topology.TERMINATE.getValue())) {
-            return new TestCase(topology, new ArrayList<>(), 0, 30, Resolution.MEDIUM,
-                    OpenViduRecordingMode.NONE, false, false, true, Browser.CHROME);
-        }
-
         List<String> participants = parseParticipants(element);
         int sessions = parseSessions(element);
         int frameRate = parseFrameRate(element);