[DMAAP-DR] Patch DR certs for another yr

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

14 files changed, 78 insertions, 78 deletions

diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.cred.props b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.cred.props
index 73ee4a9f..9a43f584 100644
--- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.cred.props
+++ b/datarouter-node/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:38:49.244+0000
+#   on 2022-03-22T12:31:16.865+0000
 # @copyright 2019, AT&T
 ############################################################
-Challenge=enc:9vA1vTl-6d8P2bOzJEyUtZ-hP95ubp7sW1fjxSmpGOYne5kSXrnKEKg-4ph-C72C
+Challenge=enc:2dZO7B2UVelU01IezilQ9hUYptjIvurC6JWO9vJHOiiqg9qUna3AdEMxzBpXcgIO
 cadi_alias=dmaap-dr-node@dmaap-dr.onap.org
-cadi_key_password=enc:s3TcKeRwuQe3ammLASLKvdoZ_lT7tFaHvhUPyD4fWTgG1in9HuODEzLzSb4w23C3
+cadi_key_password=enc:ow380FBQU5xvQEDzTiXdfx-BD_0dEWbRCXjnUPxVFatk_7KaejgiLCVew6C6x8_9
 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:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9
-cadi_keystore_password_jks=enc:-Y-zJNwSoGr5SkEtmOVfKus6TF7V1iCHGnSbyUNZ2LPY0utPPbm8YFvQ871jU65Q
-cadi_keystore_password_p12=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9
+cadi_keystore_password=enc:Urky1AuqpokGwoSl72ypmhVONokY0H1Gy28S9P8jfvK1-d7W8SODXf87K37EubDo
+cadi_keystore_password_jks=enc:lwXWmxaVAHy207uNeiHPYLho3qezj4xu7_iH4myTitXuj_bo9esv0e1L19HluXlM
+cadi_keystore_password_p12=enc:Urky1AuqpokGwoSl72ypmhVONokY0H1Gy28S9P8jfvK1-d7W8SODXf87K37EubDo
 cadi_truststore=/opt/app/osaaf/local/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:62_om4n9NkpeK0JEwHjhvqv_fJrgDrcCKmtJnLoltnk7HmetDPb97cGzI2WSx0Ko
+cadi_truststore_password=enc:stAsWWKk5FOcWxyWsNqyQlSdkwWSxcy3Jed6RW_r4jyZosqV8kmSCJLSHNLyWyTH
 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-node/src/main/resources/aaf/org.onap.dmaap-dr.keyfile b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.keyfile
index 4ae2c1bc..987cae1f 100644
--- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.keyfile
+++ b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.keyfile
@@ -1,27 +1,27 @@
-8eW4Ws5xIgwNpnNu_Gq_KhPol_80m8yFretJeBMvL6BOYeZ7i1BfuTn-RAovW03M5nFzhklBpcco
-RPoks-2mYpqp9pPztSCpA2rw11yOolsYFQEoanGn5JdVXB0m7ssIvkcqwyFd3TBO93jupaOMWO0h
-3ArRNxhK8QZ6EiqDsp3Y43UgeCuHjVgjRrMP1HQYR6tUM3DBRzymwYjOvXQdRRcaTLei1mGlgDpj
-n66OJ2vEjPKQdu8HELynbzvcmW8yEd-BqCRESz44IRTDqUW3MWt0fgHvbDj-a3CfZ6HIbxn4Wgwf
-mQvJasPjd3tSVNXhyhU70aRmpKr1qNdwbMCQLqvs4-Voz9rF-FhZqWFipZJo9xLsPnc551bDRM4k
-a6iqYXefr69pIKZXm_0ksfphElWIVU9vU7P0jmICAwXACJOcn3xa7JpHRP1NMv-4uVaZGRoAx0dj
-G-45GZiNvkpS5Vq974ebNqASolB55N16cUMnn-M9JtjJYJ5EHIVrwteTldIjnU2z7iWMQ_c99Mb3
-kZWkNbVPFDGXyV8PSS13Zupzbo-_OA6XgFwccIRsQx9ZDir33kqWOqFnJ66UEgq-d96rQ_Zr6e-U
-cnfLOmi7HlFnVb1tYk2k01B-6yiLdPvdV9uTR943TJrlLhADXvlutRzK6YPrRr-zxp71ekgc9DVS
-9AU3cj4lw0-rvsfW5ke995QL4pQSo2ITcKHqenQ9bAKDxTfp_2acd0B4muLVMmtOcmoUnKYCix6I
-c-DEaqK1E8Q8EHpMlZmp8uTloaL-0_R8Y1XwrrJXs9D2Smn5H87VZ-T8fzHtKYqNtOy7tRr3G9uI
-it68rgBbEiEvpXQKQzMH7yVnso7FP_fgN5c960yOL93vEBmSPQ1DkkHqPVqwRmRhJH7g7sM9U5iC
-988DsuodbX2V9A348oe2S4nVVCHDbCkZGKreCaQsfbYpOOaegVCSszqn6FGjfVT8Eb1Zm0BDcZFj
--_HGgXMYTHsFF-OxvCkRgS503kldxlyHHthDog34zxH4cqlJRDxWASEG0mx-3x2Er1UJOEkO-zoC
-xMQvI05RAAydsRv29SIPqMDZXd7q_ymfWRzJIxgTBhz6zOb6iCRHYaT84CAMu8UYlJA_QcPgqEst
-T34wLTp66HjGT0KtHIiljbzVzLs4PzfA3fKigWxi0CypPa9AleiT_aOa0HteRPx1imzrD--zjcxV
-LgPaqr0cnalYRrIl3ITf5CZOR6kprO-zlsL_K-k2fmqGm0JBHfvBLohxHTZopNeuvmLDRg38d9A_
-bp13KS4jR4d10ATbIZkEjRjexvIi2NB6NPTJvBs3X4yanBa1miIQMWkPxIZQVTl3XGCc1s_7TfHM
-wQaNRyWkrmzbfi_2I6fTH3PSv_ldYT5R1ZkxXe4HbdESp5OnAU1Hs84XycmNqHiA9HyRpMo4PGFg
-PkPq3Jf8_l8FvgWsOoL7c5Xfr6Ty1FL8lhrKt3VXuwnTML0oJW2TlpRlW4coFgzT1L93QoPCV--T
-kfn5ClXAfGsjqKy38G5_vFkrLRopHcqH7uuODAjk80luLFYQzTqq0R6jAPjQBz9jpVLKUP6D8Qtk
-1lGUSvku_dmgTOkzuVTIloWiNH_1pyv9_dBWNc4DnYHho_Ox16U1yKag9X7jvewd5qyHbSCLVFDd
-YoctOUZiPUxNoCXvWc-oxEYSj7MYzRZA3qTLXyDwcQGyyLvQfqEXpMAKMQdjnBk18Z72ACdKWjrM
-rgvuGB7NAjjNmu_ffVn4p4RZ74bcE6Xz3sp4UU6tctoPXR0FNG_jBDUjQBfsxnONEk0DMFJuNkbb
-bdZmnSXRhY9kZM3RZf2sQd9qbdcm-nZzWvBMR7-yKX7cXdIAbx4ROIfPDk54OFQNEVGwz1kMrd3e
-A7fBmqT8O1ThbMlDpxCnSKPq80s_5JhAU5zLoMd7kWnD-ekmVhFqxZ7NtCrBfsK8NfE-aKCT-ObT
-gnkjdX6pQJW0q3FBrR6lCwpCRVOkYA7BSrZAQSh8zzGOVwRWbRKlyUaKTzAkovKET1TgtPMo
\ No newline at end of file
+uXr3OodaCvEvTDHfkpgh-_5UdpEkBowSRpKF18WNxMG0A9Y9k2REr-d075mNHshr5gOUYAlykgaX
+ImvY-oFtG71N-Q0uqYnYuU7eX7zgcOOFNpeT4q2db3wkiScaZgdv2UnfDOVX2Aq53GzyYeKcGB1W
+u0jKX8ryHVC0uvj69y1boiJBxQY1HwAqsh9q39Ut1XxyB42D7xDM7sa9G1I6YosQlthXPMt7Q_i0
+0CUHrozT6Wtnxfb8-qR6rM5PNmAxp8r5Jb4cnSbxJGEWpx1DkZPPZNvLjE9bBfinVftzrpIlqHd3
+2CCp3k6xrqui2c_0HaNILtKHX5VVKttRf9zoADk_l5_MowEJgh1fgu8m0r-iEB6oH18AWZ_PCtSr
+A0cqEDGbP-h7e8w-Dwb0yS_oSfeDISarZ1Q46CQFcDz7f4bVB3AW67YGM4SQBaFGivWS_Lz_juOx
+fhyo55HW_wL_92xRvAyXD1Eg64Lw0Cx0f9rn4uM7NkKaSCP8MmIvs84egCvDzCiWkT6SGzUTeZ7M
+qI0ow2tJPFUuvhozcYxJW9sFzTqTFL7iLtrO5nHmo7YUVf2WU8ByGOfC-ylZPjw0fiKpe-7MXVSz
+MIOxl3pgWSYt6kImBtZCateif6TgF_A-91yAOoQLm72baJKhOo-F-aJ4k6ToT4bZ-9-Hjs5Wk9sO
+4thYzDcMaGrWsssnR9QMBjl9x3uw5bfOYGduyyRCWC_TYNorrW6Bvh7gFZAWk_f6cK-pPahRo_3O
+erNlUHx6xaektjqUsmp91LzjCEWbmt5nDGw16VUSPhrtkca2ReWDL0vTnpjvPuRI7mWHdfyoVYMw
+KUDkRgn61QvELC0Rl0C12polUEjqSxCRvGzL8QiOrU_Z1hXhVyp2gVIYvDKyuyguvJlniEBQ2qbM
+3Y5savSaANj-b2-_J0ofhvYFGz1k_bjcCE6Wx2RSWk1nSJFJ0gFjp1Ky2cyKhhVMXCiWcbbA3vC8
+E1cE9Ixn4z5WYyHOAFyzrsiiapdn5MhB_kI-ObR2HuRy_GRJHMVpxqX15Bv3OXxWy51bXeYeRfit
+SVCoyfXMXbx12eVG4tvf3WyYg9RqK_QN57VAmnffq09MAXuzFB1NuxSeJeBHGtBW6XIvb6E32K6I
+rL7vfxGHhD7ZHqQzzie5I42HufANtBb1KNKHikeeACxxlpjOIHjjEZ6yffhoyhNbSHx4TNs7UYOf
+FUKs0TCO9ffSJ8JT67X-baqlnSYFkdqR6QTGhltZq1ssPYq6Y6NGN1iEHJMfapev07AQgp6mBBxJ
+dEwDZMAwlmb1yVkU1gfzcrGdAUeAAuM6LowPHUKYLJJvvaFLQJKbwwLvjnm_Tf9UR5QJ8a3JKiLt
+F0Ykc1AeO-fyiNPUVRnkc3--Gs0bLUpLe0_medGOZ_LLk45GarEzBCGajgF_joz8fsndKtDrEnB0
+z-8iiQ4bTZb_ALjKnnhcdKjoJNhZ-e3AsmadYO7ve2K3ApwOelWWh24iZ-ZSUbnlw-OQMu4RvI9h
+9KOTbu4gWokep3O2uT8-cVN-ax1FYRpmexHgIxZy-tmYjDdJTJQv3dMp5UngUs6xmIy5nyIBr51B
+YORSQmXRvbdvYeY7jOEQUGfXfS2yYtzLfJ07f8ODQJ24APDKsVEGWVBcBMqp53o9W7cPJ-4vnMLU
+mVYCKqVrT2bThRWb38OtaaJuA4A8GboDDe5Q0IZao0v3gqwgfCzJIjQx97AEHzEbLzEBxio_z8a0
+AYLi-_f7kMtgrMsj61gcRVUan5NVqnL7oVwFn8FuqeTRzMMbgJHUHfFzrgLxpRwnscGRzygZf39Q
+JqqOLGriWe_IOhXQ7aIp3uyBF-brJnrXcQIp3PF0fbVTGK_VyKDB6J0BjJyjmyL0TA37hDr8usna
+TgMtjF1qq9kOrJr2582n8TW-ogpyqm1ft7R18VT9_1JjtnCcTCudW-oJX87jv3UTJdaEkBMhc1Pe
+euLti-qSG3Q5QeO5AxM8mP_9YbLHB9YQboRWnbfC9oIFRmVgGAcdbHNFn0hfILBOTIYStQL4
\ No newline at end of file
diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.location.props b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.location.props
index b17da901..c30adee4 100644
--- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.location.props
+++ b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.location.props
@@ -1,8 +1,8 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2021-03-12T11:36:12.939+0000
+#   on 2022-03-22T12:31:14.170+0000
 # @copyright 2019, AT&T
 ############################################################
