Update SSL certificate for Dublin

Updated keystore for use with Dublin release
Expiry is March 26th 2020

Issue-ID: CLAMP-337
Change-Id: Ifd044b02a94bd93fa2320281638c4b3e7daa1d9c
Signed-off-by: ChrisC <christophe.closset@intl.att.com>

6 files changed, 210 insertions, 210 deletions

diff --git a/README.md b/README.md
index e5b6090f2..318d2c876 100644
--- a/README.md
+++ b/README.md
@@ -1,176 +1,176 @@
-# Summary

-

-CLAMP is a platform for designing and managing control loops. It is used to design a closed loop, configure it with specific parameters for a particular network service, then deploying and undeploying it.  Once deployed, the user can also update the loop with new parameters during runtime, as well as suspending and restarting it.

-

-It interacts with other systems to deploy and execute the closed loop. For example, it pushes the control loop design to the SDC catalog, associating it with the VF resource.  It requests from DCAE the instantiation of microservices to manage the closed loop flow.  Further, it creates and updates multiple policies in the Policy Engine that define the closed loop flow.

-

-The ONAP CLAMP platform abstracts the details of these systems under the concept of a control loop model.  The design of a control loop and its management is represented by a workflow in which all relevant system interactions take place.  This is essential for a self-service model of creating and managing control loops, where no low-level user interaction with other components is required.

-

-At a higher level, CLAMP is about supporting and managing the broad operational life cycle of VNFs/VMs and ultimately ONAP components itself. It will offer the ability to design, test, deploy and update control loop automation - both closed and open. Automating these functions would represent a significant saving on operational costs compared to traditional methods.

-

-# Developer Contact

-Owner: ONAP CLAMP Dev team

-Mailing List : onap-discuss@lists.onap.org

-Add the following prefix to Subject on the mailing list : [CLAMP]

-See here to subscribe : https://wiki.onap.org/display/DW/Mailing+Lists

-

-# Wiki

-https://wiki.onap.org/display/DW/CLAMP+Project

-

-# Build

-Jenkins Job: ${jenkins-joblink}

-

-CLAMP UI: ${cockpit-link}

-

-Logs: ${elk-link}

-

-# Docker image

-

-## Building 

-You can use the following command to build the clamp docker image:

-```

-mvn clean install -P docker

-```

-

-## Deployment

-Currently, the clamp docker image can be deployed with small configuration needs. Though, you might need to make small adjustments to the configuration. As clamp is spring based, you can use the SPRING_APPLICATION_JSON environment variable to update its parameters. 

-

-### Databases

-There are two needed datasource for Clamp. By default, both will try to connect to the localhost server using the credentials available in the example SQL files. If you need to change the default database host and/or credentials, you can do it by using the following json as SPRING_APPLICATION_JSON environment variable :

-Note that all others configurations can be configured in the JSON as well, 

-

-```json

-{

-    "spring.datasource.cldsdb.url": "jdbc:mysql://anotherDB.onap.org:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3",

-    "spring.datasource.cldsdb.username": "admin",

-    "spring.datasource.cldsdb.password": "password"

-    

-    "clamp.config.dcae.inventory.url": "http://dcaegen2.host:8080",

-    "clamp.config.dcae.dispatcher.url": "http://dcaegen2.host:8080",

-    "clamp.config.policy.pdpUrl1": "https://policy-pdp.host:9091/pdp/ , testpdp, alpha123",

-    "clamp.config.policy.pdpUrl2": "https://policy-pdp.host:9091/pdp/ , testpdp, alpha123",

-    "clamp.config.policy.papUrl": "https://policy-pap.host:8443/pap/ , testpap, alpha123",

-    "clamp.config.policy.clientKey": "5CE79532B3A2CB4D132FC0C04BF916A7"

-    "clamp.config.files.sdcController":"file:/opt/clamp/config/sdc-controllers-config.json"

-}

-```

-### SDC-Controllers config

-

-This file is a JSON that must be specified to Spring config, here is an example:

-

-```json

-{

-  "sdc-connections":{

-    "sdc-controller1":{

-        "user": "clamp",

-        "consumerGroup": "consumerGroup1",

-        "consumerId": "consumerId1",

-        "environmentName": "AUTO",

-        "sdcAddress": "localhost:8443",

-        "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",

-        "pollingInterval":30,

-        "pollingTimeout":30,

-        "activateServerTLSAuth":"false",

-        "keyStorePassword":"",

-        "keyStorePath":"",

-        "messageBusAddresses":["dmaaphost.com"]

-    },

-    "sdc-controller2":{

-        "user": "clamp",

-        "consumerGroup": "consumerGroup1",

-        "consumerId": "consumerId1",

-        "environmentName": "AUTO",

-        "sdcAddress": "localhost:8443",

-        "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",

-        "pollingInterval":30,

-        "pollingTimeout":30,

-        "activateServerTLSAuth":"false",

-        "keyStorePassword":"",

-        "keyStorePath":"",

-        "messageBusAddresses":["dmaaphost.com"]

-    }

-  }

-}

-```

-Multiple controllers can be configured so that Clamp is able to receive the notifications from different SDC servers.

-Each Clamp existing in a cluster should have different consumerGroup and consumerId so that they can each consume the SDC notification.

-The environmentName is normally the Dmaap Topic used by SDC. 

-If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers) 

-

-### Docker-compose

-

-A [docker-compose example file](extra/docker/clamp/docker-compose.yml) can be found under the [extra/docker/clamp/ folder](extra/docker/).

-

-Once the image has been built and is available locally, you can use the `docker-compose up` command to deploy a prepopullated database and a clamp instance available on [http://localhost:8080/designer/index.html](http://localhost:8080/designer/index.html).

-

-

-### Logs

-

-Clamp uses logback framework to generate logs. The logback.xml file cand be found under the [src/main/resources/ folder](src/main/resources). 

-

-With the default log settings, all logs will be generated into console and into root.log file under the Clamp root folder. The root.log file is not allowed to be appended, thus restarting the clamp will result in cleaning of the old log files.

-

-### Api

-

-You can see the swagger definition for the jaxrs apis at `/restservices/clds/v1/openapi.json`

-

-

-## Clamp Credentials

-

-There are two mechanisms that can enabled for the authentication, one or the other never both at the same time. 

-They can be enabled in the application.properties.

-

-1. AAF CA

-There is a section for SSL enablement and cadi configuration (for AAF) + one spring profile to enable

-

-server.port=8443

-server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12

-server.ssl.key-store-password=China in the Spring

-server.ssl.key-password=China in the Spring

-server.ssl.key-store-type=PKCS12

-server.ssl.key-alias=clamp@clamp.onap.org

-server.ssl.client-auth=want

-server.ssl.trust-store=classpath:/clds/aaf/truststoreONAPall.jks

-server.ssl.trust-store-password=changeit

-

-server.http-to-https-redirection.port=8080

-....

-spring.profiles.active=clamp-default,clamp-aaf-authentication,clamp-sdc-controller

-....

-clamp.config.cadi.keyFile=classpath:/clds/aaf/org.onap.clamp.keyfile

-clamp.config.cadi.cadiLoglevel=DEBUG

-clamp.config.cadi.cadiLatitude=37.78187

-clamp.config.cadi.cadiLongitude=-122.26147

-clamp.config.cadi.aafLocateUrl=https://aaf.api.simpledemo.onap.org:8095

-clamp.config.cadi.cadiKeystorePassword=enc:V_kq_EwDNb4itWp_lYfDGXIWJzemHGkhkZOxAQI9IHs

-clamp.config.cadi.cadiTruststorePassword=enc:Mj0YQqNCUKbKq2lPp1kTFQWeqLxaBXKNwd5F1yB1ukf

-clamp.config.cadi.aafEnv=DEV

-clamp.config.cadi.aafUrl=https://AAF_LOCATE_URL/AAF_NS.service:2.0

-clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US

-

-In that case a certificate must be added in the browser and is required to login properly

-Please check that section to get the certificate

-https://wiki.onap.org/display/DW/Control+Loop+Flows+and+Models+for+Casablanca#ControlLoopFlowsandModelsforCasablanca-Configure

-

-Or it can be found in the Clamp source code folder src/main/resources/clds/aaf

-(Default Password: "China in the Spring")

-

-2. Spring authentication

-It's possible to enable the spring authentication by disabling the "clamp-aaf-authentication" profile and enabling only the "clamp-default-user"

-spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller

-In that case, the credentials should be specified in `src/main/resources/clds/clds-users.json`. You might specify you own credential file by redefining the `clamp.config.files.cldsUsers` in `application.properties`.

-

-Passwords should be hashed using Bcrypt :

-```

-# pip3 install bcrypt  # if you don't have the bcrypt python lib installed, should be done once.

-# python3 -c 'import bcrypt; print(bcrypt.hashpw("password".encode(), bcrypt.gensalt(rounds=10, prefix=b"2a")))'

-```

-

-Default credentials are admin/password and cs0008/password.

-

-There is a spring file that disables the AAF and enable the Spring authentication by default. 

-To use it just add

-

---spring.config.name=application-noaaf

-

+# Summary
+
+CLAMP is a platform for designing and managing control loops. It is used to design a closed loop, configure it with specific parameters for a particular network service, then deploying and undeploying it.  Once deployed, the user can also update the loop with new parameters during runtime, as well as suspending and restarting it.
+
+It interacts with other systems to deploy and execute the closed loop. For example, it pushes the control loop design to the SDC catalog, associating it with the VF resource.  It requests from DCAE the instantiation of microservices to manage the closed loop flow.  Further, it creates and updates multiple policies in the Policy Engine that define the closed loop flow.
+
+The ONAP CLAMP platform abstracts the details of these systems under the concept of a control loop model.  The design of a control loop and its management is represented by a workflow in which all relevant system interactions take place.  This is essential for a self-service model of creating and managing control loops, where no low-level user interaction with other components is required.
+
+At a higher level, CLAMP is about supporting and managing the broad operational life cycle of VNFs/VMs and ultimately ONAP components itself. It will offer the ability to design, test, deploy and update control loop automation - both closed and open. Automating these functions would represent a significant saving on operational costs compared to traditional methods.
+
+# Developer Contact
+Owner: ONAP CLAMP Dev team
+Mailing List : onap-discuss@lists.onap.org
+Add the following prefix to Subject on the mailing list : [CLAMP]
+See here to subscribe : https://wiki.onap.org/display/DW/Mailing+Lists
+
+# Wiki
+https://wiki.onap.org/display/DW/CLAMP+Project
+
+# Build
+Jenkins Job: ${jenkins-joblink}
+
+CLAMP UI: ${cockpit-link}
+
+Logs: ${elk-link}
+
+# Docker image
+
+## Building 
+You can use the following command to build the clamp docker image:
+```
+mvn clean install -P docker
+```
+
+## Deployment
+Currently, the clamp docker image can be deployed with small configuration needs. Though, you might need to make small adjustments to the configuration. As clamp is spring based, you can use the SPRING_APPLICATION_JSON environment variable to update its parameters. 
+
+### Databases
+There are two needed datasource for Clamp. By default, both will try to connect to the localhost server using the credentials available in the example SQL files. If you need to change the default database host and/or credentials, you can do it by using the following json as SPRING_APPLICATION_JSON environment variable :
+Note that all others configurations can be configured in the JSON as well, 
+
+```json
+{
+    "spring.datasource.cldsdb.url": "jdbc:mysql://anotherDB.onap.org:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3",
+    "spring.datasource.cldsdb.username": "admin",
+    "spring.datasource.cldsdb.password": "password"
+    
+    "clamp.config.dcae.inventory.url": "http://dcaegen2.host:8080",
+    "clamp.config.dcae.dispatcher.url": "http://dcaegen2.host:8080",
+    "clamp.config.policy.pdpUrl1": "https://policy-pdp.host:9091/pdp/ , testpdp, alpha123",
+    "clamp.config.policy.pdpUrl2": "https://policy-pdp.host:9091/pdp/ , testpdp, alpha123",
+    "clamp.config.policy.papUrl": "https://policy-pap.host:8443/pap/ , testpap, alpha123",
+    "clamp.config.policy.clientKey": "5CE79532B3A2CB4D132FC0C04BF916A7"
+    "clamp.config.files.sdcController":"file:/opt/clamp/config/sdc-controllers-config.json"
+}
+```
+### SDC-Controllers config
+
+This file is a JSON that must be specified to Spring config, here is an example:
+
+```json
+{
+  "sdc-connections":{
+    "sdc-controller1":{
+        "user": "clamp",
+        "consumerGroup": "consumerGroup1",
+        "consumerId": "consumerId1",
+        "environmentName": "AUTO",
+        "sdcAddress": "localhost:8443",
+        "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
+        "pollingInterval":30,
+        "pollingTimeout":30,
+        "activateServerTLSAuth":"false",
+        "keyStorePassword":"",
+        "keyStorePath":"",
+        "messageBusAddresses":["dmaaphost.com"]
+    },
+    "sdc-controller2":{
+        "user": "clamp",
+        "consumerGroup": "consumerGroup1",
+        "consumerId": "consumerId1",
+        "environmentName": "AUTO",
+        "sdcAddress": "localhost:8443",
+        "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
+        "pollingInterval":30,
+        "pollingTimeout":30,
+        "activateServerTLSAuth":"false",
+        "keyStorePassword":"",
+        "keyStorePath":"",
+        "messageBusAddresses":["dmaaphost.com"]
+    }
+  }
+}
+```
+Multiple controllers can be configured so that Clamp is able to receive the notifications from different SDC servers.
+Each Clamp existing in a cluster should have different consumerGroup and consumerId so that they can each consume the SDC notification.
+The environmentName is normally the Dmaap Topic used by SDC. 
+If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers) 
+
+### Docker-compose
+
+A [docker-compose example file](extra/docker/clamp/docker-compose.yml) can be found under the [extra/docker/clamp/ folder](extra/docker/).
+
+Once the image has been built and is available locally, you can use the `docker-compose up` command to deploy a prepopullated database and a clamp instance available on [http://localhost:8080/designer/index.html](http://localhost:8080/designer/index.html).
+
+
+### Logs
+
+Clamp uses logback framework to generate logs. The logback.xml file cand be found under the [src/main/resources/ folder](src/main/resources). 
+
+With the default log settings, all logs will be generated into console and into root.log file under the Clamp root folder. The root.log file is not allowed to be appended, thus restarting the clamp will result in cleaning of the old log files.
+
+### Api
+
+You can see the swagger definition for the jaxrs apis at `/restservices/clds/v1/openapi.json`
+
+
+## Clamp Credentials
+
+There are two mechanisms that can enabled for the authentication, one or the other never both at the same time. 
+They can be enabled in the application.properties.
+
+1. AAF CA
+There is a section for SSL enablement and cadi configuration (for AAF) + one spring profile to enable
+
+server.port=8443
+server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12
+server.ssl.key-store-password=34xqGdj]VnHothQ]5qCykV3X
+server.ssl.key-password=34xqGdj]VnHothQ]5qCykV3X
+server.ssl.key-store-type=PKCS12
+server.ssl.key-alias=clamp@clamp.onap.org
+server.ssl.client-auth=want
+server.ssl.trust-store=classpath:/clds/aaf/truststoreONAPall.jks
+server.ssl.trust-store-password=changeit
+
+server.http-to-https-redirection.port=8080
+....
+spring.profiles.active=clamp-default,clamp-aaf-authentication,clamp-sdc-controller
+....
+clamp.config.cadi.keyFile=classpath:/clds/aaf/org.onap.clamp.keyfile
+clamp.config.cadi.cadiLoglevel=DEBUG
+clamp.config.cadi.cadiLatitude=37.78187
+clamp.config.cadi.cadiLongitude=-122.26147
+clamp.config.cadi.aafLocateUrl=https://aaf.api.simpledemo.onap.org:8095
+clamp.config.cadi.cadiKeystorePassword=enc:V_kq_EwDNb4itWp_lYfDGXIWJzemHGkhkZOxAQI9IHs
+clamp.config.cadi.cadiTruststorePassword=enc:Mj0YQqNCUKbKq2lPp1kTFQWeqLxaBXKNwd5F1yB1ukf
+clamp.config.cadi.aafEnv=DEV
+clamp.config.cadi.aafUrl=https://AAF_LOCATE_URL/AAF_NS.service:2.0
+clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US
+
+In that case a certificate must be added in the browser and is required to login properly
+Please check that section to get the certificate
+https://wiki.onap.org/display/DW/Control+Loop+Flows+and+Models+for+Casablanca#ControlLoopFlowsandModelsforCasablanca-Configure
+
+Or it can be found in the Clamp source code folder src/main/resources/clds/aaf
+(Default Password: "34xqGdj]VnHothQ]5qCykV3X")
+
+2. Spring authentication
+It's possible to enable the spring authentication by disabling the "clamp-aaf-authentication" profile and enabling only the "clamp-default-user"
+spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller
+In that case, the credentials should be specified in `src/main/resources/clds/clds-users.json`. You might specify you own credential file by redefining the `clamp.config.files.cldsUsers` in `application.properties`.
+
+Passwords should be hashed using Bcrypt :
+```
+# pip3 install bcrypt  # if you don't have the bcrypt python lib installed, should be done once.
+# python3 -c 'import bcrypt; print(bcrypt.hashpw("password".encode(), bcrypt.gensalt(rounds=10, prefix=b"2a")))'
+```
+
+Default credentials are admin/password and cs0008/password.
+
+There is a spring file that disables the AAF and enable the Spring authentication by default. 
+To use it just add
+
+--spring.config.name=application-noaaf
+
 to the jvm parameters. This file is available by default in the java classpath resource folder. 
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index 03859a994..c3c6ee402 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,6 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
-.. Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+.. Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
 
 CLAMP - Closed Loop Automation Management Platform
 ==================================================
@@ -168,8 +168,8 @@ This file is a JSON that must be specified to Spring config, here is an example:
 
 Multiple controllers can be configured so that Clamp is able to receive the notifications from different SDC servers.
 Each Clamp existing in a cluster should have different consumerGroup and consumerId so that they can each consume the SDC notification.
-The environmentName is normally the Dmaap Topic used by SDC. 
-If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers) 
+The environmentName is normally the Dmaap Topic used by SDC.
+If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers)
 
 Administration
 --------------
@@ -184,7 +184,7 @@ For OOM, the URL is https://<host-ip>:30258/designer/index.html
      Default password : password
 
    - With AAF enabled, the certificate p12 must be added to the browser
-     ca path: src/main/resources/clds/aaf/org.onap.clamp.p12, password "China in the Spring"
+     ca path: src/main/resources/clds/aaf/org.onap.clamp.p12, password "34xqGdj]VnHothQ]5qCykV3X"
      Or get it from this page : https://wiki.onap.org/display/DW/Control+Loop+Flows+and+Models+for+Casablanca
 
 Human Interfaces
@@ -193,7 +193,7 @@ Human Interfaces
 
 User Interface (CLAMP Designer) - serve to configure control loop
 CLAMP UI is used to configure the Control Loop designed and distributed by SDC. From that UI it's possible to distribute the configuration policies and control the life-cycle of the DCAE Micro Services.
- 
+
 The following actions are done using the UI:
 
 * Design a control loop flow by selecting a predefined template from a list
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 91c02ef74..d6f21d3f4 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP CLAMP
 # ================================================================================
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
 #                             reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,8 +58,8 @@ server.port=8443
 ## Config part for Server certificates
 # Can be a classpath parameter instead of file:/
 server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12
-server.ssl.key-store-password=China in the Spring
-server.ssl.key-password=China in the Spring
+server.ssl.key-store-password=34xqGdj]VnHothQ]5qCykV3X
+server.ssl.key-password=34xqGdj]VnHothQ]5qCykV3X
 server.ssl.key-store-type=PKCS12
 server.ssl.key-alias=clamp@clamp.onap.org
 
diff --git a/src/main/resources/clds/aaf/org.onap.clamp.keyfile b/src/main/resources/clds/aaf/org.onap.clamp.keyfile
index 45cdcb602..4908ca7e6 100644
--- a/src/main/resources/clds/aaf/org.onap.clamp.keyfile
+++ b/src/main/resources/clds/aaf/org.onap.clamp.keyfile
@@ -1,27 +1,27 @@
-HTQLJHUg5Du0VM7wHY5cBMTgupk6ujhSoAgx5BTHp9wt9CoWvD72ScIciyldEH9R2QZIL9ZvpVo0
-h2o-hSQueaVjPcIFUhVIl4HWmNC6I2YAlNkwy3VMl1g9otKaOTgo3ChsFUVq7ACIrcr2977wo4B_
-FeHa0lInuaLoEjHMP1fszTWYBBx9oY3K9s-9MQQyCo6bFV-4L733sPeE60j20FWoygUwvIqxp3Pc
-Bmnm1AtcrhGH0elqDg9qNjmnmC3gxZaGpGiclaEds_lVu57RIXwtTHgYyMbJzfP-Ziq3T7i8d-h3
-JZThj1l9JvDLYm2z0BEXuQ3Owvn4m98cWB9P5esJOKYEvsfIGK_Fd6uT04fzkeDT1wNV4-Swuorr
-ymZQxnvHbUAp91NJEa3EtWTuBxNeoqV0cw97WkAYn95pgjH4ZVhBdczclS-EStFJyYOHtTRAs1A_
-8i36GiuUPHn3KolkRF2GvtZfwNj5AYfcUKhqULJ-T_is2KKYnGwQ2iaItX2852o4zlzkMXFMkt5C
-qbsDmrU7F5zxn4HG6yShW5sIXgAcS9cyIs8IFgHtkYauDJlKZWynhzqibh3-bzPyfFmreTHxQ-Av
-Lgp5sAtf1B9_1feVyE78bmQ3IMtxE-YkV8RYPDJzKw0nIdjce7j89azNq_as5JMfCCHSlYcKRs8O
-Nrh8gXYun28iUL_kwEUWK0WohPgwQBb46_Hkc6a0aSYbuFA_7qgprPB9wmAlHtuqnCAb2vk8GT-h
-07DB6yPGgzE-OgXUzLIWHXVzPO6SjOg3ifYpCRigOsNqkV1paBBOzje7dn2RnpgaRJS3zupTMnqF
-g5N9qCgubxRlII626-Dc_i5X1OAWPzJK8UZPuxRAg3YVJNHluB3O0Q2Uo14RkO3a2Tn_Ce9XoTUJ
-Jqi_qZWytIB9sHMNM7KvcRxGedLqd_230O3zV7rTa4Up0BFoMyHmnf2SZu96x_Yz_n_AWhiaALvE
-ON_nTxPEOHfEfrNzo7pCwIaI5gM6eu_S24aZTf4L-5tekqH7l1PEbKr2QP4XfTZBN4FgNExgGpzG
-the3zv4k7hJeWe7GbtMmnZXIQUJkZVTHBwqvHkqtN9cBWpihCNVmI3zKq6Bsy6Us0SDZ686kpeVS
-s9eyrzj6uLPE65mQxCpoMt6G4HSjzMqA3HOX_7ixBBhtdVi5-X7NeTigr-uaZg67yP3cSikfFf9w
-dyFuMjg29jtlaTNzOov8HFrcLq01N3fpwDkSU_2TmLndU-FMat78CMCLW5QuS1KF3hC9T8wzKWS_
-WHK2oMA3SqWyqnj_cE_T4Ql_VKL3nkvf_bzTvLso_BWodUw2A-eO-1qjtCHp3nnTdSVH06E3_eRH
-BuKWEt0MLyNpm88OD0tgOC3fn7casioynQLoFatta5nlQfj4nsAXj2bD6CrohtDhjOKXqHxDU6s7
-adtNoBGyEK5FKy3HtHMC7KXsK_6wbYUluz93nCNMok696HIHojNUydGFqfr2HluQTi0S3uHnD_pS
--QM8DbsFi8oIztn6Er4CFFJQ-tUuDyX6ahfY5gWLqCgRM7RzrkoHY7b4vkHxZTBLZlPGWfRtG0vc
-GTSqIRNI2Z_Zte5-wW7T9vfFVBsArF0SJWOrlUqf7fGN1_2H9B9aIpLEMaHF7EEp1OP6_SNnfuhB
-K31EFy0VW0eGnLezpd3HT540kznub7h_m6phZaqeZJxsle9jHEOS7qDc3T6s1hZ7DLK2Ej5RFuq8
-5LA9Cj5VrdejKMZKZJwmyWylLe224RyY4gDa0MB_lDAeC-YFdY2ClymYRJmclFFSWf7X1j5beQve
-xGbsXJaWZcJpahpFu4RR-kOOyZBLPsdiyOZ7PGXz83l35NiXabmRapgjve1t7NFSuRluafihc0Lg
-GKoz_-3YAFJmh4Z3bcCsz1WhCUYqzWyDsnZiD7sMQT7Oyje7RqzoxBZs5Ke1_0jtpgFrc7BcqHG7
-WpwJr6hg53o3BpWcUEopBomhbdxiDSLxZmDrePy9LDC7YNk_7-gVKIc7dZDMgw6kSRR330p0
\ No newline at end of file
+dK4TahfDgZ9dafmSF971Olx2sfGYPTm7JZnfbtjWxJOWSoRXzyLnJ2C1JwfucH99_9QTF2HQc_Av
+LiBCbDt1UJz8K63igFpZhKHR1RpsF-jjGWcrkSWu5z9yz52DJYru4uJ-GY0simVUvlVOn_QR2SHV
+D2qknw7FzUKO8NzQd0xJSbxP2lbTEOw5bD74d3gXaVnMEA1yUrV2f5LV5F6O6zPC7s94l9G1Prxa
+LS2VE1ZUY2Y2VD9bigQxw_OdtfbMk9DrDAfvYmhUZwd4MMqurHYdqwn5iuMVBT3cz4saFVGhoFNv
+d_NwEmsaeGujnZWRQUwhnv5SPXslQY_QXOnTbucvItDwpIA07W8fxZk1os3D5q2XFkHjqDzhWqnq
+4Snv1Bz9gw7WIHBjVIgPDHfheQfvm7gO5E5LlmSiVouBdyEp1Yc4mhdR1zs8Kt1AvUEkXVzlbR7a
+rMBcASvn1lGvjcU4NqM_u8hIFg-O-w2ooMJK9UUOOVlYRI_wblAGF173Z67CfVRtWdepKb2Fv4pb
+3N9w95knLUsh6xea05W4FnNYdoGwHRofRVkH3Kotd0KUoXwe4p6UpfFw33jj-8pWMaRpkkDu9-Ol
+Q_B006lHZ6HnXMWnQyrpqYxPRWc0TvoYvlSPqcXVQWIOVP3K-pp6lnREFfJSJ4MPm9AgE9v5GywH
+YC9Tq0fWxzKuEbNZCU9xJyXP8rrQi9O8CVwBT0oAzJ012Ztt4mEXvjByKOJsCAPVbEqB3THcL-X5
+UNnyiM7aDFiemQGFbRQgNu9fkk3CgvgU_G4MvXneFmsbJdthvqVDMDe26miUmjOsQl6tZgqKg5sN
+pExhOpoApRi7YL_1J79zkeziLHLU5NC9ryRrUfQgpwivnj9nqJr0COsEYLg9381NWMM100LBm2z0
+K8BTcmp9vKKXbfTm8a3qHexjThxWw8Og-x3Qsv4YP4TpNUAaDcLn78WPc23Mpx0Ir2Z8ALRwhmpH
+W_F0phywuCPH_VO0rDulT8bTIs0Ldu5CnGCswL8hGhyw5mM0ZheOymFGn6Sd7mLOyKKFIF5HcR3n
+_xfv11UweRzp0M-5VoLcCD6rXxJTZK245ureyZsXtkOLvQ81yko1FkQRbaN_86ECtYrMpGbhLY9O
+GUyhXLG1Ac3M6ZsgwDn6iMUckCbANKIR77GY_BEIza5aw-3GHhhCsmtU5NtoUlpFuIC_JqqxoNYH
+_iAB2bqN3Py6dXvTtT0WX6gciDsyYuXchECFub3i4vw_RZe0UEfrpJM3kEjcp3AFsOrosffvS2BT
+ITDQr12f9Y0-ydAlCqzB9EpSchKwW4Hn7sUA_BEbSkO3e-ujNDrvzPPXWdESiJSzkJc6WHgossJx
+q8UnYkCd4XJYavt1a7XnrCxJcJ-TVyM1EVWuHZxziX3p0FCeu0Ett600WXVCYvJ2UsLYpvAJWgYx
+BQnMoJyJ6Xkk7-IaedqCZLlkITul99arptcxCKrfWY12V6C2cwmbJgxjvHPoM--4iads_Kj24c_q
+LTLOuyqvqHL1UIVXW5i_1ddsgYJmCUK0WjsWvI151UNlKB7N0MFNhFZlGqN9JCog2HoAtyb2bRj7
+2-0VmLeiWAysfrfxEhL_ipHB3A5iVmVC6Eq_w2G8pcTk7Ii_oqiDVIbT90sgaUZavXyb3kkGKsko
+ELxkKw7wytSXLgBY6E2IqLjnWdssQIYlolA1Hmg5JWNMr2vjcQWGQiXe1R5s6j2Kfp_vID4bn3qT
+Reptwp9nEJ1xVGwWu6rGPdHIwqp-KwzajjNffJQPAgv0IoDSknF_uQ3fYfY2N_CfyI8p_fCsn5xx
+zYXHR8enH6e1Q3olkWgdZtl5mhIF6B4RwMB7L7h5NDLoab-OlYVqDqKBZqcoE3iQXvEUGilj1S1O
+cPN8A8KB8IXUsdSy38TqAEv8j4fY6TpMnhq-dmN0RhWekDJ2v9B2Jhmdu4Wnq3UetiEW455iwd8S
+nNDAVyE0JlPq9Mgt10bUUwF5fL2JfpZWehSMVIbU2E0VMTcTxggVK9nMI3wMc2n8CRWgc7kM
\ No newline at end of file
diff --git a/src/main/resources/clds/aaf/org.onap.clamp.p12 b/src/main/resources/clds/aaf/org.onap.clamp.p12
index 5cd75944f..7003136b9 100644
--- a/src/main/resources/clds/aaf/org.onap.clamp.p12
+++ b/src/main/resources/clds/aaf/org.onap.clamp.p12
diff --git a/src/main/resources/clds/aaf/truststoreONAPall.jks b/src/main/resources/clds/aaf/truststoreONAPall.jks
index 2da1dcc4b..ff844b109 100644
--- a/src/main/resources/clds/aaf/truststoreONAPall.jks
+++ b/src/main/resources/clds/aaf/truststoreONAPall.jks