[DMAAP-DR] Patch DR certs for another yr

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I3a8354a846093ab98ab2b6a9a36e9daf9feb4370
Issue-ID: DMAAP-1726

13 files changed, 74 insertions, 74 deletions

diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.cred.props b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.cred.props
index ddac3673..bb86e9d0 100644
--- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.cred.props
+++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.cred.props
@@ -1,17 +1,17 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2021-03-12T11:29:50.699+0000
+#   on 2022-03-22T12:34:23.012+0000
 # @copyright 2019, AT&T
 ############################################################
-Challenge=enc:vAjLYtGeryLHcxGPKVfnclyeD9RqGdXITc4hl6CZ4TZJ0zX8Ye7oM8ZI2sprEBFC
+Challenge=enc:v6yuDc_Lu1OgeFEthckOsa7R0XW6h0iZqUQXnw4CpstwzjmN0x9VOsf27um5fC5z
 cadi_alias=dmaap-dr-prov@dmaap-dr.onap.org
-cadi_key_password=enc:3-xb3J9NZGt3Bi1pBU8IzUkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem
+cadi_key_password=enc:CBXkw5IMQ8IeOhERa_oK4XcS1BsKy3T9BiZgAOIBqI46Nvy0USwgXCyOkTgVlJn7
 cadi_keyfile=/opt/app/osaaf/local/org.onap.dmaap-dr.keyfile
 cadi_keystore=/opt/app/osaaf/local/org.onap.dmaap-dr.p12
-cadi_keystore_password=enc:oTui_2WtTJacNR4BzMpwMNkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem
-cadi_keystore_password_jks=enc:MzNI3f2sBZjEZLe7H-qtPqsS8Ep6izdrfMSC6HgcODln1yQTf3TvT2lGCd6k3W2U
-cadi_keystore_password_p12=enc:oTui_2WtTJacNR4BzMpwMNkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem
+cadi_keystore_password=enc:Qd78mq7KSyK4G-gmnA0YVrB4jpMLgMX_4jDmwkdkKpD-MmonHNXlDA0TzRd3oxWe
+cadi_keystore_password_jks=enc:GuyybAMtPX21LbCx_AXGnO7nz3NlPenZESuLVgrw-_cK55re75K4YOLYVzQswUYU
+cadi_keystore_password_p12=enc:Qd78mq7KSyK4G-gmnA0YVrB4jpMLgMX_4jDmwkdkKpD-MmonHNXlDA0TzRd3oxWe
 cadi_truststore=/opt/app/osaaf/local/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:m-AxI9-7yuDFjMrkrqDaFeBCRcLZg1odoJ5GsmnAHKqp2zOMPsFj7WIKblDLVMOb
+cadi_truststore_password=enc:y10bIyzTHei-rxWnWgHUUFUD_9TfOBdxmIn6vEf0zsyZtWmeP8ZjFE1LoPn7Ri4g
 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/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.keyfile b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.keyfile
index fc4a2f90..86092892 100644
--- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.keyfile
+++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.keyfile
@@ -1,27 +1,27 @@
-FuUPjMTqwItkH0pd22hdRFZCYb2PWFyts5oBr1sMuNcQN1CN32VU-c_m3FehqOb0XNHmFPNJqfzp
-zjdictrDN34GQ-pmrKk_ZrdjFfhibPjzKLWPW1tl6fa-bc2y_DGLCkIirvjA27oEgzVQ2CgbQw7Z
-N1honW53m6Sq_rHYilkJ25w8h_Y2Nw8TCZv2cQGi7OZJfpyZAC4mWFokAELjh3kcgbfXOdBxZxf1
-HBTpjmnDsOmpveOnDI9KU22Cs-GzT1g_avT8mxufj6252YimBd7ylpLU8F_28YJHop6CAB_YlRGJ
-xTeuM2Yr8ny-6OkQoOTIIU6iwI724ctQfuqB7QhUVgziUi8Lr-nT3nuZqsmvKiNd0B8P3_zxnnyc
-bkRyWwz2UIsiPJUq9Ne9YszUnmPhztCSY3dWP75NpPL1liT-sXWp36ekUUMNNrYxTIZDCLlMu-6h
-frFeKLN4xamaMuUCtQnh5WogsluWo5BAE4XaFSSkCWzXYCn3i5UK2E_iKPvA6rROvB1WzHNa05FH
-_aKFCm3QlwwgcBE2b76NlN27QHt5OYv5l16_4SwR_NU8eQwIfDNsf55-r0aPsj3GE8bD0EQ8upjR
-k_QQ9r1hOFmOOYR32A1XOjosh9VTAS6I69AVLXijJKdO1xe50zno_OCvpOTBBxdQo0fVMFNxORAN
-xhzbmmeP8ouJyBhyb5RcdY_FKwjRUt1KECvtheoz1UbMHy-MqzxHnrIWhHA31fClJiEccynDKE7_
-koHlK1QoO4BBZJvrDqvhMYNIMl0MGkM6F7M4acB8s-WaG1HrsMX_bevTL3mrdNGGlUdIHpIuDqS3
-8BZGDXSlm6iXJ6PhkKyoSLGmInBKoYDPPYBcLK5xqPPL0Esqq5PRxvqqG15VzoFi2Wzpz6d7SfqV
-AUdJiP_H_NL4wZcw-JaftP2svNbKDqoT0dZ5NqffSPMxT2zGK-2nsScn_Grmz27HoJMaD9LQwuwh
-FUdc9UeS9IwOmC09PAlcWBRM3sLhdmHhC8V6SbzEaRgjYzjOiF4XGzdWmPdsELa7aDw30VuGbCit
-FJjVNNzk5C6ncVisqXZwUQzL40G9N2Vd07rdyVuFEKfFb4o8_yCVCiC2NRKR5_DyvQhCeQGpG6qu
-fglPdu3xHuiufgXdg_XnzWrKhJNF7HmWkGfG8KySLgfPNTjZlPNLa54ePMnnr5sdacgtDRbCXzaN
-Lve28nSS-EPsB-peXDVqayqMbhPZv-yWl-O65B7Rwc2rLcJh6I-296AxMxFOB1cHPfXK1CBaBvlA
-I_u_G_0NVRUuqg5CaWw-yDv_tzqnDCID5smObdd-9QOnRA_t3NTkPFhhOvbQjju2ZA7FdrZnMDem
-eG-znmI2JwQlgrzybXs2MHOtmI1d9sAUROGkYSnzMzCX6GXd_vf-UD3SpfURrQ2SOmflVf1-WKZh
-a6KcKPhXHH0wxB4fLxmvBVHT8U0E0PMbQ_ilZ9lU9A2fxcwPhnZpwJadZQ2H33OdNVFHDARWBZj0
-3Kt0eVIfxaRWgptF0WYPlh5ge9oveMWMvDg4oIAdBDNrkcX4cCfS9dmmXvCNhtY5KrQPr9SO66OC
-nljHSsmTRDcIWgi23chfJcm8GJbwC4MD2JSb7oqXNIDUCse5SInSWSpdH0sAgbDrN0_fzoF7rLVH
-wgFLuQBCJQtCW9D00iVfaUj8BfvHaH5xpO09DpK10CDV1lgjav9x88KcQo7jtcDUNEf4NM8_oo9K
-zAil7PabfVsvBGjU-YAW7_sF9jPiQgYYD4DHXOi3o9tvwBWrwAyoI13ziMzlCXZw8f1ftpE2VVPW
-su0QTPd7TO3B_gdWeaGbkBKyMU06SqrXd6-OPdBepSiNtKODRpY3dOFYsQVUkQOfyLYdoso_BO5C
-10I_DTKHgO32yenIJPn72qPSk3-lxbcHhqPy96u9Y-krmOnx1bjoeN2jhJEKxwKQclemP-eFHDKz
-LMdbL_gt946nPVqrKPZtzDSkqztoal3sWmkoT__6fK0sMyIU64VCaLp2pyuh8dujFe3DDmi1
\ No newline at end of file
+gf-I4kLSg98uxwCXpklt-W2Qfa0mFgvXDoQk_qsLs4uuLI9FmWkrdlgdqzEgISL1sf6SAhoXFXO4
+BSm8fSPPrjaFEQ-uZcho1bY63lG710ZLh7vf0Bc7WPieRXesloH07CRXXjUdTkXXU8qTP6Ufru16
+mbGODzcZ-Ygm2GLVbkLk7953CJYIvuYT0M3ggrDr51eOalpgwXA1uO2DCTmY_fyqFNpZbLEtcYAx
+EEBkbaT0KhKwSfXfPINjpfCVMNBr3eK2m75RFJzTmA4Nq_WFgQQBUJkYu6EaWR8xwKEnX3brIFN-
+uY8Xk-Wxh8hhqNQWSxaSa_w6BfbP5CwUpIk9Ex1v_gCa63NIy4WzoRxOHKuCQAS26vLJFxTTNOlP
+d_DVC0gmvL-q8VnedNVSsRw1zuDOtOzKg3iUbTjopba3YryelxwL2xUJzkxv8RiOVvTCdZ34lPP0
+vQCaGJYg52OKOCMaIs4e6bqfCFMT4nlbad--mPeZGS3X5pJ0xSAMRa8L2_ksHbTOvcjOlCvmWNDK
+puP22sdegP-mV6Ygm30Gyn7TnUodDA3bzIiA70zrkrlt8pBMhKmCbmWvGfjItoRnfGwtlsm1OU73
+Jst8pQ_mvCK486UoH4Lui1kNBTqAJIrzYT_m-MrL6w9lx7Lu-ZG0HqdDVO4zB06WTyCXT-I2r-XS
+F9ddoQ3GOUMA4kIckEeEVYfZiVaoPeizNwynSLHZDA3Xztc-kz7HEqdUCypM5pM32qGN-z4Gzbh0
+K4GO7_cGyctMGNY5za3iANK3BBBx9d3G3XKuCH2EDF9aj_kFarMaJjTHwn9-OAeD2GXtdYQqarod
+4Yw11CD8JjyF6PdYstTh9t5_iK3pZjFaLMBPlLFN_tDu_5zsVagJjM7nMjfn8iWH5o3rj7WAIqBC
+NoxZhIRUVpEmDKkhsnq9i9gdjoiKjrNwEsswX2vGsXEAf1vTXH2YsgraTjEhlW0cIb4PBLd4YoSE
+AW3MXhwu5rYFgGooHyB99OKZOX6-5Y44fA0TE0ypn8HZ5oVrERCHVHNXsiXg1pRjTHjoIYUFoSQQ
+lT8eVUo5MUxQ0SVKUi03wA7EduWrwvuD_KyLeNnvECj6IDuK7qiqH86UV7AyQhwjSZPj4N3KIlvD
+VJNLmt6s8b6SLZpO23P-ZceFEIIYG7E1IGmo2s5VkWTNTkvqD7blxoOsfBIxb-SjttnMtbKCcXPj
+aKMC1oqr5xLsvtg9XDKKXt4kELElRBiKtrud8t7qqYMfC-q6lIddmG8x_196qsYiErKd9mLyDT2H
+DG9wmz3dDds_bUnXA7_-LsriDI4t_fAqAKnvR8tLi9DjhU1g9yjlGuKn4yd3y8aK-UFFfBi1AKxA
+WoxSt2Omw_sl9Jc6bzoZ2_NHPZz7IaDhSu1imAAcAms4SIr3g-MnBffVpxarrXYsoaxurMRMoqLx
+r0DyV1Y9IZSwo-xsWk42CxrvEF31AmFWewI0ykA8bZ-zpWux3z7BfbKDqxglg3Lp5uIfVFHamds3
+ya-KMBCtaSgiJ9fB7Q183Lt0tMxrOLe3hln55I4SRgHT5blh1LEznIigIfhFEOo514JEdctkVrDS
+bDSbCO-yZE_0BcznTsjoyImwObeVRbDDu0feM9uGs4fL7zwVCbzEurGU2js-0o0rcyDiv30tsL5S
+LaxA-xz7x5HO4JAd7BeaeF4-v0-IeLKPH4HzYk0g1PKskZaZHMWBWSPaJWin68ahh9Eh44xSjsCW
+TUcoddf4-5HZS_RWlrLvbnfbEBAm7Ikbno1zLJz7_H3tmLKv2axkGEu-YWIAffb7xMzG0T9m6S3B
+Iz1jWxtJ41gTE5kGFmaezDeUGPrioaqOq0bCq6DStQMc_5kcKAIg6GffOX75ZvagC2E6E_B58AGU
+iVDzz_yi4Xcssf2jN-MIiHes0HsMQILrLAu1PLZh9qOIGOnVgLdwr0o5CGsg0h7Bxxl6jFQubwAZ
+rc2foRg7arAcRHYasoC34f9pH0hfBzHfTGg5S7bWU6mDaldpWS8Na0EoCoFoZATkdzG77w6c
\ No newline at end of file
diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.location.props b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.location.props
index 11dafa78..eef8aac6 100644
--- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.location.props
+++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.location.props
@@ -1,7 +1,7 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2021-03-12T11:29:45.890+0000
+#   on 2022-03-22T12:34:21.359+0000
 # @copyright 2019, AT&T
 ############################################################
 cadi_latitude=38.0
diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12 b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12
index 7b37cbe9..69948c25 100644
--- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12
+++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12
diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.props b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.props
index 897b076b..a392a489 100644
--- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.props
+++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.props
@@ -1,7 +1,7 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2021-03-12T11:29:45.885+0000
+#   on 2022-03-22T12:34:21.357+0000
 # @copyright 2019, AT&T
 ############################################################
 aaf_env=DEV
diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks
index c61528ac..3666b965 100644
--- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks
diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/AafPropsUtilsTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/AafPropsUtilsTest.java
index d6de895b..4f2f3ee5 100644
--- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/AafPropsUtilsTest.java
+++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/AafPropsUtilsTest.java
@@ -37,12 +37,12 @@ public class AafPropsUtilsTest {
 
     @Test
     public void Assert_AaafPropsUtils_Decrypt_KeyStorePass() {
-        Assert.assertEquals("SYCnsM&BPf@JFhi[&Z2?w?p1", aafPropsUtils.getKeystorePassProperty());
+        Assert.assertEquals("b.Qo{*!a(a;jmeOfKbA&vHx#", aafPropsUtils.getKeystorePassProperty());
     }
 
     @Test
     public void Assert_AaafPropsUtils_Decrypt_TruststorePass() {
-        Assert.assertEquals(";#HI&OVN,V5O!qBRoNiQEut:", aafPropsUtils.getTruststorePassProperty());
+        Assert.assertEquals("YeXhcTw6%G[od1a43+P!yhoN", aafPropsUtils.getTruststorePassProperty());
     }
 
     @Test
diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.cred.props b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.cred.props
index 96048dcf..bf3feda8 100644
--- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.cred.props
+++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.cred.props
@@ -1,17 +1,17 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2021-03-12T11:29:50.699+0000
+#   on 2022-03-22T12:34:23.012+0000
 # @copyright 2019, AT&T
 ############################################################
-Challenge=enc:vAjLYtGeryLHcxGPKVfnclyeD9RqGdXITc4hl6CZ4TZJ0zX8Ye7oM8ZI2sprEBFC
+Challenge=enc:v6yuDc_Lu1OgeFEthckOsa7R0XW6h0iZqUQXnw4CpstwzjmN0x9VOsf27um5fC5z
 cadi_alias=dmaap-dr-prov@dmaap-dr.onap.org
-cadi_key_password=enc:3-xb3J9NZGt3Bi1pBU8IzUkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem
+cadi_key_password=enc:CBXkw5IMQ8IeOhERa_oK4XcS1BsKy3T9BiZgAOIBqI46Nvy0USwgXCyOkTgVlJn7
 cadi_keyfile=src/test/resources/aaf/org.onap.dmaap-dr.keyfile
 cadi_keystore=src/test/resources/aaf/org.onap.dmaap-dr.p12
-cadi_keystore_password=enc:oTui_2WtTJacNR4BzMpwMNkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem
-cadi_keystore_password_jks=enc:MzNI3f2sBZjEZLe7H-qtPqsS8Ep6izdrfMSC6HgcODln1yQTf3TvT2lGCd6k3W2U
-cadi_keystore_password_p12=enc:oTui_2WtTJacNR4BzMpwMNkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem
+cadi_keystore_password=enc:Qd78mq7KSyK4G-gmnA0YVrB4jpMLgMX_4jDmwkdkKpD-MmonHNXlDA0TzRd3oxWe
+cadi_keystore_password_jks=enc:GuyybAMtPX21LbCx_AXGnO7nz3NlPenZESuLVgrw-_cK55re75K4YOLYVzQswUYU
+cadi_keystore_password_p12=enc:Qd78mq7KSyK4G-gmnA0YVrB4jpMLgMX_4jDmwkdkKpD-MmonHNXlDA0TzRd3oxWe
 cadi_truststore=src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:m-AxI9-7yuDFjMrkrqDaFeBCRcLZg1odoJ5GsmnAHKqp2zOMPsFj7WIKblDLVMOb
+cadi_truststore_password=enc:y10bIyzTHei-rxWnWgHUUFUD_9TfOBdxmIn6vEf0zsyZtWmeP8ZjFE1LoPn7Ri4g
 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/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.keyfile b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.keyfile
index fc4a2f90..86092892 100644
--- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.keyfile
+++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.keyfile
@@ -1,27 +1,27 @@
-FuUPjMTqwItkH0pd22hdRFZCYb2PWFyts5oBr1sMuNcQN1CN32VU-c_m3FehqOb0XNHmFPNJqfzp
-zjdictrDN34GQ-pmrKk_ZrdjFfhibPjzKLWPW1tl6fa-bc2y_DGLCkIirvjA27oEgzVQ2CgbQw7Z
-N1honW53m6Sq_rHYilkJ25w8h_Y2Nw8TCZv2cQGi7OZJfpyZAC4mWFokAELjh3kcgbfXOdBxZxf1
-HBTpjmnDsOmpveOnDI9KU22Cs-GzT1g_avT8mxufj6252YimBd7ylpLU8F_28YJHop6CAB_YlRGJ
-xTeuM2Yr8ny-6OkQoOTIIU6iwI724ctQfuqB7QhUVgziUi8Lr-nT3nuZqsmvKiNd0B8P3_zxnnyc
-bkRyWwz2UIsiPJUq9Ne9YszUnmPhztCSY3dWP75NpPL1liT-sXWp36ekUUMNNrYxTIZDCLlMu-6h
-frFeKLN4xamaMuUCtQnh5WogsluWo5BAE4XaFSSkCWzXYCn3i5UK2E_iKPvA6rROvB1WzHNa05FH
-_aKFCm3QlwwgcBE2b76NlN27QHt5OYv5l16_4SwR_NU8eQwIfDNsf55-r0aPsj3GE8bD0EQ8upjR
-k_QQ9r1hOFmOOYR32A1XOjosh9VTAS6I69AVLXijJKdO1xe50zno_OCvpOTBBxdQo0fVMFNxORAN
-xhzbmmeP8ouJyBhyb5RcdY_FKwjRUt1KECvtheoz1UbMHy-MqzxHnrIWhHA31fClJiEccynDKE7_
-koHlK1QoO4BBZJvrDqvhMYNIMl0MGkM6F7M4acB8s-WaG1HrsMX_bevTL3mrdNGGlUdIHpIuDqS3
-8BZGDXSlm6iXJ6PhkKyoSLGmInBKoYDPPYBcLK5xqPPL0Esqq5PRxvqqG15VzoFi2Wzpz6d7SfqV
-AUdJiP_H_NL4wZcw-JaftP2svNbKDqoT0dZ5NqffSPMxT2zGK-2nsScn_Grmz27HoJMaD9LQwuwh
-FUdc9UeS9IwOmC09PAlcWBRM3sLhdmHhC8V6SbzEaRgjYzjOiF4XGzdWmPdsELa7aDw30VuGbCit
-FJjVNNzk5C6ncVisqXZwUQzL40G9N2Vd07rdyVuFEKfFb4o8_yCVCiC2NRKR5_DyvQhCeQGpG6qu
-fglPdu3xHuiufgXdg_XnzWrKhJNF7HmWkGfG8KySLgfPNTjZlPNLa54ePMnnr5sdacgtDRbCXzaN
-Lve28nSS-EPsB-peXDVqayqMbhPZv-yWl-O65B7Rwc2rLcJh6I-296AxMxFOB1cHPfXK1CBaBvlA
-I_u_G_0NVRUuqg5CaWw-yDv_tzqnDCID5smObdd-9QOnRA_t3NTkPFhhOvbQjju2ZA7FdrZnMDem
-eG-znmI2JwQlgrzybXs2MHOtmI1d9sAUROGkYSnzMzCX6GXd_vf-UD3SpfURrQ2SOmflVf1-WKZh
-a6KcKPhXHH0wxB4fLxmvBVHT8U0E0PMbQ_ilZ9lU9A2fxcwPhnZpwJadZQ2H33OdNVFHDARWBZj0
-3Kt0eVIfxaRWgptF0WYPlh5ge9oveMWMvDg4oIAdBDNrkcX4cCfS9dmmXvCNhtY5KrQPr9SO66OC
-nljHSsmTRDcIWgi23chfJcm8GJbwC4MD2JSb7oqXNIDUCse5SInSWSpdH0sAgbDrN0_fzoF7rLVH
-wgFLuQBCJQtCW9D00iVfaUj8BfvHaH5xpO09DpK10CDV1lgjav9x88KcQo7jtcDUNEf4NM8_oo9K
-zAil7PabfVsvBGjU-YAW7_sF9jPiQgYYD4DHXOi3o9tvwBWrwAyoI13ziMzlCXZw8f1ftpE2VVPW
-su0QTPd7TO3B_gdWeaGbkBKyMU06SqrXd6-OPdBepSiNtKODRpY3dOFYsQVUkQOfyLYdoso_BO5C
-10I_DTKHgO32yenIJPn72qPSk3-lxbcHhqPy96u9Y-krmOnx1bjoeN2jhJEKxwKQclemP-eFHDKz
-LMdbL_gt946nPVqrKPZtzDSkqztoal3sWmkoT__6fK0sMyIU64VCaLp2pyuh8dujFe3DDmi1
\ No newline at end of file
+gf-I4kLSg98uxwCXpklt-W2Qfa0mFgvXDoQk_qsLs4uuLI9FmWkrdlgdqzEgISL1sf6SAhoXFXO4
+BSm8fSPPrjaFEQ-uZcho1bY63lG710ZLh7vf0Bc7WPieRXesloH07CRXXjUdTkXXU8qTP6Ufru16
+mbGODzcZ-Ygm2GLVbkLk7953CJYIvuYT0M3ggrDr51eOalpgwXA1uO2DCTmY_fyqFNpZbLEtcYAx
+EEBkbaT0KhKwSfXfPINjpfCVMNBr3eK2m75RFJzTmA4Nq_WFgQQBUJkYu6EaWR8xwKEnX3brIFN-
+uY8Xk-Wxh8hhqNQWSxaSa_w6BfbP5CwUpIk9Ex1v_gCa63NIy4WzoRxOHKuCQAS26vLJFxTTNOlP
+d_DVC0gmvL-q8VnedNVSsRw1zuDOtOzKg3iUbTjopba3YryelxwL2xUJzkxv8RiOVvTCdZ34lPP0
+vQCaGJYg52OKOCMaIs4e6bqfCFMT4nlbad--mPeZGS3X5pJ0xSAMRa8L2_ksHbTOvcjOlCvmWNDK
+puP22sdegP-mV6Ygm30Gyn7TnUodDA3bzIiA70zrkrlt8pBMhKmCbmWvGfjItoRnfGwtlsm1OU73
+Jst8pQ_mvCK486UoH4Lui1kNBTqAJIrzYT_m-MrL6w9lx7Lu-ZG0HqdDVO4zB06WTyCXT-I2r-XS
+F9ddoQ3GOUMA4kIckEeEVYfZiVaoPeizNwynSLHZDA3Xztc-kz7HEqdUCypM5pM32qGN-z4Gzbh0
+K4GO7_cGyctMGNY5za3iANK3BBBx9d3G3XKuCH2EDF9aj_kFarMaJjTHwn9-OAeD2GXtdYQqarod
+4Yw11CD8JjyF6PdYstTh9t5_iK3pZjFaLMBPlLFN_tDu_5zsVagJjM7nMjfn8iWH5o3rj7WAIqBC
+NoxZhIRUVpEmDKkhsnq9i9gdjoiKjrNwEsswX2vGsXEAf1vTXH2YsgraTjEhlW0cIb4PBLd4YoSE
+AW3MXhwu5rYFgGooHyB99OKZOX6-5Y44fA0TE0ypn8HZ5oVrERCHVHNXsiXg1pRjTHjoIYUFoSQQ
+lT8eVUo5MUxQ0SVKUi03wA7EduWrwvuD_KyLeNnvECj6IDuK7qiqH86UV7AyQhwjSZPj4N3KIlvD
+VJNLmt6s8b6SLZpO23P-ZceFEIIYG7E1IGmo2s5VkWTNTkvqD7blxoOsfBIxb-SjttnMtbKCcXPj
+aKMC1oqr5xLsvtg9XDKKXt4kELElRBiKtrud8t7qqYMfC-q6lIddmG8x_196qsYiErKd9mLyDT2H
+DG9wmz3dDds_bUnXA7_-LsriDI4t_fAqAKnvR8tLi9DjhU1g9yjlGuKn4yd3y8aK-UFFfBi1AKxA
+WoxSt2Omw_sl9Jc6bzoZ2_NHPZz7IaDhSu1imAAcAms4SIr3g-MnBffVpxarrXYsoaxurMRMoqLx
+r0DyV1Y9IZSwo-xsWk42CxrvEF31AmFWewI0ykA8bZ-zpWux3z7BfbKDqxglg3Lp5uIfVFHamds3
+ya-KMBCtaSgiJ9fB7Q183Lt0tMxrOLe3hln55I4SRgHT5blh1LEznIigIfhFEOo514JEdctkVrDS
+bDSbCO-yZE_0BcznTsjoyImwObeVRbDDu0feM9uGs4fL7zwVCbzEurGU2js-0o0rcyDiv30tsL5S
+LaxA-xz7x5HO4JAd7BeaeF4-v0-IeLKPH4HzYk0g1PKskZaZHMWBWSPaJWin68ahh9Eh44xSjsCW
+TUcoddf4-5HZS_RWlrLvbnfbEBAm7Ikbno1zLJz7_H3tmLKv2axkGEu-YWIAffb7xMzG0T9m6S3B
+Iz1jWxtJ41gTE5kGFmaezDeUGPrioaqOq0bCq6DStQMc_5kcKAIg6GffOX75ZvagC2E6E_B58AGU
+iVDzz_yi4Xcssf2jN-MIiHes0HsMQILrLAu1PLZh9qOIGOnVgLdwr0o5CGsg0h7Bxxl6jFQubwAZ
+rc2foRg7arAcRHYasoC34f9pH0hfBzHfTGg5S7bWU6mDaldpWS8Na0EoCoFoZATkdzG77w6c
\ No newline at end of file
diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.location.props b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.location.props
index 11dafa78..eef8aac6 100644
--- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.location.props
+++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.location.props
@@ -1,7 +1,7 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2021-03-12T11:29:45.890+0000
+#   on 2022-03-22T12:34:21.359+0000
 # @copyright 2019, AT&T
 ############################################################
 cadi_latitude=38.0
diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.p12 b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.p12
index 7b37cbe9..69948c25 100644
--- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.p12
+++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.p12
diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.props b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.props
index a7c9882f..985939b6 100644
--- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.props
+++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.props
@@ -1,7 +1,7 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2021-03-12T11:29:45.885+0000
+#   on 2022-03-22T12:34:21.357+0000
 # @copyright 2019, AT&T
 ############################################################
 aaf_env=DEV
diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
index c61528ac..3666b965 100644
--- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks