diff options
Diffstat (limited to 'common-app-api/src/main/java/org/openecomp')
7 files changed, 57 insertions, 56 deletions
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/BeEcompErrorManager.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/BeEcompErrorManager.java index 3cb7974c06..bf6a022464 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/BeEcompErrorManager.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/BeEcompErrorManager.java @@ -71,8 +71,8 @@ public class BeEcompErrorManager extends AbsEcompErrorManager { processEcompError(context, EcompErrorEnum.BeHealthCheckRecovery); } - public void logBeHealthCheckTitanRecovery(String context) { - processEcompError(context, EcompErrorEnum.BeHealthCheckTitanRecovery); + public void logBeHealthCheckJanusGraphRecovery(String context) { + processEcompError(context, EcompErrorEnum.BeHealthCheckJanusGraphRecovery); } public void logBeHealthCheckElasticSearchRecovery(String context) { @@ -99,8 +99,8 @@ public class BeEcompErrorManager extends AbsEcompErrorManager { processEcompError(context, EcompErrorEnum.BeHealthCheckError); } - public void logBeHealthCheckTitanError(String context) { - processEcompError(context, EcompErrorEnum.BeHealthCheckTitanError); + public void logBeHealthCheckJanusGraphError(String context) { + processEcompError(context, EcompErrorEnum.BeHealthCheckJanusGraphError); } public void logBeHealthCheckElasticSearchError(String context) { 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 a9c4ed362a..05e705ce14 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 @@ -69,14 +69,14 @@ public class Configuration extends BasicConfiguration { private Map<String, String> users; private Map<String, Object> neo4j; private ElasticSearchConfig elasticSearch; - private String titanCfgFile; - private String titanMigrationKeySpaceCfgFile; - private Boolean titanInMemoryGraph; + private String janusGraphCfgFile; + private String janusGraphMigrationKeySpaceCfgFile; + private Boolean janusGraphInMemoryGraph; private int startMigrationFrom; - private Long titanLockTimeout; - private Long titanReconnectIntervalInSeconds; + private Long janusGraphLockTimeout; + private Long janusGraphReconnectIntervalInSeconds; private List<String> healthStatusExclude; - private Long titanHealthCheckReadTimeout; + private Long janusGraphHealthCheckReadTimeout; private Long esReconnectIntervalInSeconds; private Long uebHealthCheckReconnectIntervalInSeconds; private Long uebHealthCheckReadTimeout; @@ -374,28 +374,28 @@ public class Configuration extends BasicConfiguration { this.elasticSearch = elasticSearch; } - public String getTitanCfgFile() { - return titanCfgFile; + public String getJanusGraphCfgFile() { + return janusGraphCfgFile; } - public void setTitanCfgFile(String titanCfgFile) { - this.titanCfgFile = titanCfgFile; + public void setJanusGraphCfgFile(String janusGraphCfgFile) { + this.janusGraphCfgFile = janusGraphCfgFile; } - public String getTitanMigrationKeySpaceCfgFile() { - return titanMigrationKeySpaceCfgFile; + public String getJanusGraphMigrationKeySpaceCfgFile() { + return janusGraphMigrationKeySpaceCfgFile; } - public void setTitanMigrationKeySpaceCfgFile(String titanMigrationKeySpaceCfgFile) { - this.titanMigrationKeySpaceCfgFile = titanMigrationKeySpaceCfgFile; + public void setJanusGraphMigrationKeySpaceCfgFile(String janusGraphMigrationKeySpaceCfgFile) { + this.janusGraphMigrationKeySpaceCfgFile = janusGraphMigrationKeySpaceCfgFile; } - public Boolean getTitanInMemoryGraph() { - return titanInMemoryGraph; + public Boolean getJanusGraphInMemoryGraph() { + return janusGraphInMemoryGraph; } - public void setTitanInMemoryGraph(Boolean titanInMemoryGraph) { - this.titanInMemoryGraph = titanInMemoryGraph; + public void setJanusGraphInMemoryGraph(Boolean janusGraphInMemoryGraph) { + this.janusGraphInMemoryGraph = janusGraphInMemoryGraph; } public int getStartMigrationFrom() { @@ -406,36 +406,36 @@ public class Configuration extends BasicConfiguration { this.startMigrationFrom = startMigrationFrom; } - public Long getTitanLockTimeout() { - return titanLockTimeout; + public Long getJanusGraphLockTimeout() { + return janusGraphLockTimeout; } - public void setTitanLockTimeout(Long titanLockTimeout) { - this.titanLockTimeout = titanLockTimeout; + public void setJanusGraphLockTimeout(Long janusGraphLockTimeout) { + this.janusGraphLockTimeout = janusGraphLockTimeout; } - public Long getTitanHealthCheckReadTimeout() { - return titanHealthCheckReadTimeout; + public Long getJanusGraphHealthCheckReadTimeout() { + return janusGraphHealthCheckReadTimeout; } - public Long getTitanHealthCheckReadTimeout(long defaultVal) { - return titanHealthCheckReadTimeout == null ? defaultVal : titanHealthCheckReadTimeout; + public Long getJanusGraphHealthCheckReadTimeout(long defaultVal) { + return janusGraphHealthCheckReadTimeout == null ? defaultVal : janusGraphHealthCheckReadTimeout; } - public void setTitanHealthCheckReadTimeout(Long titanHealthCheckReadTimeout) { - this.titanHealthCheckReadTimeout = titanHealthCheckReadTimeout; + public void setJanusGraphHealthCheckReadTimeout(Long janusGraphHealthCheckReadTimeout) { + this.janusGraphHealthCheckReadTimeout = janusGraphHealthCheckReadTimeout; } - public Long getTitanReconnectIntervalInSeconds() { - return titanReconnectIntervalInSeconds; + public Long getJanusGraphReconnectIntervalInSeconds() { + return janusGraphReconnectIntervalInSeconds; } - public Long getTitanReconnectIntervalInSeconds(long defaultVal) { - return titanReconnectIntervalInSeconds == null ? defaultVal : titanReconnectIntervalInSeconds; + public Long getJanusGraphReconnectIntervalInSeconds(long defaultVal) { + return janusGraphReconnectIntervalInSeconds == null ? defaultVal : janusGraphReconnectIntervalInSeconds; } - public void setTitanReconnectIntervalInSeconds(Long titanReconnectIntervalInSeconds) { - this.titanReconnectIntervalInSeconds = titanReconnectIntervalInSeconds; + public void setJanusGraphReconnectIntervalInSeconds(Long janusGraphReconnectIntervalInSeconds) { + this.janusGraphReconnectIntervalInSeconds = janusGraphReconnectIntervalInSeconds; } public Long getEsReconnectIntervalInSeconds() { @@ -1365,10 +1365,11 @@ public class Configuration extends BasicConfiguration { .append(format("Released: %s%n", released)).append(format("Supported protocols: %s%n", protocols)) .append(format("Users: %s%n", users)).append(format("Neo4j: %s%n", neo4j)) .append(format("ElasticSearch: %s%n", elasticSearch)) - .append(format("Titan Cfg File: %s%n", titanCfgFile)) - .append(format("Titan In memory: %s%n", titanInMemoryGraph)) - .append(format("Titan lock timeout: %s%n", titanLockTimeout)) - .append(format("Titan reconnect interval seconds: %s%n", titanReconnectIntervalInSeconds)) + .append(format("JanusGraph Cfg File: %s%n", janusGraphCfgFile)) + .append(format("JanusGraph In memory: %s%n", janusGraphInMemoryGraph)) + .append(format("JanusGraph lock timeout: %s%n", janusGraphLockTimeout)) + .append(format("JanusGraph reconnect interval seconds: %s%n", + janusGraphReconnectIntervalInSeconds)) .append(format("excludeResourceCategory: %s%n", excludeResourceCategory)) .append(format("informationalResourceArtifacts: %s%n", informationalResourceArtifacts)) .append(format("deploymentResourceArtifacts: %s%n", deploymentResourceArtifacts)) 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 b106472f4d..646c655bf0 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 @@ -133,7 +133,7 @@ public final class Constants { //SDC HealthCheck components public static final String HC_COMPONENT_FE = "FE"; public static final String HC_COMPONENT_BE = "BE"; - public static final String HC_COMPONENT_TITAN = "TITAN"; + public static final String HC_COMPONENT_JANUSGRAPH = "JANUSGRAPH"; public static final String HC_COMPONENT_ES = "ES"; public static final String HC_COMPONENT_CASSANDRA = "CASSANDRA"; public static final String HC_COMPONENT_DISTRIBUTION_ENGINE = "DE"; diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/api/HealthCheckInfo.java b/common-app-api/src/main/java/org/openecomp/sdc/common/api/HealthCheckInfo.java index c887c09149..4d2fb00094 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/api/HealthCheckInfo.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/api/HealthCheckInfo.java @@ -94,7 +94,7 @@ public class HealthCheckInfo { } /*public enum HealthCheckComponent { - FE, BE, TITAN, DE, ON_BOARDING, CASSANDRA, DCAE, + FE, BE, JANUSGRAPH, DE, ON_BOARDING, CASSANDRA, DCAE, CAS, ZU;//Amdocs components }*/ diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/config/EcompErrorCode.java b/common-app-api/src/main/java/org/openecomp/sdc/common/config/EcompErrorCode.java index aabd6d9305..a423354e86 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/config/EcompErrorCode.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/config/EcompErrorCode.java @@ -26,16 +26,16 @@ public enum EcompErrorCode { "An Authentication failure occured during access to UEB server. Please check that UEB keys are configured correctly in ASDC BE distribution configuration."), E_199( "Internal authentication problem. Description: %s"), - E_200("ASDC Backend probably lost connectivity to either one of the following components: Titan DB, Cassandra, Onboarding, UEB Cluster. Please check the logs for more information."), E_201( - "ASDC Backend probably lost connectivity to Titan DB. Please check the logs for more information."), E_202( + E_200("ASDC Backend probably lost connectivity to either one of the following components: JanusGraph DB, Cassandra, Onboarding, UEB Cluster. Please check the logs for more information."), E_201( + "ASDC Backend probably lost connectivity to JanusGraph DB. Please check the logs for more information."), E_202( "ASDC Backend probably lost connectivity to ElasticSearch. Please check the logs for more information."), E_203( "ASDC Backend probably lost connectivity to UEB Cluster. Please check the logs for more information.", "Check connectivity to UEB cluster which is configured under parameter uebServers in distribution-configuration.yaml."), E_204( "Unable to connect to a valid ASDC Backend Server", "Please check connectivity from this FE instance towards BE or BE Load Balancer. Please check that parameters in FE configuration.yaml: beHost, beHttpPort and beSslPort point to a valid host and port values."), - E_205("ASDC Backend Recovery to either one of the following components: Titan DB, Cassandra, Onboarding, UEB Cluster."), E_206( - "ASDC Backend connection recovery to Titan DB."), E_207( + E_205("ASDC Backend Recovery to either one of the following components: JanusGraph DB, Cassandra, Onboarding, UEB Cluster."), E_206( + "ASDC Backend connection recovery to JanusGraph DB."), E_207( "ASDC Backend connection recovery to ElasticSearch."), E_208( "ASDC Backend connection recovery to UEB Cluster."), E_209( "Connectivity to ASDC BE Server is recovered."), E_210( @@ -82,7 +82,7 @@ public enum EcompErrorCode { "System Error occured in ASDC Distribution Engine. Please check ASDC logs for more details."), E_504( "Failed adding node of type %s to graph."), E_505( "Operation towards database failed.", - "Please check Titan DB health or look at the logs for more details."), E_506( + "Please check JanusGraph DB health or look at the logs for more details."), E_506( "Unexpected error during operation"), E_507( "Going to execute rollback on graph."), E_508( "Failed to lock object for update. Type = %s, Id = %s"), E_509( diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/config/EcompErrorEnum.java b/common-app-api/src/main/java/org/openecomp/sdc/common/config/EcompErrorEnum.java index 575cbe9e7e..9d53f7bc2d 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/config/EcompErrorEnum.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/config/EcompErrorEnum.java @@ -40,7 +40,7 @@ public enum EcompErrorEnum { EcompClassification.FATAL), BeHealthCheckRecovery(EcompErrorCode.E_205, ErrorType.RECOVERY, AlarmSeverity.INFORMATIONAL, - EcompClassification.INFORMATION, null), BeHealthCheckTitanRecovery(EcompErrorCode.E_206, ErrorType.RECOVERY, + EcompClassification.INFORMATION, null), BeHealthCheckJanusGraphRecovery(EcompErrorCode.E_206, ErrorType.RECOVERY, AlarmSeverity.INFORMATIONAL, EcompClassification.INFORMATION, null), BeHealthCheckElasticSearchRecovery(EcompErrorCode.E_207, ErrorType.RECOVERY, AlarmSeverity.INFORMATIONAL, EcompClassification.INFORMATION, @@ -54,8 +54,8 @@ public enum EcompErrorEnum { AlarmSeverity.CRITICAL, EcompClassification.ERROR, BeHealthCheckRecovery), - BeHealthCheckTitanError(EcompErrorCode.E_201, ErrorType.SYSTEM_ERROR, AlarmSeverity.CRITICAL, - EcompClassification.ERROR, BeHealthCheckTitanRecovery), BeHealthCheckElasticSearchError( + BeHealthCheckJanusGraphError(EcompErrorCode.E_201, ErrorType.SYSTEM_ERROR, AlarmSeverity.CRITICAL, + EcompClassification.ERROR, BeHealthCheckJanusGraphRecovery), BeHealthCheckElasticSearchError( EcompErrorCode.E_202, ErrorType.SYSTEM_ERROR, AlarmSeverity.CRITICAL, EcompClassification.ERROR, BeHealthCheckElasticSearchRecovery), BeHealthCheckUebClusterError(EcompErrorCode.E_203, ErrorType.SYSTEM_ERROR, AlarmSeverity.CRITICAL, EcompClassification.ERROR, @@ -245,7 +245,7 @@ public enum EcompErrorEnum { * * BeHealthCheckRecovery(EcompErrorCode.E_205, ErrorType.RECOVERY, * AlarmSeverity.INFORMATIONAL, EcompClassification.INFORMATION, null), - * BeHealthCheckTitanRecovery(EcompErrorCode.E_206, ErrorType.RECOVERY, + * BeHealthCheckJanusGraphRecovery(EcompErrorCode.E_206, ErrorType.RECOVERY, * AlarmSeverity.INFORMATIONAL, EcompClassification.INFORMATION, null), * BeHealthCheckElasticSearchRecovery(EcompErrorCode.E_207, * ErrorType.RECOVERY, AlarmSeverity.INFORMATIONAL, @@ -258,9 +258,9 @@ public enum EcompErrorEnum { * AlarmSeverity.CRITICAL, EcompClassification.ERROR, * BeHealthCheckRecovery), * - * BeHealthCheckTitanError(EcompErrorCode.E_201, ErrorType.SYSTEM_ERROR, + * BeHealthCheckJanusGraphError(EcompErrorCode.E_201, ErrorType.SYSTEM_ERROR, * AlarmSeverity.CRITICAL, EcompClassification.ERROR, - * BeHealthCheckTitanRecovery), + * BeHealthCheckJanusGraphRecovery), * BeHealthCheckElasticSearchError(EcompErrorCode.E_202, * ErrorType.SYSTEM_ERROR, AlarmSeverity.CRITICAL, * EcompClassification.ERROR, BeHealthCheckElasticSearchRecovery), diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/test/BaseConfDependent.java b/common-app-api/src/main/java/org/openecomp/sdc/common/test/BaseConfDependent.java index 49caf61bcc..9faaaf9931 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/test/BaseConfDependent.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/test/BaseConfDependent.java @@ -43,7 +43,7 @@ public class BaseConfDependent { configurationManager = new ConfigurationManager(configurationSource); - configurationManager.getConfiguration().setTitanInMemoryGraph(true); + configurationManager.getConfiguration().setJanusGraphInMemoryGraph(true); } |