expose timeout setting

expose setting of time out in env.json
remove the hard codeing of password in the configuration,
cs password is set using the envjson.

Change-Id: I09cc1f99914f444900e6b73d2ae438c72527ba2c
Issue-ID: SDC-833
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
index 79d6438df3..0a0d6e505e 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java
@@ -597,6 +597,8 @@ public class Configuration extends BasicConfiguration {
 		List<String> cassandraHosts;
 		String localDataCenter;
 		Long reconnectTimeout;
+        Integer socketReadTimeout;
+        Integer socketConnectTimeout;
 		List<KeyspaceConfig> keySpaces;
 		boolean authenticate;
 		String username;
@@ -669,6 +671,14 @@ public class Configuration extends BasicConfiguration {
 			this.reconnectTimeout = reconnectTimeout;
 		}
 
+		public Integer getSocketReadTimeout() { return socketReadTimeout; }
+
+		public void setSocketReadTimeout(Integer socketReadTimeout) { this.socketReadTimeout = socketReadTimeout;}
+
+		public Integer getSocketConnectTimeout() {	return socketConnectTimeout;}
+
+		public void setSocketConnectTimeout(Integer socketConnectTimeout) { this.socketConnectTimeout = socketConnectTimeout; 	}
+
 		public List<String> getCassandraHosts() {
 			return cassandraHosts;
 		}