summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Krishna Verma <ram_krishna.verma@bell.ca>2021-03-22 21:45:22 +0000
committerGerrit Code Review <gerrit@onap.org>2021-03-22 21:45:22 +0000
commit1020f697395bcf2513b5027334ac22583193dab6 (patch)
tree82fbadbeb6fdfb7d18afef99f38f806d67d700db
parent369a94a9fd626b35d52c2e7ee5f19e6ff6e1b9d8 (diff)
parent7aab1fdce67ff0ac376e3b6cbabef0b1665cc916 (diff)
Merge "Delete keystores from apex"
-rw-r--r--packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystorebin4431 -> 0 bytes
-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
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore b/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore
deleted file mode 100644
index b95e01031..000000000
--- a/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore
+++ /dev/null
Binary files differ
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