Commit 3a778745 authored by Daniel Seybold's avatar Daniel Seybold
Browse files

removed management component from single node

parent 3e48c61c
Pipeline #43907 passed with stage
in 8 minutes and 14 seconds
......@@ -22,7 +22,7 @@ import javax.validation.constraints.*;
* a set of custom configuration items, the LCA scripts need to be aware of
*/
@ApiModel(description = "a set of custom configuration items, the LCA scripts need to be aware of")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class CustomConfiguration extends java.util.ArrayList<CustomConfigurationItem> {
@Override
......
......@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
/**
* CustomConfigurationItem
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class CustomConfigurationItem {
@JsonProperty("envName")
private String envName = null;
......
......@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
/**
* DataMemory
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class DataMemory {
/**
* environment variable name
......
......@@ -28,7 +28,7 @@ import javax.validation.constraints.*;
* todo
*/
@ApiModel(description = "todo")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class DatabaseCluster {
/**
* database name, needs to map an existing database application description
......
......@@ -30,7 +30,7 @@ import javax.validation.constraints.*;
* todo
*/
@ApiModel(description = "todo")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class DatabaseCrossCluster {
/**
* database name, needs to map an existing database application description
......
......@@ -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-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
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-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class DatabaseManagementComponent {
@JsonProperty("instances")
private Integer instances = null;
......
......@@ -13,24 +13,18 @@
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.JsonProperty;
import com.fasterxml.jackson.annotation.JsonValue;
import de.uulm.omi.cloudiator.dbms.evaluator.model.Component;
import de.uulm.omi.cloudiator.dbms.evaluator.model.CustomConfiguration;
import de.uulm.omi.cloudiator.dbms.evaluator.model.NodeConfiguration;
import de.uulm.omi.cloudiator.dbms.evaluator.model.ReplicationFactor;
import de.uulm.omi.cloudiator.dbms.evaluator.model.VM;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;
import java.util.Objects;
/**
* 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-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class DatabaseSeedComponent {
@JsonProperty("instances")
private Integer instances = null;
......
......@@ -17,7 +17,6 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -27,7 +26,7 @@ import javax.validation.constraints.*;
* todo
*/
@ApiModel(description = "todo")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class DatabaseSingle {
/**
* database name, needs to map an existing database application description
......@@ -80,9 +79,6 @@ public class DatabaseSingle {
@JsonProperty("databaseSeedComponent")
private DatabaseSeedComponent databaseSeedComponent = null;
@JsonProperty("databaseManagementComponent")
private java.util.List<DatabaseManagementComponent> databaseManagementComponent = null;
public DatabaseSingle type(TypeEnum type) {
this.type = type;
return this;
......@@ -121,33 +117,6 @@ public class DatabaseSingle {
this.databaseSeedComponent = databaseSeedComponent;
}
public DatabaseSingle databaseManagementComponent(java.util.List<DatabaseManagementComponent> databaseManagementComponent) {
this.databaseManagementComponent = databaseManagementComponent;
return this;
}
public DatabaseSingle addDatabaseManagementComponentItem(DatabaseManagementComponent databaseManagementComponentItem) {
if (this.databaseManagementComponent == null) {
this.databaseManagementComponent = new java.util.ArrayList<>();
}
this.databaseManagementComponent.add(databaseManagementComponentItem);
return this;
}
/**
* Get databaseManagementComponent
* @return databaseManagementComponent
**/
@JsonProperty("databaseManagementComponent")
@ApiModelProperty(value = "")
public java.util.List<DatabaseManagementComponent> getDatabaseManagementComponent() {
return databaseManagementComponent;
}
public void setDatabaseManagementComponent(java.util.List<DatabaseManagementComponent> databaseManagementComponent) {
this.databaseManagementComponent = databaseManagementComponent;
}
@Override
public boolean equals(java.lang.Object o) {
......@@ -159,13 +128,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.databaseSeedComponent, databaseSingle.databaseSeedComponent);
}
@Override
public int hashCode() {
return Objects.hash(type, databaseSeedComponent, databaseManagementComponent);
return Objects.hash(type, databaseSeedComponent);
}
......@@ -176,7 +144,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("}");
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-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
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-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
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-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class IndexMemory {
/**
* environment variable name
......
......@@ -26,7 +26,7 @@ import javax.validation.constraints.*;
* An existing node resource
*/
@ApiModel(description = "An existing node resource")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class Node extends Resource {
@JsonProperty("endpoint")
private Integer endpoint = null;
......
......@@ -26,7 +26,7 @@ import javax.validation.constraints.*;
* configuration settings on node level
*/
@ApiModel(description = "configuration settings on node level")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class NodeConfiguration {
@JsonProperty("dataMemory")
private DataMemory dataMemory = null;
......
......@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
/**
* ReplicationFactor
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class ReplicationFactor {
/**
* environment variable name
......
......@@ -26,7 +26,7 @@ import javax.validation.constraints.*;
* A requirement set Colosseum will solves an provision the resources
*/
@ApiModel(description = "A requirement set Colosseum will solves an provision the resources")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class Requirement extends Resource {
@JsonProperty("item")
private Integer item = null;
......
......@@ -26,7 +26,7 @@ import javax.validation.constraints.*;
/**
* Resource
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class Resource {
/**
* Gets or Sets resourceType
......
......@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
/**
* SparkJob
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class SparkJob {
@JsonProperty("name")
private String name = null;
......
......@@ -28,7 +28,7 @@ import javax.validation.constraints.*;
* the Spark Master
*/
@ApiModel(description = "the Spark Master")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class SparkMasterComponent {
@JsonProperty("instances")
private Integer instances = null;
......
......@@ -28,7 +28,7 @@ import javax.validation.constraints.*;
* the Spark Master
*/
@ApiModel(description = "the Spark Master")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-02-22T12:55:40.755Z")
public class SparkWorkerComponent {
@JsonProperty("instances")
private Integer instances = null;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment