From 0ccf8ebba94447e7e7004c1a14049f679b0f28b2 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Wed, 4 Sep 2019 13:49:22 +0300 Subject: Improve vid-simulator cloud-nativeness Issue-ID: VID-608 * Integrative tests will look at `SIM_HOST` that may differ from `VID_HOST`. * Simulator will look at `hibernate.connection.url` property for db-connection config * Don't skip DB connection if schema not ready, by removing schema validation Change-Id: Idb4587c30dd0cbc0fe7e7362cb691a4cb425fd10 Signed-off-by: Ittay Stern --- .../org/onap/simulator/controller/SimulatorController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'vid-ext-services-simulator/src/main/java/org/onap/simulator') diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java index 3845c7419..aec437806 100644 --- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java @@ -1,11 +1,13 @@ package org.onap.simulator.controller; +import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.mockserver.integration.ClientAndServer.startClientAndServer; import static org.mockserver.matchers.Times.exactly; import static org.mockserver.model.JsonBody.json; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; import java.io.BufferedInputStream; import java.io.DataInputStream; @@ -107,11 +109,20 @@ public class SimulatorController { private void initJPA() { if (enableJPA) { - entityManagerFactory = Persistence.createEntityManagerFactory("vid"); + entityManagerFactory = Persistence.createEntityManagerFactory("vid", overrideConnectionUrl()); entityManager = entityManagerFactory.createEntityManager(); } } + private Map overrideConnectionUrl() { + final String connectionUrlEnvProperty = "hibernate.connection.url"; + if (isEmpty(System.getProperty(connectionUrlEnvProperty))) { + return Collections.emptyMap(); + } else { + return ImmutableMap.of(connectionUrlEnvProperty, System.getProperty(connectionUrlEnvProperty)); + } + } + @PreDestroy public void tearDown(){ logger.info("Stopping VID Simulator...."); -- cgit 1.2.3-korg