Update certs and will be valid until Jan 2022

Issue-ID: AAI-2841
Change-Id: I5e866c9b710026168bcd84ed0d4a40f4a382fb55
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

9 files changed, 111 insertions, 98 deletions

diff --git a/components/aai-resources/resources/config/aaf/org.onap.aai.keyfile b/components/aai-resources/resources/config/aaf/org.onap.aai.keyfile
index 4c14bc3..1d10b63 100644
--- a/components/aai-resources/resources/config/aaf/org.onap.aai.keyfile
+++ b/components/aai-resources/resources/config/aaf/org.onap.aai.keyfile
@@ -1,27 +1,27 @@
-VoVoSXQrAveX2NBnoAGs7p5q5Zn5vWkVXC81HQrzers30k7OzSy5rfCRSUVO13wuo-wzJQ4GGn4e
-ZSOZrtTCenFwunUX6mirkIlip8W2TLNVH6O3VN-F7JS6t_6EFF5z1y7amr9MCWQ8p72Ig9uHMUWC
-uPLjD6GUWAEw0BIGtCbXgJDs6v2EOCv0TV8Mq1uYSaiAOZgMlehwt1tWcE3iSRfZscjIp4Kjpe4e
-QsZ9Bc5ATTnY3Tc5Mtmubc-1cwGDQQWFIo5k_cWfxhtpMAsNSidwp-zBjCKEWC465BKSSiUHwp4M
-YW_6xrmN1FobnFqLCNoUEoXH3Mcgeze74dXmaN8_JyQ6T5pT1EtETsitnktrfFh-XsLKGf8vE1m8
-pfAtq4hPeq1jMdG0D8SRVGFxJlHa9VsmYpbUj_4I3GGsaBt_EBl9ZUtL0b3Vnx5fnqS1OZ1amL0z
-94rQfQMf2UAnbI1j2j5oV6Hy2eBmSiLft2aNxs1VPmmZLQsm5dXDKF1eJ6twNmaZvzmQaSHTpN4b
-YqPonSwlYK1ZARaKzx1SivpRWzRP-nqqFazfAnPlLdvCBpCK0g_SjwLvlifozVmH2j0Vd6E9F9XE
-NzJSfUY6NsX6_7t10yDYtBKbFKID3jIKmSj7yn5PKNbEWBwmgvkBh4PIKTRij11udR8S8PnYsfTT
-PyC52LH37LL5Me3Y443zOUXtYWwN6wfCi9H4pDQGmg7mcnpKV0Z-Iw59AuLKypTriG3-9DxYgMSa
-_GCDiCIXhcWSEYieRV45qHoeVdgrPGN8iy9leO_JmikGsjcIKl0-mGrojsV0zHrqeP-fyvgpFD1x
-NXLKeqErqSw_KMFOxCa0-cUQHgrVvrs5wDYeetZ4TRafKEYkojZhq6mbM5V2zScQTxU_VEHK0PIs
-BJ6xHzcw9DLUjPTVtHXXbag9ly9ReoHXRLD5O9RZUvLH9pGRIkn_tMrVD1scMiS4ln9QplyGRF1_
-AAXysVgCna3-xuOIYo8zG74d29eNcuEpejPR8CiSWKiKNqp0zMYB5Jpv2dlf0XMucMne-6WV1-gg
-EETogBbymFC6rcc31TjPwqnqyLY0XP7Gy1trJ47aI9zBXS3IZLmGaKW1d12ELDRsWctujcjHyt1_
-Vp3hrny5w7BNWD8SIueUzke3-OuEhOmu0o84TGvfHc6fmKCggRBn_oXee4OeCnt2HzNSlLvOV9AZ
-g5e1UKuzl2dODQCZHNNdj-7f25LIVSV44m0SVNsDwboQ4s7T5HOTn3NM2KpklwBnB6w5ze2FFBzb
-5XNzyXOpDgHEnszN1U90WrpoFvJ0LFJ5XeX8mH0q9lpcKZXbOqP383_dBXyEd237m2OF6WVG4VVm
-4dqB98pBLiGpCR1K6ocdcZE6mAMQn-OdDaLIJLcXt77i1j2MNlODeax-MJnxMW8EjPAzNJzrdq5e
-21spFMZJT9vthdl0qqiiduuTazaXGrmvnB85uvRCXVqJOesVG3HebubWrQuuuePxVTSL18R_PhId
-0hmqho-MOZUHHTxGzqFDR0iOO8Y4hZfiAipHAd49IkkmYJUrEAb258in8W4__vJ5UcIdq2Rd8L9l
-vtIzf7AKcFCyx7Woi95GpEJ2Kr_f6aG1_04hbFY_LHP3EHPcOxsDHjz-8FYreze_LUdsYx-fBMft
-mcFmbFAblk8Jz7GYQ7c4XwULt2BbMr9rsuGuZHL3Ap6lX1eI0-6d8ZZ3DIXIWubTTqHG_mRNd5XW
-b0x5nlEbnvw4t4DdjGsEONpQfllnnmkr25tPQBncPjlsA3oso6h5QM4psvkkKi8yd0N6t-yyLwra
-w1B3p9YQFzK2hGA24Seo83baLRgIK6YvEsNnXdI7fmVEOetIslQue__6S6GupdqgUFx9xrtDLN-d
-TbdxpezKWfkjCxEBxXyAhOttb3qqP0-jtZV7OEsZmmz0T9DG4hYnNfs-clD7rrD3Va7znzDru2sq
-PtgpapahbNjM9pbx9_fU7M35aEYnGtEwG9BVGVxsWmIBMTc05ncru4qE0fLkjsDSnCMQ54e0
\ No newline at end of file
+rkjjwMnwFj7AbU45vuNPO_dJOOezwTLLwibfSCZ9UaNP-n78Uwesmr_LIP8Mb0cvJhYHrLy0Eliu
+uraF2pO_LzhUO3sXEuSxMqMr9CNEQ7FKw-E5mADetfA5kOBYfwMqy9n-3bdBxfvF7PQuq7yFC2gJ
+VOhRmIjkl2MUh8fKM7bhAZxG_pHMkuI1VVQK1n_DfJD01GfFRzr0yE3FFcvg_Jgi6mr_Xvlry2ri
+AhZMzP7nsQ5IJz-qOXWyEMEJq1rNCQwVwIBbDTtTEyTIpgOjUw6F1JvO3baSS5TKwF74xYYGGWcM
+pCk8eSYtYAtHGyVjxGTEFB1-T6LG3w9TSchhCECLpqXGyId5RGM7q8UERL_tHSuHAV6m9QLZf18R
+T3ySpFzwfYEdhQ7cf1THHqG7JHyYUGsXRqGyuZ1UBxopyMCGYNiud2udhYZ8mGnt4zRuXHKENTtp
+pCkXKEpQq-WKFj4tqFoYkX5Q5VS7TeEkREdPqARxoxWQcZ6omtEqVAQc0c5SIXAlcQUqCRQHp64n
+ETSvK4_S6s4w7-8Xve9va6uYzS1CkS_LQAcAe1nnR1p2Gw4upO1NOBr9SczG7GzCtYsHo7ExoVP-
+XrnWqsENIuYposWNgN6whYWnkhE8F3Mu4VaDwwluTtzkCcRXLs8tS_nzXMWoy6B8IxSgmsp6mfIy
+ZApxvic8Ae8BmfNndK8WawIXTt4IpmxFIFud4VCrHCiUhx-Q0eSl7y3abpMEf0eDQYBZld5VW-zc
+8PlDKmtoGI3XYoPgAWM9Y0tuyEPnoTsfh8r3vFySW79POsaG39XATp9a9W5ZEK4Dp9yQ-CQTyupH
+W3rJgsn3Oov5PglApsVzcQCKlcz3wiE_GWJEk8_WLThLQU5N1OBwTuEIJdqPg9SWOqbHAFDJQPOS
+hbWGxGgKESxUu5x2uja5YXQ-tbvER6cPQL5-ymEPXITsvCz8aREihI86OhR_7q7kkmMo8xXk70Gp
+oWbh5sDzFQ20BhCzZkI_TcYb9bIy-_nYOpwvunC3b-Ba_GFzVaw_ZRfh77XPK9_Szp9_N9a5CmEM
+GBIdL3hKdLSKSuBCF4cDE9x0TQhYOgwSrvTJw0LitaQ1LEIc9IpBpueT0OLu2lr_3EbkLy_26Lg2
+LSvQ0W7o-LLyT4LXrFkbNeAwIl5Sx08LvV8n_yaI8aojXDnniRNmDiuFn7OZM5JtIzf2sOb1sJiN
+Bn3r9qwQR7UePXNabyxb6EXhygIsAv2Hr9is-8JK6wXf3d4rUVpBe08ll0inAaZcGARR1kxUtObm
+nDpIicq-hUNwwjCGLQF-KT0symzwYOSx3tumQtolhx-usZx3rBUyXBJug2CP9REr2ufbqsA3p1mS
+wsU3-tX-OQZdegJr84A5Oyp7DvXx08HW3gUd7VdxyWWTjpNGsUV6A4uZscngmz_eHCFv6pwEe7Pq
+xaHyMVHzBSYvvAT4E99NogZas-r2xj_AKpaf_k4jDWWeOTcjU8t8r1u__fOiSpGaQS1wsKzwwHuG
+gYLW0sETApz5UyDl2xrX6Sr9RdwlR5AbIiHnheNn84z2reVP7pNKbok0STnGV1QaMUJqkhRdPnop
+AiyftGYMwsBie_20zZpbZO8kLOV_Sw1dEC6Mb0ZBpDAnWWBIjxT22ZC5H4wJpKyfphlK4zI_tMeh
+LZTX50ILytzCnUIfc1WvU7HeSfXrc_fzOIIij002pm2zRbe50NMvpn8K1ctUFAzCayBKRkTtQaMP
+ncJyjEoUMZ9ykBaTC856mb7L_N9PhxArxxVWDgEaCOu-Tp53n2XkbuWbuciH2ZfO8zvIwSnYsR53
+joMMaGqtMCZF8sonpPbCXRDgBB0YhBP1CYkNTZSqbR4smxUtvMhz4AGiKg6e6x0a2npVSrTwPxb7
+jHs-jF7L4ldKv5-8Xp4z_z9pIafV6grW2-GhQSUkEXjhIsvwRrsFxc476KXhbpMdEBosCmTzgOF6
+wNMkn5SNCUtjp80UgP6IOSPemkf2lAAPdcZJPo1jtR7-W--zIYATHDy4dUqMg1s2yREozgb9
\ No newline at end of file
diff --git a/components/aai-resources/resources/config/aaf/org.onap.aai.p12 b/components/aai-resources/resources/config/aaf/org.onap.aai.p12
index b2449c6..2601acf 100644
--- a/components/aai-resources/resources/config/aaf/org.onap.aai.p12
+++ b/components/aai-resources/resources/config/aaf/org.onap.aai.p12
diff --git a/components/aai-resources/resources/config/aaf/org.onap.aai.props b/components/aai-resources/resources/config/aaf/org.onap.aai.props
index d5a6475..6a202eb 100644
--- a/components/aai-resources/resources/config/aaf/org.onap.aai.props
+++ b/components/aai-resources/resources/config/aaf/org.onap.aai.props
@@ -5,7 +5,7 @@
 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
 cadi_keyfile=/opt/app/aai-resources/resources/aaf/org.onap.aai.keyfile
 cadi_keystore=/opt/app/aai-resources/resources/aaf/org.onap.aai.p12
-cadi_keystore_password=enc:dgVjUeXy3cuR7nJ3TFVrXFfAu19gn6rie-RsS96-0fmeZwMsXlNIgK_rHd2eRY_p
+cadi_keystore_password=enc:QZ1m5hWsVkhtOlw3JgMW5EHzlOpawI64djJryybxO1SiYeZ1nMm-Tj6njLHlmGZD
 
 #cadi_key_password=enc:9xs_lJ9QQRDoMcHqLbGg40-gefGrw-sLMjWL40ejbyqdC7Jt_pQfY6ajBLGcbLuL
 cadi_alias=aai@aai.onap.org
diff --git a/components/aai-search-data/resources/config/auth/tomcat_keystore b/components/aai-search-data/resources/config/auth/tomcat_keystore
index e280b31..5f5f47f 100644
--- a/components/aai-search-data/resources/config/auth/tomcat_keystore
+++ b/components/aai-search-data/resources/config/auth/tomcat_keystore
diff --git a/components/aai-traversal/resources/config/aaf/org.onap.aai.keyfile b/components/aai-traversal/resources/config/aaf/org.onap.aai.keyfile
index 4c14bc3..1d10b63 100644
--- a/components/aai-traversal/resources/config/aaf/org.onap.aai.keyfile
+++ b/components/aai-traversal/resources/config/aaf/org.onap.aai.keyfile
@@ -1,27 +1,27 @@
-VoVoSXQrAveX2NBnoAGs7p5q5Zn5vWkVXC81HQrzers30k7OzSy5rfCRSUVO13wuo-wzJQ4GGn4e
-ZSOZrtTCenFwunUX6mirkIlip8W2TLNVH6O3VN-F7JS6t_6EFF5z1y7amr9MCWQ8p72Ig9uHMUWC
-uPLjD6GUWAEw0BIGtCbXgJDs6v2EOCv0TV8Mq1uYSaiAOZgMlehwt1tWcE3iSRfZscjIp4Kjpe4e
-QsZ9Bc5ATTnY3Tc5Mtmubc-1cwGDQQWFIo5k_cWfxhtpMAsNSidwp-zBjCKEWC465BKSSiUHwp4M
-YW_6xrmN1FobnFqLCNoUEoXH3Mcgeze74dXmaN8_JyQ6T5pT1EtETsitnktrfFh-XsLKGf8vE1m8
-pfAtq4hPeq1jMdG0D8SRVGFxJlHa9VsmYpbUj_4I3GGsaBt_EBl9ZUtL0b3Vnx5fnqS1OZ1amL0z
-94rQfQMf2UAnbI1j2j5oV6Hy2eBmSiLft2aNxs1VPmmZLQsm5dXDKF1eJ6twNmaZvzmQaSHTpN4b
-YqPonSwlYK1ZARaKzx1SivpRWzRP-nqqFazfAnPlLdvCBpCK0g_SjwLvlifozVmH2j0Vd6E9F9XE
-NzJSfUY6NsX6_7t10yDYtBKbFKID3jIKmSj7yn5PKNbEWBwmgvkBh4PIKTRij11udR8S8PnYsfTT
-PyC52LH37LL5Me3Y443zOUXtYWwN6wfCi9H4pDQGmg7mcnpKV0Z-Iw59AuLKypTriG3-9DxYgMSa
-_GCDiCIXhcWSEYieRV45qHoeVdgrPGN8iy9leO_JmikGsjcIKl0-mGrojsV0zHrqeP-fyvgpFD1x
-NXLKeqErqSw_KMFOxCa0-cUQHgrVvrs5wDYeetZ4TRafKEYkojZhq6mbM5V2zScQTxU_VEHK0PIs
-BJ6xHzcw9DLUjPTVtHXXbag9ly9ReoHXRLD5O9RZUvLH9pGRIkn_tMrVD1scMiS4ln9QplyGRF1_
-AAXysVgCna3-xuOIYo8zG74d29eNcuEpejPR8CiSWKiKNqp0zMYB5Jpv2dlf0XMucMne-6WV1-gg
-EETogBbymFC6rcc31TjPwqnqyLY0XP7Gy1trJ47aI9zBXS3IZLmGaKW1d12ELDRsWctujcjHyt1_
-Vp3hrny5w7BNWD8SIueUzke3-OuEhOmu0o84TGvfHc6fmKCggRBn_oXee4OeCnt2HzNSlLvOV9AZ
-g5e1UKuzl2dODQCZHNNdj-7f25LIVSV44m0SVNsDwboQ4s7T5HOTn3NM2KpklwBnB6w5ze2FFBzb
-5XNzyXOpDgHEnszN1U90WrpoFvJ0LFJ5XeX8mH0q9lpcKZXbOqP383_dBXyEd237m2OF6WVG4VVm
-4dqB98pBLiGpCR1K6ocdcZE6mAMQn-OdDaLIJLcXt77i1j2MNlODeax-MJnxMW8EjPAzNJzrdq5e
-21spFMZJT9vthdl0qqiiduuTazaXGrmvnB85uvRCXVqJOesVG3HebubWrQuuuePxVTSL18R_PhId
-0hmqho-MOZUHHTxGzqFDR0iOO8Y4hZfiAipHAd49IkkmYJUrEAb258in8W4__vJ5UcIdq2Rd8L9l
-vtIzf7AKcFCyx7Woi95GpEJ2Kr_f6aG1_04hbFY_LHP3EHPcOxsDHjz-8FYreze_LUdsYx-fBMft
-mcFmbFAblk8Jz7GYQ7c4XwULt2BbMr9rsuGuZHL3Ap6lX1eI0-6d8ZZ3DIXIWubTTqHG_mRNd5XW
-b0x5nlEbnvw4t4DdjGsEONpQfllnnmkr25tPQBncPjlsA3oso6h5QM4psvkkKi8yd0N6t-yyLwra
-w1B3p9YQFzK2hGA24Seo83baLRgIK6YvEsNnXdI7fmVEOetIslQue__6S6GupdqgUFx9xrtDLN-d
-TbdxpezKWfkjCxEBxXyAhOttb3qqP0-jtZV7OEsZmmz0T9DG4hYnNfs-clD7rrD3Va7znzDru2sq
-PtgpapahbNjM9pbx9_fU7M35aEYnGtEwG9BVGVxsWmIBMTc05ncru4qE0fLkjsDSnCMQ54e0
\ No newline at end of file
+rkjjwMnwFj7AbU45vuNPO_dJOOezwTLLwibfSCZ9UaNP-n78Uwesmr_LIP8Mb0cvJhYHrLy0Eliu
+uraF2pO_LzhUO3sXEuSxMqMr9CNEQ7FKw-E5mADetfA5kOBYfwMqy9n-3bdBxfvF7PQuq7yFC2gJ
+VOhRmIjkl2MUh8fKM7bhAZxG_pHMkuI1VVQK1n_DfJD01GfFRzr0yE3FFcvg_Jgi6mr_Xvlry2ri
+AhZMzP7nsQ5IJz-qOXWyEMEJq1rNCQwVwIBbDTtTEyTIpgOjUw6F1JvO3baSS5TKwF74xYYGGWcM
+pCk8eSYtYAtHGyVjxGTEFB1-T6LG3w9TSchhCECLpqXGyId5RGM7q8UERL_tHSuHAV6m9QLZf18R
+T3ySpFzwfYEdhQ7cf1THHqG7JHyYUGsXRqGyuZ1UBxopyMCGYNiud2udhYZ8mGnt4zRuXHKENTtp
+pCkXKEpQq-WKFj4tqFoYkX5Q5VS7TeEkREdPqARxoxWQcZ6omtEqVAQc0c5SIXAlcQUqCRQHp64n
+ETSvK4_S6s4w7-8Xve9va6uYzS1CkS_LQAcAe1nnR1p2Gw4upO1NOBr9SczG7GzCtYsHo7ExoVP-
+XrnWqsENIuYposWNgN6whYWnkhE8F3Mu4VaDwwluTtzkCcRXLs8tS_nzXMWoy6B8IxSgmsp6mfIy
+ZApxvic8Ae8BmfNndK8WawIXTt4IpmxFIFud4VCrHCiUhx-Q0eSl7y3abpMEf0eDQYBZld5VW-zc
+8PlDKmtoGI3XYoPgAWM9Y0tuyEPnoTsfh8r3vFySW79POsaG39XATp9a9W5ZEK4Dp9yQ-CQTyupH
+W3rJgsn3Oov5PglApsVzcQCKlcz3wiE_GWJEk8_WLThLQU5N1OBwTuEIJdqPg9SWOqbHAFDJQPOS
+hbWGxGgKESxUu5x2uja5YXQ-tbvER6cPQL5-ymEPXITsvCz8aREihI86OhR_7q7kkmMo8xXk70Gp
+oWbh5sDzFQ20BhCzZkI_TcYb9bIy-_nYOpwvunC3b-Ba_GFzVaw_ZRfh77XPK9_Szp9_N9a5CmEM
+GBIdL3hKdLSKSuBCF4cDE9x0TQhYOgwSrvTJw0LitaQ1LEIc9IpBpueT0OLu2lr_3EbkLy_26Lg2
+LSvQ0W7o-LLyT4LXrFkbNeAwIl5Sx08LvV8n_yaI8aojXDnniRNmDiuFn7OZM5JtIzf2sOb1sJiN
+Bn3r9qwQR7UePXNabyxb6EXhygIsAv2Hr9is-8JK6wXf3d4rUVpBe08ll0inAaZcGARR1kxUtObm
+nDpIicq-hUNwwjCGLQF-KT0symzwYOSx3tumQtolhx-usZx3rBUyXBJug2CP9REr2ufbqsA3p1mS
+wsU3-tX-OQZdegJr84A5Oyp7DvXx08HW3gUd7VdxyWWTjpNGsUV6A4uZscngmz_eHCFv6pwEe7Pq
+xaHyMVHzBSYvvAT4E99NogZas-r2xj_AKpaf_k4jDWWeOTcjU8t8r1u__fOiSpGaQS1wsKzwwHuG
+gYLW0sETApz5UyDl2xrX6Sr9RdwlR5AbIiHnheNn84z2reVP7pNKbok0STnGV1QaMUJqkhRdPnop
+AiyftGYMwsBie_20zZpbZO8kLOV_Sw1dEC6Mb0ZBpDAnWWBIjxT22ZC5H4wJpKyfphlK4zI_tMeh
+LZTX50ILytzCnUIfc1WvU7HeSfXrc_fzOIIij002pm2zRbe50NMvpn8K1ctUFAzCayBKRkTtQaMP
+ncJyjEoUMZ9ykBaTC856mb7L_N9PhxArxxVWDgEaCOu-Tp53n2XkbuWbuciH2ZfO8zvIwSnYsR53
+joMMaGqtMCZF8sonpPbCXRDgBB0YhBP1CYkNTZSqbR4smxUtvMhz4AGiKg6e6x0a2npVSrTwPxb7
+jHs-jF7L4ldKv5-8Xp4z_z9pIafV6grW2-GhQSUkEXjhIsvwRrsFxc476KXhbpMdEBosCmTzgOF6
+wNMkn5SNCUtjp80UgP6IOSPemkf2lAAPdcZJPo1jtR7-W--zIYATHDy4dUqMg1s2yREozgb9
\ No newline at end of file
diff --git a/components/aai-traversal/resources/config/aaf/org.onap.aai.p12 b/components/aai-traversal/resources/config/aaf/org.onap.aai.p12
index b2449c6..2601acf 100644
--- a/components/aai-traversal/resources/config/aaf/org.onap.aai.p12
+++ b/components/aai-traversal/resources/config/aaf/org.onap.aai.p12
diff --git a/components/aai-traversal/resources/config/aaf/org.onap.aai.props b/components/aai-traversal/resources/config/aaf/org.onap.aai.props
index ef78622..ff492b1 100644
--- a/components/aai-traversal/resources/config/aaf/org.onap.aai.props
+++ b/components/aai-traversal/resources/config/aaf/org.onap.aai.props
@@ -5,7 +5,7 @@
 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
 cadi_keyfile=/opt/app/aai-traversal/resources/aaf/org.onap.aai.keyfile
 cadi_keystore=/opt/app/aai-traversal/resources/aaf/org.onap.aai.p12
