aboutsummaryrefslogtreecommitdiffstats
path: root/test-apis-ci/sdc-api-tests
diff options
context:
space:
mode:
authorshrek2000 <oren.kleks@amdocs.com>2020-01-30 14:52:49 +0200
committershrek2000 <oren.kleks@amdocs.com>2020-01-30 14:52:49 +0200
commit0594c412c406b22725b33633299d85587ee03f08 (patch)
tree66228ad365c77c09219e147e683fae9a4999cce7 /test-apis-ci/sdc-api-tests
parent22b57cf9313f0b21a1dca090088b811eec8cca6a (diff)
Upgrade to Cassandra 3
Creating base dockers suitable for Cassandra 3 remove cqlsh version Change-Id: I996bad2341410cdf45c49f191e998acf4781fc5d Issue-ID: SDC-2596 Signed-off-by: shrek2000 <oren.kleks@amdocs.com>
Diffstat (limited to 'test-apis-ci/sdc-api-tests')
-rw-r--r--test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb2
-rw-r--r--test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/BE-janusgraph.properties.erb21
2 files changed, 12 insertions, 11 deletions
diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb
index e90fa87e02..55ab07fca5 100644
--- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb
+++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb
@@ -21,6 +21,7 @@ template "sdc-yaml-config" do
:ConfigurationFile => "#{tests_base}/conf/configuration.yaml",
:errorConfigurationFile => "#{tests_base}/conf/error-configuration.yaml",
:CASSANDRA_IP => node['Nodes']['CS'][0],
+ :CASSANDRA_PORT => node['cassandra'][[:cassandra_port],
:CASSANDRA_PWD => node['cassandra'][:cassandra_password],
:CASSANDRA_USR => node['cassandra'][:cassandra_user]
})
@@ -34,6 +35,7 @@ template "janusgraph.properties" do
mode "0755"
variables({
:CASSANDRA_IP => node['Nodes']['CS'].join(",").gsub(/[|]/,''),
+ :CASSANDRA_PORT => node['cassandra'][[:cassandra_port],
:CASSANDRA_PWD => node['cassandra'][:cassandra_password],
:CASSANDRA_USR => node['cassandra'][:cassandra_user],
:rep_factor => node['cassandra']['replication_factor'],
diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/BE-janusgraph.properties.erb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/BE-janusgraph.properties.erb
index a42c7bf206..d333242710 100644
--- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/BE-janusgraph.properties.erb
+++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/BE-janusgraph.properties.erb
@@ -1,25 +1,24 @@
-storage.backend=cassandra
+storage.backend=cql
storage.hostname=<%= @CASSANDRA_IP %>
-storage.port=9160
+storage.port=<%= @CASSANDRA_PORT %>
storage.username=<%= @CASSANDRA_USR %>
storage.password=<%= @CASSANDRA_PWD %>
storage.connection-timeout=10000
-storage.cassandra.keyspace=sdctitan
+storage.cql.keyspace=sdctitan
-storage.cassandra.ssl.enabled=false
-storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore
-storage.cassandra.ssl.truststore.password=Aa123456
+storage.cql.ssl.enabled=false
+storage.cql.ssl.truststore.location=/var/lib/jetty/config/.truststore
+storage.cql.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.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-strategy-class=NetworkTopologyStrategy
+storage.cql.replication-strategy-options=<%= @DC_NAME %>,<%= @rep_factor %>
storage.lock.retries=5
storage.lock.wait-time=500