Remodeling packages

ppgia-unifor · Feb 27, 2024 · 2d3c297 · 2d3c297
1 parent 2899bc1
commit 2d3c297
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 12 deletions.
diff --git a/resilience-bench/operator/.idea/inspectionProfiles/Project_Default.xml b/resilience-bench/operator/.idea/inspectionProfiles/Project_Default.xml
diff --git a/...nce-bench/operator/src/main/java/br/unifor/ppgia/resiliencebench/BenchmarkReconciler.java b/...nce-bench/operator/src/main/java/br/unifor/ppgia/resiliencebench/BenchmarkReconciler.java
@@ -1,5 +1,6 @@
 package br.unifor.ppgia.resiliencebench;
 
+import br.unifor.ppgia.resiliencebench.execution.Scheduler;
 import br.unifor.ppgia.resiliencebench.resources.ExecutionQueueFactory;
 import br.unifor.ppgia.resiliencebench.resources.ScenarioFactory;
 import br.unifor.ppgia.resiliencebench.resources.benchmark.Benchmark;

diff --git a/...cebench/scenarioexec/ScenarioRunner2.java → ...encebench/execution/ScenarioExecutor.java b/...cebench/scenarioexec/ScenarioRunner2.java → ...encebench/execution/ScenarioExecutor.java
@@ -1,5 +1,8 @@
-package br.unifor.ppgia.resiliencebench.scenarioexec;
+package br.unifor.ppgia.resiliencebench.execution;
 
+import br.unifor.ppgia.resiliencebench.execution.steps.IstioFaultStep;
+import br.unifor.ppgia.resiliencebench.execution.steps.IstioRetryStep;
+import br.unifor.ppgia.resiliencebench.execution.steps.K6LoadGeneratorStep;
 import br.unifor.ppgia.resiliencebench.resources.scenario.Scenario;
 import br.unifor.ppgia.resiliencebench.support.CustomResourceRepository;
 import io.fabric8.istio.client.IstioClient;
@@ -10,12 +13,12 @@
 
 import static java.lang.String.format;
 
-public class ScenarioRunner2 {
+public class ScenarioExecutor {
 
   private final KubernetesClient kubernetesClient;
   private final IstioClient istioClient;
 
-  public ScenarioRunner2(KubernetesClient kubernetesClient, IstioClient istioClient) {
+  public ScenarioExecutor(KubernetesClient kubernetesClient, IstioClient istioClient) {
     this.istioClient = istioClient;
     this.kubernetesClient = kubernetesClient;
   }

diff --git a/...ifor/ppgia/resiliencebench/Scheduler.java → .../resiliencebench/execution/Scheduler.java b/...ifor/ppgia/resiliencebench/Scheduler.java → .../resiliencebench/execution/Scheduler.java
@@ -1,9 +1,8 @@
-package br.unifor.ppgia.resiliencebench;
+package br.unifor.ppgia.resiliencebench.execution;
 
 import br.unifor.ppgia.resiliencebench.resources.queue.ExecutionQueue;
 import br.unifor.ppgia.resiliencebench.resources.queue.Item;
 import br.unifor.ppgia.resiliencebench.resources.scenario.Scenario;
-import br.unifor.ppgia.resiliencebench.scenarioexec.ScenarioRunner2;
 import br.unifor.ppgia.resiliencebench.support.CustomResourceRepository;
 import io.fabric8.istio.client.DefaultIstioClient;
 import io.fabric8.kubernetes.api.model.batch.v1.Job;
@@ -66,7 +65,7 @@ private boolean existsJobRunning(String namespace) {
   }
 
   private void createJob(String namespace, Item item) {
-    var runner = new ScenarioRunner2(this.client, new DefaultIstioClient());
+    var runner = new ScenarioExecutor(this.client, new DefaultIstioClient());
     var job = runner.run(namespace, item.getScenario());
     var jobsClient = client.batch().v1().jobs();
     job = jobsClient.resource(job).create();

diff --git a/...iencebench/scenarioexec/ExecutorStep.java → ...cebench/execution/steps/ExecutorStep.java b/...iencebench/scenarioexec/ExecutorStep.java → ...cebench/execution/steps/ExecutorStep.java
@@ -1,4 +1,4 @@
-package br.unifor.ppgia.resiliencebench.scenarioexec;
+package br.unifor.ppgia.resiliencebench.execution.steps;
 
 import br.unifor.ppgia.resiliencebench.resources.scenario.Scenario;
 import io.fabric8.kubernetes.api.model.HasMetadata;

diff --git a/...bench/scenarioexec/IstioExecutorStep.java → ...ch/execution/steps/IstioExecutorStep.java b/...bench/scenarioexec/IstioExecutorStep.java → ...ch/execution/steps/IstioExecutorStep.java
@@ -1,4 +1,4 @@
-package br.unifor.ppgia.resiliencebench.scenarioexec;
+package br.unifor.ppgia.resiliencebench.execution.steps;
 
 import br.unifor.ppgia.resiliencebench.resources.scenario.Scenario;
 import br.unifor.ppgia.resiliencebench.resources.service.ResilientService;

diff --git a/...ncebench/scenarioexec/IstioFaultStep.java → ...bench/execution/steps/IstioFaultStep.java b/...ncebench/scenarioexec/IstioFaultStep.java → ...bench/execution/steps/IstioFaultStep.java
@@ -1,4 +1,4 @@
-package br.unifor.ppgia.resiliencebench.scenarioexec;
+package br.unifor.ppgia.resiliencebench.execution.steps;
 
 import br.unifor.ppgia.resiliencebench.resources.scenario.Scenario;
 import br.unifor.ppgia.resiliencebench.resources.scenario.ScenarioFaultTemplate;

diff --git a/...ncebench/scenarioexec/IstioRetryStep.java → ...bench/execution/steps/IstioRetryStep.java b/...ncebench/scenarioexec/IstioRetryStep.java → ...bench/execution/steps/IstioRetryStep.java
@@ -1,4 +1,4 @@
-package br.unifor.ppgia.resiliencebench.scenarioexec;
+package br.unifor.ppgia.resiliencebench.execution.steps;
 
 import br.unifor.ppgia.resiliencebench.resources.scenario.Scenario;
 import io.fabric8.istio.api.networking.v1beta1.HTTPRetry;

diff --git a/...nch/scenarioexec/K6LoadGeneratorStep.java → .../execution/steps/K6LoadGeneratorStep.java b/...nch/scenarioexec/K6LoadGeneratorStep.java → .../execution/steps/K6LoadGeneratorStep.java
@@ -1,4 +1,4 @@
-package br.unifor.ppgia.resiliencebench.scenarioexec;
+package br.unifor.ppgia.resiliencebench.execution.steps;
 
 import br.unifor.ppgia.resiliencebench.resources.scenario.Scenario;
 import br.unifor.ppgia.resiliencebench.resources.scenario.ScenarioWorkload;

diff --git a/...ench/scenarioexec/ScenarioRunnerStep.java → ...h/execution/steps/ScenarioRunnerStep.java b/...ench/scenarioexec/ScenarioRunnerStep.java → ...h/execution/steps/ScenarioRunnerStep.java
@@ -1,4 +1,4 @@
-package br.unifor.ppgia.resiliencebench.scenarioexec;
+package br.unifor.ppgia.resiliencebench.execution.steps;
 
 import br.unifor.ppgia.resiliencebench.resources.scenario.Scenario;
 import io.fabric8.kubernetes.client.KubernetesClient;