From a247d7b2c29b1422e0025b63529b3a92dc8aa551 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Fri, 19 Mar 2021 13:08:02 -0400
Subject: [PATCH] Delete keystores from models

The Keystores are no longer needed in the tarballs, as they are supplied
externally by the CSITs and Helm charts.  Deleted those files.
Also modified the junits to use utils-test to generate keystores at
runtime, thus deleted the junit keystore file, too.

Issue-ID: POLICY-3143
Change-Id: Idd24b735a908476765d40bdcb5c741257edc7bb6
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../src/main/resources/etc/ssl/policy-keystore           | Bin 4431 -> 0 bytes
 .../src/main/resources/ssl/policy-keystore               | Bin 4431 -> 0 bytes
 .../src/main/resources/ssl/policy-keystore               | Bin 4431 -> 0 bytes
 .../src/main/resources/ssl/policy-keystore               | Bin 4431 -> 0 bytes
 .../java/org/onap/policy/models/simulators/MainTest.java |  15 ++++++++++-----
 .../src/test/resources/keystore-test                     | Bin 3895 -> 0 bytes
 6 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 models-sim/models-sim-dmaap/src/main/resources/etc/ssl/policy-keystore
 delete mode 100644 models-sim/packages/models-simulator-tarball/src/main/resources/ssl/policy-keystore
 delete mode 100644 models-sim/policy-models-sim-pdp/src/main/resources/ssl/policy-keystore
 delete mode 100644 models-sim/policy-models-simulators/src/main/resources/ssl/policy-keystore
 delete mode 100644 models-sim/policy-models-simulators/src/test/resources/keystore-test

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
deleted file mode 100644
index b95e010318ac620b5d13b24a07839471edd34ce1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4431
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

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
deleted file mode 100644
index b95e010318ac620b5d13b24a07839471edd34ce1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4431
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

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
deleted file mode 100644
index b95e010318ac620b5d13b24a07839471edd34ce1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4431
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

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
deleted file mode 100644
index b95e010318ac620b5d13b24a07839471edd34ce1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4431
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

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
deleted file mode 100644
index 5820e0f0ce4be85553e170fa63d2669b757b44fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3895
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
TB{{+@Z#{s98>97~Dxv-bP#hX;

-- 
2.16.6