From 60f8c04c87612da4fe0c8b6e08bd1c26a964c5e3 Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Tue, 22 Mar 2022 13:15:22 +0000
Subject: [PATCH] [DMAAP-DR] Patch DR certs for another yr

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I3a8354a846093ab98ab2b6a9a36e9daf9feb4370
Issue-ID: DMAAP-1726
---
 .../resources/aaf/org.onap.dmaap-dr.cred.props     |  14 +++---
 .../main/resources/aaf/org.onap.dmaap-dr.keyfile   |  54 ++++++++++-----------
 .../resources/aaf/org.onap.dmaap-dr.location.props |   6 +--
 .../src/main/resources/aaf/org.onap.dmaap-dr.p12   | Bin 4217 -> 4217 bytes
 .../src/main/resources/aaf/org.onap.dmaap-dr.props |   2 +-
 .../main/resources/aaf/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes
 .../datarouter/node/NodeAafPropsUtilsTest.java     |   2 +-
 .../onap/dmaap/datarouter/node/NodeUtilsTest.java  |   2 +-
 .../resources/aaf/org.onap.dmaap-dr.cred.props     |  14 +++---
 .../test/resources/aaf/org.onap.dmaap-dr.keyfile   |  54 ++++++++++-----------
 .../resources/aaf/org.onap.dmaap-dr.location.props |   6 +--
 .../src/test/resources/aaf/org.onap.dmaap-dr.p12   | Bin 4217 -> 4217 bytes
 .../src/test/resources/aaf/org.onap.dmaap-dr.props |   2 +-
 .../test/resources/aaf/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes
 .../resources/aaf/org.onap.dmaap-dr.cred.props     |  14 +++---
 .../main/resources/aaf/org.onap.dmaap-dr.keyfile   |  54 ++++++++++-----------
 .../resources/aaf/org.onap.dmaap-dr.location.props |   2 +-
 .../src/main/resources/aaf/org.onap.dmaap-dr.p12   | Bin 4217 -> 4217 bytes
 .../src/main/resources/aaf/org.onap.dmaap-dr.props |   2 +-
 .../main/resources/aaf/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes
 .../provisioning/utils/AafPropsUtilsTest.java      |   4 +-
 .../resources/aaf/org.onap.dmaap-dr.cred.props     |  14 +++---
 .../test/resources/aaf/org.onap.dmaap-dr.keyfile   |  54 ++++++++++-----------
 .../resources/aaf/org.onap.dmaap-dr.location.props |   2 +-
 .../src/test/resources/aaf/org.onap.dmaap-dr.p12   | Bin 4217 -> 4217 bytes
 .../src/test/resources/aaf/org.onap.dmaap-dr.props |   2 +-
 .../test/resources/aaf/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes
 27 files changed, 152 insertions(+), 152 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 a82b2659c353b3d9d4f4725dfc2bac33bcf9203b..4238c868b863ba52a49061a90f8182f34ad9d8a5 100644
GIT binary patch
delta 4013
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
Tgr2IL^eUl+^bQ#U0|ADhUWdO;