-cadi_keystore_password=enc:dgVjUeXy3cuR7nJ3TFVrXFfAu19gn6rie-RsS96-0fmeZwMsXlNIgK_rHd2eRY_p
+cadi_keystore_password=enc:QZ1m5hWsVkhtOlw3JgMW5EHzlOpawI64djJryybxO1SiYeZ1nMm-Tj6njLHlmGZD
 
 #cadi_key_password=enc:9xs_lJ9QQRDoMcHqLbGg40-gefGrw-sLMjWL40ejbyqdC7Jt_pQfY6ajBLGcbLuL
 cadi_alias=aai@aai.onap.org
diff --git a/resources/config/aai/aai_keystore b/resources/config/aai/aai_keystore
index d1ebae8..b9a3e45 100644
--- a/resources/config/aai/aai_keystore
+++ b/resources/config/aai/aai_keystore
diff --git a/resources/config/haproxy/aai.pem b/resources/config/haproxy/aai.pem
index 6390db1..454600b 100644
--- a/resources/config/haproxy/aai.pem
+++ b/resources/config/haproxy/aai.pem
@@ -1,19 +1,26 @@
+Bag Attributes
+    friendlyName: aai@aai.onap.org
+    localKeyID: 54 69 6D 65 20 31 36 31 31 32 37 39 34 33 39 39 37 30 
+subject=CN = aai, OU = aai@aai.onap.org:DEV, OU = OSAAF, O = ONAP, C = US
+
+issuer=C = US, O = ONAP, OU = OSAAF, CN = intermediateCA_9
+
 -----BEGIN CERTIFICATE-----
