From 2623c8402a57e2035db69a9d92d2851050916801 Mon Sep 17 00:00:00 2001 From: shrikantawachar Date: Mon, 20 May 2019 12:11:54 +0530 Subject: 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 --- .../src/main/resources/config/configuration.yaml | 16 +++++------ .../config/janusgraph-migration.properties | 4 +++ .../main/resources/config/janusgraph.properties | 28 ++++++++++++++++++ .../resources/config/titan-migration.properties | 4 --- .../src/main/resources/config/titan.properties | 28 ------------------ .../main/resources/scripts/deleteAllProducts.sh | 6 ++-- asdctool/src/main/resources/scripts/exportUsers.sh | 6 ++-- .../resources/scripts/janusGraphSchemaCreation.sh | 33 ++++++++++++++++++++++ .../main/resources/scripts/titanSchemaCreation.sh | 33 ---------------------- asdctool/src/main/resources/scripts/updateIsVnf.sh | 2 +- 10 files changed, 80 insertions(+), 80 deletions(-) create mode 100644 asdctool/src/main/resources/config/janusgraph-migration.properties create mode 100644 asdctool/src/main/resources/config/janusgraph.properties delete mode 100644 asdctool/src/main/resources/config/titan-migration.properties delete mode 100644 asdctool/src/main/resources/config/titan.properties create mode 100644 asdctool/src/main/resources/scripts/janusGraphSchemaCreation.sh delete mode 100644 asdctool/src/main/resources/scripts/titanSchemaCreation.sh (limited to 'asdctool/src/main/resources') diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml index bdc6a43e12..b1b51fd458 100644 --- a/asdctool/src/main/resources/config/configuration.yaml +++ b/asdctool/src/main/resources/config/configuration.yaml @@ -42,16 +42,16 @@ supportAllottedResourcesAndProxy: false deleteLockTimeoutInSeconds: 60 maxDeleteComponents: 10 -titanCfgFile: src\main\resources\config\titan.properties -titanMigrationKeySpaceCfgFile: src\main\resources\config\titan-migration.properties -titanInMemoryGraph: false -titanLockTimeout: 1800 +janusGraphCfgFile: src\main\resources\config\janusgraph.properties +janusGraphMigrationKeySpaceCfgFile: src\main\resources\config\janusgraph-migration.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 diff --git a/asdctool/src/main/resources/config/janusgraph-migration.properties b/asdctool/src/main/resources/config/janusgraph-migration.properties new file mode 100644 index 0000000000..e982c2d085 --- /dev/null +++ b/asdctool/src/main/resources/config/janusgraph-migration.properties @@ -0,0 +1,4 @@ +storage.backend=cassandra +storage.hostname=localhost +storage.port=9160 +storage.cassandra.keyspace=sdctitan diff --git a/asdctool/src/main/resources/config/janusgraph.properties b/asdctool/src/main/resources/config/janusgraph.properties new file mode 100644 index 0000000000..5f22a08837 --- /dev/null +++ b/asdctool/src/main/resources/config/janusgraph.properties @@ -0,0 +1,28 @@ +storage.backend=cassandrathrift +storage.hostname=192.168.33.10 +storage.port=9160 +storage.username=asdc_user +storage.password=Aa1234%^! +storage.connection-timeout=10000 +storage.cassandra.keyspace=sdctitan + +storage.cassandra.ssl.enabled=true +storage.cassandra.ssl.truststore.location=C:\\gitWork\\vagrant-sdc-all-in-one\\mytmp.trust +storage.cassandra.ssl.truststore.password=Aa123456 + +storage.cassandra.read-consistency-level=LOCAL_QUORUM +storage.cassandra.write-consistency-level=LOCAL_QUORUM +storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.NetworkTopologyStrategy +storage.cassandra.replication-strategy-options=DC-sdc-iltlv633,1 +storage.cassandra.astyanax.local-datacenter=DC-sdc-iltlv633 + + +cache.db-cache = false +cache.db-cache-clean-wait = 20 +cache.db-cache-time = 180000 +cache.db-cache-size = 0.5 + +cache.tx-cache-size = 1000000 + +storage.lock.retries=5 +storage.lock.wait-time=500 diff --git a/asdctool/src/main/resources/config/titan-migration.properties b/asdctool/src/main/resources/config/titan-migration.properties deleted file mode 100644 index e982c2d085..0000000000 --- a/asdctool/src/main/resources/config/titan-migration.properties +++ /dev/null @@ -1,4 +0,0 @@ -storage.backend=cassandra -storage.hostname=localhost -storage.port=9160 -storage.cassandra.keyspace=sdctitan diff --git a/asdctool/src/main/resources/config/titan.properties b/asdctool/src/main/resources/config/titan.properties deleted file mode 100644 index 5f22a08837..0000000000 --- a/asdctool/src/main/resources/config/titan.properties +++ /dev/null @@ -1,28 +0,0 @@ -storage.backend=cassandrathrift -storage.hostname=192.168.33.10 -storage.port=9160 -storage.username=asdc_user -storage.password=Aa1234%^! -storage.connection-timeout=10000 -storage.cassandra.keyspace=sdctitan - -storage.cassandra.ssl.enabled=true -storage.cassandra.ssl.truststore.location=C:\\gitWork\\vagrant-sdc-all-in-one\\mytmp.trust -storage.cassandra.ssl.truststore.password=Aa123456 - -storage.cassandra.read-consistency-level=LOCAL_QUORUM -storage.cassandra.write-consistency-level=LOCAL_QUORUM -storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.NetworkTopologyStrategy -storage.cassandra.replication-strategy-options=DC-sdc-iltlv633,1 -storage.cassandra.astyanax.local-datacenter=DC-sdc-iltlv633 - - -cache.db-cache = false -cache.db-cache-clean-wait = 20 -cache.db-cache-time = 180000 -cache.db-cache-size = 0.5 - -cache.tx-cache-size = 1000000 - -storage.lock.retries=5 -storage.lock.wait-time=500 diff --git a/asdctool/src/main/resources/scripts/deleteAllProducts.sh b/asdctool/src/main/resources/scripts/deleteAllProducts.sh index 38e468d5f7..474b6c8980 100644 --- a/asdctool/src/main/resources/scripts/deleteAllProducts.sh +++ b/asdctool/src/main/resources/scripts/deleteAllProducts.sh @@ -1,8 +1,8 @@ #!/bin/bash -############################## -# delete all products from titan -############################## +##################################### +# delete all products from JanusGraph +##################################### CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) diff --git a/asdctool/src/main/resources/scripts/exportUsers.sh b/asdctool/src/main/resources/scripts/exportUsers.sh index d701c57f92..fec7d5abe4 100644 --- a/asdctool/src/main/resources/scripts/exportUsers.sh +++ b/asdctool/src/main/resources/scripts/exportUsers.sh @@ -1,8 +1,8 @@ #!/bin/bash -############################## -# export all users from titan -############################## +################################## +# export all users from JanusGraph +################################## CURRENT_DIR=`pwd` BASEDIR=$(dirname $0) diff --git a/asdctool/src/main/resources/scripts/janusGraphSchemaCreation.sh b/asdctool/src/main/resources/scripts/janusGraphSchemaCreation.sh new file mode 100644 index 0000000000..d4b7871f30 --- /dev/null +++ b/asdctool/src/main/resources/scripts/janusGraphSchemaCreation.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +############################## +# JanusGraph Schema Creation +############################## + +CURRENT_DIR=`pwd` +BASEDIR=$(dirname $0) + +if [ ${BASEDIR:0:1} = "/" ] +then + FULL_PATH=$BASEDIR +else + FULL_PATH=$CURRENT_DIR/$BASEDIR +fi + +source ${FULL_PATH}/baseOperation.sh + +mainClass="org.openecomp.sdc.asdctool.main.DataSchemaMenu" + +command="java $JVM_LOG_FILE -cp $JARS $mainClass create-janusgraph-structures $@" +echo $command + +$command +result=$? + +echo "***********************************" +echo "***** $result *********************" +echo "***********************************" + +exit $result + + diff --git a/asdctool/src/main/resources/scripts/titanSchemaCreation.sh b/asdctool/src/main/resources/scripts/titanSchemaCreation.sh deleted file mode 100644 index 8a2488b3e2..0000000000 --- a/asdctool/src/main/resources/scripts/titanSchemaCreation.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -############################## -# Titan Schema Creation -############################## - -CURRENT_DIR=`pwd` -BASEDIR=$(dirname $0) - -if [ ${BASEDIR:0:1} = "/" ] -then - FULL_PATH=$BASEDIR -else - FULL_PATH=$CURRENT_DIR/$BASEDIR -fi - -source ${FULL_PATH}/baseOperation.sh - -mainClass="org.openecomp.sdc.asdctool.main.DataSchemaMenu" - -command="java $JVM_LOG_FILE -cp $JARS $mainClass create-titan-structures $@" -echo $command - -$command -result=$? - -echo "***********************************" -echo "***** $result *********************" -echo "***********************************" - -exit $result - - diff --git a/asdctool/src/main/resources/scripts/updateIsVnf.sh b/asdctool/src/main/resources/scripts/updateIsVnf.sh index 62bfb9cd66..bf45fa88b5 100644 --- a/asdctool/src/main/resources/scripts/updateIsVnf.sh +++ b/asdctool/src/main/resources/scripts/updateIsVnf.sh @@ -3,7 +3,7 @@ ######################################################################## # # Example: -# ./updateIsVnf.sh ../config/titan.properties Bservice,Myservice +# ./updateIsVnf.sh ../config/janusgraph.properties Bservice,Myservice # ######################################################################## -- cgit 1.2.3-korg