geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject incubator-geode git commit: GEODE-420: Amended LocatorDUnitTest.java to use new SSL properties
Date Tue, 09 Aug 2016 22:38:18 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-420 e960a9760 -> 2a1633d7d


GEODE-420: Amended LocatorDUnitTest.java to use new SSL properties


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2a1633d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2a1633d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2a1633d7

Branch: refs/heads/feature/GEODE-420
Commit: 2a1633d7d597e277b6283bd52e4d215f844f80fc
Parents: e960a97
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Wed Aug 10 08:38:04 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Wed Aug 10 08:38:04 2016 +1000

----------------------------------------------------------------------
 .../gemfire/distributed/LocatorDUnitTest.java   | 88 +++++++++-----------
 1 file changed, 40 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2a1633d7/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index e30a017..b28caaf 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -416,14 +416,13 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
-    properties.put(CLUSTER_SSL_ENABLED, "true");
-    properties.put(CLUSTER_SSL_CIPHERS, "any");
-    properties.put(CLUSTER_SSL_PROTOCOLS, "any");
-    properties.put(CLUSTER_SSL_KEYSTORE, getSingleKeyKeystore());
-    properties.put(CLUSTER_SSL_KEYSTORE_PASSWORD, "password");
-    properties.put(CLUSTER_SSL_KEYSTORE_TYPE, "JKS");
-    properties.put(CLUSTER_SSL_TRUSTSTORE, getSingleKeyKeystore());
-    properties.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "password");
+    properties.put(SSL_CIPHERS, "any");
+    properties.put(SSL_PROTOCOLS, "any");
+    properties.put(SSL_KEYSTORE, getSingleKeyKeystore());
+    properties.put(SSL_KEYSTORE_PASSWORD, "password");
+    properties.put(SSL_KEYSTORE_TYPE, "JKS");
+    properties.put(SSL_TRUSTSTORE, getSingleKeyKeystore());
+    properties.put(SSL_TRUSTSTORE_PASSWORD, "password");
     properties.put(SSL_ENABLED_COMPONENTS, SSLEnabledComponent.LOCATOR.getConstant());
 
 
@@ -534,14 +533,13 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
-    properties.put(CLUSTER_SSL_ENABLED, "true");
-    properties.put(CLUSTER_SSL_CIPHERS, "any");
-    properties.put(CLUSTER_SSL_PROTOCOLS, "any");
-    properties.put(CLUSTER_SSL_KEYSTORE, getMultiKeyKeystore());
-    properties.put(CLUSTER_SSL_KEYSTORE_PASSWORD, "password");
-    properties.put(CLUSTER_SSL_KEYSTORE_TYPE, "JKS");
-    properties.put(CLUSTER_SSL_TRUSTSTORE, getMultiKeyTruststore());
-    properties.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "password");
+    properties.put(SSL_CIPHERS, "any");
+    properties.put(SSL_PROTOCOLS, "any");
+    properties.put(SSL_KEYSTORE, getMultiKeyKeystore());
+    properties.put(SSL_KEYSTORE_PASSWORD, "password");
+    properties.put(SSL_KEYSTORE_TYPE, "JKS");
+    properties.put(SSL_TRUSTSTORE, getMultiKeyTruststore());
+    properties.put(SSL_TRUSTSTORE_PASSWORD, "password");
     properties.put(LOCATOR_SSL_ALIAS, "locatorkey");
     properties.put(SSL_ENABLED_COMPONENTS, SSLEnabledComponent.LOCATOR.getConstant());
 
@@ -646,21 +644,19 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
-    properties.put(CLUSTER_SSL_ENABLED, "true");
-    properties.put(CLUSTER_SSL_CIPHERS, "any");
-    properties.put(CLUSTER_SSL_PROTOCOLS, "any");
-    properties.put(CLUSTER_SSL_KEYSTORE, getSingleKeyKeystore());
-    properties.put(CLUSTER_SSL_KEYSTORE_PASSWORD, "password");
-    properties.put(CLUSTER_SSL_KEYSTORE_TYPE, "JKS");
-    properties.put(CLUSTER_SSL_TRUSTSTORE, getSingleKeyKeystore());
-    properties.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "password");
-    properties.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
+    properties.put(SSL_CIPHERS, "any");
+    properties.put(SSL_PROTOCOLS, "any");
+    properties.put(SSL_KEYSTORE, getSingleKeyKeystore());
+    properties.put(SSL_KEYSTORE_PASSWORD, "password");
+    properties.put(SSL_KEYSTORE_TYPE, "JKS");
+    properties.put(SSL_TRUSTSTORE, getSingleKeyKeystore());
+    properties.put(SSL_TRUSTSTORE_PASSWORD, "password");
+    properties.put(SSL_REQUIRE_AUTHENTICATION, "true");
     properties.put(SSL_ENABLED_COMPONENTS, SSLEnabledComponent.LOCATOR.getConstant());
 
     try {
       loc1.invoke("start Locator1", () -> startLocator(port1, properties));
       loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(1));