delta 4013
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
T?DI?OrFcj>ph^h>0|ADhwDq(K

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 6739cdc48bcb9126469b78f575ac19d7a71820f5..e09e2e61a298406009440267e6c17ddad259bf7e 100644
GIT binary patch
delta 37
tcmZqWZsndJ&sx86j&8+96<=17wr7{+9%hP7cIgf|ku~>gj<{LF2LKUS58(g+

delta 37
tcmZqWZsndJ&sw2o9m};*#g|p&vG>huF2Qjh&VAYWGPK0!{-Gn1KL7?U5di=I

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 a82b2659c353b3d9d4f4725dfc2bac33bcf9203b..4238c868b863ba52a49061a90f8182f34ad9d8a5 100644
GIT binary patch
delta 4013
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
Tgr2IL^eUl+^bQ#U0|ADhUWdO;

delta 4013
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
T?DI?OrFcj>ph^h>0|ADhwDq(K

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 6739cdc48bcb9126469b78f575ac19d7a71820f5..e09e2e61a298406009440267e6c17ddad259bf7e 100644
GIT binary patch
delta 37
tcmZqWZsndJ&sx86j&8+96<=17wr7{+9%hP7cIgf|ku~>gj<{LF2LKUS58(g+

delta 37
tcmZqWZsndJ&sw2o9m};*#g|p&vG>huF2Qjh&VAYWGPK0!{-Gn1KL7?U5di=I

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 7b37cbe90f34d0e8c46eb410396d0750e28f112e..69948c2562e06b8e679fe1ec0be5cb189215204a 100644
GIT binary patch
delta 4013
zcmV;e4^r^?Ao(DWXn+4fYu_`mDWPw(&-N@I?mPBUWd#BQ0K-rOf&|D54xNRVN9f=5
zUaC3W5F!0bOF1URfOwGqFK5uWS!|H4ETA$LJ77T~I^gg~gpWLTt2-gJ(Z@4I4%zV?
z=sPv~OvRkNH|94(jv<pME;;5vfCG0gC$+R6?WH+})|QhZW`DF~7jx*tE@O8XE$;}u
zo+phm$h4B(H^_RqwFl62u7F2&HyUdIR|pl4QiheQZ80I~fG@INYZ)#6{Bd?aV~PVd
zMgmqP-*~;Vb?j^{5-#_^!8A1z9TC*CnHq>1TP$)<q4)1?A9b;=E9EJVXf#C+5FYcr
zqd}BDUMz#<CV!Gl^t!J>l6(qg+l`7ic24Aqm$OgH;KY7+I9q{^Bh2nr+Cw)(Tmf|f
zp{htR(f2WA6FWkc9`{q{n4p6u#q+g=Wolnnjy`y1-iKAE0x^!xVABhsab4Q%9IB<C
zOSi<W($$1+FzPb8aRUae_AXEEL-Y2MOC`eB#XMix+J8iiVz<OWHK<juhH{~H{%~=X
zH<|(x#tBui^t1o-zWI)(BEdgRZN%7KT^sh>RqNVYuT)G<>B^bwEvgVcn?){BDob(P
z|E4OWZl!hmf4_<Jqa|Mlkv7`!YR9cL)GI@;SuB@>L-!U<)dBRf=?K~0oqR=Wf}jEM
zhBe;WFn<!T>R~XS)~rP|P&%%I34mKL=HNI`;=iw5n<-Ggh)T7ZaZ*sdr#$`>*%5G5
zz42;KaSNTb$;@IYtuRg36@OG|KUR^q*^Em9ogHf!^`gjyibpE$xdJ~HGqm=Z#dTqe
zqxuminyr}&H?ygqcfVF2n#_LTUfH3O<-TzdqJJB;XxGky87MES@s%H2<;~$WZKTEn
z6fkL4N)svz#F~7Puf@PEuDz>UP_rgNG+`z(NNMung?z`&#8CJr8qdtY*k=D?$JPG?
zOYDyf%-k$qAiFpX2iOzOmuSyJnZZyaNVQhNqB#RSU&vr}D&8Bba3_KKc(ACUt4(F+
z5r41I<ndw%Orc~{ui^%*u`7H@t0s>E;JWkQPtXpRaAr@62E3`m)5UaQC+zm>%_k@g
zajw5)faHU0(F0)F%Pf2Kzl4Y==BZXcYrQiz8!N&G!2P-w`?hwW&yCA5Q>SPW?S17U
zD#qTx^3GLQS&Q;78`)pIY^~-$F7`f>B7Yzzk`k~J6j`fX$Qf-K2j22czN)S9V>^YW
zXOW{s*T{)_2a#5}hE1kTy?%&6{>-+3`lPP~f9&s0#knJ}90G4aQ#)$+RU!(;(D1**
z{Z{a`=a}=*rpzBIu;eDB?t99f`60QkSssLY`KCu%CEcwuMzfmTv2SYj8rr@fqJKv7
zr%@4S(*^gUBv+CS<UfQ4i(Uq|(f@ia%&Sp2R5!$~sC!}?xWhi63Alpp5cwrFiCp6v
z4E1}wM&rYqeZ*msU0-?bcYTF^`sJ_i_qLuhAP~Z2GmNj&HA#Gy6h6pq_`N%B0ma~r
z{EG1udd0hyeP@{0Ih(r>AQJ>0ihq3?10RR`E3kuhFoB+<oB?G+f&^UEB$Raq)9{>x
zOAL2Tt2#frgv(%+&?Ev`;Uw68Il!=Dr|dqgpWY6R`eUK9rvX<VcNsgO8_604<KB0_
zc-TV(YU}r0rsOBphQunyyXm_OYA@xQ$g-zjF>)|X1_>&LNQU<f0SOc_K$BhtSPL{a
zIW;mgHZnLhH<Q5yJAac9XJpQI*?j|Lp(#A4ej8WHcVz+t0K-s#f(js=5m0y}etCx3
zk`yIE&#<{Wn^o@uy`?1@qq0fcuVgebu&!wY(uMw4l1~Y+cLp5NE3@xiAa^D{m0<_~
zyRVqeLeJ%BNWDvF;4KZve3|&KOWt4=i%b3mpEb@jqI66coPU_#X<0p|BO(h$(HTu|
z)&`Zkk3lVQ;btq-GFX?wxzqOF-zzP9DQSjs_ofpVyL}f&O<uhfiiJu2`lJcu(ug5$
z+Sal*+inI&izBsQYMLyRzTFR0RikzMLYiJtX>HYr0F>HG7V;uS_VCc>3@PI?X6omx
zkp0sWkxz3W5PxYp^EN?{uoOOw{sXVXX#{ccH{E>KK#BF}_l7=Uk)@+(dmc36nkpP-
zd*UF~qrgA6n(v~ge)kpGz!%QAy&T-%?j`}42mC{`$_<6ek#*IWK89&<0;bu4{w*y@
zls&`8+iU8WjPQ@4<HErW8c5S$e@nZwa0F9wF_h>yTz~r-dzv#@`HuW!fsPJU<MkDm
z=B{U}y=n<)fy!s$mNqVxQn?Ka6_0{pxl3Nfqyo_zq3+JQ2Z$=pOFwGJpkS^<FORs_
zIhBg9081KyB@m)Z+Vuz?0goZWUSx-eFba4u$Ffn_bShQNrxGJkd*Fmudt4OkS|;yK
zh{bwset-FuK#Wbk$s7p}!|xx0z6ZbGuCtlBkP!CVukQ2mJCB}>!WPSQwSanQhp)7=
zIlm36!;i9U=1rQoerf~|gRRe&XZ1wbEV8C~(J%OCv|+8<&2povL@RfRMF!kk3aAnv
zpkHt%b$H3igUZ={i|-K0qO=d^J5y#k-pcckEq~0L8rl>+{e=tjk&h~-m?3Ua_WR%+
zr!;TF{+RNS!|Wcmxi=*Y(g~Au;Oj|a#H9t__oK9<dk~WE!yKs8IWqel_0tLgH67K|
z*lg{MEH!vFM3Kf?VSIV#{J{MnsN6F7F95ruqt&{c%7%@_|4PNtNsxRBEUc4Ib|=<C
z)PKN^yTO!$2_qg#qrdQR{u8jCXOH0SkC8V1dabeCo8L%o2X+PnEBX0*-1R7`+{*6G
zIi(@v4m1hBmeZGE`^Ie+igFMoReGdpaBx5(dF^)7sQ4}5<UlO*au+{u&k#UJ`r!Eq
zk>t}~ltU%okx@0IM=8SOHTTp9N<TbjdVloOr<Abq#DZl^+{mrKn+mT8E~6kvrxfEW
z8FR~LY0>;4E;HqlzydecoEwH>lXyiO88i&3bFp54O62!q<<KoU{f>WYkNfrISH=oE
zy1LcF>Vwa&KcVw-t9KO03tf|2;(`fw3&!eZMKJ_cOA`&F6bH07n6#c6&-m?ec7H{?
z2M>%TonbVe3bUkE_l8!Kf<G$6;dRj!8MgR=`?#SdB#;(#BQfvPwOMZq(n7+jBOl~X
z>6Z2~NS)o;vCbWqVk6EaE8ER2@Es_jY}1SQi<rxbr#qavfv0K1H)pfPq~{~H#8f{D
zrlmFSyotw#<k^^}Q*fbJ2Dqw6g@5A6=h|@_0d^Woo5Fc=zdWU#|IZ;Ju8r)9I*4Xi
zh7ZXNOSd{}r4%=v9V#8U6`_sNtAFj!1zNUDG@u!sE$t;3K}TChd?K)KI&Fa4(@%%7
zaLGaXkCpBb-)76T8(OMz`T+JAwr5dx0@i|Rqk*t`y>z0-=7uPc(AVl5e}682&z%q(
z`nZ@3z}&D;ALV+r9M#xlEe7gMF;a4pidZMVhc-SJ>U}YB$Ye5rAf+k1d2_7?fy0#f
z;Zl?MWt)2Ugu9W_q0iu4BwmF4%dbZ2*JvM)<%h8d2bn@3#~YReKN>5M8Y-EP+BD5o
zfPKP|)hG`cT}k4a)67!62!Dq8EqK$QpW_S>Oy)JB&20A$OEPwqD^@vFIp;n~q)t-*
zbRJxIh|%gZOb{z(*2r3HzqoAGRcD!)R)AQfGc7zACT(3W#s95p5T@=h#es=a@R{j_
z45=i{EGo~xA^q}wTVzT6E+mOIM@Q7mfu)eoOToLC(q@-Clg3;UY=1V5adI{l2>Cs<
zd2amPE%y;!@fIcVZ<2&0>#&f9-+s)*A+<VpY<@v6JJY6&o=ln%{kDAr$~8sCIwzm3
z>T%J><+U@_TEo1+X8CXy+$!r+k>Jr=?Tk{ii)^5qW7^FaF~W^|1L4-O&qIz}aA0$7
z(~R{fV-H*vD%xy+6n{;)Od{Ox2nZ-tJKHTwXxy=<2k4OG-gjH2d-qZSGP9YYu9)@f
zcX-Cf2KL2KNf~sQwF-qs%k*WuQ}Em#NQu#ge3$?AS5TIEwr8WonEoiyTa#`N`x;pU
z#BY+fGeU*tl4RzH(;`PkskZwmh9Ep0LayJ|b?_lqXF?nZ9e)e!{r@|5Nf}IUIpiy{
z#RY92p@&q3WICF1&DPE!oh0+9PVt(0Lea1H0YD!<rH6E^Jk<fb+W`9eN}lL+#Z;|(
zQ{9Mh+{@eieG{Ab*K!C=rJs;t>AsT64{-cp?E!!PeGZ7(yyhvrX>n~+kx2iDDSo94
zsAiyMB~(dL$$#h6o#C^U5NQR=!gt_AAopJ|q3l(_zqcxZWf9b8H{Wf!Ic%czFai6o
z!g5K*@kDMg^wtEI6#JgdEaznLDW|R^pvv$q`+Hf}A*1V|sxlZN&7%A{f;78j5)VMo
z3kE|rjg|7rWK$Witj%Wy1*Bw4SH`0F^LaRH5)p_3=YMuHaH=Ix>$Gj@DOu1iwiZU5
zzENV#pO9&iCRlWf1v!m@T7#&)qi;=8`uh^hw;}$NEn3<)@pKh25i50Z+H#s^A@=Cx
zl)oHZn4Fkp&cWF4-LnM&absRM@bhMAR5K%ddl&ngALD9Pl-xU=(xz4~T}dQIMStfy
zu`nzR4u1m#muD?q$D%WqNM}UA_+^$(W4Td6=e4-x^a9!q*%i5-=>GVF{UyG+oEj`f
zLyT<8kgSkU+J3j?viz1FIYl%99TR8|d!0eO3QoBmQa2$UKulMf!Ns>UOfa1=8CV{r
z+t~u6>)~5PL6uJOIg1Z79A^CHYr+BPF_?z&&3}yY%9HEyJ@;%uD0t_ruqyz19Si-z
z`M>4V^iS%^84<ywfT;3yg1UCQ=YLE1FhV>zeJ-(ASH%M_r&&B?EdBh3nc7aEDs9`B
zz4$l7VJkE-dv`-JBM5|e6{zlKojV&4+Y}RRibR{9a$2f33If(abTOb|(ugDv;I{fn
z;D3%go!4U)yqA4Q9*#u6Abk4nbxzSRT0cO*q3=Bmla)nI-sTKufz%~QBW>GnX3y?v
zK&nv?^-AsS@jDzfi<q)V7Z?^X>*!&8&V>wjN*QBzF{?XJKXUrp$k)u?)n*Vfxr2up
zg0JY?Iw}y#Lbtdao#$BGVQmZdma@8>#(&+MoA5cELR|OEjc>PP!UfP3<+M`x?Gdd$
z>M)RhBGo7Fo2(?gverAnRKJPna~ReuG(WrLnm(c;whV*ucZ1O(oe5dG<;Jj5WDc4V
zC22-5J}@CL2?hl#4g&%j1povT6nH))h4sa?MFxdeS$TGI+qGR^1Qep0S&($dS`u@Y
T;NA%CC-4|KzH`w60|ADhLZ86k

delta 4013
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
TJF40c$AHNw0}?#~0|ADh-f+P#

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 c61528accfbe8864ce9097d4598c22a9f427ac74..3666b96565f8080d3603e77abc03df37d2967571 100644
GIT binary patch
delta 37
tcmZqWZsndJ&sx86KFi#VD!!~DF=}r&Ztytl`e>DDPH07!h?VV)y#Na^4@3X}

delta 37
tcmZqWZsndJ&sw2otQE0Q#g|n?qG-3ZrDj8+;>#ENWN*f)ugjNW1OVCq44D7`

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 7b37cbe90f34d0e8c46eb410396d0750e28f112e..69948c2562e06b8e679fe1ec0be5cb189215204a 100644
GIT binary patch
delta 4013
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
T;NA%CC-4|KzH`w60|ADhLZ86k

delta 4013
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
TJF40c$AHNw0}?#~0|ADh-f+P#

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 c61528accfbe8864ce9097d4598c22a9f427ac74..3666b96565f8080d3603e77abc03df37d2967571 100644
GIT binary patch
delta 37
tcmZqWZsndJ&sx86KFi#VD!!~DF=}r&Ztytl`e>DDPH07!h?VV)y#Na^4@3X}

delta 37
tcmZqWZsndJ&sw2otQE0Q#g|n?qG-3ZrDj8+;>#ENWN*f)ugjNW1OVCq44D7`

-- 
2.16.6