update AAF certs for SDNC

update AAF Certs for SDNC with Apr 7 2021 expiration

Issue-ID: CCSDK-2304
Signed-off-by: Agarwal, Ruchira (ra1926) <ra1926@att.com>
Change-Id: I0f1be22f5cc94d6da857e9007874b18fb9485e95
(cherry picked from commit 49ca4b56b46d1cc2eba37ee72b71ab1f1216c6b5 [formerly 79ca0e7ea5ea970af5d760e8a959721c2ec83868])

Former-commit-id: f455c747bd229b41d43f77410c2b8f237cf514c8

5 files changed, 39 insertions, 38 deletions

diff --git a/installation/src/main/properties/org.onap.sdnc.cred.props b/installation/src/main/properties/org.onap.sdnc.cred.props
index 88983837..58ea14c1 100644
--- a/installation/src/main/properties/org.onap.sdnc.cred.props
+++ b/installation/src/main/properties/org.onap.sdnc.cred.props
@@ -1,17 +1,17 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
-#   by ubuntu
-#   on 2019-04-26T17:48:02.614+0000
+#   by root
+#   on 2020-04-07T19:49:10.483+0000
 # @copyright 2019, AT&T
 ############################################################
-Challenge=enc:YLFZL0xwmf-22zzHjNwMDus4xQhhjOO_HERh0LisPjGFMODJtM77jjh7EctH-Pme
+Challenge=enc:gsZC3qJk3ylRSusYHUQqBiflWlKXn4rnh-fULJmfIU3RAphd_AHmZ6c6kl42qcJE
 cadi_alias=sdnc@sdnc.onap.org
-cadi_key_password=enc:fbgVR_kMh7wuaEfm16VlW84HJR_yiob_CUf3oDXSE0K2yPlp0t55xT335GMh8ZSv
+cadi_key_password=enc:HLzeIrsDqKLcY1fNlbRTXVch5RrfUvAXKW_sJ9cv9Rs49q8GsiPsZDqboJXAT-lF
 cadi_keyfile=/opt/sdnc/data/stores/org.onap.sdnc.keyfile
 cadi_keystore=/opt/sdnc/data/stores/org.onap.sdnc.p12
-cadi_keystore_password=enc:xAl_o-JBdI86B4pDUNyrY9IauP54ecsXLUZYl_9p9R4Roybcnppqwwkdp_wJq1Ir
-cadi_keystore_password_jks=enc:Qf5-2ZRKRMYBwvO14qENypmu4A1HNjkdu_KkM0N5i7v7QjC_GmshNrYmmeWLQWIr
-cadi_keystore_password_p12=enc:xAl_o-JBdI86B4pDUNyrY9IauP54ecsXLUZYl_9p9R4Roybcnppqwwkdp_wJq1Ir
+cadi_keystore_password=enc:aH6rL1KPu8ZzMtQ16FiMvGE-janpERZBU3tnVuGcXBaK2T9_3F28UuBH-GJ2BRjM
+cadi_keystore_password_jks=enc:ydq6zoDeWGdBbFXkF_bLHJ4HrhMn-cSZ11m-NUNCm116gYhsjF1HKfkqs6Wrn6Zl
+cadi_keystore_password_p12=enc:aH6rL1KPu8ZzMtQ16FiMvGE-janpERZBU3tnVuGcXBaK2T9_3F28UuBH-GJ2BRjM
 cadi_truststore=/opt/sdnc/data/stores/org.onap.sdnc.trust.jks
-cadi_truststore_password=enc:U-tuJC67-g5WkC4o8aYf-zqxfB-u2ep3NcB9CZt3VfGCP_NhTWFYVx8mCL3S-jhU
+cadi_truststore_password=enc:Lhl6jEPxCYutrEpioq0woR1ypC4K1i9yPWKGRG7s9eARe5egSzsEBCooiKB7om5B
 cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
diff --git a/installation/src/main/properties/org.onap.sdnc.props b/installation/src/main/properties/org.onap.sdnc.props
index 5b96b907..54ce372a 100644
--- a/installation/src/main/properties/org.onap.sdnc.props
+++ b/installation/src/main/properties/org.onap.sdnc.props
@@ -1,15 +1,16 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2019-02-15T20:08:07.125+0000
-# @copyright 2016, AT&T
+#   on 2020-04-07T19:49:08.370+0000
+# @copyright 2019, AT&T
 ############################################################
 aaf_id=sdnc@sdnc.onap.org
 aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
 aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
-cadi_etc_dir=/opt/sdnc/data/stores
+#cadi_etc_dir=/opt/sdnc/data/stores
 cadi_latitude=38.432899
 cadi_longitude=-90.43248
 cadi_prop_files=/opt/sdnc/data/properties/org.onap.sdnc.cred.props
 cm_url=https://AAF_LOCATE_URL/AAF_NS.cm:2.1
+cadi_protocols=TLSv1.1,TLSv1.2
 cadi_bath_convert=/opt/sdnc/data/properties/bath_config.csv
diff --git a/installation/src/main/stores/org.onap.sdnc.keyfile b/installation/src/main/stores/org.onap.sdnc.keyfile
index 4bbb0abc..eb8fe842 100644
--- a/installation/src/main/stores/org.onap.sdnc.keyfile
+++ b/installation/src/main/stores/org.onap.sdnc.keyfile
@@ -1,27 +1,27 @@
-ssTXV3XxGHmaZ_tDK60bUUwJMidA6-cMQbn8EVO1HWhwTS3vhftirZkfE-Ymv0xkhB82LT05cTjv
-MnM6E_OU8ZzQtNCb0XTTsOU-xTExWuIJzgfTKDanH14OB83r-pM0Q1z3iOjgIZyKNn7Qtl-7FyJu
-Fr6bmPKFMMSDROwH347eYBpunVPIa1X0NNqJcHDQsWFhW0bgsfRMnP3XZNltqbuAFZocYsY3Tk5N
-Iz52WXz6-nSWYBO0sPuBUZmkck1zKZ9PMn2SAPYx1V3i1-kOBLE6AHj-ad7e_dnJjdSTrjhG5z81
-QtmwAevh2ROCdNXTeyurrGXaLrMluE9csSVIp0YCCuhUCX02oDQBqIY5IDIQtAIXS8_i2bJWwmMv
-tZOTavGZH1_nwyQQ60lWF8w0GtL1m-s1SVH5v8VunYrjdnwFsrwUkKWfmz70OWFy6RwRis4IL434
-ln0RY48K-E_93jw3pbV4vZFTo8-RO59DGr_0pZf7ZhDSNrdy8sMpaSeHjjrVMfD5TI-JWDdzaKhi
-edKGZN_MZLfgPKwXTfXLDQKxowLUoDpEKfAj_KSOAdTCB2piala6Ht3FM5zfXFY7PnYgDho1fe2j
-nSWQhN6BqMr4LVKCLVonIiiAgyEetseUnW5_FCcFJALhfEKG4CHI0TvbRZ9IG7SwEFBovrk3RkBv
--UHxqqUAi9W3Zdm6wmYtSsUaT-lmMomJxHigWn9vCJ6fO0r_KSoGo-u8idP8P989hNdLqKx6sVWa
-en-Kyf0YUvYUk6TblucGVG0UYpjqMAr64tA2_a595QWriVRsxFWTZXBiXWUrOtbXxYZ6vn4jLomF
-KWAOu7ot-SQa9zAAAgIme5VB3I2h9s0mUOsQd-T1fJq_CdAGzyqXmBwt8TO4G8iQCMUtOptxJ220
-dq_unPUWJylDuU_9fTY95PLSIGfTCwOedOJb5A9IvyN_mahSPZqYH3a0P6gOgHPxQfTrUid31u7a
-BqsQdKKMoWCT7ZdX-ja95f3Z3PzHxhlI2dr1nCRBkN89GLyIK70dVN2QTVVWV5B4hLoyrON6QVwy
-1csZ1X6UGO-4YOX3_GUacJSnCenZzJFbn3moCkZ-QfpwU7Cqq2I7DEa8bDKz1sdeNtycOxiQnmnA
-AnVdXfOavctGcpA6tWyj-WAkZvV6yedt6Kb4BPL5_qDsCNa0r1wYNaQqzH1bYQnJu0aVjspTzlj4
-2ik_2i9t36Avoqj_g3e8fvwmF0r__yPpF2oULa4LcIQ8Cs3U9Oq3BmxlNXlEj7dyNOTIlJLcvrzX
-Js_5iv5rA_rIWY7YpOc-UCVrZw3yb8Ih-XI4tNuUn3qE7tHHQclWrrYRVM2Jt_u-73WYqL-iCvwQ
-BU5soWkSK5TwgR1BHfDs5-yNh1MRnr9RbNd8x_p3ohQrFtepgBHodTl98er9XANCy-HycLZhDP3D
-TUQdWVKxAwDFVBB-p6itYB9oVvkQtSosLQUYcAjbMTrFz4zqOj0CHMvquE-Wbznkayo5ZdvKoPXk
-loNtiG4qPx3UXpvfHElps-vPi8y1TlcmwqWEOn2vxKd5IIk2fglHXM9tv2m86XRgvTjppSs1V7NS
-Uoz_C_bW8zH5D-Twmq2DGHxuKbpUpqe0FDFXxoQezGCVhN6bzp-44CBkz9I9QeNVkm3XFu8s2fDn
-PeP2B_hGxkLhJHAJ28_3zZex818zqvFW-flWY43w6Cke8qWns3gxdyvXLUTluoidkFdTEvMBPIos
-itOB1MsLxsZNdAZtn3vxANPm7dTf8YIAJdMYH6yL9G83PxgKZ8uhoIZIsbrV2UWOJMLH8agctEZI
-pFqCipM8RZwuZwq7JmTYPyIjUDVTvAmiLJbG127T9eAfrZa2TYDWaE469v9f-7MdTD4_PK2JSogD
-8dg30EruD1VwQq03M98hL9EQsRNwAZ4MAshE2Kp3jQje2A-ZxGtMKNiw6DV0j3BM42FBitpV-Ley
-UaqWwELwDh7-BFmUeCu_RSP4XwrTUcOV725yIYcGkk06wLahMf2UvFzYS3PAmZLrs4fvLMK5
\ No newline at end of file
+Xgwa72kLHXU9NRElW4t4taIjudICPqMwywqYe1HVQ7Ve9ccqRRksY9gjK4hnDwU9mn0XdYEMlIU2
+OMWL4ck6PaxjHlaVR1qVBIFRcrkXs_ttagrjijBxXvJvJVI60JMCBGmIgNkI78wnEZOi6PLG0x7S
+agVQM34a5HHBEMePfqtgO-J8rBXMaeIrpHOTTEEtZXU-ZvbI8VZWhCD0e9fnn3YlFQaPeni0zqOE
+NY_lV6ZxlAtD5RCKdQWuU4O_cmmv3_LpIm41NT7Dn4sG6QzHjw2WM5essLTCEUvXJntlj3OmZTkr
+p4lPBVAWg2-qc_ZZyY2VEtoxVmKIMP15ctq50RVgPtQMmd-hdj5I51yW5MQYSM4jTgxtspiGUDJq
+ftsxb76K5w76X-ADxpZt85bEe068dwEoqZd5Qe33jIcZD2iNfGUb_ee1vSVlTQO1JlGqHAelUNks
+ellL5WE7X4g4TCG8KW38_GUOyohyQ5pv-Mozq-Sxz2bK8JCBs6hFBhKbnE07x3yY7SOBVnDbdCec
+cXZ86TNcdOsxBdqfNXD4PK_qMiXZTh3OMRsEG8IhhFyD3sbpFEyVhU_96o47iOgvAeAAiIKJ2Uww
+QUTHfNxp7LWUTw7aHhmK4wZLpFS-Lz1seat65uNp9DRuQ9jin0Hpi0XW1UwY4WzYvWeiQh2swwM8
+XCz9jawem18wTJ-pZUvKtkAQ5ImwSBuIFaKoUkbiowrNAGFOFGaFhtapV1uvehPlpmzbvn9HfPO8
+1xAp3Jusu3G4tGrrsJdvkenUB-3BbcJHMPE-Ku1jEWGoOXnrn0WURiHXhYMy8gWbko56ykftIJRP
+Q4bq4TCwxNE8nzhNXSh0_dqYK0JlAkoOtvkBogM42Ljly5ODCIDb7NZFtTyK3FpYVXLC-um9wYxI
+2t7V5N-nPinFf9hWzgTCvnjfAn0X2kAWTBQVwO-Sxepy40ZbTkEkQzsKyFKa3pnB_BmkE6dvQMqj
+QZlg5dpu3eacVSMPaZCdgISYN-pYrWNYtPKKlxYQgsK0Z6hJuS-87snx-WYRN4SRhWBY_b-G1EsZ
+SeL9L8daNXYzmOHnprenlz5ZqitnM_KoL9th_rG4krV8-Nlw1Rh7K_YcXuFsKGTlzYbuoHyM1CBn
+oWPIf32W5DN4BRcSTi74wV_tScQL4sueKYo3epZMrTA0djFyq94-wyA0bOzySQxcrGIvvLMITJ51
+U6c845RXFAK8_Z2Nt8-Mdv6Ox_KDmZtX4P9bNJ21nM9D9Htgr2H5GIBXFBt_ZDUzwZ5WLrs-l4Li
+26dHL5OudyekOaI4BVxg_09hRD9xNPpU5kiVcz5_QAi7QsnYqf53oB55H_NEhq1h3KOmqzJw9q7M
+kYQgO-q5Y5dIvduBe9zruFIQIt-WhhRJM8v4i50QNaOCnbZfmDalStlSzFX9xEXKESU8q-7VwxRT
+Aro7Teu_fS3PXvsgr6hHSf-SK2zbrizPG-5AaPn3SkBoU-3Ofr-HeJfihx0NnvcCnjDYvQw9C5d6
+845zvcrJrphNkXVPNO23lRMTEuStQiCbbdZcaNcPFXMpjlS4x8tonxwNqBBa4CwO7p5omkayEVLi
+i_JbOg4JSor1C_cSnA9TIfEcwVe9znPeEE01uFp_IBP5rJHuiInca-f7NbZFDkhO5LJPIoyvmTHZ
+76LBniKhcocSW8CR7Gc9Q8wxXJFEivQb4JvA1gd8VZ_A31yqnSTnApxGcAu1DEHNnCd9AVYIq9jd
+weFikVaf5n3GF-DBYxeesu1ChEmTOLN0tZw43uyAvqWrqLU_m5DspMAv-MNA0ddgcMOw8yph0035
+5HgcosFyhnx_FByGJtbr0bahZ1dJnswN_lXlRUYB2-WYnWUot-ONKiw3cD7kU095p3zPOHkd6KlI
+cyRcCDVN9KQkE-S9VDWBWD8V2A6wudLLICsRug_Ypa6doZKGcF335ZT9U54R9DNqUHCf3IEu0xl3
+YlQrkCwrFZB8WVMkfJQJKFfqYyjeH-t-afS3JR-PkH-qBRDFFYZ3m1anYuZI20-IiP8BZKCI
\ No newline at end of file
diff --git a/installation/src/main/stores/org.onap.sdnc.p12 b/installation/src/main/stores/org.onap.sdnc.p12
index 079ee67a..23a701a2 100644
--- a/installation/src/main/stores/org.onap.sdnc.p12
+++ b/installation/src/main/stores/org.onap.sdnc.p12
diff --git a/installation/src/main/stores/org.onap.sdnc.trust.jks b/installation/src/main/stores/org.onap.sdnc.trust.jks
index e1f2e570..7a698619 100644
--- a/installation/src/main/stores/org.onap.sdnc.trust.jks
+++ b/installation/src/main/stores/org.onap.sdnc.trust.jks