Skip to content
Snippets Groups Projects
Unverified Commit 8000273d authored by Martin Weise's avatar Martin Weise
Browse files

Updated container model and test model

parent a8581aa2
Branches
Tags
4 merge requests!231CI: Remove build for log-service,!228Better error message handling in the frontend,!223Release of version 1.4.0,!211Added more configuration options for frontend
......@@ -4,7 +4,6 @@ import at.tuwien.api.container.image.ImageBriefDto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;
......
......@@ -51,7 +51,7 @@ public class Container {
@Column(nullable = false, columnDefinition = "integer default port")
private Integer uiPort;
@Column(name = "ui_additional_flags")
@Column
private String uiAdditionalFlags;
@ToString.Exclude
......
......@@ -825,6 +825,9 @@ public abstract class BaseTest {
public final static String CONTAINER_1_NAME = "u01";
public final static String CONTAINER_1_INTERNALNAME = "dbrepo-userdb-u01";
public final static String CONTAINER_1_IP = "127.0.0.1";
public final static String CONTAINER_1_UI_HOST = "localhost";
public final static Integer CONTAINER_1_UI_PORT = 3306;
public final static String CONTAINER_1_UI_ADDITIONAL_FLAGS = "?sslMode=disable";
public final static Boolean CONTAINER_1_RUNNING = true;
public final static Integer CONTAINER_1_PORT = 3308;
public final static String CONTAINER_1_PRIVILEGED_USERNAME = "root";
......@@ -840,6 +843,9 @@ public abstract class BaseTest {
.created(CONTAINER_1_CREATED)
.host(CONTAINER_1_IP)
.port(CONTAINER_1_PORT)
.uiHost(CONTAINER_1_UI_HOST)
.uiPort(CONTAINER_1_UI_PORT)
.uiAdditionalFlags(CONTAINER_1_UI_ADDITIONAL_FLAGS)
.privilegedUsername(CONTAINER_1_PRIVILEGED_USERNAME)
.privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
.build();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment