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>

7 files changed, 32 insertions, 36 deletions

diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index df9ef7673a..64dbe05e5d 100644
--- a/asdctool/sdc-cassandra-init/Dockerfile
+++ b/asdctool/sdc-cassandra-init/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-cqlsh:1.4.1
+FROM onap/base_sdc-cqlsh:1.5.0-SNAPSHOT-latest
 
 COPY chef-solo /root/chef-solo/
 
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb
index a516c7108b..38de1e8844 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb
@@ -4,7 +4,7 @@ template "/tmp/create_dox_keyspace.sh" do
     mode 0755
     variables({
       :cassandra_ip     => node['Nodes']['CS'].first,
-      :cassandra_port   => node['cassandra']['cassandra_port'],
+      :cassandra_port   => node['cassandra'][:cassandra_port],
       :DC_NAME          => node['cassandra']['datacenter_name'],
       :cassandra_pwd    => node['cassandra'][:cassandra_password],
       :cassandra_usr    => node['cassandra'][:cassandra_user]
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb
index 72a144634c..a62550eeae 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb
@@ -20,9 +20,10 @@ template "janusgraph.properties" do
   variables({
      :DC_NAME                       => node['cassandra']['datacenter_name'],
      :cassandra_ip                  => node['Nodes']['CS'].first,
+     :cassandra_port_num            => node['cassandra'][:cassandra_port],
+     :janus_connection_timeout      => node['cassandra'][:janusgraph_connection_timeout],
      :cassandra_pwd                 => node['cassandra'][:cassandra_password],
      :cassandra_usr                 => node['cassandra'][:cassandra_user],
-     :janusgraph_connection_timeout => node['cassandra']['janusgraph_connection_timeout'],
      :replication_factor            => node['cassandra']['replication_factor']
   })
 end
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_cassandra_user.sh.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_cassandra_user.sh.erb
index bbd048cb9e..426eed83df 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_cassandra_user.sh.erb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/create_cassandra_user.sh.erb
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 CASSANDRA_IP=<%= @cassandra_ip %>
-#Port for Cassandra Thrift to listen for clients on
-CASSANDRA_PORT=9160
+CASSANDRA_PORT=<%= @cassandra_port %>
 CS_PASSWORD=<%= @cassandra_pwd %>
 SDC_USER=<%= @sdc_usr %>
 SDC_PASSWORD=<%= @sdc_pwd %>
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb
index 60c24d7613..9b1ebdd5a4 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb
@@ -1,21 +1,20 @@
-storage.backend=cassandra
+storage.backend=cql
 storage.hostname=<%= @cassandra_ip %>
-storage.port=9160
+storage.port=<%= @cassandra_port_num %>
 storage.username=<%= @cassandra_usr %>
 storage.password=<%= @cassandra_pwd %>
-storage.connection-timeout=<%= @janusgraph_connection_timeout %>
-storage.cassandra.keyspace=sdctitan
+storage.connection-timeout=<%= @janus_connection_timeout %>
+storage.cql.keyspace=sdctitan
 
+storage.cql.ssl.enabled=false
+storage.cql.ssl.truststore.location=<%= @cassandra_truststore_path %>
+storage.cql.ssl.truststore.password=<%= @cassandra_truststore_password %>
 
-storage.cassandra.ssl.enabled=false
-storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore
-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_NAME %>,<%= @replication_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 %>,<%= @replication_factor %>
+storage.cql.local-datacenter=<%= @DC_NAME %>
 
 cache.db-cache = false
 cache.db-cache-clean-wait = 20
@@ -23,7 +22,4 @@ 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
-
+storage.lock.wait-time=500
\ No newline at end of file
diff --git a/asdctool/src/main/resources/config/janusgraph-migration.properties b/asdctool/src/main/resources/config/janusgraph-migration.properties
index e982c2d085..57113b0ddf 100644
--- a/asdctool/src/main/resources/config/janusgraph-migration.properties
+++ b/asdctool/src/main/resources/config/janusgraph-migration.properties
@@ -1,4 +1,4 @@
-storage.backend=cassandra
+storage.backend=cql
 storage.hostname=localhost
-storage.port=9160
+storage.port=9042
 storage.cassandra.keyspace=sdctitan
diff --git a/asdctool/src/main/resources/config/janusgraph.properties b/asdctool/src/main/resources/config/janusgraph.properties
index 3e88b0d3c8..e0b844f554 100644
--- a/asdctool/src/main/resources/config/janusgraph.properties
+++ b/asdctool/src/main/resources/config/janusgraph.properties
@@ -1,20 +1,20 @@
-storage.backend=cassandrathrift
+storage.backend=cql
 storage.hostname=192.168.33.10
-storage.port=9160
+storage.port=9042
 storage.username=asdc_user
 storage.password=Aa1234%^!
 storage.connection-timeout=10000
-storage.cassandra.keyspace=sdctitan
+storage.cql.keyspace=sdctitan
 
-storage.cassandra.ssl.enabled=true
-storage.cassandra.ssl.truststore.location=/var/lib/jetty/etc/truststore
-storage.cassandra.ssl.truststore.password=Aa123456
+storage.cql.ssl.enabled=true
+storage.cql.ssl.truststore.location=C:\\gitWork\\vagrant-sdc-all-in-one\\mytmp.trust
+storage.cql.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-ILTLV2083,1
-storage.cassandra.astyanax.local-datacenter=DC-ILTLV2083
+storage.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-strategy-class=org.apache.cassandra.locator.NetworkTopologyStrategy
+storage.cql.replication-strategy-options=DC-sdc-iltlv633,1
+storage.cql.local-datacenter=DC-sdc-iltlv633
 
 
 cache.db-cache = false
@@ -25,4 +25,4 @@ cache.db-cache-size = 0.5
 cache.tx-cache-size = 1000000
 
 storage.lock.retries=5
-storage.lock.wait-time=500
+storage.lock.wait-time=500
\ No newline at end of file