diff --git a/conf/local.properties b/conf/local.properties index be9bc04384b776ee77f8fbccbfc68d0eddfcf463..531bbb5e66ca721a5a558d3019e94a0f6bcfad33 100644 --- a/conf/local.properties +++ b/conf/local.properties @@ -1,10 +1,10 @@ # Colosseum #colosseumUri=http://134.60.152.90:9000/api -colosseumUri=http://134.60.153.38:9000/api +colosseumUri=http://134.60.244.56:9000/api # Application Catalogue #applicationCatalogue=http://localhost:9091/v1 -applicationCatalogue=http://134.60.153.38:9091/v1 +applicationCatalogue=http:/134.60.244.56:9091/v1 # Workload-API #workloadApi=http://134.60.47.80:8181/v1 @@ -13,7 +13,7 @@ workloadApi=http://134.60.64.144:8181/v1 # InfluxDB -influxDbUrl=http://134.60.153.38:8086 +influxDbUrl=http://134.60.244.56:8086 influxDbDatabase=telegraf #influxDbUser=carlos diff --git a/src/main/java/de/uulm/omi/evaluation/scenario/PerformanceTSBSScenario.java b/src/main/java/de/uulm/omi/evaluation/scenario/PerformanceTSBSScenario.java index 4f95994f1eedf23862a353a9e1fb7ba21f419a6a..4104601d426522482c00f6e79ac59e6a1ab4c0cb 100644 --- a/src/main/java/de/uulm/omi/evaluation/scenario/PerformanceTSBSScenario.java +++ b/src/main/java/de/uulm/omi/evaluation/scenario/PerformanceTSBSScenario.java @@ -57,6 +57,13 @@ public class PerformanceTSBSScenario extends EvaluationScenario { CheckDeployment checkDeployment = new CheckDeployment(this.evaluationContext, this.dbmsClusterContext); + + //TODO: check for refactoring into load and query phase + TSBSWorkload tsbsWorkload = new TSBSWorkload(this.evaluationContext, this.dbmsClusterContext, + this.performanceTSBS.getWorkload(), this.performanceTSBS.getWorkloadNetwork(), this.workloadPhaseContext, + performanceTSBS.getWorkloadInstances()); + + CheckWorkload checkWorkload = new CheckWorkload(this.evaluationContext, this.workloadPhaseContext, performanceTSBS.getWorkloadInstances()); @@ -65,11 +72,6 @@ public class PerformanceTSBSScenario extends EvaluationScenario { FetchTSBSResult fetchTSBSResultQuery = new FetchTSBSResult(this.evaluationContext, this.workloadPhaseContext, performanceTSBS.getWorkloadInstances(), "query"); - //TODO: check for refactoring into load and query phase - TSBSWorkload tsbsWorkload = new TSBSWorkload(this.evaluationContext, this.dbmsClusterContext, - this.performanceTSBS.getWorkload(), this.performanceTSBS.getWorkloadNetwork(), this.workloadPhaseContext, - performanceTSBS.getWorkloadInstances()); - CleanUpRun cleanUpRun = new CleanUpRun(this.evaluationContext, this.dbmsClusterContext); CleanUpResources cleanUpResources = new CleanUpResources(this.evaluationContext, this.dbmsClusterContext, this.cleanUp); diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml index a12e2e15e9a2b91f706bc9effb420207f1c68ca5..effdcec023eb29478a3ae2e25b10bc23a73ed180 100644 --- a/swagger/swagger.yaml +++ b/swagger/swagger.yaml @@ -202,7 +202,7 @@ paths: enum: - CASSANDRA - MONGODB - - INFLUXDB + - INFLUX - POSTGRESQL - TIMESCALEDB required: true @@ -1559,7 +1559,7 @@ definitions: - SCYLLADB - VOLTDB - ELASTICSEARCH - - INFLUXDB + - INFLUX - POSTGRESQL - TIMESCALE databaseSeedComponent: @@ -2130,12 +2130,12 @@ definitions: dbms: type: string enum: - - influx - - timescaledb - - mongodb - - cassandra + - INFLUX + - TIMESALEDB + - MONGODB + - CASSANDRA description: 'specifies the data format for the selected DBMS' - example: 'influx' + example: INFLUX tsbsDataGeneration: $ref: '#/definitions/TSBSDataGeneration' tsbsLoadExecution: