aboutsummaryrefslogtreecommitdiffstats
path: root/test-apis-ci
diff options
context:
space:
mode:
Diffstat (limited to 'test-apis-ci')
-rw-r--r--test-apis-ci/pom.xml25
-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
-rw-r--r--test-apis-ci/src/main/resources/ci/conf/janusgraph.properties6
-rw-r--r--test-apis-ci/src/main/resources/log4j.properties2
5 files changed, 39 insertions, 17 deletions
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index 68e0df0a9d..35b0b4f716 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -248,14 +248,35 @@
</dependency>
<dependency>
+ <groupId>com.clearspring.analytics</groupId>
+ <artifactId>stream</artifactId>
+ <version>${clearspring.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.janusgraph</groupId>
- <artifactId>janusgraph-cassandra</artifactId>
+ <artifactId>janusgraph-cql</artifactId>
<version>${janusgraph.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
- <artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>groovy</artifactId>
+ <groupId>org.codehaus.groovy</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
</exclusion>
</exclusions>
</dependency>
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
diff --git a/test-apis-ci/src/main/resources/ci/conf/janusgraph.properties b/test-apis-ci/src/main/resources/ci/conf/janusgraph.properties
index 5411a44224..ea498bb7da 100644
--- a/test-apis-ci/src/main/resources/ci/conf/janusgraph.properties
+++ b/test-apis-ci/src/main/resources/ci/conf/janusgraph.properties
@@ -1,6 +1,6 @@
-storage.backend=cassandra
+storage.backend=cql
storage.hostname=localhost
-storage.port=9160
+storage.port=9042
cache.db-cache = false
cache.db-cache-clean-wait = 20
@@ -8,4 +8,4 @@ cache.db-cache-time = 180000
cache.db-cache-size = 0.5
cache.tx-cache-size = 500000
-storage.cassandra.keyspace=sdctitan
+storage.cql.keyspace=sdctitan
diff --git a/test-apis-ci/src/main/resources/log4j.properties b/test-apis-ci/src/main/resources/log4j.properties
index 02f783076a..31c4ba091b 100644
--- a/test-apis-ci/src/main/resources/log4j.properties
+++ b/test-apis-ci/src/main/resources/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.org.janusgraph.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout
+log4j.logger.org.janusgraph.diskstorage.cql.CassandraTransaction=INFO, FILE, stdout
log4j.logger.org.openecomp.sdc.ci.tests.utils=INFO, FILE, stdout
log4j.additivity.org.openecomp.sdc.ci.tests.utils=false