-MIIFKzCCBBOgAwIBAgIILW/fiLbps3kwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
+MIIFKzCCBBOgAwIBAgIIOB41ln9crqQwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
 BhMCVVMxDTALBgNVBAoMBE9OQVAxDjAMBgNVBAsMBU9TQUFGMRkwFwYDVQQDDBBp
-bnRlcm1lZGlhdGVDQV85MB4XDTIwMDMxNzIwMjg1NloXDTIxMDMxNzIwMjg1Nlow
+bnRlcm1lZGlhdGVDQV85MB4XDTIxMDEyMjAxMzcxOVoXDTIyMDEyMjAxMzcxOVow
 WTEMMAoGA1UEAwwDYWFpMR0wGwYDVQQLDBRhYWlAYWFpLm9uYXAub3JnOkRFVjEO
 MAwGA1UECwwFT1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVTMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAov4ddmOzRCWAU/sx2Q9kcYZZ0r/x
-agqwDBcmlS2OP0MAou/f/xY2gzE2ugXXGGEXG6PCUx4YEHGeRxyezEQ/+c+kSjFe
-0FTUa8Z1Ojad3VDsJfjfZ1994NpV99KTrrw1Twq9Ei7dpkypUA8kZxEjg7eM11TU
-F4jS6x5NEyVsxih5uJjIF7ErGwimSEKsympcsXezYgG9Z/VPBpZWmYlYl5MWjzT6
-F0FgGfSbajWauMifEPajmvn8ZXn6Lyx0RCI25+BCcOhS6UvYXFX+jE/uOoEbKgwz
-11tIdryEFrXiLVfD01uhacx02YCrzj1u53RWiD6bCPyatKo1hQsf+aDkEQIDAQAB
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtHUOwrGkw8fjOyb/wKNb8BDJeAmP
+mtFxCU3CaoBlgI0kn2XIg1IlK2g1TjiM81z6hrcfUt3fPT3EiLTmxMyHtJJpQLQZ
+WbrWR+oHugiPxXqRCINNu2KmlObhVl+zQundSwRz9ecX2wgws7w6rT4keJP4A9qR
+4ueBtHvPHbebt6bXbD9G79ARPqhtCRmrJnYvOyo+ImvwyRtqcRcBRSEZ1VUkP5Ol
+2/8c4vRl5owXNA2PT7NMdiZHEWKc/sWN+58VNONLK4ylL8YPF3hbxDbPx90dS6+E
+dT5ZKtjzTYjsbMWhBOyMdrcQN/07vSTPzvYaHN5uf1F8Yl/kTz8HRNTr1wIDAQAB
 o4ICBzCCAgMwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwIAYDVR0lAQH/BBYw
 FAYIKwYBBQUHAwEGCCsGAQUFBwMCMFQGA1UdIwRNMEuAFIH3mVsQuciM3vNSXupO
 aaBDPqzdoTCkLjAsMQ4wDAYDVQQLDAVPU0FBRjENMAsGA1UECgwET05BUDELMAkG
-A1UEBhMCVVOCAQcwHQYDVR0OBBYEFP94WTftXhHcz93nBT6jIdMe6h+6MIIBTQYD
+A1UEBhMCVVOCAQcwHQYDVR0OBBYEFO3zKoHszn7OiYywPQ5RD+mVC5UPMIIBTQYD
 VR0RBIIBRDCCAUCBH21hcmsuZC5tYW5hZ2VyQHBlb3BsZS5vc2FhZi5jb22CA2Fh
 aYIUYWFpLXNlYXJjaC1kYXRhLm9uYXCCEmFhaS1zcGFya3ktYmUub25hcIIbYWFp
 LmFwaS5zaW1wbGVkZW1vLm9uYXAub3JngiVhYWkuZWxhc3RpY3NlYXJjaC5zaW1w
@@ -21,13 +28,19 @@ bGVkZW1vLm9uYXAub3JngiVhYWkuZ3JlbWxpbnNlcnZlci5zaW1wbGVkZW1vLm9u
 YXAub3Jngh1hYWkuaGJhc2Uuc2ltcGxlZGVtby5vbmFwLm9yZ4IIYWFpLm9uYXCC
 JWFhaS5zZWFyY2hzZXJ2aWNlLnNpbXBsZWRlbW8ub25hcC5vcmeCF2FhaS5zaW1w
 bGVkZW1vLm9uYXAub3JnghphYWkudWkuc2ltcGxlZGVtby5vbmFwLm9yZzANBgkq
-hkiG9w0BAQsFAAOCAQEAVigPPsYd8yscW+U6zpffBc5S6Mg2DQD/gikB0uF//lIq
-oa5qTI3yB0wPoRKmxpeEZiJYDkBs3App2sPM2fPb9GGmGncCLkprqTflM2Y4yxX4
-k/a7w8vEwMoCrBgxEdmniAj9TirsISyLqBIXoGT7WtaXBLZarYhJ4P7TplhyWuwe
-sV6jxkZLIRLj31ihf32adFIhPZQKxaHbbFnyEylLTdPuZGy3nvdmjajZuomOFF8h
-HhDIouSJAtgkuWVsMiX6iR1qG9//6ymnZMvUyDGr8bkZURhMqesAejwP4aKxqDZg
-B0uVjapQTJH4ES0M+2PoY9gP8uh0dc3TusOs1QYJiA==
+hkiG9w0BAQsFAAOCAQEAPXR5X88JkmrJ3fwt/fwngTVbooacoItx8ZQyabcsn7q6
+KLw8iyF8Bq/iXXeOvZLzkM1EFCTVHd5VcjfMgVNXhKtcZVJqawF+Kj4fmCQXgml+
+TbxEz+FDze38Y9KEKT8B+bMDca+0bmZvC6QwajBfUSULrzRCUDc2oLM7Jt4+SwQS
+Vn+1Jutp+pD8GeZsLCr8YkuZxczevm/0Rub0lBLiTEDV0DbtyT8YP4qZbBLXKLLf
+w4mF0zGY+5ECq5mHcHfw3rHw3JlBgNs9kBllB/wBJ3OztchUd9/d30zw3ac+FzxI
+oIZbF7liT8mqgGwPI5HGTpq/oTZWEkhPfxBFlmp3+g==
 -----END CERTIFICATE-----
