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 --- ui-ci/pom.xml | 25 ---------------------- .../files/default/conf/log4j.properties | 2 +- .../recipes/sanityUiTests_2_setup_configuration.rb | 8 +++---- .../templates/default/BE-janusgraph.properties.erb | 25 ++++++++++++++++++++++ .../templates/default/BE-titan.properties.erb | 25 ---------------------- .../templates/default/sdc-sanity.yaml.erb | 2 +- ui-ci/src/main/resources/ci/conf/attsdc.yaml | 4 ++-- ui-ci/src/main/resources/ci/conf/log4j.properties | 2 +- 8 files changed, 34 insertions(+), 59 deletions(-) create mode 100644 ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb delete mode 100644 ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-titan.properties.erb (limited to 'ui-ci') diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index be40b0497c..afaf49143b 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -144,31 +144,6 @@ compile - - - com.thinkaurelius.titan - titan-core - ${titan.version} - compile - - - commons-collections - commons-collections - - - groovy - org.codehaus.groovy - - - - - - org.onap.sdc.sdc-titan-cassandra - sdc-titan-cassandra - ${sdc.titan.version} - compile - - org.codehaus.jackson jackson-mapper-asl diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties index d313e92b55..02f783076a 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties @@ -26,7 +26,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n log4j.logger.org.apache.cassandra.service.StorageProxy=INFO -log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout +log4j.logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout log4j.logger.org.openecomp.sdc.ci.tests.utils=INFO, FILE, stdout log4j.additivity.org.openecomp.sdc.ci.tests.utils=false diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb index 1d4c6d6f6c..04a65413f5 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb @@ -11,7 +11,7 @@ template "sdc-yaml-config" do :catalogBE_port => node['BE'][:http_port], :webportal_ip => node['Nodes']['FE'], :webportal_port => node['FE'][:http_port], - :titan_file => "#{tests_base}/conf/titan.properties", + :janusgraph_file => "#{tests_base}/conf/janusgraph.properties", :tests_base_ci => "#{tests_base}/CI/tests", :components_path => "#{tests_base}/CI/components", :importResourceConfigDir => "#{tests_base}/CI/importResource", @@ -26,9 +26,9 @@ template "sdc-yaml-config" do }) end -template "titan.properties" do - path "/#{tests_base}/conf/titan.properties" - source "BE-titan.properties.erb" +template "janusgraph.properties" do + path "/#{tests_base}/conf/janusgraph.properties" + source "BE-janusgraph.properties.erb" owner "root" group "root" mode "0755" diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb new file mode 100644 index 0000000000..a42c7bf206 --- /dev/null +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb @@ -0,0 +1,25 @@ +storage.backend=cassandra +storage.hostname=<%= @CASSANDRA_IP %> +storage.port=9160 +storage.username=<%= @CASSANDRA_USR %> +storage.password=<%= @CASSANDRA_PWD %> +storage.connection-timeout=10000 +storage.cassandra.keyspace=sdctitan + +storage.cassandra.ssl.enabled=false +storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore +storage.cassandra.ssl.truststore.password=Aa123456 + +cache.db-cache = false +cache.db-cache-clean-wait = 20 +cache.db-cache-time = 180000 +cache.db-cache-size = 0.5 + +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_NAME %>,<%= @rep_factor %> +storage.cassandra.astyanax.local-datacenter=<%= @DC_NAME %> + +storage.lock.retries=5 +storage.lock.wait-time=500 diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-titan.properties.erb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-titan.properties.erb deleted file mode 100644 index a42c7bf206..0000000000 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-titan.properties.erb +++ /dev/null @@ -1,25 +0,0 @@ -storage.backend=cassandra -storage.hostname=<%= @CASSANDRA_IP %> -storage.port=9160 -storage.username=<%= @CASSANDRA_USR %> -storage.password=<%= @CASSANDRA_PWD %> -storage.connection-timeout=10000 -storage.cassandra.keyspace=sdctitan - -storage.cassandra.ssl.enabled=false -storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore -storage.cassandra.ssl.truststore.password=Aa123456 - -cache.db-cache = false -cache.db-cache-clean-wait = 20 -cache.db-cache-time = 180000 -cache.db-cache-size = 0.5 - -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_NAME %>,<%= @rep_factor %> -storage.cassandra.astyanax.local-datacenter=<%= @DC_NAME %> - -storage.lock.retries=5 -storage.lock.wait-time=500 diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb index 70063e00d5..c8a3258625 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb @@ -40,4 +40,4 @@ importResourceTestsConfigDir: <%= @importResourceTestsConfigDir %> errorConfigurationFile: <%= @errorConfigurationFile %> configurationFile: <%= @ConfigurationFile %> importTypesConfigDir: <%= @importTypesDir %> -titanPropertiesFile: <%= @titan_file %> \ No newline at end of file +janusGraphPropertiesFile: <%= @janusgraph_file %> \ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/conf/attsdc.yaml b/ui-ci/src/main/resources/ci/conf/attsdc.yaml index e6790939cf..36018d7b7f 100644 --- a/ui-ci/src/main/resources/ci/conf/attsdc.yaml +++ b/ui-ci/src/main/resources/ci/conf/attsdc.yaml @@ -45,13 +45,13 @@ localDataCenter: DC-Automate01 useBrowserMobProxy: false captureTraffic: false -titanPropertiesFile: src/main/resources/ci/conf/titan.properties +janusGraphPropertiesFile: src/main/resources/ci/conf/janusgraph.properties stopOnClassFailure: false #todo onboardingBeHost: 192.168.33.10 onboardingBePort: 8080 -#List of non-abstract resources to keep during titan cleanup between tests +#List of non-abstract resources to keep during JanusGraph cleanup between tests #Only 1.0 version will be kept resourcesNotToDelete: - tosca.nodes.Compute diff --git a/ui-ci/src/main/resources/ci/conf/log4j.properties b/ui-ci/src/main/resources/ci/conf/log4j.properties index 3e159ec8df..0bdf0fad8c 100644 --- a/ui-ci/src/main/resources/ci/conf/log4j.properties +++ b/ui-ci/src/main/resources/ci/conf/log4j.properties @@ -26,7 +26,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG -log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout +log4j.logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout log4j.logger.org.openecomp.sdc.ci.tests.utils=TRACE, FILE, stdout log4j.additivity.org.openecomp.sdc.ci.tests.utils=false -- cgit 1.2.3-korg