Upgrade SDC from Titan to Janus Graph

Upgrade SDC from Titan to Janus Graph

Change-Id: I67fb8b8e60cc6751697bc5ff2f06754c92803786
Issue-ID: SDC-2296
Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>

3 files changed, 41 insertions, 41 deletions

diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/BeEcompErrorManagerTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/BeEcompErrorManagerTest.java
index 440f7587c7..fec97143c6 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/BeEcompErrorManagerTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/BeEcompErrorManagerTest.java
@@ -58,13 +58,13 @@ public class BeEcompErrorManagerTest {
 
 	
 	@Test
-	public void testLogBeHealthCheckTitanRecovery() throws Exception {
+	public void testLogBeHealthCheckJanusGraphRecovery() throws Exception {
 		BeEcompErrorManager testSubject;
 		String context = "";
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.logBeHealthCheckTitanRecovery(context);
+		testSubject.logBeHealthCheckJanusGraphRecovery(context);
 	}
 
 	
@@ -113,13 +113,13 @@ public class BeEcompErrorManagerTest {
 
 	
 	@Test
-	public void testLogBeHealthCheckTitanError() throws Exception {
+	public void testLogBeHealthCheckJanusGraphError() throws Exception {
 		BeEcompErrorManager testSubject;
 		String context = "";
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.logBeHealthCheckTitanError(context);
+		testSubject.logBeHealthCheckJanusGraphError(context);
 	}
 
 	
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 0604e80ffc..49b93c5f58 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
@@ -402,68 +402,68 @@ public class ConfigurationTest {
 
 	
 	@Test
-	public void testGetTitanCfgFile() throws Exception {
+	public void testGetJanusGraphCfgFile() throws Exception {
 		Configuration testSubject;
 		String result;
 
 		// default test
 		testSubject = createTestSubject();
-		result = testSubject.getTitanCfgFile();
+		result = testSubject.getJanusGraphCfgFile();
 	}
 
 	
 	@Test
-	public void testSetTitanCfgFile() throws Exception {
+	public void testSetJanusGraphCfgFile() throws Exception {
 		Configuration testSubject;
-		String titanCfgFile = "";
+		String janusGraphCfgFile = "";
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.setTitanCfgFile(titanCfgFile);
+		testSubject.setJanusGraphCfgFile(janusGraphCfgFile);
 	}
 
 	
 	@Test
-	public void testGetTitanMigrationKeySpaceCfgFile() throws Exception {
+	public void testGetJanusGraphMigrationKeySpaceCfgFile() throws Exception {
 		Configuration testSubject;
 		String result;
 
 		// default test
 		testSubject = createTestSubject();
-		result = testSubject.getTitanMigrationKeySpaceCfgFile();
+		result = testSubject.getJanusGraphMigrationKeySpaceCfgFile();
 	}
 
 	
 	@Test
-	public void testSetTitanMigrationKeySpaceCfgFile() throws Exception {
+	public void testSetJanusGraphMigrationKeySpaceCfgFile() throws Exception {
 		Configuration testSubject;
-		String titanMigrationKeySpaceCfgFile = "";
+		String janusGraphMigrationKeySpaceCfgFile = "";
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.setTitanMigrationKeySpaceCfgFile(titanMigrationKeySpaceCfgFile);
+		testSubject.setJanusGraphMigrationKeySpaceCfgFile(janusGraphMigrationKeySpaceCfgFile);
 	}
 
 	
 	@Test
-	public void testGetTitanInMemoryGraph() throws Exception {
+	public void testGetJanusGraphInMemoryGraph() throws Exception {
 		Configuration testSubject;
 		Boolean result;
 
 		// default test
 		testSubject = createTestSubject();
-		result = testSubject.getTitanInMemoryGraph();
+		result = testSubject.getJanusGraphInMemoryGraph();
 	}
 
 	
 	@Test
-	public void testSetTitanInMemoryGraph() throws Exception {
+	public void testSetJanusGraphInMemoryGraph() throws Exception {
 		Configuration testSubject;
-		Boolean titanInMemoryGraph = null;
+		Boolean janusGraphInMemoryGraph = null;
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.setTitanInMemoryGraph(titanInMemoryGraph);
+		testSubject.setJanusGraphInMemoryGraph(janusGraphInMemoryGraph);
 	}
 
 	
@@ -490,72 +490,72 @@ public class ConfigurationTest {
 
 	
 	@Test
-	public void testGetTitanLockTimeout() throws Exception {
+	public void testGetJanusGraphLockTimeout() throws Exception {
 		Configuration testSubject;
 		Long result;
 
 		// default test
 		testSubject = createTestSubject();
-		result = testSubject.getTitanLockTimeout();
+		result = testSubject.getJanusGraphLockTimeout();
 	}
 
 	
 	@Test
-	public void testSetTitanLockTimeout() throws Exception {
+	public void testSetJanusGraphLockTimeout() throws Exception {
 		Configuration testSubject;
-		Long titanLockTimeout = null;
+		Long janusGraphLockTimeout = null;
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.setTitanLockTimeout(titanLockTimeout);
+		testSubject.setJanusGraphLockTimeout(janusGraphLockTimeout);
 	}
 
 	
 	@Test
-	public void testGetTitanHealthCheckReadTimeout() throws Exception {
+	public void testGetJanusGraphHealthCheckReadTimeout() throws Exception {
 		Configuration testSubject;
 		Long result;
 
 		// default test
 		testSubject = createTestSubject();
-		result = testSubject.getTitanHealthCheckReadTimeout();
+		result = testSubject.getJanusGraphHealthCheckReadTimeout();
 	}
 
 	
 
 	
 	@Test
-	public void testSetTitanHealthCheckReadTimeout() throws Exception {
+	public void testSetJanusGraphHealthCheckReadTimeout() throws Exception {
 		Configuration testSubject;
-		Long titanHealthCheckReadTimeout = null;
+		Long janusGraphHealthCheckReadTimeout = null;
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.setTitanHealthCheckReadTimeout(titanHealthCheckReadTimeout);
+		testSubject.setJanusGraphHealthCheckReadTimeout(janusGraphHealthCheckReadTimeout);
 	}
 
 	
 	@Test
-	public void testGetTitanReconnectIntervalInSeconds() throws Exception {
+	public void testGetJanusGraphReconnectIntervalInSeconds() throws Exception {
 		Configuration testSubject;
 		Long result;
 
 		// default test
 		testSubject = createTestSubject();
-		result = testSubject.getTitanReconnectIntervalInSeconds();
+		result = testSubject.getJanusGraphReconnectIntervalInSeconds();
 	}
 
 	
 
 	
 	@Test
-	public void testSetTitanReconnectIntervalInSeconds() throws Exception {
+	public void testSetJanusGraphReconnectIntervalInSeconds() throws Exception {
 		Configuration testSubject;
-		Long titanReconnectIntervalInSeconds = null;
+		Long janusGraphReconnectIntervalInSeconds = null;
 
 		// default test
 		testSubject = createTestSubject();
-		testSubject.setTitanReconnectIntervalInSeconds(titanReconnectIntervalInSeconds);
+		testSubject.setJanusGraphReconnectIntervalInSeconds(janusGraphReconnectIntervalInSeconds);
 	}
 
 	
diff --git a/common-app-api/src/test/resources/config/common/configuration.yaml b/common-app-api/src/test/resources/config/common/configuration.yaml
index 59d4121116..24c7936d7f 100644
--- a/common-app-api/src/test/resources/config/common/configuration.yaml
+++ b/common-app-api/src/test/resources/config/common/configuration.yaml
@@ -22,15 +22,15 @@ released: 2012-11-30
 toscaConformanceLevel: 8.0
 minToscaConformanceLevel: 3.0
 
-titanCfgFile: /home/vagrant/catalog-be/config/catalog-be/titan.properties
-titanInMemoryGraph: false
-titanLockTimeout: 1800
+janusGraphCfgFile: /home/vagrant/catalog-be/config/catalog-be/janusgraph.properties
+janusGraphInMemoryGraph: false
+janusGraphLockTimeout: 1800
 
-# The interval to try and reconnect to titan DB when it is down during ASDC startup:
-titanReconnectIntervalInSeconds: 3
+# The interval to try and reconnect to JanusGraph DB when it is down during ASDC startup:
+janusGraphReconnectIntervalInSeconds: 3
 
-# The read timeout towards Titan DB when health check is invoked:
-titanHealthCheckReadTimeout: 1
+# The read timeout towards JanusGraph DB when health check is invoked:
+janusGraphHealthCheckReadTimeout: 1
 
 # The interval to try and reconnect to Elasticsearch when it is down during ASDC startup:
 esReconnectIntervalInSeconds: 3