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
......@@ -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;
......
......@@ -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;
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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<String, String> emptyProperties = Collections.emptyMap();
......@@ -159,8 +157,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService {
Map<String, String> 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<String, String> emptyProperties = Collections.emptyMap();
......@@ -187,8 +183,6 @@ public class DatabaseApiServiceImpl extends DatabaseApiService {
Map<String, String> 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<String, String> emptyProperties = Collections.emptyMap();
......@@ -214,8 +207,7 @@ public class DatabaseApiServiceImpl extends DatabaseApiService {
Map<String, String> envVars = EnvironmentVariablesHelper
.convertToEnvironmentVariables(EnvironmentVariableType.DB_MANAGEMENT,
databaseManagementComponent, networkType);
envVars
.putAll(EnvironmentVariablesHelper.convertMonitoringEnvironmentVariables(monitoringConfig));
ComponentDeploymentSpec dataDeploymentSpec = new ComponentDeploymentSpecBuilder()
.setName(databaseManagementComponent.getName().toString())
......
......@@ -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<String, String> convertMonitoringEnvironmentVariables(
MonitoringConfig monitoringConfig) {
Map<String, String> variables = new HashMap<>();
......@@ -144,4 +144,5 @@ public class EnvironmentVariablesHelper {
return variables;
}
*/
}
......@@ -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
......
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