From c175a0de2f05d37c1c774684318a525eb96bb59b Mon Sep 17 00:00:00 2001 From: Avi Ziv Date: Thu, 15 Mar 2018 13:21:44 +0200 Subject: Create on boarding docker Add BE and Cassandra init docker images Change-Id: Id9d767c73fc946819cec821b4634ce650cbb22fd Issue-ID: SDC-781 Signed-off-by: Michael Lando --- .../org/openecomp/sdc/fe/config/Configuration.java | 74 ++++++++++++++-------- .../openecomp/sdc/fe/config/ConfigurationTest.java | 28 -------- 2 files changed, 46 insertions(+), 56 deletions(-) (limited to 'common-app-api') diff --git a/common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java index 7267bd148c..012e96afa2 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java @@ -258,14 +258,6 @@ public class Configuration extends BasicConfiguration { this.feFqdn = feFqdn; } - public String getOnboardingForwardContext() { - return onboardingForwardContext; - } - - public void setOnboardingForwardContext(String onboardingForwardContext) { - this.onboardingForwardContext = onboardingForwardContext; - } - public OnboardingConfig getOnboarding() { return onboarding; } @@ -330,42 +322,68 @@ public class Configuration extends BasicConfiguration { } public static class OnboardingConfig { + String protocolFe = "http"; + String hostFe; + Integer portFe; + String protocolBe = "http"; + String hostBe; + Integer portBe; + String healthCheckUriFe; + + public String getProtocolFe() { + return protocolFe; + } - String protocol = "http"; - String host; - Integer port; - String healthCheckUri; + public void setProtocolFe(String protocolFe) { + this.protocolFe = protocolFe; + } - public String getProtocol() { - return protocol; + public String getProtocolBe() { + return protocolBe; } - public void setProtocol(String protocol) { - this.protocol = protocol; + public void setProtocolBe(String protocolBe) { + this.protocolBe = protocolBe; } - public String getHost() { - return host; + public String getHostFe() { + return hostFe; } - public void setHost(String host) { - this.host = host; + public void setHostFe(String hostFe) { + this.hostFe = hostFe; } - public Integer getPort() { - return port; + public String getHostBe() { + return hostBe; } - public void setPort(Integer port) { - this.port = port; + public void setHostBe(String hostBe) { + this.hostBe = hostBe; } - public String getHealthCheckUri() { - return healthCheckUri; + public Integer getPortFe() { + return portFe; } - public void setHealthCheckUri(String healthCheckUri) { - this.healthCheckUri = healthCheckUri; + public void setPortFe(Integer portFe) { + this.portFe = portFe; + } + + public Integer getPortBe() { + return portBe; + } + + public void setPortBe(Integer portBe) { + this.portBe = portBe; + } + + public String getHealthCheckUriFe() { + return healthCheckUriFe; + } + + public void setHealthCheckUriFe(String healthCheckUriFe) { + this.healthCheckUriFe = healthCheckUriFe; } } diff --git a/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java index 6342da8222..4afafaefd4 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java @@ -499,35 +499,7 @@ public class ConfigurationTest { testSubject.setFeFqdn(feFqdn); } - - @Test - public void testGetOnboardingForwardContext() throws Exception { - Configuration testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getOnboardingForwardContext(); - } - - - @Test - public void testSetOnboardingForwardContext() throws Exception { - Configuration testSubject; - String onboardingForwardContext = ""; - // default test - testSubject = createTestSubject(); - testSubject.setOnboardingForwardContext(onboardingForwardContext); - } - - - - - - - - @Test public void testToString() throws Exception { Configuration testSubject; -- cgit 1.2.3-korg