-      properties.put(CLUSTER_SSL_ENABLED, "false");
       properties.remove(SSL_ENABLED_COMPONENTS);
 
       loc2.invoke("start Locator2", () -> startLocator(port2, properties));
@@ -708,22 +704,20 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
-    properties.put(CLUSTER_SSL_ENABLED, "false");
-    properties.put(CLUSTER_SSL_CIPHERS, "any");
-    properties.put(CLUSTER_SSL_PROTOCOLS, "any");
+    properties.put(SSL_CIPHERS, "any");
+    properties.put(SSL_PROTOCOLS, "any");
 
 
     try {
       loc1.invoke("start Locator1", () -> startLocator(port1, properties));
       loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(1));
 
-      properties.put(CLUSTER_SSL_ENABLED, "true");
-      properties.put(CLUSTER_SSL_KEYSTORE, getSingleKeyKeystore());
-      properties.put(CLUSTER_SSL_KEYSTORE_PASSWORD, "password");
-      properties.put(CLUSTER_SSL_KEYSTORE_TYPE, "JKS");
-      properties.put(CLUSTER_SSL_TRUSTSTORE, getSingleKeyKeystore());
-      properties.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "password");
-      properties.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
+      properties.put(SSL_KEYSTORE, getSingleKeyKeystore());
+      properties.put(SSL_KEYSTORE_PASSWORD, "password");
+      properties.put(SSL_KEYSTORE_TYPE, "JKS");
+      properties.put(SSL_TRUSTSTORE, getSingleKeyKeystore());
+      properties.put(SSL_TRUSTSTORE_PASSWORD, "password");
+      properties.put(SSL_REQUIRE_AUTHENTICATION, "true");
       properties.put(SSL_ENABLED_COMPONENTS, SSLEnabledComponent.LOCATOR.getConstant());
 
       loc2.invoke("start Locator2", () -> startLocator(port2, properties));
@@ -771,24 +765,22 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
-    properties.put(CLUSTER_SSL_ENABLED, "false");
-    properties.put(CLUSTER_SSL_CIPHERS, "any");
-    properties.put(CLUSTER_SSL_PROTOCOLS, "any");
-    properties.put(CLUSTER_SSL_ENABLED, "true");
-    properties.put(CLUSTER_SSL_KEYSTORE, getSingleKeyKeystore());
-    properties.put(CLUSTER_SSL_KEYSTORE_PASSWORD, "password");
-    properties.put(CLUSTER_SSL_KEYSTORE_TYPE, "JKS");
-    properties.put(CLUSTER_SSL_TRUSTSTORE, getSingleKeyKeystore());
-    properties.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "password");
-    properties.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
+    properties.put(SSL_CIPHERS, "any");
+    properties.put(SSL_PROTOCOLS, "any");
+    properties.put(SSL_KEYSTORE, getSingleKeyKeystore());
+    properties.put(SSL_KEYSTORE_PASSWORD, "password");
+    properties.put(SSL_KEYSTORE_TYPE, "JKS");
+    properties.put(SSL_TRUSTSTORE, getSingleKeyKeystore());
+    properties.put(SSL_TRUSTSTORE_PASSWORD, "password");
+    properties.put(SSL_REQUIRE_AUTHENTICATION, "true");
     properties.put(SSL_ENABLED_COMPONENTS, SSLEnabledComponent.LOCATOR.getConstant());
 
     try {
       loc1.invoke("start Locator1", () -> startLocator(port1, properties));
       loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(1));
 
-      properties.put(CLUSTER_SSL_KEYSTORE, getMultiKeyKeystore());
-      properties.put(CLUSTER_SSL_TRUSTSTORE, getMultiKeyTruststore());
+      properties.put(SSL_KEYSTORE, getMultiKeyKeystore());
+      properties.put(SSL_TRUSTSTORE, getMultiKeyTruststore());
       properties.put(LOCATOR_SSL_ALIAS, "locatorkey");
 
       //      loc2.invoke("start Locator2", () -> startLocator(port2, properties));


Mime
View raw message