You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/03/20 14:45:14 UTC
[2/2] geode-native git commit: GEODE-2687: Cleaned up test code
GEODE-2687: Cleaned up test code
This closes #61.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/d2ae527f
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/d2ae527f
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/d2ae527f
Branch: refs/heads/develop
Commit: d2ae527f2c4ca4222ddf005ae610b548c131269d
Parents: 4149cd6
Author: Ernest Burghardt <eb...@pivotal.io>
Authored: Fri Mar 17 15:40:44 2017 -0700
Committer: Jacob Barrett <jb...@pivotal.io>
Committed: Mon Mar 20 07:44:17 2017 -0700
----------------------------------------------------------------------
src/cppcache/integration-test/CacheHelper.cpp | 45 +++++++++++-----------
1 file changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/d2ae527f/src/cppcache/integration-test/CacheHelper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheHelper.cpp b/src/cppcache/integration-test/CacheHelper.cpp
index ac146a8..b71e34d 100644
--- a/src/cppcache/integration-test/CacheHelper.cpp
+++ b/src/cppcache/integration-test/CacheHelper.cpp
@@ -1811,33 +1811,32 @@ std::string CacheHelper::generateGeodeProperties(const std::string& path,
msg += "mcast-port=0\n";
msg += "enable-network-partition-detection=false\n";
+ std::string serverKeystore;
+ std::string serverTruststore;
+ std::string password;
+
if (ssl) {
if (untrustedCert){
- msg += "jmx-manager-ssl-enabled=false\n";
- msg += "cluster-ssl-enabled=true\n";
- msg += "cluster-ssl-require-authentication=true\n";
- msg += "cluster-ssl-ciphers=TLS_RSA_WITH_AES_128_CBC_SHA\n";
- msg += "cluster-ssl-keystore-type=jks\n";
- msg += "cluster-ssl-keystore=" + keystore + "/untrusted_server_keystore.jks\n";
- msg += "cluster-ssl-keystore-password=secret\n";
- msg += "cluster-ssl-truststore=" + keystore + "/untrusted_server_truststore.jks\n";
- msg += "cluster-ssl-truststore-password=secret\n";
- msg += "security-username=xxxx\n";
- msg += "security-userPassword=yyyy \n";
- }
+ serverKeystore += "untrusted_server_keystore.jks";
+ serverTruststore += "untrusted_server_truststore.jks";
+ password += "secret";
+ }
else {
- msg += "jmx-manager-ssl-enabled=false\n";
- msg += "cluster-ssl-enabled=true\n";
- msg += "cluster-ssl-require-authentication=true\n";
- msg += "cluster-ssl-ciphers=TLS_RSA_WITH_AES_128_CBC_SHA\n";
- msg += "cluster-ssl-keystore-type=jks\n";
- msg += "cluster-ssl-keystore=" + keystore + "/server_keystore.jks\n";
- msg += "cluster-ssl-keystore-password=gemstone\n";
- msg += "cluster-ssl-truststore=" + keystore + "/server_truststore.jks\n";
- msg += "cluster-ssl-truststore-password=gemstone\n";
- msg += "security-username=xxxx\n";
- msg += "security-userPassword=yyyy \n";
+ serverKeystore += "server_keystore.jks";
+ serverTruststore += "server_truststore.jks";
+ password += "gemstone";
}
+ msg += "jmx-manager-ssl-enabled=false\n";
+ msg += "cluster-ssl-enabled=true\n";
+ msg += "cluster-ssl-require-authentication=true\n";
+ msg += "cluster-ssl-ciphers=TLS_RSA_WITH_AES_128_CBC_SHA\n";
+ msg += "cluster-ssl-keystore-type=jks\n";
+ msg += "cluster-ssl-keystore=" + keystore + "/" + serverKeystore.c_str() + "\n";
+ msg += "cluster-ssl-keystore-password=" + password + "\n";
+ msg += "cluster-ssl-truststore=" + keystore + "/" + serverTruststore.c_str() + "\n";
+ msg += "cluster-ssl-truststore-password=" + password + "\n";
+ msg += "security-username=xxxx\n";
+ msg += "security-userPassword=yyyy \n";
}
if (remoteLocator != 0) {
sprintf(gemStr, "distributed-system-id=%d\n remote-locators=localhost[%d]",