Make Cassandra port configurable.

[sdc.git] / catalog-dao / src / main / java / org / openecomp / sdc / be / dao / cassandra / schema / SdcSchemaUtils.java

diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java
index 7531ad4..e6b091b 100644 (file)
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java
@@ -44,13 +44,14 @@ public class SdcSchemaUtils {
     public Cluster createCluster() {
         final Configuration.CassandrConfig config = getCassandraConfig();
         List<String> nodes = config.getCassandraHosts();
-        if (nodes == null) {
-            log.info("no nodes were supplied in configuration.");
+        Integer cassandraPort = config.getCassandraPort();
+        if (nodes == null || cassandraPort == null) {
+            log.info("no nodes or port were supplied in configuration.");
             return null;
         }
-        log.info("connecting to node:{}.", nodes);
+        log.info("connecting to node:{} port{}.", nodes, cassandraPort);
         Cluster.Builder clusterBuilder = Cluster.builder();
-        nodes.forEach(clusterBuilder::addContactPoint);
+        nodes.forEach(node -> clusterBuilder.addContactPoint(node).withPort(cassandraPort));
 
         clusterBuilder.withMaxSchemaAgreementWaitSeconds(60);