NONRTRIC PMS, updated certs

Updated certificate (which was expired).

Issue-ID: CCSDK-3683
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Change-Id: I373bf34bc0a1bb0b5b5ff00f0f98da080ba794ff

diff --git a/a1-policy-management/config/README b/a1-policy-management/config/README
index b54a675..42e0b7b 100644 (file)
--- a/a1-policy-management/config/README
+++ b/a1-policy-management/config/README
@@ -3,13 +3,15 @@ The keystore.jks and truststore.jks files are created by using the following com
 1) Create a CA certificate and a private key:
 
 openssl genrsa -des3 -out CA-key.pem 2048
-openssl req -new -key CA-key.pem -x509 -days 1000 -out CA-cert.pem 
+openssl req -new -key CA-key.pem -x509 -days 3600 -out CA-cert.pem
 
 2) Create a keystore with a private key entry that is signed by the CA:
 
+Note: the "your name" must be "localhost" for the unittest to work.
+
 keytool -genkeypair -alias policy_agent -keyalg RSA -keysize 2048 -keystore keystore.jks -validity 3650 -storepass policy_agent
 keytool -certreq -alias policy_agent -file request.csr -keystore keystore.jks -ext san=dns:your.domain.com -storepass policy_agent
-openssl x509 -req -days 365 -in request.csr -CA CA-cert.pem -CAkey CA-key.pem -CAcreateserial -out ca_signed-cert.pem
+openssl x509 -req -days 3650 -in request.csr -CA CA-cert.pem -CAkey CA-key.pem -CAcreateserial -out ca_signed-cert.pem
 keytool -importcert -alias ca_cert -file CA-cert.pem -keystore keystore.jks -trustcacerts -storepass policy_agent
 keytool -importcert -alias policy_agent -file ca_signed-cert.pem -keystore keystore.jks -trustcacerts -storepass policy_agent
 

diff --git a/a1-policy-management/config/keystore.jks b/a1-policy-management/config/keystore.jks
index 48c3b33..563c67b 100644 (file)
Binary files a/a1-policy-management/config/keystore.jks and b/a1-policy-management/config/keystore.jks differ

diff --git a/a1-policy-management/config/truststore.jks b/a1-policy-management/config/truststore.jks
index 760261e..50a0f9e 100644 (file)
Binary files a/a1-policy-management/config/truststore.jks and b/a1-policy-management/config/truststore.jks differ

diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java
index b4fe10a..0484524 100644 (file)
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java
@@ -95,8 +95,8 @@ import reactor.util.annotation.Nullable;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @TestPropertySource(properties = { //
-        "server.ssl.key-store=./src/test/resources/keystore.jks", //
-        "app.webclient.trust-store=./src/test/resources/truststore.jks", //
+        "server.ssl.key-store=./config/keystore.jks", //
+        "app.webclient.trust-store=./config/truststore.jks", //
         "app.webclient.trust-store-used=true", //
         "app.vardata-directory=./target/testdata", //
         "app.filepath=" //
@@ -314,8 +314,10 @@ class ApplicationTest {
     @Test
     void testTrustValidation() {
         addRic("ric1");
+
         String rsp = restClient(true).get("/rics").block(); // restClient(true) enables trust validation
         assertThat(rsp).contains("ric1");
+
     }
 
     @Test
@@ -929,8 +931,8 @@ class ApplicationTest {
 
         for (int i = 0; i < 10; ++i) {
             AsyncRestClient restClient = restClient();
-            ConcurrencyTestRunnable test =
-                    new ConcurrencyTestRunnable(restClient, supervision, a1ClientFactory, rics, policyTypes);
+            ConcurrencyTestRunnable test = new ConcurrencyTestRunnable(restClient, supervision, a1ClientFactory, rics,
+                    policyTypes);
             Thread thread = new Thread(test, "TestThread_" + i);
             thread.start();
             threads.add(thread);

diff --git a/a1-policy-management/src/test/resources/keystore.jks b/a1-policy-management/src/test/resources/keystore.jks
deleted file mode 100644 (file)
index 675785b..0000000
Binary files a/a1-policy-management/src/test/resources/keystore.jks and /dev/null differ

diff --git a/a1-policy-management/src/test/resources/truststore.jks b/a1-policy-management/src/test/resources/truststore.jks
deleted file mode 100644 (file)
index e883cd6..0000000
Binary files a/a1-policy-management/src/test/resources/truststore.jks and /dev/null differ