aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb6
-rw-r--r--catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb5
-rw-r--r--catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb1
-rw-r--r--catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb11
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java20
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogicHealthTest.java22
-rw-r--r--catalog-be/src/test/resources/config/catalog-be/configuration.yaml6
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb5
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb13
-rw-r--r--catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java35
-rw-r--r--catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java15
-rw-r--r--catalog-model/src/test/resources/config/catalog-model/configuration.yaml6
-rw-r--r--catalog-model/src/test/resources/config/configuration.yaml5
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java50
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java1
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/fe/config/Configuration.java50
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java7
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java8
-rw-r--r--docs/configuration.rst13
-rw-r--r--integration-tests/environments/integration-test.json3
-rw-r--r--sdc-os-chef/environments/Template.json3
21 files changed, 4 insertions, 281 deletions
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
index e4c4cbd8aa..c5b7f635d0 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
@@ -258,12 +258,6 @@ onboarding:
downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages"
healthCheckUri: "/onboarding-api/v1.0/healthcheck"
-dcae:
- protocol: http
- host: <%= @host_ip %>
- port: <%= @catalog_port %>
- healthCheckUri: "/dcae/healthCheck"
-
# #GSS IDNS
switchoverDetector:
gBeFqdn:
diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb
index 614433c2e7..528ddae9ad 100644
--- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb
+++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb
@@ -19,11 +19,6 @@ default['jetty'][:keymanager_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31"
# MUST BE ALSO CHANGE IN THE startup.sh FILE
default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0"
-#Reserved for DCAE backend
-default['DCAE']['BE'][:http_port] = 8082
-default['DCAE']['BE'][:https_port] = 8444
-default['DCAE_BE_VIP'] = "dcae-be"
-
#BasicAuth
default['basic_auth']['enabled'] = false
default['basic_auth'][:user_name] = "testName"
diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
index cdb9f82729..51a943fa68 100644
--- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
+++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
@@ -61,7 +61,6 @@ template "catalog-be-config" do
:cassandra_usr => node['cassandra'][:cassandra_user],
:cassandra_truststore_password => node['cassandra'][:truststore_password],
:cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}",
- :dcae_be_vip => node['DCAE_BE_VIP'],
:dmaap_active => node['DMAAP']['active']
})
end
diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
index e8d2ece84b..5a059aae7d 100644
--- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
@@ -948,17 +948,6 @@ onboarding:
downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages"
healthCheckUri: "/onboarding-api/v1.0/healthcheck"
-dcae:
- host: <%= @dcae_be_vip %>
- <% if node[:disableHttp] -%>
- protocol: https
- port: <%= node['DCAE']['BE'][:https_port] %>
- <% else %>
- protocol: http
- port: <%= node['DCAE']['BE'][:http_port] %>
- <% end -%>
- healthCheckUri: "/dcae/healthCheck"
-
# #GSS IDNS
switchoverDetector:
gBeFqdn:
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java
index e5eefb43ad..c532ee979e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java
@@ -66,7 +66,6 @@ import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
import static org.apache.http.HttpStatus.SC_OK;
import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_BE;
import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_CASSANDRA;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_DCAE;
import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_DMAAP_PRODUCER;
import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_ECOMP_PORTAL;
import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_JANUSGRAPH;
@@ -163,10 +162,7 @@ public class HealthCheckBusinessLogic {
// Amdocs
healthCheckInfos.add(getHostedComponentsBeHealthCheck(HC_COMPONENT_ON_BOARDING, buildOnBoardingHealthCheckUrl()));
- //DCAE
- healthCheckInfos.add(getHostedComponentsBeHealthCheck(HC_COMPONENT_DCAE, buildDcaeHealthCheckUrl()));
-
- //ECOMP Portal
+ //ECOMP Portal
healthCheckInfos.add(portalHealthCheck.getHealthCheckInfo());
//CADI
@@ -440,20 +436,6 @@ public class HealthCheckBusinessLogic {
return null;
}
- @VisibleForTesting
- String buildDcaeHealthCheckUrl() {
-
- Configuration.DcaeConfig dcaeConfig = ConfigurationManager.getConfigurationManager().getConfiguration().getDcae();
-
- if (dcaeConfig != null) {
- return String.format(hcUrl, dcaeConfig.getProtocol(), dcaeConfig.getHost(),
- dcaeConfig.getPort(),dcaeConfig.getHealthCheckUri());
- }
-
- log.error("DCAE health check configuration is missing.");
- return null;
- }
-
public class HealthCheckScheduledTask implements Runnable {
@Override
public void run() {
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogicHealthTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogicHealthTest.java
index d7e0654806..7f4b82bcaf 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogicHealthTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogicHealthTest.java
@@ -45,7 +45,6 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_DCAE;
import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_ON_BOARDING;
@RunWith(MockitoJUnitRunner.class)
@@ -219,17 +218,6 @@ public class HealthCheckBusinessLogicHealthTest extends BeConfDependentTest {
}
@Test
- public void testGetDcaeHealthCheck() throws Exception {
- HealthCheckBusinessLogic testSubject;
- List<HealthCheckInfo> healthCheckInfos = new LinkedList<>();
-
- // default test
- testSubject = createTestSubject();
- String url = testSubject.buildDcaeHealthCheckUrl();
- Deencapsulation.invoke(testSubject, "getHostedComponentsBeHealthCheck", HC_COMPONENT_DCAE, url);
- }
-
- @Test
public void testGetHostedComponentsBeHealthCheck() throws Exception {
HealthCheckBusinessLogic testSubject;
String componentName = "mock";
@@ -317,12 +305,4 @@ public class HealthCheckBusinessLogicHealthTest extends BeConfDependentTest {
Deencapsulation.invoke(testSubject, "buildOnBoardingHealthCheckUrl");
}
- @Test
- public void testBuildDcaeHealthCheckUrl() throws Exception {
- HealthCheckBusinessLogic testSubject;
-
- // default test
- testSubject = createTestSubject();
- Deencapsulation.invoke(testSubject, "buildDcaeHealthCheckUrl");
- }
-} \ No newline at end of file
+}
diff --git a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
index 3ca0682a4b..78d3722806 100644
--- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
+++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
@@ -349,12 +349,6 @@ onboarding:
downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages"
healthCheckUri: "/onboarding-api/v1.0/healthcheck"
-dcae:
- protocol: http
- host: 127.0.0.1
- port: 8080
- healthCheckUri: "/dcae/healthCheck"
-
ecompPortal:
protocol: https
host: ecomp-portal-web-tdevn2.mtn23a.ecomp.cci.att.com
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb
index 7f66138f92..9fbb363bf9 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb
@@ -14,11 +14,6 @@ default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0"
default['ONBOARDING_BE'][:http_port] = 8081
default['ONBOARDING_BE'][:https_port] = 8445
-#Reserved for DCAE backend
-default['DCAE']['FE'][:http_port] = 8183
-default['DCAE']['FE'][:https_port] = 9444
-default['DCAE_FE_VIP'] = "dcaed-fe"
-
#BasicAuth
default['basic_auth']['enabled'] = true
default['basic_auth'][:user_name] = "testName"
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
index 688bdedb3c..4b371959d5 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
@@ -63,18 +63,7 @@ onboarding:
portBe: <%= node['ONBOARDING_BE'][:http_port] %>
<% end -%>
-dcae:
- host: <%= @dcae_fe_vip %>
- <% if node[:disableHttp] -%>
- protocol: https
- port: <%= node['DCAE']['FE'][:https_port] %>
- <% else %>
- protocol: http
- port: <%= node['DCAE']['FE'][:http_port] %>
- <% end -%>
- healthCheckUri: "/dcaed/healthCheck"
-
-identificationHeaderFields:
+identificationHeaderFields:
-
- &HTTP_IV_USER HTTP_IV_USER
- &iv-user iv-user
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java
index 61d7597e37..5470fc8568 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTask.java
@@ -57,7 +57,6 @@ import java.util.List;
import java.util.Map;
import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_CATALOG_FACADE_MS;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_DCAE;
import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_ON_BOARDING;
public class HealthCheckScheduledTask implements Runnable {
@@ -67,7 +66,6 @@ public class HealthCheckScheduledTask implements Runnable {
private static final String LOG_TARGET_ENTITY_BE = "SDC.BE";
private static final String LOG_TARGET_ENTITY_CONFIG = "SDC.FE.Configuration";
private static final String LOG_TARGET_SERVICE_NAME_OB = "getOnboardingConfig";
- private static final String LOG_TARGET_SERVICE_NAME_DCAE = "getDCAEConfig";
private static final String LOG_TARGET_SERVICE_NAME_FACADE = "getCatalogFacadeConfig";
private static final String LOG_SERVICE_NAME = "/rest/healthCheck";
private static LogFieldsMdcHandler mdcFieldsHandler = new LogFieldsMdcHandler();
@@ -75,12 +73,11 @@ public class HealthCheckScheduledTask implements Runnable {
private static final String URL = "%s://%s:%s/sdc2/rest/healthCheck";
private final List<String> healthCheckFeComponents =
- Arrays.asList(HC_COMPONENT_ON_BOARDING, HC_COMPONENT_DCAE, HC_COMPONENT_CATALOG_FACADE_MS);
+ Arrays.asList(HC_COMPONENT_ON_BOARDING, HC_COMPONENT_CATALOG_FACADE_MS);
private static final HealthCheckUtil healthCheckUtil = new HealthCheckUtil();
private static final String DEBUG_CONTEXT = "HEALTH_FE";
private static final String EXTERNAL_HC_URL = "%s://%s:%s%s";
private static String ONBOARDING_HC_URL;
- private static String DCAE_HC_URL;
private static String CATALOG_FACADE_MS_HC_URL;
private final HealthCheckService service;
@@ -93,10 +90,6 @@ public class HealthCheckScheduledTask implements Runnable {
return ONBOARDING_HC_URL;
}
- static String getDcaeHcUrl() {
- return DCAE_HC_URL;
- }
-
static String getCatalogFacadeMsHcUrl() {
return CATALOG_FACADE_MS_HC_URL;
}
@@ -163,9 +156,6 @@ public class HealthCheckScheduledTask implements Runnable {
case HC_COMPONENT_ON_BOARDING:
healthCheckUri = service.getConfig().getOnboarding().getHealthCheckUriFe();
break;
- case HC_COMPONENT_DCAE:
- healthCheckUri = service.getConfig().getDcae().getHealthCheckUri();
- break;
case HC_COMPONENT_CATALOG_FACADE_MS:
healthCheckUri = service.getConfig().getCatalogFacadeMs().getHealthCheckUri();
break;
@@ -184,9 +174,6 @@ public class HealthCheckScheduledTask implements Runnable {
case HC_COMPONENT_ON_BOARDING:
healthCheckUrl = getOnboardingHealthCheckUrl();
break;
- case HC_COMPONENT_DCAE:
- healthCheckUrl = getDcaeHealthCheckUrl();
- break;
case HC_COMPONENT_CATALOG_FACADE_MS:
healthCheckUrl = getCatalogFacadeHealthCheckUrl();
break;
@@ -345,7 +332,6 @@ public class HealthCheckScheduledTask implements Runnable {
healthCheckInfos.add(new HealthCheckInfo(Constants.HC_COMPONENT_CASSANDRA, HealthCheckInfo.HealthCheckStatus.UNKNOWN, null, null));
healthCheckInfos.add(new HealthCheckInfo(Constants.HC_COMPONENT_DISTRIBUTION_ENGINE, HealthCheckInfo.HealthCheckStatus.UNKNOWN, null, null));
healthCheckInfos.add(new HealthCheckInfo(Constants.HC_COMPONENT_ON_BOARDING, HealthCheckInfo.HealthCheckStatus.UNKNOWN, null, null));
- healthCheckInfos.add(new HealthCheckInfo(Constants.HC_COMPONENT_DCAE, HealthCheckInfo.HealthCheckStatus.UNKNOWN, null, null));
healthCheckInfos.add(new HealthCheckInfo(HC_COMPONENT_CATALOG_FACADE_MS, HealthCheckInfo.HealthCheckStatus.UNKNOWN, null, null));
return new HealthCheckWrapper(healthCheckInfos, "UNKNOWN", "UNKNOWN");
}
@@ -373,25 +359,6 @@ public class HealthCheckScheduledTask implements Runnable {
return ONBOARDING_HC_URL;
}
- private String getDcaeHealthCheckUrl() {
- Configuration.DcaeConfig dcaeConfig = service.getConfig().getDcae();
- ErrorLogOptionalData errorLogOptionalData = ErrorLogOptionalData.newBuilder().targetEntity(LOG_TARGET_ENTITY_CONFIG)
- .targetServiceName(LOG_TARGET_SERVICE_NAME_DCAE).build();
-
- if (StringUtils.isEmpty(DCAE_HC_URL)) {
- if (dcaeConfig != null) {
- DCAE_HC_URL = buildHealthCheckUrl(
- dcaeConfig.getProtocol(), dcaeConfig.getHost(),
- dcaeConfig.getPort(), dcaeConfig.getHealthCheckUri());
- }
- else {
- log.error(EcompLoggerErrorCode.BUSINESS_PROCESS_ERROR, LOG_SERVICE_NAME, errorLogOptionalData,
- "DCAE health check configuration is missing.");
- }
- }
- return DCAE_HC_URL;
- }
-
private String getCatalogFacadeHealthCheckUrl() {
Configuration.CatalogFacadeMsConfig catalogFacadeMsConfig = service.getConfig().getCatalogFacadeMs();
ErrorLogOptionalData errorLogOptionalData = ErrorLogOptionalData.newBuilder().targetEntity(LOG_TARGET_ENTITY_CONFIG)
diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java
index 362d40cb29..38863f5900 100644
--- a/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java
+++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/impl/HealthCheckScheduledTaskTest.java
@@ -55,8 +55,6 @@ public class HealthCheckScheduledTaskTest {
@Mock
private Configuration.CatalogFacadeMsConfig catalogFacadeMsConfig;
@Mock
- private Configuration.DcaeConfig dcaeConfig;
- @Mock
private Configuration.OnboardingConfig onboardingConfig;
@Mock
private Configuration configuration;
@@ -107,14 +105,6 @@ public class HealthCheckScheduledTaskTest {
}
@Test
- public void getDcaeUrlWhenConfigurationIsProvided() {
- when(configuration.getDcae()).thenReturn(dcaeConfig);
- assertNull(HealthCheckScheduledTask.getDcaeHcUrl());
- healthCheckScheduledTask.getExternalComponentHcUrl(Constants.HC_COMPONENT_DCAE);
- assertEquals(HC_URL, HealthCheckScheduledTask.getDcaeHcUrl());
- }
-
- @Test
public void getExcludedComponentListWhenCatalogFacadeMsConfigExists() {
when(configuration.getCatalogFacadeMs()).thenReturn(catalogFacadeMsConfig);
when(catalogFacadeMsConfig.getPath()).thenReturn("/uicache");
@@ -172,11 +162,6 @@ public class HealthCheckScheduledTaskTest {
when(onboardingConfig.getPortFe()).thenReturn(PORT);
when(onboardingConfig.getHealthCheckUriFe()).thenReturn(URI);
- when(dcaeConfig.getProtocol()).thenReturn(PROTOCOL);
- when(dcaeConfig.getHost()).thenReturn(HOST);
- when(dcaeConfig.getPort()).thenReturn(PORT);
- when(dcaeConfig.getHealthCheckUri()).thenReturn(URI);
-
when(catalogFacadeMsConfig.getProtocol()).thenReturn(PROTOCOL);
when(catalogFacadeMsConfig.getHost()).thenReturn(HOST);
when(catalogFacadeMsConfig.getPort()).thenReturn(PORT);
diff --git a/catalog-model/src/test/resources/config/catalog-model/configuration.yaml b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml
index 5055198a2d..7d879260b1 100644
--- a/catalog-model/src/test/resources/config/catalog-model/configuration.yaml
+++ b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml
@@ -269,12 +269,6 @@ onboarding:
downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages"
healthCheckUri: "/onboarding-api/v1.0/healthcheck"
-dcae:
- protocol: http
- host: 127.0.0.1
- port: 8080
- healthCheckUri: "/dcae/healthCheck"
-
switchoverDetector:
gBeFqdn: AIO-BE.ecomp.idns.cip.com
gFeFqdn: AIO-FE.ecomp.idns.cip.com
diff --git a/catalog-model/src/test/resources/config/configuration.yaml b/catalog-model/src/test/resources/config/configuration.yaml
index 504c020dca..6705c54dbd 100644
--- a/catalog-model/src/test/resources/config/configuration.yaml
+++ b/catalog-model/src/test/resources/config/configuration.yaml
@@ -330,11 +330,6 @@ onboarding:
downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages"
healthCheckUri: "/onboarding-api/v1.0/healthcheck"
-dcae:
- protocol: http
- host: 127.0.0.1
- port: 8080
- healthCheckUri: "/dcae/healthCheck"
switchoverDetector:
gBeFqdn: AIO-BE.ecomp.idns.cip.com
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
index 14fb755ab3..5bfed0dc06 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
@@ -116,8 +116,6 @@ public class Configuration extends BasicConfiguration {
private OnboardingConfig onboarding;
- private DcaeConfig dcae;
-
private BasicAuthConfig basicAuth;
private CassandrConfig cassandraConfig;
@@ -1223,54 +1221,6 @@ public class Configuration extends BasicConfiguration {
}
}
- public DcaeConfig getDcae() {
- return dcae;
- }
-
- public void setDcae(DcaeConfig dcae) {
- this.dcae = dcae;
- }
-
- public static class DcaeConfig {
-
- String protocol = "http";
- String host;
- Integer port;
- String healthCheckUri;
-
- public String getProtocol() {
- return protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
- public String getHost() {
- return host;
- }
-
- public void setHost(String host) {
- this.host = host;
- }
-
- public Integer getPort() {
- return port;
- }
-
- public void setPort(Integer port) {
- this.port = port;
- }
-
- public String getHealthCheckUri() {
- return healthCheckUri;
- }
-
- public void setHealthCheckUri(String healthCheckUri) {
- this.healthCheckUri = healthCheckUri;
- }
- }
-
public static class EcompPortalConfig {
private String protocol = "https";
private String host;
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java b/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java
index 20c85683b7..b06d55aa67 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java
@@ -150,7 +150,6 @@ public final class Constants {
//external HealthCheck components
public static final String HC_COMPONENT_ON_BOARDING = "ON_BOARDING";
- public static final String HC_COMPONENT_DCAE = "DCAE";
public static final String HC_COMPONENT_ECOMP_PORTAL = "PORTAL";
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 e437034ea0..e692b623f4 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
@@ -57,8 +57,6 @@ public class Configuration extends BasicConfiguration {
private OnboardingConfig onboarding;
- private DcaeConfig dcae;
-
private CookieConfig authCookie;
private BasicAuthConfig basicAuth;
@@ -251,14 +249,6 @@ public class Configuration extends BasicConfiguration {
this.onboarding = onboarding;
}
- public DcaeConfig getDcae() {
- return dcae;
- }
-
- public void setDcae(DcaeConfig dcae) {
- this.dcae = dcae;
- }
-
public CookieConfig getAuthCookie() {
return authCookie;
}
@@ -388,46 +378,6 @@ public class Configuration extends BasicConfiguration {
}
}
- public static class DcaeConfig {
-
- String protocol = "http";
- String host;
- Integer port;
- String healthCheckUri;
-
- public String getProtocol() {
- return protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
- public String getHost() {
- return host;
- }
-
- public void setHost(String host) {
- this.host = host;
- }
-
- public Integer getPort() {
- return port;
- }
-
- public void setPort(Integer port) {
- this.port = port;
- }
-
- public String getHealthCheckUri() {
- return healthCheckUri;
- }
-
- public void setHealthCheckUri(String healthCheckUri) {
- this.healthCheckUri = healthCheckUri;
- }
- }
-
public static class CookieConfig {
String cookieName = "AuthenticationCookie";
String path = "";
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java
index 055b41c921..23e0ab8439 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java
@@ -77,13 +77,6 @@ public class ConfigurationTest {
));
}
@Test
- public void validateBeanForDcaeConfig() {
- assertThat(Configuration.DcaeConfig.class, allOf(
- hasValidBeanConstructor(),
- hasValidGettersAndSettersExcluding()
- ));
- }
- @Test
public void validateBeanForEcompPortalConfig() {
assertThat(Configuration.EcompPortalConfig.class, allOf(
hasValidBeanConstructor(),
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 1968e4bb58..ae30ccf502 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
@@ -57,14 +57,6 @@ public class ConfigurationTest {
}
@Test
- public void validateDcaeConfigBean() {
- assertThat(Configuration.DcaeConfig.class, allOf(
- hasValidBeanConstructor(),
- hasValidGettersAndSetters()
- ));
- }
-
- @Test
public void validateGetHealthCheckSocketTimeoutInMsReturnsProperTime() {
final int defaultTestTimeout = 100;
final int setTestTimeout = 1000;
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 807839e5fb..f839a1f314 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -38,8 +38,6 @@ environment.json
"FE_VIP": "yyy",
"ES_VIP": "yyy",
"KB_VIP": "yyy",
- "DCAE_BE_VIP": "yyy",
- "DCAE_FE_VIP": "yyy",
"interfaces": {
"application": "eth0",
"private": "eth1"
@@ -804,17 +802,6 @@ BE-configuration.yaml
# Url for onboarding health check
healthCheckUri: "/onboarding-api/v1.0/healthcheck"
- dcae:
- # The ip of the onboarding docker
- host: <%= @dcae_be_vip %>
- # The protocol to use
- protocol: <https/http>
- # The port the docker is listening on
- port: <port>
- # The url of the health check to use
- healthCheckUri: "/dcae/healthCheck"
-
-
#GSS IDNS
# Switchover configuration is used for Geo redundancy to provide automatic failovers
switchoverDetector:
diff --git a/integration-tests/environments/integration-test.json b/integration-tests/environments/integration-test.json
index dec9c2f042..1f804b81c6 100644
--- a/integration-tests/environments/integration-test.json
+++ b/integration-tests/environments/integration-test.json
@@ -10,9 +10,6 @@
"BE_VIP": "sdc-BE",
"ONBOARDING_BE_VIP": "sdc-onboard-BE",
"FE_VIP": "sdc-FE",
- "DCAE_BE_VIP": "localhost",
- "DCAE_FE_VIP": "localhost",
- "DCAE_TOSCA_LAB_VIP": "localhost",
"interfaces": {
"application": "eth0",
"private": "eth1"
diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index 4e5b4b55a0..b4b836100b 100644
--- a/sdc-os-chef/environments/Template.json
+++ b/sdc-os-chef/environments/Template.json
@@ -10,9 +10,6 @@
"BE_VIP": "yyy",
"ONBOARDING_BE_VIP": "yyy",
"FE_VIP": "yyy",
- "DCAE_BE_VIP": "yyy",
- "DCAE_FE_VIP": "yyy",
- "DCAE_TOSCA_LAB_VIP": "yyy",
"interfaces": {
"application": "eth0",
"private": "eth1"