From 6feed28964441d7a8261e6a4a37890f04c309d29 Mon Sep 17 00:00:00 2001 From: Daniel Seybold Date: Mon, 17 Dec 2018 11:35:25 +0100 Subject: [PATCH] removed monitoringConfig from API, will now be set by orchestrator --- .../catalogue/server/api/ApiException.java | 2 +- .../catalogue/server/api/ApiOriginFilter.java | 2 +- .../server/api/ApiResponseMessage.java | 2 +- .../catalogue/server/api/BigdataApi.java | 2 +- .../server/api/BigdataApiService.java | 2 +- .../catalogue/server/api/DatabaseApi.java | 2 +- .../server/api/DatabaseApiService.java | 2 +- .../catalogue/server/api/GenericApi.java | 2 +- .../server/api/GenericApiService.java | 2 +- .../server/api/NotFoundException.java | 2 +- .../catalogue/server/api/StringUtil.java | 2 +- .../catalogue/server/api/UtilsApi.java | 2 +- .../catalogue/server/api/UtilsApiService.java | 2 +- .../dbms/evaluator/model/Cluster.java | 2 +- .../dbms/evaluator/model/Component.java | 2 +- .../model/CrossClusterConfiguration.java | 2 +- .../model/CrossDatabaseDataComponent.java | 2 +- .../model/CrossDatabaseSeedComponent.java | 2 +- .../evaluator/model/CustomConfiguration.java | 2 +- .../model/CustomConfigurationItem.java | 2 +- .../dbms/evaluator/model/DataMemory.java | 2 +- .../dbms/evaluator/model/DatabaseCluster.java | 31 +-- .../model/DatabaseConfiguration.java | 138 ---------- .../evaluator/model/DatabaseCrossCluster.java | 31 +-- .../model/DatabaseDataComponent.java | 2 +- .../model/DatabaseManagementComponent.java | 2 +- .../model/DatabaseSeedComponent.java | 2 +- .../dbms/evaluator/model/DatabaseSingle.java | 31 +-- .../dbms/evaluator/model/Deployment.java | 2 +- .../dbms/evaluator/model/Error.java | 2 +- .../dbms/evaluator/model/IndexMemory.java | 2 +- .../model/ManagementConfiguration.java | 90 ------ .../evaluator/model/MonitoringConfig.java | 258 ------------------ .../cloudiator/dbms/evaluator/model/Node.java | 2 +- .../evaluator/model/NodeConfiguration.java | 2 +- .../evaluator/model/ReplicationFactor.java | 2 +- .../dbms/evaluator/model/Requirement.java | 2 +- .../dbms/evaluator/model/Resource.java | 2 +- .../dbms/evaluator/model/SparkJob.java | 2 +- .../evaluator/model/SparkMasterComponent.java | 2 +- .../evaluator/model/SparkWorkerComponent.java | 2 +- .../cloudiator/dbms/evaluator/model/VM.java | 2 +- .../factories/BigdataApiServiceFactory.java | 2 +- .../factories/DatabaseApiServiceFactory.java | 2 +- .../factories/GenericApiServiceFactory.java | 2 +- .../api/factories/UtilsApiServiceFactory.java | 2 +- .../api/impl/DatabaseApiServiceImpl.java | 28 +- .../EnvironmentVariablesHelper.java | 3 +- swagger/swagger.yaml | 29 +- 49 files changed, 65 insertions(+), 654 deletions(-) delete mode 100644 src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfiguration.java delete mode 100644 src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/ManagementConfiguration.java delete mode 100644 src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MonitoringConfig.java diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiException.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiException.java index ce5d238..34ffdd2 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiException.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiException.java @@ -1,6 +1,6 @@ package de.uulm.omi.cloudiator.catalogue.server.api; -@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 ApiException extends Exception{ private int code; public ApiException (int code, String msg) { diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiOriginFilter.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiOriginFilter.java index 1bd1208..21eb3c6 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiOriginFilter.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiOriginFilter.java @@ -5,7 +5,7 @@ import java.io.IOException; import javax.servlet.*; import javax.servlet.http.HttpServletResponse; -@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 ApiOriginFilter implements javax.servlet.Filter { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiResponseMessage.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiResponseMessage.java index caf205a..74d8c80 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiResponseMessage.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/ApiResponseMessage.java @@ -3,7 +3,7 @@ package de.uulm.omi.cloudiator.catalogue.server.api; import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement -@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 ApiResponseMessage { public static final int ERROR = 1; public static final int WARNING = 2; diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/BigdataApi.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/BigdataApi.java index 6c280fc..1785401 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/BigdataApi.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/BigdataApi.java @@ -32,7 +32,7 @@ import javax.validation.constraints.*; @Produces({ "application/json" }) @io.swagger.annotations.Api(description = "the bigdata API") -@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 BigdataApi { private final BigdataApiService delegate; diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/BigdataApiService.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/BigdataApiService.java index a9def45..38e3e5f 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/BigdataApiService.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/BigdataApiService.java @@ -18,7 +18,7 @@ import java.io.InputStream; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.validation.constraints.*; -@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 abstract class BigdataApiService { public abstract Response bigdataSparkPost( @NotNull String name,Cluster cluster,SecurityContext securityContext) throws NotFoundException; public abstract Response bigdataSparkSparkJobPost(SparkJob job,SecurityContext securityContext) throws NotFoundException; diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/DatabaseApi.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/DatabaseApi.java index 48bd04c..6f9d8d5 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/DatabaseApi.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/DatabaseApi.java @@ -33,7 +33,7 @@ import javax.validation.constraints.*; @Produces({ "application/json" }) @io.swagger.annotations.Api(description = "the database API") -@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 DatabaseApi { private final DatabaseApiService delegate; diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/DatabaseApiService.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/DatabaseApiService.java index d267195..c0e0be1 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/DatabaseApiService.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/DatabaseApiService.java @@ -19,7 +19,7 @@ import java.io.InputStream; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.validation.constraints.*; -@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 abstract class DatabaseApiService { public abstract Response databaseClusterPost( @NotNull String networType,DatabaseCluster databaseComponents,SecurityContext securityContext) throws NotFoundException; public abstract Response databaseCrossClusterPost( @NotNull String networType,DatabaseCrossCluster databaseComponents,SecurityContext securityContext) throws NotFoundException; diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/GenericApi.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/GenericApi.java index 0cedb9c..70a7172 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/GenericApi.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/GenericApi.java @@ -31,7 +31,7 @@ import javax.validation.constraints.*; @Produces({ "application/json" }) @io.swagger.annotations.Api(description = "the generic API") -@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 GenericApi { private final GenericApiService delegate; diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/GenericApiService.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/GenericApiService.java index 60921f5..660caaa 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/GenericApiService.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/GenericApiService.java @@ -17,7 +17,7 @@ import java.io.InputStream; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.validation.constraints.*; -@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 abstract class GenericApiService { public abstract Response genericPost( @NotNull String applicationName, @NotNull String networkType,java.util.List components,SecurityContext securityContext) throws NotFoundException; } diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/NotFoundException.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/NotFoundException.java index df41281..d68a430 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/NotFoundException.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/NotFoundException.java @@ -1,6 +1,6 @@ package de.uulm.omi.cloudiator.catalogue.server.api; -@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 NotFoundException extends ApiException { private int code; public NotFoundException (int code, String msg) { diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/StringUtil.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/StringUtil.java index 9a6e6d3..3bb5136 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/StringUtil.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/StringUtil.java @@ -1,6 +1,6 @@ package de.uulm.omi.cloudiator.catalogue.server.api; -@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 StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/UtilsApi.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/UtilsApi.java index 4a01a57..175f24f 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/UtilsApi.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/UtilsApi.java @@ -31,7 +31,7 @@ import javax.validation.constraints.*; @Produces({ "application/json" }) @io.swagger.annotations.Api(description = "the utils API") -@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 UtilsApi { private final UtilsApiService delegate; diff --git a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/UtilsApiService.java b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/UtilsApiService.java index ed94c4d..07c61dd 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/UtilsApiService.java +++ b/src/gen/java/de/uulm/omi/cloudiator/catalogue/server/api/UtilsApiService.java @@ -17,7 +17,7 @@ import java.io.InputStream; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.validation.constraints.*; -@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 abstract class UtilsApiService { public abstract Response utilsDeploymentStateGet( @NotNull BigDecimal applicationInstanceId,SecurityContext securityContext) throws NotFoundException; } diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Cluster.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Cluster.java index 250df17..0c6c57c 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Cluster.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Cluster.java @@ -25,7 +25,7 @@ import javax.validation.constraints.*; /** * Cluster */ -@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 Cluster { @JsonProperty("sparkMasterComponent") private SparkMasterComponent sparkMasterComponent = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Component.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Component.java index 5ae0d98..524984a 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Component.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Component.java @@ -25,7 +25,7 @@ import javax.validation.constraints.*; /** * Component */ -@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 Component { @JsonProperty("instances") private Integer instances = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossClusterConfiguration.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossClusterConfiguration.java index 0988563..f3465d2 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossClusterConfiguration.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossClusterConfiguration.java @@ -23,7 +23,7 @@ import javax.validation.constraints.*; /** * CrossClusterConfiguration */ -@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 CrossClusterConfiguration { @JsonProperty("crossClusterPort") private Integer crossClusterPort = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossDatabaseDataComponent.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossDatabaseDataComponent.java index d46b350..9a684fd 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossDatabaseDataComponent.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossDatabaseDataComponent.java @@ -28,7 +28,7 @@ import javax.validation.constraints.*; * A data component of a cross-DDBMS, requires existing seed and CrossDatabaseSeedComponents */ @ApiModel(description = "A data component of a cross-DDBMS, requires existing seed and CrossDatabaseSeedComponents") -@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 CrossDatabaseDataComponent { @JsonProperty("instances") private Integer instances = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossDatabaseSeedComponent.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossDatabaseSeedComponent.java index 0c15d95..13fcd55 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossDatabaseSeedComponent.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CrossDatabaseSeedComponent.java @@ -31,7 +31,7 @@ import javax.validation.constraints.*; * A seed component of a cross-DDBMS, provides the cluster entrypoint for DatabaseDataComponents and CrossDatabaseDataComponent */ @ApiModel(description = "A seed component of a cross-DDBMS, provides the cluster entrypoint for DatabaseDataComponents and CrossDatabaseDataComponent") -@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 CrossDatabaseSeedComponent { @JsonProperty("instances") private Integer instances = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CustomConfiguration.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CustomConfiguration.java index a3cf9f9..2a2695a 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CustomConfiguration.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CustomConfiguration.java @@ -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-11-23T13:21:26.160Z") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z") public class CustomConfiguration extends java.util.ArrayList { @Override diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CustomConfigurationItem.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CustomConfigurationItem.java index 8801f6c..cdd6616 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CustomConfigurationItem.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/CustomConfigurationItem.java @@ -23,7 +23,7 @@ import javax.validation.constraints.*; /** * CustomConfigurationItem */ -@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 CustomConfigurationItem { @JsonProperty("envName") private String envName = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DataMemory.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DataMemory.java index d36f076..2d6f9d0 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DataMemory.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DataMemory.java @@ -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 diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseCluster.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseCluster.java index e243078..246373d 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseCluster.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseCluster.java @@ -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 = 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(); } diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfiguration.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfiguration.java deleted file mode 100644 index 686c99d..0000000 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfiguration.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * 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 "); - } -} - diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseCrossCluster.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseCrossCluster.java index e5f0728..a560612 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseCrossCluster.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseCrossCluster.java @@ -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 = 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(); } diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseDataComponent.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseDataComponent.java index 1a55529..aef965b 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseDataComponent.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseDataComponent.java @@ -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; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseManagementComponent.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseManagementComponent.java index e4d6bfd..c9567ff 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseManagementComponent.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseManagementComponent.java @@ -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; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseSeedComponent.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseSeedComponent.java index c3edaee..8cd6a4d 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseSeedComponent.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseSeedComponent.java @@ -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; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseSingle.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseSingle.java index 0875a45..aff5513 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseSingle.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseSingle.java @@ -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 = 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(); } diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Deployment.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Deployment.java index c849048..c708325 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Deployment.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Deployment.java @@ -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; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java index a91d8f3..0b789ca 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java +++ b/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 = "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; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/IndexMemory.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/IndexMemory.java index 84fac76..1a82e8a 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/IndexMemory.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/IndexMemory.java @@ -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 diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/ManagementConfiguration.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/ManagementConfiguration.java deleted file mode 100644 index 70de960..0000000 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/ManagementConfiguration.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * 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 "); - } -} - diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MonitoringConfig.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MonitoringConfig.java deleted file mode 100644 index d8742f6..0000000 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MonitoringConfig.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * 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") - private String scenarioRun = null; - - @JsonProperty("scenarioCloud") - private String scenarioCloud = null; - - @JsonProperty("influxDbUrl") - private String influxDbUrl = null; - - @JsonProperty("influxDbdatabase") - private String influxDbdatabase = null; - - @JsonProperty("influxDbUser") - private String influxDbUser = null; - - @JsonProperty("influxDbPassword") - private String influxDbPassword = null; - - public MonitoringConfig scenarioId(String scenarioId) { - this.scenarioId = scenarioId; - return this; - } - - /** - * Get scenarioId - * @return scenarioId - **/ - @JsonProperty("scenarioId") - @ApiModelProperty(value = "") - public String getScenarioId() { - return scenarioId; - } - - public void setScenarioId(String scenarioId) { - this.scenarioId = scenarioId; - } - - public MonitoringConfig scenarioConfiguration(String scenarioConfiguration) { - this.scenarioConfiguration = scenarioConfiguration; - return this; - } - - /** - * Get scenarioConfiguration - * @return scenarioConfiguration - **/ - @JsonProperty("scenarioConfiguration") - @ApiModelProperty(value = "") - public String getScenarioConfiguration() { - return scenarioConfiguration; - } - - public void setScenarioConfiguration(String scenarioConfiguration) { - this.scenarioConfiguration = scenarioConfiguration; - } - - public MonitoringConfig scenarioRun(String scenarioRun) { - this.scenarioRun = scenarioRun; - return this; - } - - /** - * Get scenarioRun - * @return scenarioRun - **/ - @JsonProperty("scenarioRun") - @ApiModelProperty(value = "") - public String getScenarioRun() { - return scenarioRun; - } - - public void setScenarioRun(String scenarioRun) { - this.scenarioRun = scenarioRun; - } - - public MonitoringConfig scenarioCloud(String scenarioCloud) { - this.scenarioCloud = scenarioCloud; - return this; - } - - /** - * Get scenarioCloud - * @return scenarioCloud - **/ - @JsonProperty("scenarioCloud") - @ApiModelProperty(value = "") - public String getScenarioCloud() { - return scenarioCloud; - } - - public void setScenarioCloud(String scenarioCloud) { - this.scenarioCloud = scenarioCloud; - } - - public MonitoringConfig influxDbUrl(String influxDbUrl) { - this.influxDbUrl = influxDbUrl; - return this; - } - - /** - * Get influxDbUrl - * @return influxDbUrl - **/ - @JsonProperty("influxDbUrl") - @ApiModelProperty(value = "") - public String getInfluxDbUrl() { - return influxDbUrl; - } - - public void setInfluxDbUrl(String influxDbUrl) { - this.influxDbUrl = influxDbUrl; - } - - public MonitoringConfig influxDbdatabase(String influxDbdatabase) { - this.influxDbdatabase = influxDbdatabase; - return this; - } - - /** - * Get influxDbdatabase - * @return influxDbdatabase - **/ - @JsonProperty("influxDbdatabase") - @ApiModelProperty(value = "") - public String getInfluxDbdatabase() { - return influxDbdatabase; - } - - public void setInfluxDbdatabase(String influxDbdatabase) { - this.influxDbdatabase = influxDbdatabase; - } - - public MonitoringConfig influxDbUser(String influxDbUser) { - this.influxDbUser = influxDbUser; - return this; - } - - /** - * Get influxDbUser - * @return influxDbUser - **/ - @JsonProperty("influxDbUser") - @ApiModelProperty(value = "") - public String getInfluxDbUser() { - return influxDbUser; - } - - public void setInfluxDbUser(String influxDbUser) { - this.influxDbUser = influxDbUser; - } - - public MonitoringConfig influxDbPassword(String influxDbPassword) { - this.influxDbPassword = influxDbPassword; - return this; - } - - /** - * Get influxDbPassword - * @return influxDbPassword - **/ - @JsonProperty("influxDbPassword") - @ApiModelProperty(value = "") - public String getInfluxDbPassword() { - return influxDbPassword; - } - - public void setInfluxDbPassword(String influxDbPassword) { - this.influxDbPassword = influxDbPassword; - } - - - @Override - public boolean equals(java.lang.Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MonitoringConfig monitoringConfig = (MonitoringConfig) o; - return Objects.equals(this.scenarioId, monitoringConfig.scenarioId) && - Objects.equals(this.scenarioConfiguration, monitoringConfig.scenarioConfiguration) && - Objects.equals(this.scenarioRun, monitoringConfig.scenarioRun) && - Objects.equals(this.scenarioCloud, monitoringConfig.scenarioCloud) && - Objects.equals(this.influxDbUrl, monitoringConfig.influxDbUrl) && - Objects.equals(this.influxDbdatabase, monitoringConfig.influxDbdatabase) && - Objects.equals(this.influxDbUser, monitoringConfig.influxDbUser) && - Objects.equals(this.influxDbPassword, monitoringConfig.influxDbPassword); - } - - @Override - public int hashCode() { - return Objects.hash(scenarioId, scenarioConfiguration, scenarioRun, scenarioCloud, influxDbUrl, influxDbdatabase, influxDbUser, influxDbPassword); - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class MonitoringConfig {\n"); - - sb.append(" scenarioId: ").append(toIndentedString(scenarioId)).append("\n"); - sb.append(" scenarioConfiguration: ").append(toIndentedString(scenarioConfiguration)).append("\n"); - sb.append(" scenarioRun: ").append(toIndentedString(scenarioRun)).append("\n"); - sb.append(" scenarioCloud: ").append(toIndentedString(scenarioCloud)).append("\n"); - sb.append(" influxDbUrl: ").append(toIndentedString(influxDbUrl)).append("\n"); - sb.append(" influxDbdatabase: ").append(toIndentedString(influxDbdatabase)).append("\n"); - sb.append(" influxDbUser: ").append(toIndentedString(influxDbUser)).append("\n"); - sb.append(" influxDbPassword: ").append(toIndentedString(influxDbPassword)).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 "); - } -} - diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Node.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Node.java index a4d6ccc..8f30016 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Node.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Node.java @@ -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-11-23T13:21:26.160Z") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z") public class Node extends Resource { @JsonProperty("endpoint") private Integer endpoint = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/NodeConfiguration.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/NodeConfiguration.java index 91003ae..1c30bc6 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/NodeConfiguration.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/NodeConfiguration.java @@ -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-11-23T13:21:26.160Z") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z") public class NodeConfiguration { @JsonProperty("dataMemory") private DataMemory dataMemory = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/ReplicationFactor.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/ReplicationFactor.java index 912711d..62ed65a 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/ReplicationFactor.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/ReplicationFactor.java @@ -25,7 +25,7 @@ import javax.validation.constraints.*; /** * ReplicationFactor */ -@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 ReplicationFactor { /** * environment variable name diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Requirement.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Requirement.java index 95113c5..26ad3de 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Requirement.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Requirement.java @@ -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-11-23T13:21:26.160Z") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z") public class Requirement extends Resource { @JsonProperty("item") private Integer item = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Resource.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Resource.java index c9751bb..aa09cb7 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Resource.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Resource.java @@ -26,7 +26,7 @@ import javax.validation.constraints.*; /** * Resource */ -@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 Resource { /** * Gets or Sets resourceType diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkJob.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkJob.java index da48f98..f9167ed 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkJob.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkJob.java @@ -23,7 +23,7 @@ import javax.validation.constraints.*; /** * SparkJob */ -@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 SparkJob { @JsonProperty("name") private String name = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkMasterComponent.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkMasterComponent.java index dc10bf9..90efd03 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkMasterComponent.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkMasterComponent.java @@ -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-11-23T13:21:26.160Z") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z") public class SparkMasterComponent { @JsonProperty("instances") private Integer instances = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkWorkerComponent.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkWorkerComponent.java index c970d4c..6eef54d 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkWorkerComponent.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/SparkWorkerComponent.java @@ -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-11-23T13:21:26.160Z") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2018-12-17T10:30:23.635Z") public class SparkWorkerComponent { @JsonProperty("instances") private Integer instances = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/VM.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/VM.java index 6f04c51..fe40a4b 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/VM.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/VM.java @@ -26,7 +26,7 @@ import javax.validation.constraints.*; * A VM resource, which will be created by Colosseum */ @ApiModel(description = "A VM resource, which will be created by Colosseum") -@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 VM extends Resource { @JsonProperty("idCloud") private Integer idCloud = null; diff --git a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/BigdataApiServiceFactory.java b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/BigdataApiServiceFactory.java index b2d6362..8fe1090 100644 --- a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/BigdataApiServiceFactory.java +++ b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/BigdataApiServiceFactory.java @@ -3,7 +3,7 @@ package de.uulm.omi.cloudiator.catalogue.server.api.factories; import de.uulm.omi.cloudiator.catalogue.server.api.BigdataApiService; import de.uulm.omi.cloudiator.catalogue.server.api.impl.BigdataApiServiceImpl; -@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 BigdataApiServiceFactory { private final static BigdataApiService service = new BigdataApiServiceImpl(); diff --git a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/DatabaseApiServiceFactory.java b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/DatabaseApiServiceFactory.java index 58c2497..08259d7 100644 --- a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/DatabaseApiServiceFactory.java +++ b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/DatabaseApiServiceFactory.java @@ -3,7 +3,7 @@ package de.uulm.omi.cloudiator.catalogue.server.api.factories; import de.uulm.omi.cloudiator.catalogue.server.api.DatabaseApiService; import de.uulm.omi.cloudiator.catalogue.server.api.impl.DatabaseApiServiceImpl; -@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 DatabaseApiServiceFactory { private final static DatabaseApiService service = new DatabaseApiServiceImpl(); diff --git a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/GenericApiServiceFactory.java b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/GenericApiServiceFactory.java index b88cc5d..6b01059 100644 --- a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/GenericApiServiceFactory.java +++ b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/GenericApiServiceFactory.java @@ -3,7 +3,7 @@ package de.uulm.omi.cloudiator.catalogue.server.api.factories; import de.uulm.omi.cloudiator.catalogue.server.api.GenericApiService; import de.uulm.omi.cloudiator.catalogue.server.api.impl.GenericApiServiceImpl; -@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 GenericApiServiceFactory { private final static GenericApiService service = new GenericApiServiceImpl(); diff --git a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/UtilsApiServiceFactory.java b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/UtilsApiServiceFactory.java index f4cf33b..b9cb7a6 100644 --- a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/UtilsApiServiceFactory.java +++ b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/factories/UtilsApiServiceFactory.java @@ -3,7 +3,7 @@ package de.uulm.omi.cloudiator.catalogue.server.api.factories; import de.uulm.omi.cloudiator.catalogue.server.api.UtilsApiService; import de.uulm.omi.cloudiator.catalogue.server.api.impl.UtilsApiServiceImpl; -@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 UtilsApiServiceFactory { private final static UtilsApiService service = new UtilsApiServiceImpl(); diff --git a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/impl/DatabaseApiServiceImpl.java b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/impl/DatabaseApiServiceImpl.java index 6bc3f56..7bea1f2 100644 --- a/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/impl/DatabaseApiServiceImpl.java +++ b/src/main/java/de/uulm/omi/cloudiator/catalogue/server/api/impl/DatabaseApiServiceImpl.java @@ -10,7 +10,6 @@ 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.DatabaseSingle; -import de.uulm.omi.cloudiator.dbms.evaluator.model.MonitoringConfig; import de.uulm.omi.runtime.application.deployment.ApplicationDeployment; import de.uulm.omi.runtime.application.deployment.ApplicationDeploymentSpec; import de.uulm.omi.runtime.application.deployment.ApplicationType; @@ -50,7 +49,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { //build the seed component ComponentDeploymentSpec componentDeploymentSpec = buildComponentDeploymentSpecFromSeed( - databaseSeedComponent, databaseComponents.getMonitoringConfig(), networType); + databaseSeedComponent, networType); componentDeploymentSpecs.add(componentDeploymentSpec); } @@ -60,7 +59,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { .getDatabaseDataComponent()) { ComponentDeploymentSpec componentDeploymentSpec = buildComponentDeploymentSpecFromData( - databaseDataComponent, databaseComponents.getMonitoringConfig(), networType); + databaseDataComponent, networType); componentDeploymentSpecs.add(componentDeploymentSpec); } @@ -70,7 +69,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { .getDatabaseManagementComponent()) { ComponentDeploymentSpec componentDeploymentSpec = buildComponentDeploymentSpecFromManagement( - databaseManagementComponent, databaseComponents.getMonitoringConfig(), networType); + databaseManagementComponent, networType); componentDeploymentSpecs.add(componentDeploymentSpec); } @@ -115,7 +114,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { DatabaseSeedComponent databaseSeedComponent = databaseComponents.getDatabaseSeedComponent(); ComponentDeploymentSpec componentDeploymentSpec = buildComponentDeploymentSpecFromSeed( - databaseSeedComponent, databaseComponents.getMonitoringConfig(), networType); + databaseSeedComponent, networType); componentDeploymentSpecs.add(componentDeploymentSpec); //build MANAGEMENT components @@ -123,7 +122,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { .getDatabaseManagementComponent()) { ComponentDeploymentSpec managementComponentDeploymentSpec = buildComponentDeploymentSpecFromManagement( - databaseManagementComponent, databaseComponents.getMonitoringConfig(), networType); + databaseManagementComponent, networType); componentDeploymentSpecs.add(componentDeploymentSpec); } @@ -150,8 +149,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { private ComponentDeploymentSpec buildComponentDeploymentSpecFromSeed( - DatabaseSeedComponent databaseSeedComponent, MonitoringConfig monitoringConfig, - String networkType) { + DatabaseSeedComponent databaseSeedComponent, String networkType) { //TODO: check for properites parameter and possible values Map emptyProperties = Collections.emptyMap(); @@ -159,8 +157,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { Map envVars = EnvironmentVariablesHelper .convertToEnvironmentVariables(EnvironmentVariableType.DB_SEED, databaseSeedComponent, networkType); - envVars - .putAll(EnvironmentVariablesHelper.convertMonitoringEnvironmentVariables(monitoringConfig)); + ComponentDeploymentSpec seedDeploymentSpec = new ComponentDeploymentSpecBuilder() .setName(databaseSeedComponent.getName().toString()) @@ -178,8 +175,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { } private ComponentDeploymentSpec buildComponentDeploymentSpecFromData( - DatabaseDataComponent databaseDataComponent, MonitoringConfig monitoringConfig, - String networkType) { + DatabaseDataComponent databaseDataComponent, String networkType) { //TODO: check for properites parameter and possible values Map emptyProperties = Collections.emptyMap(); @@ -187,8 +183,6 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { Map envVars = EnvironmentVariablesHelper .convertToEnvironmentVariables(EnvironmentVariableType.DB_DATA, databaseDataComponent, networkType); - envVars - .putAll(EnvironmentVariablesHelper.convertMonitoringEnvironmentVariables(monitoringConfig)); ComponentDeploymentSpec dataDeploymentSpec = new ComponentDeploymentSpecBuilder() .setName(databaseDataComponent.getName().toString()) @@ -205,8 +199,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { } private ComponentDeploymentSpec buildComponentDeploymentSpecFromManagement( - DatabaseManagementComponent databaseManagementComponent, MonitoringConfig monitoringConfig, - String networkType) { + DatabaseManagementComponent databaseManagementComponent, String networkType) { //TODO: check for properites parameter and possible values Map emptyProperties = Collections.emptyMap(); @@ -214,8 +207,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService { Map envVars = EnvironmentVariablesHelper .convertToEnvironmentVariables(EnvironmentVariableType.DB_MANAGEMENT, databaseManagementComponent, networkType); - envVars - .putAll(EnvironmentVariablesHelper.convertMonitoringEnvironmentVariables(monitoringConfig)); + ComponentDeploymentSpec dataDeploymentSpec = new ComponentDeploymentSpecBuilder() .setName(databaseManagementComponent.getName().toString()) diff --git a/src/main/java/de/uulm/omi/runtime/application/deployment/EnvironmentVariablesHelper.java b/src/main/java/de/uulm/omi/runtime/application/deployment/EnvironmentVariablesHelper.java index 6f68e7f..47684dc 100644 --- a/src/main/java/de/uulm/omi/runtime/application/deployment/EnvironmentVariablesHelper.java +++ b/src/main/java/de/uulm/omi/runtime/application/deployment/EnvironmentVariablesHelper.java @@ -8,7 +8,6 @@ import de.uulm.omi.cloudiator.dbms.evaluator.model.CustomConfigurationItem; 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 de.uulm.omi.cloudiator.dbms.evaluator.model.NodeConfiguration; import java.util.HashMap; import java.util.Map; @@ -128,6 +127,7 @@ public class EnvironmentVariablesHelper { return variables; } + /* public static Map convertMonitoringEnvironmentVariables( MonitoringConfig monitoringConfig) { Map variables = new HashMap<>(); @@ -144,4 +144,5 @@ public class EnvironmentVariablesHelper { return variables; } + */ } diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml index 7e7a5aa..6c81683 100644 --- a/swagger/swagger.yaml +++ b/swagger/swagger.yaml @@ -346,8 +346,7 @@ definitions: type: array items: $ref: '#/definitions/DatabaseManagementComponent' - monitoringConfig: - $ref: '#/definitions/MonitoringConfig' + DatabaseCluster: description: todo type: object @@ -380,8 +379,7 @@ definitions: type: array items: $ref: '#/definitions/DatabaseManagementComponent' - monitoringConfig: - $ref: '#/definitions/MonitoringConfig' + DatabaseCrossCluster: description: todo type: object @@ -421,8 +419,7 @@ definitions: type: array items: $ref: '#/definitions/CrossDatabaseSeedComponent' - monitoringConfig: - $ref: '#/definitions/MonitoringConfig' + ############## DBMS Data configuration ########################## DatabaseDataComponent: @@ -563,25 +560,7 @@ definitions: envValue: description: environment variable value type: string - MonitoringConfig: - type: object - properties: - scenarioId: - type: string - scenarioConfiguration: - type: string - scenarioRun: - type: string - scenarioCloud: - type: string - influxDbUrl: - type: string - influxDbdatabase: - type: string - influxDbUser: - type: string - influxDbPassword: - type: string + SparkMasterComponent: description: the Spark Master -- GitLab