summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-03-19 12:13:26 -0400
committerJim Hahn <jrh3@att.com>2021-03-19 12:13:44 -0400
commit4e9855e3f7605d996a10c9ce23f52e0d3ab35977 (patch)
treef09142cc5fc4c046de1247e41e6aa41740e811c5
parent3e9fe84af892cd75c564da90481800a4131fc009 (diff)
Delete keystores from xacml
The Keystore is no longer needed in the tarball, as it is supplied externally by the CSITs and Helm charts. Deleted that file. Also modified the junits to use utils-test to generates keystores at runtime, thus deleted the junit keystore file, too. Issue-ID: POLICY-3143 Change-Id: If4966538452a16b22ea3a338eb9656a295641402 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--main/src/test/java/org/onap/policy/pdpx/main/CommonRest.java8
-rw-r--r--main/src/test/resources/ssl/policy-keystorebin4431 -> 0 bytes
-rw-r--r--packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-keystorebin4431 -> 0 bytes
3 files changed, 4 insertions, 4 deletions
diff --git a/main/src/test/java/org/onap/policy/pdpx/main/CommonRest.java b/main/src/test/java/org/onap/policy/pdpx/main/CommonRest.java
index d2379e09..a46ee503 100644
--- a/main/src/test/java/org/onap/policy/pdpx/main/CommonRest.java
+++ b/main/src/test/java/org/onap/policy/pdpx/main/CommonRest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,6 +42,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.onap.policy.common.utils.network.NetworkUtil;
import org.onap.policy.common.utils.resources.ResourceUtils;
+import org.onap.policy.common.utils.security.SelfSignedKeyStore;
import org.onap.policy.pdpx.main.rest.XacmlPdpStatisticsManager;
import org.onap.policy.pdpx.main.startstop.Main;
import org.onap.policy.pdpx.main.startstop.XacmlPdpActivator;
@@ -51,7 +52,6 @@ import org.powermock.reflect.Whitebox;
* Common base class for REST service tests.
*/
public class CommonRest {
- private static final String KEYSTORE = System.getProperty("user.dir") + "/src/test/resources/ssl/policy-keystore";
/**
* Full path to the config file.
@@ -109,8 +109,8 @@ public class CommonRest {
*/
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- System.setProperty("javax.net.ssl.keyStore", KEYSTORE);
- System.setProperty("javax.net.ssl.keyStorePassword", "Pol1cy_0nap");
+ System.setProperty("javax.net.ssl.keyStore", new SelfSignedKeyStore().getKeystoreName());
+ System.setProperty("javax.net.ssl.keyStorePassword", SelfSignedKeyStore.KEYSTORE_PASSWORD);
System.setProperty("org.eclipse.jetty.util.log.class", "org.eclipse.jetty.util.log.StdErrLog");
System.setProperty("org.eclipse.jetty.LEVEL", "OFF");
diff --git a/main/src/test/resources/ssl/policy-keystore b/main/src/test/resources/ssl/policy-keystore
deleted file mode 100644
index b95e0103..00000000
--- a/main/src/test/resources/ssl/policy-keystore
+++ /dev/null
Binary files differ
diff --git a/packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-keystore b/packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-keystore
deleted file mode 100644
index b95e0103..00000000
--- a/packages/policy-xacmlpdp-tarball/src/main/resources/etc/ssl/policy-keystore
+++ /dev/null
Binary files differ