From 97ace6245fb8b7238d2f7f871797ba03df2d435f Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Wed, 11 May 2022 13:10:40 +0200 Subject: NONRTRIC PMS, Cherry-pick the recent changes into Jakarta Release Sqasch of cherrypicked commits for the maintenance release. Issue-ID: CCSDK-3742 Signed-off-by: PatrikBuhr NONRTRIC PMS added support for custom A1 adapters Added support for added external A1-P adapter. This makes it possible to design and include adapter to APIs for accessing of A1 policies (in a NearRT-RIC) without any changes in this SW. Issue-ID: CCSDK-3655 Signed-off-by: PatrikBuhr NONRTRIC PMS added support for custom A1 adapters Updates of the json schema for configuration. Made it stricter and added the customAdapterClass prpoperty. Issue-ID: CCSDK-3655 Signed-off-by: PatrikBuhr NONRTRIC PMS removalof usage of immutable Issue-ID: CCSDK-3629 Signed-off-by: PatrikBuhr NONRTRIC PMS, Sporadic instability Attempt to stablize the synch. Issue-ID: CCSDK-3683 Signed-off-by: PatrikBuhr NONRTRIC PMS, Sporadic instability Attempt to stablize the synch. Issue-ID: CCSDK-3683 Signed-off-by: PatrikBuhr NONRTRIC PMS, Sporadic instability Some further simplifications and added test. Issue-ID: CCSDK-3683 Signed-off-by: PatrikBuhr Change-Id: I1ec98017d63047a0036db5ea12f770db00b1152b NONRTRIC PMS, updated SDNC rest interface Update path and output-json for SDNC rest interface - A1 Kohn Issue-ID: CCSDK-3193 Signed-off-by: PatrikBuhr NONRTRIC PMS, Bugfix If the auth-token-file parameter in the file application.yaml is missing, it would not default to an empty file name. Issue-ID: CCSDK-3683 Signed-off-by: PatrikBuhr NONRTRIC PMS, updated certs Updated certificate (which was expired). Issue-ID: CCSDK-3683 Signed-off-by: PatrikBuhr Change-Id: I34ffc932d855ba3b94cfff23dcb56f30780dbecc --- a1-policy-management/config/README | 6 ++++-- a1-policy-management/config/application.yaml | 3 ++- .../config/application_configuration.json | 23 ++++++++++++++++++--- a1-policy-management/config/keystore.jks | Bin 4779 -> 5269 bytes a1-policy-management/config/truststore.jks | Bin 3587 -> 3869 bytes 5 files changed, 26 insertions(+), 6 deletions(-) (limited to 'a1-policy-management/config') diff --git a/a1-policy-management/config/README b/a1-policy-management/config/README index b54a6751..42e0b7bd 100644 --- 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/application.yaml b/a1-policy-management/config/application.yaml index 7628624d..f0f53375 100644 --- a/a1-policy-management/config/application.yaml +++ b/a1-policy-management/config/application.yaml @@ -56,6 +56,8 @@ server: key-store: /opt/app/policy-agent/etc/cert/keystore.jks key-password: policy_agent key-alias: policy_agent + # trust-store-password: + # trust-store: app: # Location of the component configuration file. filepath: /opt/app/policy-agent/data/application_configuration.json @@ -80,4 +82,3 @@ app: # A file containing an authorization token, which shall be inserted in each HTTP header (authorization). # If the file name is empty, no authorization token is sent. auth-token-file: - diff --git a/a1-policy-management/config/application_configuration.json b/a1-policy-management/config/application_configuration.json index 6187c866..29d59232 100644 --- a/a1-policy-management/config/application_configuration.json +++ b/a1-policy-management/config/application_configuration.json @@ -1,6 +1,6 @@ { "description": "Application configuration", - "config": { + "config": { "controller": [ { "name": "controller1", @@ -13,12 +13,29 @@ { "name": "ric1", "baseUrl": "http://ric1:8085/", - "controller": "controller1", "managedElementIds": [ "kista_1", "kista_2" ] + }, + { + "name": "ric2", + "baseUrl": "http://localhost:8081/", + "customAdapterClass": "org.onap.ccsdk.oran.a1policymanagementservice.clients.StdA1ClientVersion2$Factory", + "managedElementIds": [ + "kista_3", + "kista_4" + ] + }, + { + "name": "ric3", + "baseUrl": "http://ric1:8085/", + "controller": "controller1", + "managedElementIds": [ + "kista_5", + "kista_6" + ] } ] } -} +} \ No newline at end of file diff --git a/a1-policy-management/config/keystore.jks b/a1-policy-management/config/keystore.jks index 48c3b33c..563c67b3 100644 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 760261eb..50a0f9e9 100644 Binary files a/a1-policy-management/config/truststore.jks and b/a1-policy-management/config/truststore.jks differ -- cgit 1.2.3-korg