+Bag Attributes
+    friendlyName: CN=intermediateCA_9,OU=OSAAF,O=ONAP,C=US
+subject=C = US, O = ONAP, OU = OSAAF, CN = intermediateCA_9
+
+issuer=OU = OSAAF, O = ONAP, C = US
+
 -----BEGIN CERTIFICATE-----
 MIIEdTCCAl2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
 RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwODE3MTg1MTM3WhcN
@@ -56,33 +69,33 @@ BmMXTvouW+Flyvcw/0oTcfN0biDIt0mCkZ5CQVjfGL9DTOYteR5hw+k=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: aai@aai.onap.org
-    localKeyID: 54 69 6D 65 20 31 35 38 34 34 37 36 39 33 36 35 31 35 
+    localKeyID: 54 69 6D 65 20 31 36 31 31 32 37 39 34 33 39 39 37 30 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCi/h12Y7NEJYBT
-+zHZD2RxhlnSv/FqCrAMFyaVLY4/QwCi79//FjaDMTa6BdcYYRcbo8JTHhgQcZ5H
-HJ7MRD/5z6RKMV7QVNRrxnU6Np3dUOwl+N9nX33g2lX30pOuvDVPCr0SLt2mTKlQ
-DyRnESODt4zXVNQXiNLrHk0TJWzGKHm4mMgXsSsbCKZIQqzKalyxd7NiAb1n9U8G
-llaZiViXkxaPNPoXQWAZ9JtqNZq4yJ8Q9qOa+fxlefovLHREIjbn4EJw6FLpS9hc
-Vf6MT+46gRsqDDPXW0h2vIQWteItV8PTW6FpzHTZgKvOPW7ndFaIPpsI/Jq0qjWF
-Cx/5oOQRAgMBAAECggEAVYWGSf9IKYKP0gDkh+LmrhZzfPxPnHddJgrjqLSNha4P
-YG8CliK+mZmyAGteECGpcUw8g0YwFDi5dtCSldVdyCLmLjO3bxKDnsUz70aHEIAM
-WGQ8PE5Diz6kivMHoFCKnB2jVS4YCNECqco4LIg2nT8q/DU7T9nv6YQtptUlPNdY
-OmJRXfUfcBSUINqVi/VbEjHtbZqc6dgvaRNEF0CYtqHm7P51BXGa3pH+6drL+U+a
-o3T4yHrEsDKUaQzJZoiJneexwN91x42gcyHzg30UZVgCP+9Zt2GQWXqpENNZjGlI
-bwzouvBj266ViBNbuu3tar58MASOCnCKGA0Jrs3P3QKBgQD0ENenvzaqNzV0A47x
-+RI76DM2eorY2dxh+4txAt1pXlkbMZuWXjs1ysBPYaGHZRitiCFcaSwdP2T0oCET
-ojYEU97bJkKlcuw2scAqznSi7U0uSaStwaWzEviGTsQ51MKghRESMfpt3BxZqyi0
-BV+fPeRk3l3xaw1AuZQ/JTn0qwKBgQCq9msPcbRzKvsmfsAVvjKAodzl6EaM+PcF
-YLnJLurjCtdyjj1lRaCBg9bRbaRbt9YPg4VA5oMYm2SuwbJQQHjqaeN+SpnV8GGc
-nPsZgoSlfZrnLovyGgC3muiA3uSPREZWUlp+IE8qlQ8VztSWkNyxNej4nhxk2UTH
-DOE2ZmNyMwKBgFD+yeKkZUrFuZp/l8+bfb6dx2kb77oZSrbFmLfvYHUYV2/b3atg
-KDwoxftSBh39odvs4k1dpcMrB6DbBz8RxOVYxAtsPg/T/KoGASTzkOeE4ukqjVkQ
-e6Ha+NjxiNM8VT6aCllEdrxAoLPtRju/0MTy8Dm9ReXZRfOl4pm2C+6zAoGAY2D6
-uu+NxaSmeaoUXo9BLCTrE3oCCNBwR2ACnz/2qiQTOTQV3FitBJxusy7Y67fhZwM8
-4o0ch6FM1Yki7iOMJjeHVlJnOkWReEiIbjvAf7KT6O7VytXytMgHf2IR2nYFrQgS
-Ml71pfsf2b1xNlTe9OQxmNPQDY9+u3ZxM/4wsKECgYBPvlYMaZNIOLFf7VXzUYGG
-rkXMpbLgLvIHvhF+4nsvspPVSqPeWjh2KMee3tMamy93H4R66G/KfoQw02JuZH+N
-HbGnnpyLa2jGjY0NkXEo08o2wsqv2QFtT/SFRoDLkah8rwZUwpxIg0akgrwwTslO
-rzAazDQvlb0itUxgU4qgqw==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC0dQ7CsaTDx+M7
+Jv/Ao1vwEMl4CY+a0XEJTcJqgGWAjSSfZciDUiUraDVOOIzzXPqGtx9S3d89PcSI
+tObEzIe0kmlAtBlZutZH6ge6CI/FepEIg027YqaU5uFWX7NC6d1LBHP15xfbCDCz
+vDqtPiR4k/gD2pHi54G0e88dt5u3ptdsP0bv0BE+qG0JGasmdi87Kj4ia/DJG2px
+FwFFIRnVVSQ/k6Xb/xzi9GXmjBc0DY9Ps0x2JkcRYpz+xY37nxU040srjKUvxg8X
+eFvENs/H3R1Lr4R1Plkq2PNNiOxsxaEE7Ix2txA3/Tu9JM/O9hoc3m5/UXxiX+RP
+PwdE1OvXAgMBAAECggEBAI2CPdDu/QWJ+eao7mVhtPbMMzCuTq5ZDwr8rzhU90OX
+auCUMGjKQduIHET6k41DnDGH6EhTNHwRs8yAD3bD7KbtKRxUHoz+toouO2Dm1ddG
+BfVnAc2vznF1m77fzPLr8VyiYUyzq0FXatmHAXxY/sCPSC29eCk24b9mV0Q2dyXL
+nKN+hJghcyKrojIQ2K7Ehk48+wADaTs7UqobbBQgjFqzxGg/boAgXdm+z1jjLYOi
+SrO3qYhhGbazb2CwLivpNm95BLNGGLSGm0bO/Cr+bTQx0mG2ksJhe5NpVpSaaa5t
+gsiMxlJPPFT0Q8FJTdp64S6NJVMfn/kpUxIMuXmFEgECgYEA7wE5eigme5lDnK0m
+4zsNYGNnH63JeMa98sxBnNyhg2d6zDhZvILlJbVQo0r7xtxhLuEHGlOGXv2d8d0N
+0HDreplFoK+SBtUvBiSmSuoALZNccQR7JbO8Ic5c6ufzRGSz6AP2o17bYYm/tP9Q
+IxYuc/QKSjbOnL/T+XZht46sm5MCgYEAwUoM7sd5EfWUSqHUwoB248pbJIciGps1
+jC4CO67kKwQCW7beTSLUorlzvB0QwpmWTsnWxRqZ/4zZM3rTZwF/yVljEJmS8ouH
+p1PYbVXvvQ0il8cAJMTBWYdW16FGmfXIJwpyfS60ZX5/E7SFN4rUGqKzNLNJO/b7
+wb6QbA3WAS0CgYAGZnb+kXKuXqVT3cMr1JoAGclaLNI3XMMbbGLZa4MbvLqqG1wz
+0yGFx/w30zs40Q/9LGN/TftMMeh34J6NFWkI6G/X5Lu5WR4gQPz/BpMopUiVcjRG
+BzEjip4sYDfAfh3fObPyHgkr7H9ovmmL9v0Zd9CKujsAMZbgmE33l2eB5wKBgDgx
+fBMLQOJ8v/D2nXEygd31nYvAEaUkjGvFkHajgMgUsU7SmkxYnPL18XS2CoJYvn8H
+ZP4GntDRtO+nfMBMikcSSp+v1i3XbMezs48N1dXjdLQlcaA+52tM0m18AJeQAfF/
+sws7wcxj+zPSXoxoOwPHW0wt91OMmWKZMUmIuDe9AoGBALP//iER8Wx6mgh/TrWU
+LzO3qz7fEBaf4/LBspp6YzkwYE82TcC6u/zAGATtNZI72FA6CO90PtNJTObboDiz
+IZOAQIG2a5s2AF1ORXv4GWwKCOZfme4e6qoTKfIp7GUVzzaoP+F8p8gWrThM6MWf
+Ko0Qqa0i0hSL+fgk8QslsWue
 -----END PRIVATE KEY-----