summaryrefslogtreecommitdiffstats
path: root/common-app-api
diff options
context:
space:
mode:
authorAvi Ziv <avi.ziv@amdocs.com>2018-03-15 13:21:44 +0200
committerMichael Lando <ml636r@att.com>2018-04-24 07:50:44 +0000
commitc175a0de2f05d37c1c774684318a525eb96bb59b (patch)
tree0c8bd736fdbcb512fefce93ec841fd3537336206 /common-app-api
parent08d85958f46d1de9aec9cf459632b5be040063be (diff)
Create on boarding docker
Add BE and Cassandra init docker images Change-Id: Id9d767c73fc946819cec821b4634ce650cbb22fd Issue-ID: SDC-781 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'common-app-api')
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java74
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java28
2 files changed, 46 insertions, 56 deletions
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;