Commit 6feed289 authored by Daniel Seybold's avatar Daniel Seybold
Browse files

removed monitoringConfig from API, will now be set by orchestrator

parent 1978e92e
Pipeline #19365 passed with stage
in 7 minutes and 27 seconds
......@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
/**
* DataMemory
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class DataMemory {
/**
* environment variable name
......
......@@ -20,7 +20,6 @@ import com.fasterxml.jackson.annotation.JsonValue;
import de.uulm.omi.cloudiator.dbms.evaluator.model.DatabaseDataComponent;
import de.uulm.omi.cloudiator.dbms.evaluator.model.DatabaseManagementComponent;
import de.uulm.omi.cloudiator.dbms.evaluator.model.DatabaseSeedComponent;
import de.uulm.omi.cloudiator.dbms.evaluator.model.MonitoringConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;
......@@ -29,7 +28,7 @@ import javax.validation.constraints.*;
* todo
*/
@ApiModel(description = "todo")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class DatabaseCluster {
/**
* database name, needs to map an existing database application description
......@@ -90,9 +89,6 @@ public class DatabaseCluster {
@JsonProperty("databaseManagementComponent")
private java.util.List<DatabaseManagementComponent> databaseManagementComponent = null;
@JsonProperty("monitoringConfig")
private MonitoringConfig monitoringConfig = null;
public DatabaseCluster type(TypeEnum type) {
this.type = type;
return this;
......@@ -193,25 +189,6 @@ public class DatabaseCluster {
this.databaseManagementComponent = databaseManagementComponent;
}
public DatabaseCluster monitoringConfig(MonitoringConfig monitoringConfig) {
this.monitoringConfig = monitoringConfig;
return this;
}
/**
* Get monitoringConfig
* @return monitoringConfig
**/
@JsonProperty("monitoringConfig")
@ApiModelProperty(value = "")
public MonitoringConfig getMonitoringConfig() {
return monitoringConfig;
}
public void setMonitoringConfig(MonitoringConfig monitoringConfig) {
this.monitoringConfig = monitoringConfig;
}
@Override
public boolean equals(java.lang.Object o) {
......@@ -225,13 +202,12 @@ public class DatabaseCluster {
return Objects.equals(this.type, databaseCluster.type) &&
Objects.equals(this.databaseDataComponent, databaseCluster.databaseDataComponent) &&
Objects.equals(this.databaseSeedComponent, databaseCluster.databaseSeedComponent) &&
Objects.equals(this.databaseManagementComponent, databaseCluster.databaseManagementComponent) &&
Objects.equals(this.monitoringConfig, databaseCluster.monitoringConfig);
Objects.equals(this.databaseManagementComponent, databaseCluster.databaseManagementComponent);
}
@Override
public int hashCode() {
return Objects.hash(type, databaseDataComponent, databaseSeedComponent, databaseManagementComponent, monitoringConfig);
return Objects.hash(type, databaseDataComponent, databaseSeedComponent, databaseManagementComponent);
}
......@@ -244,7 +220,6 @@ public class DatabaseCluster {
sb.append(" databaseDataComponent: ").append(toIndentedString(databaseDataComponent)).append("\n");
sb.append(" databaseSeedComponent: ").append(toIndentedString(databaseSeedComponent)).append("\n");
sb.append(" databaseManagementComponent: ").append(toIndentedString(databaseManagementComponent)).append("\n");
sb.append(" monitoringConfig: ").append(toIndentedString(monitoringConfig)).append("\n");
sb.append("}");
return sb.toString();
}
......
/*
* Cloudiator Application Catalogue API
* Deploy a generic distributed application in the cloud
*
* OpenAPI spec version: 0.0.1
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;
/**
* DatabaseConfiguration
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-09T13:36:36.660Z")
public class DatabaseConfiguration {
@JsonProperty("databaseName")
private String databaseName = null;
@JsonProperty("databaseUser")
private String databaseUser = null;
@JsonProperty("databasePassword")
private String databasePassword = null;
public DatabaseConfiguration databaseName(String databaseName) {
this.databaseName = databaseName;
return this;
}
/**
* database name
* @return databaseName
**/
@JsonProperty("databaseName")
@ApiModelProperty(value = "database name")
public String getDatabaseName() {
return databaseName;
}
public void setDatabaseName(String databaseName) {
this.databaseName = databaseName;
}
public DatabaseConfiguration databaseUser(String databaseUser) {
this.databaseUser = databaseUser;
return this;
}
/**
* database user name
* @return databaseUser
**/
@JsonProperty("databaseUser")
@ApiModelProperty(value = "database user name")
public String getDatabaseUser() {
return databaseUser;
}
public void setDatabaseUser(String databaseUser) {
this.databaseUser = databaseUser;
}
public DatabaseConfiguration databasePassword(String databasePassword) {
this.databasePassword = databasePassword;
return this;
}
/**
* database password
* @return databasePassword
**/
@JsonProperty("databasePassword")
@ApiModelProperty(value = "database password")
public String getDatabasePassword() {
return databasePassword;
}
public void setDatabasePassword(String databasePassword) {
this.databasePassword = databasePassword;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
DatabaseConfiguration databaseConfiguration = (DatabaseConfiguration) o;
return Objects.equals(this.databaseName, databaseConfiguration.databaseName) &&
Objects.equals(this.databaseUser, databaseConfiguration.databaseUser) &&
Objects.equals(this.databasePassword, databaseConfiguration.databasePassword);
}
@Override
public int hashCode() {
return Objects.hash(databaseName, databaseUser, databasePassword);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class DatabaseConfiguration {\n");
sb.append(" databaseName: ").append(toIndentedString(databaseName)).append("\n");
sb.append(" databaseUser: ").append(toIndentedString(databaseUser)).append("\n");
sb.append(" databasePassword: ").append(toIndentedString(databasePassword)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
......@@ -22,7 +22,6 @@ import de.uulm.omi.cloudiator.dbms.evaluator.model.CrossDatabaseSeedComponent;
import de.uulm.omi.cloudiator.dbms.evaluator.model.DatabaseDataComponent;
import de.uulm.omi.cloudiator.dbms.evaluator.model.DatabaseManagementComponent;
import de.uulm.omi.cloudiator.dbms.evaluator.model.DatabaseSeedComponent;
import de.uulm.omi.cloudiator.dbms.evaluator.model.MonitoringConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;
......@@ -31,7 +30,7 @@ import javax.validation.constraints.*;
* todo
*/
@ApiModel(description = "todo")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class DatabaseCrossCluster {
/**
* database name, needs to map an existing database application description
......@@ -96,9 +95,6 @@ public class DatabaseCrossCluster {
@JsonProperty("crossDatabaseSeedComponent")
private java.util.List<CrossDatabaseSeedComponent> crossDatabaseSeedComponent = null;
@JsonProperty("monitoringConfig")
private MonitoringConfig monitoringConfig = null;
public DatabaseCrossCluster type(TypeEnum type) {
this.type = type;
return this;
......@@ -253,25 +249,6 @@ public class DatabaseCrossCluster {
this.crossDatabaseSeedComponent = crossDatabaseSeedComponent;
}
public DatabaseCrossCluster monitoringConfig(MonitoringConfig monitoringConfig) {
this.monitoringConfig = monitoringConfig;
return this;
}
/**
* Get monitoringConfig
* @return monitoringConfig
**/
@JsonProperty("monitoringConfig")
@ApiModelProperty(value = "")
public MonitoringConfig getMonitoringConfig() {
return monitoringConfig;
}
public void setMonitoringConfig(MonitoringConfig monitoringConfig) {
this.monitoringConfig = monitoringConfig;
}
@Override
public boolean equals(java.lang.Object o) {
......@@ -287,13 +264,12 @@ public class DatabaseCrossCluster {
Objects.equals(this.databaseSeedComponent, databaseCrossCluster.databaseSeedComponent) &&
Objects.equals(this.databaseManagementComponent, databaseCrossCluster.databaseManagementComponent) &&
Objects.equals(this.crossDatabaseDataComponent, databaseCrossCluster.crossDatabaseDataComponent) &&
Objects.equals(this.crossDatabaseSeedComponent, databaseCrossCluster.crossDatabaseSeedComponent) &&
Objects.equals(this.monitoringConfig, databaseCrossCluster.monitoringConfig);
Objects.equals(this.crossDatabaseSeedComponent, databaseCrossCluster.crossDatabaseSeedComponent);
}
@Override
public int hashCode() {
return Objects.hash(type, databaseDataComponent, databaseSeedComponent, databaseManagementComponent, crossDatabaseDataComponent, crossDatabaseSeedComponent, monitoringConfig);
return Objects.hash(type, databaseDataComponent, databaseSeedComponent, databaseManagementComponent, crossDatabaseDataComponent, crossDatabaseSeedComponent);
}
......@@ -308,7 +284,6 @@ public class DatabaseCrossCluster {
sb.append(" databaseManagementComponent: ").append(toIndentedString(databaseManagementComponent)).append("\n");
sb.append(" crossDatabaseDataComponent: ").append(toIndentedString(crossDatabaseDataComponent)).append("\n");
sb.append(" crossDatabaseSeedComponent: ").append(toIndentedString(crossDatabaseSeedComponent)).append("\n");
sb.append(" monitoringConfig: ").append(toIndentedString(monitoringConfig)).append("\n");
sb.append("}");
return sb.toString();
}
......
......@@ -29,7 +29,7 @@ import javax.validation.constraints.*;
* A data component of a DDBMS, requires existing seed components
*/
@ApiModel(description = "A data component of a DDBMS, requires existing seed components")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class DatabaseDataComponent {
@JsonProperty("instances")
private Integer instances = null;
......
......@@ -28,7 +28,7 @@ import javax.validation.constraints.*;
* A management component of a DDBMS
*/
@ApiModel(description = "A management component of a DDBMS")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class DatabaseManagementComponent {
@JsonProperty("instances")
private Integer instances = null;
......
......@@ -30,7 +30,7 @@ import javax.validation.constraints.*;
* A seed component of a DDBMS, provides the cluster entrypoint for DatabaseDataComponents
*/
@ApiModel(description = "A seed component of a DDBMS, provides the cluster entrypoint for DatabaseDataComponents")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class DatabaseSeedComponent {
@JsonProperty("instances")
private Integer instances = null;
......
......@@ -19,7 +19,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import de.uulm.omi.cloudiator.dbms.evaluator.model.DatabaseManagementComponent;
import de.uulm.omi.cloudiator.dbms.evaluator.model.DatabaseSeedComponent;
import de.uulm.omi.cloudiator.dbms.evaluator.model.MonitoringConfig;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;
......@@ -28,7 +27,7 @@ import javax.validation.constraints.*;
* todo
*/
@ApiModel(description = "todo")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class DatabaseSingle {
/**
* database name, needs to map an existing database application description
......@@ -84,9 +83,6 @@ public class DatabaseSingle {
@JsonProperty("databaseManagementComponent")
private java.util.List<DatabaseManagementComponent> databaseManagementComponent = null;
@JsonProperty("monitoringConfig")
private MonitoringConfig monitoringConfig = null;
public DatabaseSingle type(TypeEnum type) {
this.type = type;
return this;
......@@ -152,25 +148,6 @@ public class DatabaseSingle {
this.databaseManagementComponent = databaseManagementComponent;
}
public DatabaseSingle monitoringConfig(MonitoringConfig monitoringConfig) {
this.monitoringConfig = monitoringConfig;
return this;
}
/**
* Get monitoringConfig
* @return monitoringConfig
**/
@JsonProperty("monitoringConfig")
@ApiModelProperty(value = "")
public MonitoringConfig getMonitoringConfig() {
return monitoringConfig;
}
public void setMonitoringConfig(MonitoringConfig monitoringConfig) {
this.monitoringConfig = monitoringConfig;
}
@Override
public boolean equals(java.lang.Object o) {
......@@ -183,13 +160,12 @@ public class DatabaseSingle {
DatabaseSingle databaseSingle = (DatabaseSingle) o;
return Objects.equals(this.type, databaseSingle.type) &&
Objects.equals(this.databaseSeedComponent, databaseSingle.databaseSeedComponent) &&
Objects.equals(this.databaseManagementComponent, databaseSingle.databaseManagementComponent) &&
Objects.equals(this.monitoringConfig, databaseSingle.monitoringConfig);
Objects.equals(this.databaseManagementComponent, databaseSingle.databaseManagementComponent);
}
@Override
public int hashCode() {
return Objects.hash(type, databaseSeedComponent, databaseManagementComponent, monitoringConfig);
return Objects.hash(type, databaseSeedComponent, databaseManagementComponent);
}
......@@ -201,7 +177,6 @@ public class DatabaseSingle {
sb.append(" type: ").append(toIndentedString(type)).append("\n");
sb.append(" databaseSeedComponent: ").append(toIndentedString(databaseSeedComponent)).append("\n");
sb.append(" databaseManagementComponent: ").append(toIndentedString(databaseManagementComponent)).append("\n");
sb.append(" monitoringConfig: ").append(toIndentedString(monitoringConfig)).append("\n");
sb.append("}");
return sb.toString();
}
......
......@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
* the Cloudiator applicationInstanceId for further interactions with the application instance, e.g. getting application components details, scale application components
*/
@ApiModel(description = "the Cloudiator applicationInstanceId for further interactions with the application instance, e.g. getting application components details, scale application components")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class Deployment {
@JsonProperty("applicationInstanceId")
private Long applicationInstanceId = null;
......
......@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
/**
* Error
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class Error {
@JsonProperty("code")
private Integer code = null;
......
......@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
/**
* IndexMemory
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
public class IndexMemory {
/**
* environment variable name
......
/*
* Cloudiator Application Catalogue API
* Deploy a generic distributed application in the cloud
*
* OpenAPI spec version: 0.0.1
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;
/**
* ManagementConfiguration
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-09T13:36:36.660Z")
public class ManagementConfiguration {
@JsonProperty("crossClusterPort")
private Integer crossClusterPort = null;
public ManagementConfiguration crossClusterPort(Integer crossClusterPort) {
this.crossClusterPort = crossClusterPort;
return this;
}
/**
* port to connect across multiple clusters
* @return crossClusterPort
**/
@JsonProperty("crossClusterPort")
@ApiModelProperty(value = "port to connect across multiple clusters")
public Integer getCrossClusterPort() {
return crossClusterPort;
}
public void setCrossClusterPort(Integer crossClusterPort) {
this.crossClusterPort = crossClusterPort;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
ManagementConfiguration managementConfiguration = (ManagementConfiguration) o;
return Objects.equals(this.crossClusterPort, managementConfiguration.crossClusterPort);
}
@Override
public int hashCode() {
return Objects.hash(crossClusterPort);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ManagementConfiguration {\n");
sb.append(" crossClusterPort: ").append(toIndentedString(crossClusterPort)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
/*
* Cloudiator Application Catalogue API
* Deploy a generic distributed application in the cloud
*
* OpenAPI spec version: 0.0.1
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;
/**
* MonitoringConfig
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-11-23T13:21:26.160Z")
public class MonitoringConfig {
@JsonProperty("scenarioId")
private String scenarioId = null;
@JsonProperty("scenarioConfiguration")
private String scenarioConfiguration = null;
@JsonProperty("scenarioRun")