-cadi_latitude=13.2
-cadi_longitude=52.3
+cadi_latitude=0.0
+cadi_longitude=0.0
diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.p12 b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.p12
index a82b2659..4238c868 100644
--- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.p12
+++ b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.p12
diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.props b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.props
index 1a8ecd59..fd5c5aa4 100644
--- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.props
+++ b/datarouter-node/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:36:12.839+0000
+#   on 2022-03-22T12:31:14.169+0000
 # @copyright 2019, AT&T
 ############################################################
 aaf_env=DEV
diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks
index 6739cdc4..e09e2e61 100644
--- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks
diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeAafPropsUtilsTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeAafPropsUtilsTest.java
index 0cfbc75d..fbb93324 100644
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeAafPropsUtilsTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeAafPropsUtilsTest.java
@@ -36,6 +36,6 @@ public class NodeAafPropsUtilsTest {
 
     @Test
     public void Veirfy_Aaf_Pass_Decryp_Successful() {
-        Assert.assertEquals("ikeRgx8Q++Vz}0)kOusl^xjd", nodeAafPropsUtils.getDecryptedPass("cadi_keystore_password"));
+        Assert.assertEquals("w7(O#.QV#kQ;L(8fsaoT7cY&", nodeAafPropsUtils.getDecryptedPass("cadi_keystore_password"));
     }
 }
diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
index 2ea3f550..f3d14df7 100644
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
@@ -85,7 +85,7 @@ public class NodeUtilsTest {
 
     @Test
     public void Given_Get_CanonicalName_Called_Valid_CN_Returned_From_P12() {
-        String canonicalName = NodeUtils.getCanonicalName("PKCS12", "src/test/resources/aaf/org.onap.dmaap-dr.p12", "ikeRgx8Q++Vz}0)kOusl^xjd");
+        String canonicalName = NodeUtils.getCanonicalName("PKCS12", "src/test/resources/aaf/org.onap.dmaap-dr.p12", "w7(O#.QV#kQ;L(8fsaoT7cY&");
         Assert.assertEquals("dmaap-dr-node", canonicalName);
     }
 }
diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.cred.props b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.cred.props
index 714619d7..452a0112 100644
--- a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.cred.props
+++ b/datarouter-node/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:38:49.244+0000
+#   on 2022-03-22T12:31:16.865+0000
 # @copyright 2019, AT&T
 ############################################################
-Challenge=enc:9vA1vTl-6d8P2bOzJEyUtZ-hP95ubp7sW1fjxSmpGOYne5kSXrnKEKg-4ph-C72C
+Challenge=enc:2dZO7B2UVelU01IezilQ9hUYptjIvurC6JWO9vJHOiiqg9qUna3AdEMxzBpXcgIO
 cadi_alias=dmaap-dr-node@dmaap-dr.onap.org
-cadi_key_password=enc:s3TcKeRwuQe3ammLASLKvdoZ_lT7tFaHvhUPyD4fWTgG1in9HuODEzLzSb4w23C3
+cadi_key_password=enc:ow380FBQU5xvQEDzTiXdfx-BD_0dEWbRCXjnUPxVFatk_7KaejgiLCVew6C6x8_9
 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:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9
