diff options
author | Ram Krishna Verma <ram_krishna.verma@bell.ca> | 2021-03-22 21:45:40 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2021-03-22 21:45:40 +0000 |
commit | b0fc73fd9ff6d9727c0f93a7ad0a742b704b4c9d (patch) | |
tree | a98d4b4bcca3738ad8a5bd17eba4c558e276f76a /models-sim | |
parent | d6db5582b6705c11abbf8b507aa423aa00bcd7ae (diff) | |
parent | a247d7b2c29b1422e0025b63529b3a92dc8aa551 (diff) |
Merge "Delete keystores from models"
Diffstat (limited to 'models-sim')
-rw-r--r-- | models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-keystore | bin | 4431 -> 0 bytes | |||
-rw-r--r-- | models-sim/packages/models-simulator-tarball/src/main/resources/ssl/policy-keystore | bin | 4431 -> 0 bytes | |||
-rw-r--r-- | models-sim/policy-models-sim-pdp/src/main/resources/ssl/policy-keystore | bin | 4431 -> 0 bytes | |||
-rw-r--r-- | models-sim/policy-models-simulators/src/main/resources/ssl/policy-keystore | bin | 4431 -> 0 bytes | |||
-rw-r--r-- | models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java | 15 | ||||
-rw-r--r-- | models-sim/policy-models-simulators/src/test/resources/keystore-test | bin | 3895 -> 0 bytes |
6 files changed, 10 insertions, 5 deletions
diff --git a/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-keystore b/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-keystore Binary files differdeleted file mode 100644 index b95e01031..000000000 --- a/models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-keystore +++ /dev/null diff --git a/models-sim/packages/models-simulator-tarball/src/main/resources/ssl/policy-keystore b/models-sim/packages/models-simulator-tarball/src/main/resources/ssl/policy-keystore Binary files differdeleted file mode 100644 index b95e01031..000000000 --- a/models-sim/packages/models-simulator-tarball/src/main/resources/ssl/policy-keystore +++ /dev/null diff --git a/models-sim/policy-models-sim-pdp/src/main/resources/ssl/policy-keystore b/models-sim/policy-models-sim-pdp/src/main/resources/ssl/policy-keystore Binary files differdeleted file mode 100644 index b95e01031..000000000 --- a/models-sim/policy-models-sim-pdp/src/main/resources/ssl/policy-keystore +++ /dev/null diff --git a/models-sim/policy-models-simulators/src/main/resources/ssl/policy-keystore b/models-sim/policy-models-simulators/src/main/resources/ssl/policy-keystore Binary files differdeleted file mode 100644 index b95e01031..000000000 --- a/models-sim/policy-models-simulators/src/main/resources/ssl/policy-keystore +++ /dev/null diff --git a/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java b/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java index bb4fa7c5a..e1517f3a8 100644 --- a/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java +++ b/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java @@ -31,6 +31,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.FileNotFoundException; +import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -52,6 +53,7 @@ import org.onap.policy.common.endpoints.http.server.internal.JettyJerseyServer; import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.network.NetworkUtil; +import org.onap.policy.common.utils.security.SelfSignedKeyStore; public class MainTest { private static final String PARAMETER_FILE = "simParameters.json"; @@ -64,7 +66,7 @@ public class MainTest { * Saves system properties. */ @BeforeClass - public static void setUpBeforeClass() { + public static void setUpBeforeClass() throws IOException, InterruptedException { savedValues = new HashMap<>(); for (String prop : List.of(JettyJerseyServer.SYSTEM_KEYSTORE_PASSWORD_PROPERTY_NAME, @@ -75,11 +77,14 @@ public class MainTest { savedValues.put(prop, System.getProperty(prop)); } - System.setProperty(JettyJerseyServer.SYSTEM_KEYSTORE_PROPERTY_NAME, "src/test/resources/keystore-test"); - System.setProperty(JettyJerseyServer.SYSTEM_KEYSTORE_PASSWORD_PROPERTY_NAME, "kstest"); + System.setProperty(JettyJerseyServer.SYSTEM_KEYSTORE_PROPERTY_NAME, new SelfSignedKeyStore().getKeystoreName()); + System.setProperty(JettyJerseyServer.SYSTEM_KEYSTORE_PASSWORD_PROPERTY_NAME, + SelfSignedKeyStore.KEYSTORE_PASSWORD); - System.setProperty(JettyJerseyServer.SYSTEM_TRUSTSTORE_PROPERTY_NAME, "src/test/resources/keystore-test"); - System.setProperty(JettyJerseyServer.SYSTEM_TRUSTSTORE_PASSWORD_PROPERTY_NAME, "kstest"); + System.setProperty(JettyJerseyServer.SYSTEM_TRUSTSTORE_PROPERTY_NAME, + "src/main/resources/ssl/policy-truststore"); + System.setProperty(JettyJerseyServer.SYSTEM_TRUSTSTORE_PASSWORD_PROPERTY_NAME, + SelfSignedKeyStore.KEYSTORE_PASSWORD); } /** diff --git a/models-sim/policy-models-simulators/src/test/resources/keystore-test b/models-sim/policy-models-simulators/src/test/resources/keystore-test Binary files differdeleted file mode 100644 index 5820e0f0c..000000000 --- a/models-sim/policy-models-simulators/src/test/resources/keystore-test +++ /dev/null |