Merge branch 'tsbs-integration-stable' into 'master'

Tsbs integration stable

See merge request !3

init/entrypoint

@@ -84,10 +84,11 @@ function init(){
     # configure Swagger UI
     configureSwaggerUI
 
-    # prepare result folder here and not in Dockerfile as host /tmp will be mounted for /opt/results
+    # prepare result and data folder here and not in Dockerfile as host /tmp will be mounted for /opt/results
     mkdir -p /opt/results/YCSB/
     mkdir -p /opt/results/TPCC/
     mkdir -p /opt/results/TSBS/
+    mkdir -p /opt/workloads/data/
 
     # start telegraf service
     startTelegraf

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * DBEndpoint
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
 public class DBEndpoint   {
   @JsonProperty("ipAddress")
   private String ipAddress = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java

@@ -22,7 +22,7 @@ import javax.validation.constraints.*;
  * a list of the database endpoints  to issue the  workload
  */
 @ApiModel(description = "a list of the database endpoints  to issue the  workload")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
 public class DBEndpoints extends java.util.ArrayList<DBEndpoint>  {
 
   @Override

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * DatabaseConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
 public class DatabaseConfig   {
   /**
    * Gets or Sets databaseBinding

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * DatabaseConfigProperty
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
 public class DatabaseConfigProperty   {
   @JsonProperty("name")
   private String name = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * Error
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
 public class Error   {
   @JsonProperty("code")
   private Integer code = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java

@@ -24,7 +24,7 @@ import javax.validation.constraints.*;
 /**
  * MeasurementConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
 public class MeasurementConfig   {
   @JsonProperty("interval")
   private Integer interval = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * TPCCWorkload
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
 public class TPCCWorkload   {
   @JsonProperty("dbEndpoints")
   private DBEndpoints dbEndpoints = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * TPCCWorkloadConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
 public class TPCCWorkloadConfig   {
   @JsonProperty("activeWarehouses")
   private Integer activeWarehouses = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataConfig.java → src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java

@@ -16,17 +16,17 @@ package de.uulm.omi.cloudiator.dbms.evaluator.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import javax.validation.constraints.*;
 
 /**
- * TSBSDataConfig
+ * parameters for the data generation phase
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
-public class TSBSDataConfig   {
+@ApiModel(description = "parameters for the data generation phase")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
+public class TSBSDataGeneration   {
   @JsonProperty("usecase")
   private String usecase = null;
 
@@ -45,53 +45,17 @@ public class TSBSDataConfig   {
   @JsonProperty("logInterval")
   private String logInterval = null;
 
-  /**
-   * specifies the data format for the selected DBMS
-   */
-  public enum FormatEnum {
-    INFLUX("influx"),
-    
-    TIMESCALEDB("timescaledb"),
-    
-    MONGODB("mongodb");
-
-    private String value;
-
-    FormatEnum(String value) {
-      this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static FormatEnum fromValue(String text) {
-      for (FormatEnum b : FormatEnum.values()) {
-        if (String.valueOf(b.value).equals(text)) {
-          return b;
-        }
-      }
-      return null;
-    }
-  }
-
-  @JsonProperty("format")
-  private FormatEnum format = null;
-
-  public TSBSDataConfig usecase(String usecase) {
+  public TSBSDataGeneration usecase(String usecase) {
     this.usecase = usecase;
     return this;
   }
 
   /**
-   * TODO
+   * TSBBS supports currently: devops, iot 
    * @return usecase
    **/
   @JsonProperty("usecase")
-  @ApiModelProperty(example = "cpu-only", value = "TODO")
+  @ApiModelProperty(example = "cpu-only", value = "TSBBS supports currently: devops, iot ")
   public String getUsecase() {
     return usecase;
   }
@@ -100,7 +64,7 @@ public class TSBSDataConfig   {
     this.usecase = usecase;
   }
 
-  public TSBSDataConfig seed(BigDecimal seed) {
+  public TSBSDataGeneration seed(BigDecimal seed) {
     this.seed = seed;
     return this;
   }
@@ -119,7 +83,7 @@ public class TSBSDataConfig   {
     this.seed = seed;
   }
 
-  public TSBSDataConfig scale(BigDecimal scale) {
+  public TSBSDataGeneration scale(BigDecimal scale) {
     this.scale = scale;
     return this;
   }
@@ -138,7 +102,7 @@ public class TSBSDataConfig   {
     this.scale = scale;
   }
 
-  public TSBSDataConfig startTime(String startTime) {
+  public TSBSDataGeneration startTime(String startTime) {
     this.startTime = startTime;
     return this;
   }
@@ -157,7 +121,7 @@ public class TSBSDataConfig   {
     this.startTime = startTime;
   }
 
-  public TSBSDataConfig endTime(String endTime) {
+  public TSBSDataGeneration endTime(String endTime) {
     this.endTime = endTime;
     return this;
   }
@@ -167,7 +131,7 @@ public class TSBSDataConfig   {
    * @return endTime
    **/
   @JsonProperty("endTime")
-  @ApiModelProperty(example = "2016-01-04T00:00:00Z", value = "ending timestamp for generating the data")
+  @ApiModelProperty(example = "2016-01-01T01:00:00Z", value = "ending timestamp for generating the data")
   public String getEndTime() {
     return endTime;
   }
@@ -176,7 +140,7 @@ public class TSBSDataConfig   {
     this.endTime = endTime;
   }
 
-  public TSBSDataConfig logInterval(String logInterval) {
+  public TSBSDataGeneration logInterval(String logInterval) {
     this.logInterval = logInterval;
     return this;
   }
@@ -195,25 +159,6 @@ public class TSBSDataConfig   {
     this.logInterval = logInterval;
   }
 
-  public TSBSDataConfig format(FormatEnum format) {
-    this.format = format;
-    return this;
-  }
-
-  /**
-   * specifies the data format for the selected DBMS
-   * @return format
-   **/
-  @JsonProperty("format")
-  @ApiModelProperty(example = "influx", value = "specifies the data format for the selected DBMS")
-  public FormatEnum getFormat() {
-    return format;
-  }
-
-  public void setFormat(FormatEnum format) {
-    this.format = format;
-  }
-
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -223,26 +168,25 @@ public class TSBSDataConfig   {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TSBSDataConfig tsBSDataConfig = (TSBSDataConfig) o;
-    return Objects.equals(this.usecase, tsBSDataConfig.usecase) &&
-        Objects.equals(this.seed, tsBSDataConfig.seed) &&
-        Objects.equals(this.scale, tsBSDataConfig.scale) &&
-        Objects.equals(this.startTime, tsBSDataConfig.startTime) &&
-        Objects.equals(this.endTime, tsBSDataConfig.endTime) &&
-        Objects.equals(this.logInterval, tsBSDataConfig.logInterval) &&
-        Objects.equals(this.format, tsBSDataConfig.format);
+    TSBSDataGeneration tsBSDataGeneration = (TSBSDataGeneration) o;
+    return Objects.equals(this.usecase, tsBSDataGeneration.usecase) &&
+        Objects.equals(this.seed, tsBSDataGeneration.seed) &&
+        Objects.equals(this.scale, tsBSDataGeneration.scale) &&
+        Objects.equals(this.startTime, tsBSDataGeneration.startTime) &&
+        Objects.equals(this.endTime, tsBSDataGeneration.endTime) &&
+        Objects.equals(this.logInterval, tsBSDataGeneration.logInterval);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(usecase, seed, scale, startTime, endTime, logInterval, format);
+    return Objects.hash(usecase, seed, scale, startTime, endTime, logInterval);
   }
 
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TSBSDataConfig {\n");
+    sb.append("class TSBSDataGeneration {\n");
     
     sb.append("    usecase: ").append(toIndentedString(usecase)).append("\n");
     sb.append("    seed: ").append(toIndentedString(seed)).append("\n");
@@ -250,7 +194,6 @@ public class TSBSDataConfig   {
     sb.append("    startTime: ").append(toIndentedString(startTime)).append("\n");
     sb.append("    endTime: ").append(toIndentedString(endTime)).append("\n");
     sb.append("    logInterval: ").append(toIndentedString(logInterval)).append("\n");
-    sb.append("    format: ").append(toIndentedString(format)).append("\n");
     sb.append("}");
     return sb.toString();
   }

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadConfig.java → src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java

@@ -23,39 +23,45 @@ import java.math.BigDecimal;
 import javax.validation.constraints.*;
 
 /**
- * TSBSLoadConfig
+ * TSBSLoadExecution
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-11-25T12:06:59.598+01:00")
-public class TSBSLoadConfig   {
-  @JsonProperty("numberOfWorkers")
-  private BigDecimal numberOfWorkers = null;
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00")
+public class TSBSLoadExecution   {
+  @JsonProperty("workers")
+  private BigDecimal workers = null;
 
   @JsonProperty("batchSize")
   private BigDecimal batchSize = null;
 
+  @JsonProperty("dbName")
+  private String dbName = null;
+
+  @JsonProperty("reportingPeriod")
+  private String reportingPeriod = null;
+
   @JsonProperty("dbmsPorperties")
   private java.util.List<TSDBMSDBMSProperties> dbmsPorperties = null;
 
-  public TSBSLoadConfig numberOfWorkers(BigDecimal numberOfWorkers) {
-    this.numberOfWorkers = numberOfWorkers;
+  public TSBSLoadExecution workers(BigDecimal workers) {
+    this.workers = workers;
     return this;
   }
 
   /**
    * The number of workers to load the ts data into the DBMS
-   * @return numberOfWorkers
+   * @return workers
    **/
-  @JsonProperty("numberOfWorkers")
+  @JsonProperty("workers")
   @ApiModelProperty(example = "2.0", value = "The number of workers to load the ts data into the DBMS")
-  public BigDecimal getNumberOfWorkers() {
-    return numberOfWorkers;
+  public BigDecimal getWorkers() {
+    return workers;
   }
 
-  public void setNumberOfWorkers(BigDecimal numberOfWorkers) {
-    this.numberOfWorkers = numberOfWorkers;
+  public void setWorkers(BigDecimal workers) {
+    this.workers = workers;
   }
 
-  public TSBSLoadConfig batchSize(BigDecimal batchSize) {
+  public TSBSLoadExecution batchSize(BigDecimal batchSize) {
     this.batchSize = batchSize;
     return this;
   }
@@ -74,12 +80,50 @@ public class TSBSLoadConfig   {
     this.batchSize = batchSize;
   }
 
-  public TSBSLoadConfig dbmsPorperties(java.util.List<TSDBMSDBMSProperties> dbmsPorperties) {
+  public TSBSLoadExecution dbName(String dbName) {
+    this.dbName = dbName;
+    return this;
+  }
+
+  /**
+   * The DB to use for the benchmark, will be created automatically
+   * @return dbName
+   **/
+  @JsonProperty("dbName")
+  @ApiModelProperty(example = "benchmark", value = "The DB to use for the benchmark, will be created automatically")
+  public String getDbName() {
+    return dbName;
+  }
+
+  public void setDbName(String dbName) {
+    this.dbName = dbName;
+  }
+
+  public TSBSLoadExecution reportingPeriod(String reportingPeriod) {
+    this.reportingPeriod = reportingPeriod;
+    return this;
+  }
+
+  /**
+   * metric reporting interval
+   * @return reportingPeriod
+   **/
+  @JsonProperty("reportingPeriod")
+  @ApiModelProperty(example = "10s", value = "metric reporting interval")
+  public String getReportingPeriod() {
+    return reportingPeriod;
+  }
+
+  public void setReportingPeriod(String reportingPeriod) {
+    this.reportingPeriod = reportingPeriod;
+  }
+
+  public TSBSLoadExecution dbmsPorperties(java.util.List<TSDBMSDBMSProperties> dbmsPorperties) {
     this.dbmsPorperties = dbmsPorperties;
     return this;
   }
 
-  public TSBSLoadConfig addDbmsPorpertiesItem(TSDBMSDBMSProperties dbmsPorpertiesItem) {
+  public TSBSLoadExecution addDbmsPorpertiesItem(TSDBMSDBMSProperties dbmsPorpertiesItem) {
     if (this.dbmsPorperties == null) {
       this.dbmsPorperties = new java.util.ArrayList<>();
     }
@@ -110,25 +154,29 @@ public class TSBSLoadConfig   {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    TSBSLoadConfig tsBSLoadConfig = (TSBSLoadConfig) o;
-    return Objects.equals(this.numberOfWorkers, tsBSLoadConfig.numberOfWorkers) &&
-        Objects.equals(this.batchSize, tsBSLoadConfig.batchSize) &&
-        Objects.equals(this.dbmsPorperties, tsBSLoadConfig.dbmsPorperties);
+    TSBSLoadExecution tsBSLoadExecution = (TSBSLoadExecution) o;
+    return Objects.equals(this.workers, tsBSLoadExecution.workers) &&
+        Objects.equals(this.batchSize, tsBSLoadExecution.batchSize) &&
+        Objects.equals(this.dbName, tsBSLoadExecution.dbName) &&
+        Objects.equals(this.reportingPeriod, tsBSLoadExecution.reportingPeriod) &&
+        Objects.equals(this.dbmsPorperties, tsBSLoadExecution.dbmsPorperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(numberOfWorkers, batchSize, dbmsPorperties);
+    return Objects.hash(workers, batchSize, dbName, reportingPeriod, dbmsPorperties);
   }
 
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class TSBSLoadConfig {\n");
+    sb.append("class TSBSLoadExecution {\n");
     
-    sb.append("    numberOfWorkers: ").append(toIndentedString(numberOfWorkers)).append("\n");
+    sb.append("    workers: ").append(toIndentedString(workers)).append("\n");