Merge "[DMAAP-DR] Patch AAF artifacts"

14 files changed, 89 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 89601c18..73ee4a9f 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 2020-03-05T12:37:11.094+0000
+#   on 2021-03-12T11:38:49.244+0000
 # @copyright 2019, AT&T
 ############################################################
-Challenge=enc:arjPt8EywpbifN2FfWqLe-yYCQFfYeX19GVWbKzl3NWlxD2fQzSL0SHFUBg0ElBz
+Challenge=enc:9vA1vTl-6d8P2bOzJEyUtZ-hP95ubp7sW1fjxSmpGOYne5kSXrnKEKg-4ph-C72C
 cadi_alias=dmaap-dr-node@dmaap-dr.onap.org
-cadi_key_password=enc:moianFhZr4ug9foXZlqRgtPYGf9gMfAH7PUBclLusFoLyCYdLyZ6GkNkXHbqnNsv
+cadi_key_password=enc:s3TcKeRwuQe3ammLASLKvdoZ_lT7tFaHvhUPyD4fWTgG1in9HuODEzLzSb4w23C3
 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:dEEn7HFrUBGoGq0M5MukUq_O8rnP0foDftHLXs68y889Et_jegXyU6U_Css07nnR
-cadi_keystore_password_jks=enc:Tbtz9eL4qbdpvpG38sgaXRiXuluoSHV-beW083CDaSh2uhaPz5Xic3ybL-w5ZpgR
-cadi_keystore_password_p12=enc:dEEn7HFrUBGoGq0M5MukUq_O8rnP0foDftHLXs68y889Et_jegXyU6U_Css07nnR
+cadi_keystore_password=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9
+cadi_keystore_password_jks=enc:-Y-zJNwSoGr5SkEtmOVfKus6TF7V1iCHGnSbyUNZ2LPY0utPPbm8YFvQ871jU65Q
+cadi_keystore_password_p12=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9
 cadi_truststore=/opt/app/osaaf/local/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:REEtn_ZrfohiIuUQOcijhRwQEHnhWpa2Y7013dokESRMkrENT081YnKDWG3YR_FZ
+cadi_truststore_password=enc:62_om4n9NkpeK0JEwHjhvqv_fJrgDrcCKmtJnLoltnk7HmetDPb97cGzI2WSx0Ko
 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 74ec3473..4ae2c1bc 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 @@
-fef7r7Q2Bgstaj1Og2hCZTD-4T7uB7PyYfdwbtsBVDqA3lMU2VnDyoqQyxnxVNHI7gPU32isgtNQ
-F1lNErdq8JFqcg-6pwKHUDWXctaWzY_6sRczkzBHy8NFX1Z0C8vgZWGL1bU-LKB_HQOsIa-JQq3j
-DQcZdYviebXPFWHQv3ROJsZzy-1mbwUJ4F1_UgeGVLN_gwbKg7H3ItZyOtRftgRDpEeEHy1kGyZm
-wZr5TolWx_Kky1hUANFH5Xb_aTIWazcT4rIS0S4vGPpHXoywCfj3JUZXNUvr5Jvh3pp3HjyRSLu4
-npIY7agpkqx97ZQsrhlc06pflDZacif_yNSJ0q2tGUB9hfp9RAgGZ_oYzi_RM9tJrSvOgp2yWrqm
-cNvaYW-KRi_rlBjIXfe0CwkqKZrYlPfWG16O2MnvRt42EuN5n7i0P9TA8oyJ8lelXpjKm00GodIn
-iYUhw_lQDbI4hUGGsr_0t3ntBquvJoLqTVQuQVHQRsAmSbl_s5uqz9Sn84oOx7vuJrgEy9LNxBsv
-X2e846nLDOkao4KcFEvIZAsHxvlPAgpMjzg6yptVvf8EHo38hEbSb6DPqO2gZ6PySMRFgLl5ncPP
-hNQ7YHqFQ_VDBeraLm40-1Ehi5ko2-24MURDO5vOfrVxH1pkkjuj8I0EAaP9LRacbyoZ5Jfysepm
-nYHztywj5riMiv4V7n18XKsAsbodXqVoZF9MuLZMhQ8buz3AXMmmZk6SRoBb7t1HBhvQEmDqa8UY
-LFPyTtw9FGEP9bFGrfu-yYi_MaBbznk5WzPslOYczShTn2NLW_EHym3BvcmC8pWI3gTfC1DTcDMk
--ZCyPbksVIF_U4yOALIIDRzPkKjTOljvbTlqEKJqfHrLHL3I5ubjSve4B5cWSic-kPFqJELj7SzH
-D68T1yzynckBOlv1sAgovGVlx1P2YtNMU93lzXDR2ToOsbLpyF5ONQoThdcsorGjpPzkNyYo245I
-1wYloeLFKThZUuKTtBbOX5aUjoFaokRdQ2F5g3FRczhuAyE9J91YSJLazAVgVg5VZM14329Hsfx4
-y0XOnJqNy1ygwlj05rIQrcfY8cLcoIQHozJv9CTy9fa1_cOrl39ErTKTaXlLGFkCIhzrOMLmSrho
-v30AsTbCf0TdmDTRIWla3TxL2TCdlroY5QbiIRNBwD3hlT1-70SEMBpCfN9suuYWPeb6mkqcDnya
-w7PPSzNcR_JAzdE8_FKtXTcPX4JBpqxO82QtTyOjrnCMddXlvhVBM3k95gN6TTP2qJ44w9rHh-3R
-Lq4-PVJ0B5xUy_1t0VENhx9l0qyQ8IvAa4tzTAzG_Zqpck7fD2m0A0vx_XJfchte79lCYeRIoOx4
-vp8-WeHeqq35u9-uR49Sa4Ms1FTyOrgY1RberiGqG_M2kgtquJBIQ9uy68YVkGCP8aktIbkaFm0e
-gQPkSBYo7GTKFDFPQNQkTQJasqTBWm49KwCRK4AVQLD4vycmC-17RnW40C9SlM9fWb1sJ_zRw1tZ
-EbxogDu69E-lLBwAYze7EzDi7uprcp3XABdNDPej16yfcGDPx-O5rAqJt2vo_mHhK_AjHpGvP9CB
-WHExyGzq3u1tQoxVK5T1QDLgsK9nhwLO5jPCWdRLarW1k-Z72yrdLbrDy2Lbsat5DCsMOnC8wH4A
-muOjZ1XAeANq6oNWxeiyr1AokdMNct8792wIv9cUQTHzPuvTxsIMFqWbUGMAlxxI2FsniqHSSNrc
-0FkGsY6vxhZe1kFJz3ucqf2zg1bvGuqfZtB3UvJquAi1xENNa-9A3OwbJN92Nzowmc55kA9JcksB
-aLuzwrvd2lpU58oje1O2eDR3WZknn981mRv72bnh5td_8Vt_vOToh6aD2suBc45V_r-UKlrFSgWo
-ze0ik_LXjWfN3fdeYgOOIpuwk_chwnmiXitGzcz2VaLDLfnQAzD06A6c7wUac6_RF3XVLjn114Tv
-Uvm29vfsq3Xhel2Z7nHzFOp2T_g60HHU-NTC2M69GmUT_zJrWUXFrZenIANuPSP7C5pZlQeF
\ No newline at end of file
+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
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 9acde34b..b17da901 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 2020-03-05T12:37:09.234+0000
+#   on 2021-03-12T11:36:12.939+0000
 # @copyright 2019, AT&T
 ############################################################
-cadi_latitude=0
-cadi_longitude=0
+cadi_latitude=13.2
+cadi_longitude=52.3
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 6655dcf4..a82b2659 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 66765e11..1a8ecd59 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 2020-03-05T12:37:09.234+0000
+#   on 2021-03-12T11:36:12.839+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 6d81b9a2..6739cdc4 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 ccf2744e..0cfbc75d 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("V+b}aGuWxHI+BPSNMVXqD*bx", nodeAafPropsUtils.getDecryptedPass("cadi_keystore_password"));
+        Assert.assertEquals("ikeRgx8Q++Vz}0)kOusl^xjd", 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 d139d0e3..2ea3f550 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", "V+b}aGuWxHI+BPSNMVXqD*bx");
+        String canonicalName = NodeUtils.getCanonicalName("PKCS12", "src/test/resources/aaf/org.onap.dmaap-dr.p12", "ikeRgx8Q++Vz}0)kOusl^xjd");
         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 f63286f3..714619d7 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 2019-10-02T14:25:19.002+0000
+#   on 2021-03-12T11:38:49.244+0000
 # @copyright 2019, AT&T
 ############################################################
-Challenge=enc:HJsK_drz0D2MDwwSw-8DRU9HMrZKkyoLzJoHmSWzVNmfV60-Thvzv8cVzE_5muYb
+Challenge=enc:9vA1vTl-6d8P2bOzJEyUtZ-hP95ubp7sW1fjxSmpGOYne5kSXrnKEKg-4ph-C72C
 cadi_alias=dmaap-dr-node@dmaap-dr.onap.org
-cadi_key_password=enc:9dftI1cNP6buWnYEeCezE20kaEM7FXz7uZnRfbtQWJKw6F6Xgph6VOG8PCItM7Q9
+cadi_key_password=enc:s3TcKeRwuQe3ammLASLKvdoZ_lT7tFaHvhUPyD4fWTgG1in9HuODEzLzSb4w23C3
 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:HRDU37Il5FnfAIi9F7Hk76nenrM67n38irDqaZMq47tAu2o-KS3pCwiXSly0WZ0L
-cadi_keystore_password_jks=enc:xra37lQs-DyHe714sczkXACFJqtvylqj01qbqaC39bvkDMd0qInjg_pib9aJDM9S
-cadi_keystore_password_p12=enc:HRDU37Il5FnfAIi9F7Hk76nenrM67n38irDqaZMq47tAu2o-KS3pCwiXSly0WZ0L
+cadi_keystore_password=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9
+cadi_keystore_password_jks=enc:-Y-zJNwSoGr5SkEtmOVfKus6TF7V1iCHGnSbyUNZ2LPY0utPPbm8YFvQ871jU65Q
+cadi_keystore_password_p12=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9
 cadi_truststore=src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:xWbQBg4WdbHbQgvKGrol0ns16g9jgFYteR3nQkwTl65BtvtWf_ZKhSVP8w_Z0VHU
+cadi_truststore_password=enc:62_om4n9NkpeK0JEwHjhvqv_fJrgDrcCKmtJnLoltnk7HmetDPb97cGzI2WSx0Ko
 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 8794edd7..4ae2c1bc 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 @@
-3WQe3-v0lopz56oP3LKdegKk2FaNrftIicyQ47IHI07CoBrNy4JYGO9JtnWHDy1AdD6IDVkBf5zD
-aTMFDs2EeRdL7rhMeb7xwphn0rOWR9eOWZpU4bDArSfnSRyWoGj5AopLJigrymBifJpoFOgkfV-h
-VnYRv9884_iJ5QxAbEGK024-vnv1vZyS9ESmjbDjbw6S2-kjmqEQn_18rzrtinaRdcA89GSqtf8W
-a9CWE5nVnb3w-RzDlwM0kDGFCpD4Meo3gNmzH1-HbaTz79q2V8ia6_FZJIjP3xWkEjX8MiwKUX9u
-M7hhhtEQ8g9voCh_LrHEEbRmsMymeBBOeUFcB9nw0OU2-KnsZYweZtHt2aQP6336oFy-VhIG34qF
-Wm6jD9HBchaOvepPlDcv1rEU9k-2SOM1RB0BFGDNVfVHGkdBD7c4NqnPxcGoq5Ujyx3gxHoKPD0-
-Kzab1_agGCNIb6tfnPuiubVeP6-gHjkwARYDFBLpBXdD9dy-8s9I8rhawob6yX2ZtP60tN2HZs01
-iP42aU3QyJQgMa3fTU3Fx_DbWvaSOI0ZM9kAt-TKA5YR407IPVy4W65N1J8XfkFz-eoHcYwxIUY0
-qbF8fyEpjrh2smRSy1u340UvlCdBEzrt1TQw5RQqV1JYN-o0Mi44-9KjqkJzKrmk1pNjAR43w3h0
-xz2EhIobjHXgiX3KGYNk_FrvVFk4MQ4-HkqFvHY0Z5mG5O4I1ePzvHp32zTfqedAdQdsdy4VKU9b
-xH1tBREsRBB0WzXhLHilZ6PvGnQ7YpNo4z2WlDVR5zmLWim1062OUbp5w1QXBeO84EI2QoUFQnhI
-2xaFm9YFkPXUoqmh-phcRYKd4xkTKEcq5jU_k8Qpu3pml4uKdGfNnog2xhXxC11RBlvIyPiNJy-n
-RqywcPZ5woNEyqdbB17F6Z2FuyuruG6OTdLP1n_hiC81BBza2onPKsGxkA0VJixq4W_jn-KO578M
-Y1918I1w8NTD158T35M7Qj0XgUJn3HMp-JGX_3tjOlWNedMCQUCz_8GeKi5Luwt_we4uheZYF2um
-2VVQmcHNk94hgA4jaiHBXnLK7qLHVLpRBaNvNjFI7GFI4CMIkhZV-e7ziPk1dauaUaeAI7Th2_Sb
-lsyzGJ-pjF_l53QENjwTR5Dp6Dia61unCImJJ3xFcZuq-ewnWjdp8l8MBz5Sp5hOnkLEoL_M_FyF
-zo6f868bB8Eqq_zn08Icb8QpvBQx62-GOg51jCdTCSKWJauTf_zhTNfdd2h-IO2RX03NYXr3ZDuo
-j9KLodsG0FIwEdX91Ju_X1A15RJKKKK2aAhF1gPj1_pq4gsACcie4QGox7y1kbVMhqNJc0cStvxc
-tcEQJd2cMfawVeHoOUpTXwfbUk_GaLPmodoks3Dm1f0M7WdsSme4_c4iRsrawRPXEnbhiEbstumq
-koQUPe0f3hcCnmQPC2jLNZIISJNwp_BfziG9IlO0TuxKt9a_Qkmx22NKft4QXUSAgiMjffJP9OMj
-jYeryZYGIRGjGgxZ-J5_2U65_lLhtwalQqmyAWl6ET41xpM5tUth-iOy3Sx1-jG4bRchnFzDxkL7
-iy-BD1lICg5UuDr2mMF3QxHkJ9UqNaDgY9ix9CFvIilyq9QJv1seweTllLd8BZzNnBpRytz3b4If
-5GDts41sdx388IgIcj0zhwJZNwjWa7GJRKIHymq6rRGTlfDruski_En-Vqct0-74mpX3c9kSLY02
-QFU04YfTduCRnNnrAKRccTuo20HE5gC0g16R5BGJ-9puLzhmQfl96M-WfnHz-i9oYd_Yq235Uq6O
-K2iuPqDFt1Ob9HUFH1F1X9MD8MbZnG8UD6CQMmJn3bO4r8zBpUo2pQMhAOHAWBHFE-5EscJ3APgg
-YCvwlPjYBRn1za-kmn9pTQ0gr7TkqjwLKBtdeh6RFWmA2ebxzQ20UIDlzppHokQ652n7SQy1Cagy
-BOmDZvZ91ylkv_aygfFsnsOqNFnCF9L6lo05rw9Bt_jzLjbuT-Up6IGyhkCy6I785e8gDyCX
\ No newline at end of file
+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
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
new file mode 100644
index 00000000..b17da901
--- /dev/null
+++ b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.location.props
@@ -0,0 +1,8 @@
+############################################################
+# Properties Generated by AT&T Certificate Manager
+#   by root
+#   on 2021-03-12T11:36:12.939+0000
+# @copyright 2019, AT&T
+############################################################
+cadi_latitude=13.2
+cadi_longitude=52.3
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 607e2f89..a82b2659 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 53c6de05..38fc3b81 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,21 +1,24 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2019-10-02T14:24:02.090+0000
+#   on 2021-03-12T11:36:12.839+0000
 # @copyright 2019, AT&T
 ############################################################
 aaf_env=DEV
 aaf_id=dmaap-dr-node@dmaap-dr.onap.org
-aaf_locate_url=https://aaf-locate:8095
-aaf_locator_container=docker
+aaf_locate_url=https://aaf-locate.onap:8095
+aaf_locator_app_ns=org.osaaf.aaf
+aaf_locator_container=oom
 aaf_locator_container_ns=onap
+aaf_locator_fqdn=dmaap-dr-node
+aaf_locator_public_fqdn=dmaap-dr.onap.org
 aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.introspect:2.1/introspect
 aaf_oauth2_token_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.token:2.1/token
 aaf_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.service:2.1
 aaf_url_cm=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1
 aaf_url_fs=https://AAF_LOCATE_URL/%CNS.%AAF_NS.fs:2.1
 aaf_url_gui=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui:2.1
-aaf_url_hello=https://aaf-locate:8095/locate/onap.org.osaaf.aaf.hello:2.1
+aaf_url_hello=https://aaf-locate.onap:8095/locate/onap.org.osaaf.aaf.hello:2.1
 aaf_url_oauth=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1
 cadi_prop_files=src/test/resources/aaf/org.onap.dmaap-dr.location.props:src/test/resources/aaf/org.onap.dmaap-dr.cred.props
 cadi_protocols=TLSv1.1,TLSv1.2
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 c837fa05..6739cdc4 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