-cadi_keystore_password_jks=enc:-Y-zJNwSoGr5SkEtmOVfKus6TF7V1iCHGnSbyUNZ2LPY0utPPbm8YFvQ871jU65Q
-cadi_keystore_password_p12=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9
+cadi_keystore_password=enc:Urky1AuqpokGwoSl72ypmhVONokY0H1Gy28S9P8jfvK1-d7W8SODXf87K37EubDo
+cadi_keystore_password_jks=enc:lwXWmxaVAHy207uNeiHPYLho3qezj4xu7_iH4myTitXuj_bo9esv0e1L19HluXlM
+cadi_keystore_password_p12=enc:Urky1AuqpokGwoSl72ypmhVONokY0H1Gy28S9P8jfvK1-d7W8SODXf87K37EubDo
 cadi_truststore=src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:62_om4n9NkpeK0JEwHjhvqv_fJrgDrcCKmtJnLoltnk7HmetDPb97cGzI2WSx0Ko
+cadi_truststore_password=enc:stAsWWKk5FOcWxyWsNqyQlSdkwWSxcy3Jed6RW_r4jyZosqV8kmSCJLSHNLyWyTH
 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-node/src/test/resources/aaf/org.onap.dmaap-dr.keyfile b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.keyfile
index 4ae2c1bc..987cae1f 100644
--- a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.keyfile
+++ b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.keyfile
@@ -1,27 +1,27 @@
-8eW4Ws5xIgwNpnNu_Gq_KhPol_80m8yFretJeBMvL6BOYeZ7i1BfuTn-RAovW03M5nFzhklBpcco
-RPoks-2mYpqp9pPztSCpA2rw11yOolsYFQEoanGn5JdVXB0m7ssIvkcqwyFd3TBO93jupaOMWO0h
-3ArRNxhK8QZ6EiqDsp3Y43UgeCuHjVgjRrMP1HQYR6tUM3DBRzymwYjOvXQdRRcaTLei1mGlgDpj
-n66OJ2vEjPKQdu8HELynbzvcmW8yEd-BqCRESz44IRTDqUW3MWt0fgHvbDj-a3CfZ6HIbxn4Wgwf
-mQvJasPjd3tSVNXhyhU70aRmpKr1qNdwbMCQLqvs4-Voz9rF-FhZqWFipZJo9xLsPnc551bDRM4k
-a6iqYXefr69pIKZXm_0ksfphElWIVU9vU7P0jmICAwXACJOcn3xa7JpHRP1NMv-4uVaZGRoAx0dj
-G-45GZiNvkpS5Vq974ebNqASolB55N16cUMnn-M9JtjJYJ5EHIVrwteTldIjnU2z7iWMQ_c99Mb3
-kZWkNbVPFDGXyV8PSS13Zupzbo-_OA6XgFwccIRsQx9ZDir33kqWOqFnJ66UEgq-d96rQ_Zr6e-U
-cnfLOmi7HlFnVb1tYk2k01B-6yiLdPvdV9uTR943TJrlLhADXvlutRzK6YPrRr-zxp71ekgc9DVS
-9AU3cj4lw0-rvsfW5ke995QL4pQSo2ITcKHqenQ9bAKDxTfp_2acd0B4muLVMmtOcmoUnKYCix6I
-c-DEaqK1E8Q8EHpMlZmp8uTloaL-0_R8Y1XwrrJXs9D2Smn5H87VZ-T8fzHtKYqNtOy7tRr3G9uI
-it68rgBbEiEvpXQKQzMH7yVnso7FP_fgN5c960yOL93vEBmSPQ1DkkHqPVqwRmRhJH7g7sM9U5iC
-988DsuodbX2V9A348oe2S4nVVCHDbCkZGKreCaQsfbYpOOaegVCSszqn6FGjfVT8Eb1Zm0BDcZFj
--_HGgXMYTHsFF-OxvCkRgS503kldxlyHHthDog34zxH4cqlJRDxWASEG0mx-3x2Er1UJOEkO-zoC
-xMQvI05RAAydsRv29SIPqMDZXd7q_ymfWRzJIxgTBhz6zOb6iCRHYaT84CAMu8UYlJA_QcPgqEst
-T34wLTp66HjGT0KtHIiljbzVzLs4PzfA3fKigWxi0CypPa9AleiT_aOa0HteRPx1imzrD--zjcxV
-LgPaqr0cnalYRrIl3ITf5CZOR6kprO-zlsL_K-k2fmqGm0JBHfvBLohxHTZopNeuvmLDRg38d9A_
-bp13KS4jR4d10ATbIZkEjRjexvIi2NB6NPTJvBs3X4yanBa1miIQMWkPxIZQVTl3XGCc1s_7TfHM
-wQaNRyWkrmzbfi_2I6fTH3PSv_ldYT5R1ZkxXe4HbdESp5OnAU1Hs84XycmNqHiA9HyRpMo4PGFg
-PkPq3Jf8_l8FvgWsOoL7c5Xfr6Ty1FL8lhrKt3VXuwnTML0oJW2TlpRlW4coFgzT1L93QoPCV--T
-kfn5ClXAfGsjqKy38G5_vFkrLRopHcqH7uuODAjk80luLFYQzTqq0R6jAPjQBz9jpVLKUP6D8Qtk
-1lGUSvku_dmgTOkzuVTIloWiNH_1pyv9_dBWNc4DnYHho_Ox16U1yKag9X7jvewd5qyHbSCLVFDd
-YoctOUZiPUxNoCXvWc-oxEYSj7MYzRZA3qTLXyDwcQGyyLvQfqEXpMAKMQdjnBk18Z72ACdKWjrM
-rgvuGB7NAjjNmu_ffVn4p4RZ74bcE6Xz3sp4UU6tctoPXR0FNG_jBDUjQBfsxnONEk0DMFJuNkbb
-bdZmnSXRhY9kZM3RZf2sQd9qbdcm-nZzWvBMR7-yKX7cXdIAbx4ROIfPDk54OFQNEVGwz1kMrd3e
-A7fBmqT8O1ThbMlDpxCnSKPq80s_5JhAU5zLoMd7kWnD-ekmVhFqxZ7NtCrBfsK8NfE-aKCT-ObT
-gnkjdX6pQJW0q3FBrR6lCwpCRVOkYA7BSrZAQSh8zzGOVwRWbRKlyUaKTzAkovKET1TgtPMo
\ No newline at end of file
+uXr3OodaCvEvTDHfkpgh-_5UdpEkBowSRpKF18WNxMG0A9Y9k2REr-d075mNHshr5gOUYAlykgaX
+ImvY-oFtG71N-Q0uqYnYuU7eX7zgcOOFNpeT4q2db3wkiScaZgdv2UnfDOVX2Aq53GzyYeKcGB1W
+u0jKX8ryHVC0uvj69y1boiJBxQY1HwAqsh9q39Ut1XxyB42D7xDM7sa9G1I6YosQlthXPMt7Q_i0
+0CUHrozT6Wtnxfb8-qR6rM5PNmAxp8r5Jb4cnSbxJGEWpx1DkZPPZNvLjE9bBfinVftzrpIlqHd3
+2CCp3k6xrqui2c_0HaNILtKHX5VVKttRf9zoADk_l5_MowEJgh1fgu8m0r-iEB6oH18AWZ_PCtSr
+A0cqEDGbP-h7e8w-Dwb0yS_oSfeDISarZ1Q46CQFcDz7f4bVB3AW67YGM4SQBaFGivWS_Lz_juOx
+fhyo55HW_wL_92xRvAyXD1Eg64Lw0Cx0f9rn4uM7NkKaSCP8MmIvs84egCvDzCiWkT6SGzUTeZ7M
+qI0ow2tJPFUuvhozcYxJW9sFzTqTFL7iLtrO5nHmo7YUVf2WU8ByGOfC-ylZPjw0fiKpe-7MXVSz
+MIOxl3pgWSYt6kImBtZCateif6TgF_A-91yAOoQLm72baJKhOo-F-aJ4k6ToT4bZ-9-Hjs5Wk9sO
+4thYzDcMaGrWsssnR9QMBjl9x3uw5bfOYGduyyRCWC_TYNorrW6Bvh7gFZAWk_f6cK-pPahRo_3O
+erNlUHx6xaektjqUsmp91LzjCEWbmt5nDGw16VUSPhrtkca2ReWDL0vTnpjvPuRI7mWHdfyoVYMw
+KUDkRgn61QvELC0Rl0C12polUEjqSxCRvGzL8QiOrU_Z1hXhVyp2gVIYvDKyuyguvJlniEBQ2qbM
+3Y5savSaANj-b2-_J0ofhvYFGz1k_bjcCE6Wx2RSWk1nSJFJ0gFjp1Ky2cyKhhVMXCiWcbbA3vC8
+E1cE9Ixn4z5WYyHOAFyzrsiiapdn5MhB_kI-ObR2HuRy_GRJHMVpxqX15Bv3OXxWy51bXeYeRfit
+SVCoyfXMXbx12eVG4tvf3WyYg9RqK_QN57VAmnffq09MAXuzFB1NuxSeJeBHGtBW6XIvb6E32K6I
+rL7vfxGHhD7ZHqQzzie5I42HufANtBb1KNKHikeeACxxlpjOIHjjEZ6yffhoyhNbSHx4TNs7UYOf
+FUKs0TCO9ffSJ8JT67X-baqlnSYFkdqR6QTGhltZq1ssPYq6Y6NGN1iEHJMfapev07AQgp6mBBxJ
+dEwDZMAwlmb1yVkU1gfzcrGdAUeAAuM6LowPHUKYLJJvvaFLQJKbwwLvjnm_Tf9UR5QJ8a3JKiLt
+F0Ykc1AeO-fyiNPUVRnkc3--Gs0bLUpLe0_medGOZ_LLk45GarEzBCGajgF_joz8fsndKtDrEnB0
+z-8iiQ4bTZb_ALjKnnhcdKjoJNhZ-e3AsmadYO7ve2K3ApwOelWWh24iZ-ZSUbnlw-OQMu4RvI9h
+9KOTbu4gWokep3O2uT8-cVN-ax1FYRpmexHgIxZy-tmYjDdJTJQv3dMp5UngUs6xmIy5nyIBr51B
+YORSQmXRvbdvYeY7jOEQUGfXfS2yYtzLfJ07f8ODQJ24APDKsVEGWVBcBMqp53o9W7cPJ-4vnMLU
+mVYCKqVrT2bThRWb38OtaaJuA4A8GboDDe5Q0IZao0v3gqwgfCzJIjQx97AEHzEbLzEBxio_z8a0
+AYLi-_f7kMtgrMsj61gcRVUan5NVqnL7oVwFn8FuqeTRzMMbgJHUHfFzrgLxpRwnscGRzygZf39Q
+JqqOLGriWe_IOhXQ7aIp3uyBF-brJnrXcQIp3PF0fbVTGK_VyKDB6J0BjJyjmyL0TA37hDr8usna
+TgMtjF1qq9kOrJr2582n8TW-ogpyqm1ft7R18VT9_1JjtnCcTCudW-oJX87jv3UTJdaEkBMhc1Pe
+euLti-qSG3Q5QeO5AxM8mP_9YbLHB9YQboRWnbfC9oIFRmVgGAcdbHNFn0hfILBOTIYStQL4
\ No newline at end of file
diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.location.props b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.location.props
index b17da901..c30adee4 100644
--- a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.location.props
+++ b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.location.props
@@ -1,8 +1,8 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2021-03-12T11:36:12.939+0000
+#   on 2022-03-22T12:31:14.170+0000
 # @copyright 2019, AT&T
 ############################################################
-cadi_latitude=13.2
-cadi_longitude=52.3
+cadi_latitude=0.0
+cadi_longitude=0.0
diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.p12 b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.p12
index a82b2659..4238c868 100644
--- a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.p12
+++ b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.p12
diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.props b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.props
index 38fc3b81..c408b9ca 100644
--- a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.props
+++ b/datarouter-node/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:36:12.839+0000
+#   on 2022-03-22T12:31:14.169+0000
 # @copyright 2019, AT&T
 ############################################################
 aaf_env=DEV
diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
index 6739cdc4..e09e2e61 100644
--- a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks