aboutsummaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-03-19 12:51:26 -0400
committerJim Hahn <jrh3@att.com>2021-03-19 12:51:43 -0400
commit7aab1fdce67ff0ac376e3b6cbabef0b1665cc916 (patch)
tree3e258dcdcac706b0577a32bc468f677943f362f0 /services
parentcc52ec6f85b6aa2712c11b38d66844f8595211b4 (diff)
Delete keystores from apex
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: I9bb53fcb5887e73d661ec4c4083970630c61e5c1 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'services')
-rw-r--r--services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java8
-rw-r--r--services/services-onappf/src/test/resources/ssl/policy-keystorebin4431 -> 0 bytes
2 files changed, 4 insertions, 4 deletions
diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java
index bf5bf485d..283134087 100644
--- a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java
+++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/rest/CommonApexStarterRestServer.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,6 +51,7 @@ import org.onap.policy.common.gson.GsonMessageBodyHandler;
import org.onap.policy.common.utils.coder.Coder;
import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.common.utils.network.NetworkUtil;
+import org.onap.policy.common.utils.security.SelfSignedKeyStore;
import org.onap.policy.common.utils.services.Registry;
import org.powermock.reflect.Whitebox;
import org.slf4j.Logger;
@@ -64,8 +66,6 @@ public class CommonApexStarterRestServer {
private static final Logger LOGGER = LoggerFactory.getLogger(CommonApexStarterRestServer.class);
- private static String KEYSTORE = System.getProperty("user.dir") + "/src/test/resources/ssl/policy-keystore";
-
private static Coder coder = new StandardCoder();
public static final String NOT_ALIVE = "not alive";
@@ -180,8 +180,8 @@ public class CommonApexStarterRestServer {
}
final Properties systemProps = System.getProperties();
- systemProps.put("javax.net.ssl.keyStore", KEYSTORE);
- systemProps.put("javax.net.ssl.keyStorePassword", "Pol1cy_0nap");
+ systemProps.put("javax.net.ssl.keyStore", new SelfSignedKeyStore().getKeystoreName());
+ systemProps.put("javax.net.ssl.keyStorePassword", SelfSignedKeyStore.KEYSTORE_PASSWORD);
System.setProperties(systemProps);
final String[] apexStarterConfigParameters = { "-c", "src/test/resources/TestConfigParams.json" };
diff --git a/services/services-onappf/src/test/resources/ssl/policy-keystore b/services/services-onappf/src/test/resources/ssl/policy-keystore
deleted file mode 100644
index b95e01031..000000000
--- a/services/services-onappf/src/test/resources/ssl/policy-keystore
+++ /dev/null
Binary files differ